/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos.xml

  • Committer: Teddy Hogeborn
  • Date: 2016-02-28 13:09:43 UTC
  • Revision ID: teddy@recompile.se-20160228130943-6ofi0xgek1xd7qmy
Use GnuPG 2 if available

* debian/control (Package: mandos/Depends): Change "gnupg (<< 2)" to
                                            "gnupg".
  (Package: mandos-client/Depends): Remove "gnupg (<< 2)"; it will be
                                    depended on by libgpgme11, which
                                    will be added automatically by
                                    ${shlibs:Depends}.
* mandos (PGPEngine.__init__): Try to run "gpgconf" and set 'self.gpg'
                               to any binary found.  Also change
                               "--home" to "--homedir".
  (PGPEngine.encrypt, PGPEngine.decrypt): Use the 'self.gpg' attribute
                                          instead of "gpg".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.xml
2
2
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
3
3
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY COMMANDNAME "mandos">
5
 
<!ENTITY TIMESTAMP "2014-06-15">
 
5
<!ENTITY TIMESTAMP "2015-12-06">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
37
37
      <year>2011</year>
38
38
      <year>2012</year>
39
39
      <year>2013</year>
 
40
      <year>2014</year>
 
41
      <year>2015</year>
40
42
      <holder>Teddy Hogeborn</holder>
41
43
      <holder>Björn Påhlsson</holder>
42
44
    </copyright>
236
238
        <term><option>--priority <replaceable>
237
239
        PRIORITY</replaceable></option></term>
238
240
        <listitem>
239
 
          <xi:include href="mandos-options.xml"
240
 
                      xpointer="priority_compat"/>
 
241
          <xi:include href="mandos-options.xml" xpointer="priority"/>
241
242
        </listitem>
242
243
      </varlistentry>
243
244
      
540
541
        </listitem>
541
542
      </varlistentry>
542
543
      <varlistentry>
543
 
        <term><filename class="devicefile">/dev/log</filename></term>
544
 
      </varlistentry>
545
 
      <varlistentry>
546
544
        <term><filename
547
545
        class="directory">/var/lib/mandos</filename></term>
548
546
        <listitem>
554
552
        </listitem>
555
553
      </varlistentry>
556
554
      <varlistentry>
557
 
        <term><filename>/dev/log</filename></term>
 
555
        <term><filename class="devicefile">/dev/log</filename></term>
558
556
        <listitem>
559
557
          <para>
560
558
            The Unix domain socket to where local syslog messages are
707
705
      </varlistentry>
708
706
      <varlistentry>
709
707
        <term>
710
 
          <ulink url="http://www.gnu.org/software/gnutls/"
711
 
          >GnuTLS</ulink>
 
708
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
712
709
        </term>
713
710
      <listitem>
714
711
        <para>
752
749
      </varlistentry>
753
750
      <varlistentry>
754
751
        <term>
755
 
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
756
 
          Protocol Version 1.1</citetitle>
 
752
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
 
753
          Protocol Version 1.2</citetitle>
757
754
        </term>
758
755
      <listitem>
759
756
        <para>
760
 
          TLS 1.1 is the protocol implemented by GnuTLS.
 
757
          TLS 1.2 is the protocol implemented by GnuTLS.
761
758
        </para>
762
759
      </listitem>
763
760
      </varlistentry>
773
770
      </varlistentry>
774
771
      <varlistentry>
775
772
        <term>
776
 
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
777
 
          Security</citetitle>
 
773
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
 
774
          Security (TLS) Authentication</citetitle>
778
775
        </term>
779
776
      <listitem>
780
777
        <para>