updated fsf keyring

[fsf-keyring.git] / fsf-keyring.sh

diff --git a/fsf-keyring.sh b/fsf-keyring.sh
index 36939235040b60b3584f3ac7739d9861b5213c6b..95d57ac7c632eac1470c862a6de1b158adc44c98 100755 (executable)
--- a/fsf-keyring.sh
+++ b/fsf-keyring.sh
@@ -1,5 +1,8 @@
 #!/bin/bash -l
 
+# Usage: $0 [-r]
+# -r means dont refresh keys from keyservers
+
 set -e
 set -x
 
@@ -8,7 +11,7 @@ refresh-gpg-key() {
   key=$1
 
   error=999
-  for keyserver in pgp.mit.edu pool.sks-keyservers.net keyring.debian.org; do
+  for keyserver in keyring.debian.org keys.gnupg.net keyserver.ubuntu.com pool.sks-keyservers.net; do
     set +e
     cmd="gpg --keyserver $keyserver --recv-keys $key"
     # keyservers are not very reliable, so retry
@@ -25,6 +28,11 @@ refresh-gpg-key() {
   return $error
 }
 
+refresh=true
+if [[ $1 == -r ]]; then
+  refresh=false
+fi
+
 KEYS+="67819B343B2AB70DED9320872C6464AF2A8E4C02 " #rms
 KEYS+="A4626CBAFF376039D2D7554497BA9CE761A0963B " #johns
 KEYS+="759C0A4A39A02A079712FB5061B826E87A80C8D6 " #johnh
@@ -32,23 +40,40 @@ KEYS+="CEA951DB865D0D257BB0A14DCEB69E6F9B36C195 " #andrew
 KEYS+="13A0851D6307FC54FCCB81BA2C1008316F3E89B7 " #donald
 KEYS+="EF6643D6E1F115D1A9B7D59C92D16583E1E7C532 " #jeanne
 KEYS+="04C45B4E3AF05E9EB140FD148B10E9C6407BD6E1 " #matt
-KEYS+="05EF1D2FFE61747D1FC827C37FAC7D26472F4409 " #ruben
+KEYS+="318C679D94F17700CC847DE646A70073E4E50D4E " #ruben
 KEYS+="0CCB3494C13CCD8F6EC73AA06DA6B7D151C7643E " #dana
 KEYS+="B125F60B7B287FF6A2B7DF8F170AF0E2954295DF " #ian
 KEYS+="ECE5B5BF952A3AEA92C137F9C9230A4849ACE0DB " #molly
+KEYS+="36C9950D2F68254ED89C7C03F9C13A10581AB853 " #craigt
 KEYS+="E9A271C071964891AA57663D9EA33414F5852F4E " #mako
 KEYS+="A2F4F1966D9E35C673EC30D5B6F1D83E9ACD9EBB " #bkuhn
 KEYS+="2C31130BF7D5A459AFF2A3F3C9DFFE4A33AA52D9 " #knauth
+KEYS+="43372794C8ADD5CA8FCFFA6CD03759DAB600E3C0 " #michael
+KEYS+="B102017CCF698F79423EF9CC069C04D206A59505 " #zoe
+KEYS+="7CCC7ECD3D78EB384F6C02C8966951617A149C73 " #gregf
+KEYS+="A8CAA4A2EB655D07BA1F367BC338CAA4FA700A3A" # oliva
+
 
 rm -f /tmp/keys.asc ./fsf-keyring.gpg
 
 for KEY in $KEYS ; do
-  refresh-gpg-key $KEY
+  if $refresh; then
+    refresh-gpg-key $KEY
+  fi
   gpg --export --armor $KEY >> /tmp/keys.asc
 done
 
-# TODO: this doesn't work with gpg2. i dunno what the equivalent is, likely just exporting
-# all the keys.
-gpg --trust-model always --no-default-keyring --keyring ./fsf-keyring.gpg --import /tmp/keys.asc
+# note: this doesn't work with gpg2. i dunno what the equivalent is in
+# gpg2, likely just exporting all the keys.
+command gpg --trust-model always --no-default-keyring --keyring ./fsf-keyring.gpg --import /tmp/keys.asc
+echo
+echo "Please verify in another terminal window that the keyring doesn't contain many spam signatures before signing:"
+echo
+echo "gpg2 --no-default-keyring --keyring=./fsf-keyring.gpg --list-sigs | less"
+echo
+echo "Press [enter] to continue."
+echo
+read
 gpg --sign ./fsf-keyring.gpg
 mv fsf-keyring.gpg.gpg fsf-keyring.gpg
+rm fsf-keyring.gpg~