[Pgp-tools-commit] r832 - in trunk: caff debian

[Guilhem Moulin]

Author: guilhem-guest
Date: 2016-02-17 21:42:13 +0000 (Wed, 17 Feb 2016)
New Revision: 832

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
caff: Deprecate $CONFIG{'keyserver'}.

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2016-02-03 16:08:35 UTC (rev 831)
+++ trunk/caff/caff	2016-02-17 21:42:13 UTC (rev 832)
@@ -140,7 +140,7 @@
 
 =item $HOME/.caff/gnupghome/gpg.conf  -  gpg configuration
 
-useful options include use-agent, keyserver-options, default-cert-level, etc.
+useful options include use-agent, keyserver, keyserver-options, default-cert-level, etc.
 
 =back
 
@@ -234,18 +234,10 @@
 
 =back
 
-=head2 Keyserver settings
+=head2 Key import settings
 
 =over
 
-=item B<keyserver> [string]
-
-Keyserver to download keys from, passed to gpg(1) as argument to the
-"--keyserver" option.  (Optional keyserver configuration options may be
-provided after the keyserver name.)
-Default: the keyserver and keyserver-options defined in
-~/.gnupg/gpg.conf if found, otherwise B<pool.sks-keyservers.net>.
-
 =item B<no-download> [boolean]
 
 If true, then skip the step of fetching keys from the keyserver.
@@ -665,7 +657,7 @@
     @{$CONFIG{'keyid'}} = map { s/^0x//; uc (substr y/ //dr, -16) } @{$CONFIG{'keyid'}};
     $CONFIG{'export-sig-age'} //= 24*60*60;
     $CONFIG{'gpg'} //= $ENV{GNUPGBIN} // 'gpg';
-    mywarn("Deprecated option \$CONFIG{'$_'} = '$CONFIG{$_}'") for grep {defined $CONFIG{$_}} qw/gpg-sign gpg-delsig/;
+    mywarn("Deprecated option \$CONFIG{'$_'} = '$CONFIG{$_}'") for grep {defined $CONFIG{$_}} qw/gpg-sign gpg-delsig keyserver/;
 
     $CONFIG{'secret-keyring'} //= ($ENV{'GNUPGHOME'} || "$ENV{'HOME'}/.gnupg") . '/secring.gpg';
     $CONFIG{'no-download'} //= 0;
@@ -1441,23 +1433,9 @@
 if ($CONFIG{'no-download'}) {
     @keyids_ok = @KEYIDS;
 } else {
-    unless (defined $CONFIG{'keyserver'}) {
-        my $gpgconf = ($ENV{'GNUPGHOME'} || "$ENV{'HOME'}/.gnupg") . '/gpg.conf';
-        if (-e $gpgconf and open my $fh, $gpgconf) {
-            my @keyservers = grep defined, map { /^\s*keyserver\s+(.+)/ ? $1 : undef } <$fh>;
-            if (@keyservers) {
-                $CONFIG{'keyserver'} = $keyservers[$#keyservers]; # take the last one found
-                seek $fh, 0, 0;
-                my @keyserver_options = grep defined, map { /^\s*keyserver-options\s+(.+)/ ? $1 : undef } <$fh>;
-                $CONFIG{'keyserver'} .= ' '. join (' ', @keyserver_options) if @keyserver_options;
-            }
-            close $fh;
-        }
-    }
-    $CONFIG{'keyserver'} //= 'pool.sks-keyservers.net';
-    notice("Fetching keys from ".($CONFIG{keyserver} =~ s/\s.*//r).", this may take a while...");
-
-    my $gpg = mkGnuPG( homedir => $GNUPGHOME, extra_args => ['--keyserver='.$CONFIG{'keyserver'}] );
+    notice("Fetching keys from a keyserver this may take a while...");
+    my @args = (extra_args => ['--keyserver='.$CONFIG{'keyserver'}]) if defined $CONFIG{'keyserver'};
+    my $gpg = mkGnuPG( homedir => $GNUPGHOME, @args );
     # logger: requesting key ... from hkp
     # stdout: gpgkeys: key ... not found on keyserver
     my $handles = mkGnuPG_fds( status => undef );

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2016-02-03 16:08:35 UTC (rev 831)
+++ trunk/debian/changelog	2016-02-17 21:42:13 UTC (rev 832)
@@ -6,6 +6,11 @@
   * caff:
     + Replace a hash slice with a reverse map for compatibility with Perl
       older than 5.20.  Patch from Gregor Jasny.  (Closes: #813469)
+    + Deprecate $CONFIG{'keyserver'}.  Users of GnuPG <2.1 should put the
+      option in caff's GnuPG configuration file (~/.caff/gnupghome/gpg.conf by
+      default) instead.  GnuPG 2.1 delegates network access to another
+      process (dirmngr), hence for 2.1 the keyserver should be set in
+      ~/.gnupg/dirmngr.conf instead.
   * gpgsigs, gpg-key2latex:
     + Use "Noto Mono" as default font when compiling with XeLaTeX or LuaLaTeX;
       and "Noto Sans Mono CJK" as CJK font when compiling with XeLaTeX.