/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 "2012-06-17">
 
5
<!ENTITY TIMESTAMP "2015-12-06">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
36
36
      <year>2010</year>
37
37
      <year>2011</year>
38
38
      <year>2012</year>
 
39
      <year>2013</year>
 
40
      <year>2014</year>
 
41
      <year>2015</year>
39
42
      <holder>Teddy Hogeborn</holder>
40
43
      <holder>Björn Påhlsson</holder>
41
44
    </copyright>
105
108
      <replaceable>FD</replaceable></option></arg>
106
109
      <sbr/>
107
110
      <arg><option>--foreground</option></arg>
 
111
      <sbr/>
 
112
      <arg><option>--no-zeroconf</option></arg>
108
113
    </cmdsynopsis>
109
114
    <cmdsynopsis>
110
115
      <command>&COMMANDNAME;</command>
321
326
        </listitem>
322
327
      </varlistentry>
323
328
      
 
329
      <varlistentry>
 
330
        <term><option>--no-zeroconf</option></term>
 
331
        <listitem>
 
332
          <xi:include href="mandos-options.xml" xpointer="zeroconf"/>
 
333
        </listitem>
 
334
      </varlistentry>
 
335
      
324
336
    </variablelist>
325
337
  </refsect1>
326
338
  
516
528
        </listitem>
517
529
      </varlistentry>
518
530
      <varlistentry>
519
 
        <term><filename>/var/run/mandos.pid</filename></term>
 
531
        <term><filename>/run/mandos.pid</filename></term>
520
532
        <listitem>
521
533
          <para>
522
534
            The file containing the process id of the
523
535
            <command>&COMMANDNAME;</command> process started last.
 
536
            <emphasis >Note:</emphasis> If the <filename
 
537
            class="directory">/run</filename> directory does not
 
538
            exist, <filename>/var/run/mandos.pid</filename> will be
 
539
            used instead.
524
540
          </para>
525
541
        </listitem>
526
542
      </varlistentry>
527
543
      <varlistentry>
528
 
        <term><filename class="devicefile">/dev/log</filename></term>
529
 
      </varlistentry>
530
 
      <varlistentry>
531
544
        <term><filename
532
545
        class="directory">/var/lib/mandos</filename></term>
533
546
        <listitem>
539
552
        </listitem>
540
553
      </varlistentry>
541
554
      <varlistentry>
542
 
        <term><filename>/dev/log</filename></term>
 
555
        <term><filename class="devicefile">/dev/log</filename></term>
543
556
        <listitem>
544
557
          <para>
545
558
            The Unix domain socket to where local syslog messages are
692
705
      </varlistentry>
693
706
      <varlistentry>
694
707
        <term>
695
 
          <ulink url="http://www.gnu.org/software/gnutls/"
696
 
          >GnuTLS</ulink>
 
708
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
697
709
        </term>
698
710
      <listitem>
699
711
        <para>
737
749
      </varlistentry>
738
750
      <varlistentry>
739
751
        <term>
740
 
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
741
 
          Protocol Version 1.1</citetitle>
 
752
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
 
753
          Protocol Version 1.2</citetitle>
742
754
        </term>
743
755
      <listitem>
744
756
        <para>
745
 
          TLS 1.1 is the protocol implemented by GnuTLS.
 
757
          TLS 1.2 is the protocol implemented by GnuTLS.
746
758
        </para>
747
759
      </listitem>
748
760
      </varlistentry>
758
770
      </varlistentry>
759
771
      <varlistentry>
760
772
        <term>
761
 
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
762
 
          Security</citetitle>
 
773
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
 
774
          Security (TLS) Authentication</citetitle>
763
775
        </term>
764
776
      <listitem>
765
777
        <para>