/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 plugins.d/mandos-client.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:
plugins.d/mandos-client.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-client">
5
 
<!ENTITY TIMESTAMP "2016-07-10">
 
5
<!ENTITY TIMESTAMP "2015-07-20">
6
6
<!ENTITY % common SYSTEM "../common.ent">
7
7
%common;
8
8
]>
39
39
      <year>2013</year>
40
40
      <year>2014</year>
41
41
      <year>2015</year>
42
 
      <year>2016</year>
43
42
      <holder>Teddy Hogeborn</holder>
44
43
      <holder>Björn Påhlsson</holder>
45
44
    </copyright>
693
692
    </variablelist>
694
693
  </refsect1>
695
694
  
696
 
  <refsect1 id="bugs">
697
 
    <title>BUGS</title>
698
 
    <xi:include href="../bugs.xml"/>
699
 
  </refsect1>
 
695
<!--   <refsect1 id="bugs"> -->
 
696
<!--     <title>BUGS</title> -->
 
697
<!--     <para> -->
 
698
<!--     </para> -->
 
699
<!--   </refsect1> -->
700
700
  
701
701
  <refsect1 id="example">
702
702
    <title>EXAMPLE</title>
842
842
      </varlistentry>
843
843
      <varlistentry>
844
844
        <term>
845
 
          <ulink url="https://www.gnutls.org/">GnuTLS</ulink>
 
845
          <ulink url="http://www.gnu.org/software/gnutls/"
 
846
          >GnuTLS</ulink>
846
847
        </term>
847
848
      <listitem>
848
849
        <para>
854
855
      </varlistentry>
855
856
      <varlistentry>
856
857
        <term>
857
 
          <ulink url="https://www.gnupg.org/related_software/gpgme/"
 
858
          <ulink url="http://www.gnupg.org/related_software/gpgme/"
858
859
                 >GPGME</ulink>
859
860
        </term>
860
861
        <listitem>
898
899
      </varlistentry>
899
900
      <varlistentry>
900
901
        <term>
901
 
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
902
 
          Protocol Version 1.2</citetitle>
 
902
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
 
903
          Protocol Version 1.1</citetitle>
903
904
        </term>
904
905
      <listitem>
905
906
        <para>
906
 
          TLS 1.2 is the protocol implemented by GnuTLS.
 
907
          TLS 1.1 is the protocol implemented by GnuTLS.
907
908
        </para>
908
909
      </listitem>
909
910
      </varlistentry>
920
921
      </varlistentry>
921
922
      <varlistentry>
922
923
        <term>
923
 
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
 
924
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
924
925
          Security</citetitle>
925
926
        </term>
926
927
      <listitem>