/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 03:01:43 UTC
  • Revision ID: teddy@recompile.se-20160228030143-i6w90r7wzkvlx9kq
Stop using python-gnutls.  Use GnuTLS 3.3 or later directly.

* INSTALL: Document dependency on GnuTLS 3.3 and remove dependency on
          Python-GnuTLS.

* debian/control (Source: mandos/Build-Depends): Add (>= 3.3.0) to
                                                 "libgnutls28-dev" and
                                                 "gnutls-dev".
  (Source: mandos/Build-Depends-Indep): Remove "python2.7-gnutls".
  (Package: mandos/Depends): Remove "python-gnutls" and
                             "python2.7-gnutls", add "libgnutls28-dev
                             (>= 3.3.0) | libgnutls30 (>= 3.3.0)"
* mandos: Remove imports of "gnutls" and all submodules.
  (GnuTLS, gnutls): New; simulate a "gnutls" module.  Change all
                    callers to match new shorter names.

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 "2013-10-23">
 
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>
106
108
      <replaceable>FD</replaceable></option></arg>
107
109
      <sbr/>
108
110
      <arg><option>--foreground</option></arg>
 
111
      <sbr/>
 
112
      <arg><option>--no-zeroconf</option></arg>
109
113
    </cmdsynopsis>
110
114
    <cmdsynopsis>
111
115
      <command>&COMMANDNAME;</command>
234
238
        <term><option>--priority <replaceable>
235
239
        PRIORITY</replaceable></option></term>
236
240
        <listitem>
237
 
          <xi:include href="mandos-options.xml"
238
 
                      xpointer="priority_compat"/>
 
241
          <xi:include href="mandos-options.xml" xpointer="priority"/>
239
242
        </listitem>
240
243
      </varlistentry>
241
244
      
323
326
        </listitem>
324
327
      </varlistentry>
325
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
      
326
336
    </variablelist>
327
337
  </refsect1>
328
338
  
523
533
          <para>
524
534
            The file containing the process id of the
525
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.
526
540
          </para>
527
541
        </listitem>
528
542
      </varlistentry>
529
543
      <varlistentry>
530
 
        <term><filename class="devicefile">/dev/log</filename></term>
531
 
      </varlistentry>
532
 
      <varlistentry>
533
544
        <term><filename
534
545
        class="directory">/var/lib/mandos</filename></term>
535
546
        <listitem>
541
552
        </listitem>
542
553
      </varlistentry>
543
554
      <varlistentry>
544
 
        <term><filename>/dev/log</filename></term>
 
555
        <term><filename class="devicefile">/dev/log</filename></term>
545
556
        <listitem>
546
557
          <para>
547
558
            The Unix domain socket to where local syslog messages are
694
705
      </varlistentry>
695
706
      <varlistentry>
696
707
        <term>
697
 
          <ulink url="http://www.gnu.org/software/gnutls/"
698
 
          >GnuTLS</ulink>
 
708
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
699
709
        </term>
700
710
      <listitem>
701
711
        <para>
739
749
      </varlistentry>
740
750
      <varlistentry>
741
751
        <term>
742
 
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
743
 
          Protocol Version 1.1</citetitle>
 
752
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
 
753
          Protocol Version 1.2</citetitle>
744
754
        </term>
745
755
      <listitem>
746
756
        <para>
747
 
          TLS 1.1 is the protocol implemented by GnuTLS.
 
757
          TLS 1.2 is the protocol implemented by GnuTLS.
748
758
        </para>
749
759
      </listitem>
750
760
      </varlistentry>
760
770
      </varlistentry>
761
771
      <varlistentry>
762
772
        <term>
763
 
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
764
 
          Security</citetitle>
 
773
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
 
774
          Security (TLS) Authentication</citetitle>
765
775
        </term>
766
776
      <listitem>
767
777
        <para>