From: thijs <thijs@b513b33f-fedd-0310-b452-c3deb5f4c849>
Date: Sat, 6 Jun 2009 15:47:07 +0000 (+0000)
Subject: Make pool.sks-keyservers.net the default keyserver (closes: #527941).
X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;h=2dfca062aa06bb487599ff81386803979bdfc80c;p=pgp-tools.git

Make pool.sks-keyservers.net the default keyserver (closes: #527941).

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@429 b513b33f-fedd-0310-b452-c3deb5f4c849
---

diff --git a/caff/caff b/caff/caff
index 8cc36d7..138fef5 100755
--- a/caff/caff
+++ b/caff/caff
@@ -189,7 +189,7 @@ Default: none.
 
 =item B<keyserver> [string]
 
-Keyserver to download keys from.  Default: B<subkeys.pgp.net>.
+Keyserver to download keys from.  Default: B<pool.sks-keyservers.net>.
 
 =item B<no-download> [boolean]
 
@@ -478,7 +478,7 @@ sub load_config() {
 	};
 	@{$CONFIG{'keyid'}} = map { uc } @{$CONFIG{'keyid'}};
 	$CONFIG{'export-sig-age'}= 24*60*60 unless defined $CONFIG{'export-sig-age'};
-	$CONFIG{'keyserver'} = 'subkeys.pgp.net' unless defined $CONFIG{'keyserver'};
+	$CONFIG{'keyserver'} = 'pool.sks-keyservers.net' unless defined $CONFIG{'keyserver'};
 	$CONFIG{'gpg'} = 'gpg' unless defined $CONFIG{'gpg'};
 	$CONFIG{'gpg-sign'} = $CONFIG{'gpg'} unless defined $CONFIG{'gpg-sign'};
 	$CONFIG{'gpg-delsig'} = $CONFIG{'gpg'} unless defined $CONFIG{'gpg-delsig'};
@@ -1367,7 +1367,7 @@ the signatures by running each through `gpg --import`.
 Note that I did not upload your key to any keyservers. If you want this
 new signature to be available to others, please upload it yourself.
 With GnuPG this can be done using
-	gpg --keyserver subkeys.pgp.net --send-key {$key}
+	gpg --keyserver pool.sks-keyservers.net --send-key {$key}
 
 If you have any questions, don't hesitate to ask.
 
diff --git a/caff/caffrc.sample b/caff/caffrc.sample
index b6a69a3..4610a50 100644
--- a/caff/caffrc.sample
+++ b/caff/caffrc.sample
@@ -30,7 +30,7 @@ $CONFIG{'caffhome'}    = $ENV{'HOME'}.'/.caff';
 # Don't export UIDs by default, on which your latest signature is older than this age.
 # $CONFIG{'export-sig-age'} = 24*60*60;
 
-# Keyserver to download keys from. Default: subkeys.pgp.net.
+# Keyserver to download keys from. Default: pool.sks-keyservers.net.
 # $CONFIG{'keyserver'}      = 'keyserver.kjsl.com';
 
 # Boolean options, all default to false (0).
@@ -57,7 +57,7 @@ $CONFIG{'caffhome'}    = $ENV{'HOME'}.'/.caff';
 # 
 # If you want this new signature to be available to others, please upload
 # it yourself. With GnuPG this can be done using
-# 	gpg --keyserver subkeys.pgp.net --send-key {$key}
+# 	gpg --keyserver pool.sks-keyservers.net --send-key {$key}
 # 
 # If you have any questions, don't hesitate to ask.
 # 
diff --git a/debian/changelog b/debian/changelog
index f62e3cc..ef6b0e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,7 +22,10 @@ signing-party (1.1-3) unstable; urgency=low
     + Allowed the top1000 report to report the first 1000 ranks by passing
       *-n 1000* to top50.pl. Set to 50 by default.
 
- -- Christoph Berg <myon@debian.org>  Tue, 10 Mar 2009 17:18:21 +0100
+  [ Thijs Kinkhorst ]
+  * Make pool.sks-keyservers.net the default keyserver (closes: #527941).
+
+ -- Thijs Kinkhorst <thijs@debian.org>  Sat, 06 Jun 2009 17:46:07 +0200
 
 signing-party (1.1-2) unstable; urgency=low
 
diff --git a/keyanalyze/scripts/top50.pl b/keyanalyze/scripts/top50.pl
index da51ebf..9bd0129 100755
--- a/keyanalyze/scripts/top50.pl
+++ b/keyanalyze/scripts/top50.pl
@@ -16,7 +16,7 @@ use Getopt::Std;
 
 #my $keyserver = "http://pks.gpg.cz:11371/pks/lookup?op=vindex&fingerprint=on&search=0x";
 #my $keyserver = "http://keyserver.noreply.org/pks/lookup?op=index&fingerprint=on&search=0x";
-my $keyserver = "http://subkeys.pgp.net:11371/pks/lookup?op=index&fingerprint=on&search=0x";
+my $keyserver = "http://pool.sks-keyservers.net:11371/pks/lookup?op=index&fingerprint=on&search=0x";
 my %options;
 getopts('c:k:n:', \%options);
 my $comments = $options{c} || "top50comments.txt";