Add Anouk. Remove Savvy and Andrew"

diff --git a/fsf-keyring.gpg.asc b/fsf-keyring.gpg.asc
index 626fd357ce4daf316987cd1d4ceb58003c187b91..e8710ed1d1069e6aa090c18b91c02cfb5072c1e1 100644 (file)
--- a/fsf-keyring.gpg.asc
+++ b/fsf-keyring.gpg.asc
@@ -1,7 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iHUEABYIAB0WIQQUh+ACQhESo7bHa1Rfpm08p1GNvwUCZPI0UQAKCRBfpm08p1GN
-vxUsAQCNA85OWtboif5mae/iQxtVh+34NUOU+jC4gVV70+udPAD/fiuyQWuKdyrn
-FU3YvGaf3TMFgZPgNE5iXGLPyWSKkAc=
-=Ifn6
+iQIzBAABCAAdFiEEQzcnlMit1cqPz/ps0DdZ2rYA48AFAmUTCqUACgkQ0DdZ2rYA
+48An1Q//UldgG9jpR3CsHqAf0sdabGRlZ3f1LY9QwFwFPTDyS8bXwxeSlPrxg3oW
+uP+47ErKJ/Mo7XGcm/aNWpwjOJD7tU5pLQOV8+TqNFZN5yGhklndwnMGSRkd/TCx
+o+zAVe8aeJW+aNJkth86guiBMhHVZQALU5QlUQrOnt+VjmHuOC3fgnCO7pwXEhYq
+B8EdZSwDI7jqW08P9098CzG96rWUv0AKLDdN/ixvWCH8Wzr4CaT0hkCIQsR0CZhZ
+5EmEmEUFm62gzVBUdB73z1BlH9hwYCTiICH8rM65FM3tCbMToInvNpy50osmKtOx
+fRFCpuvH1S7lVtAox73xN+ITXbUxjjpR1JhZBJoONjEKaHbD8FKl+Z2SoRVI3Kl5
+Pecf8tQfHJUN4KjAztCWHGZZfrXkekVe5zumsbqCE9pNmStn9NcNgvmfTUZbd6mp
+CeOrti5O8L33RyqKmuEbsQTiX64a+C5wZPeW3bmawXR84fDv2/1ema5s70p9EU26
+nflVDEme8TZXJoQTvlFLiZ5LxL81+wvAd914TNpKqHE2q3dfzhEodGzhJ5jycX/6
+GYy9cAjWKD7Q+ZHbd351TFkQxqUV9wqU+t1R7o+/92pvi8cJ6PD1+4KlAAjf7KKU
+iro58xSc5SXGsOrROil3z/usLT3fRtMOGu96vPXUcytU49t1gSw=
+=c0t4
 -----END PGP SIGNATURE-----

diff --git a/fsf-keyring.sh b/fsf-keyring.sh
index 38d6ce11a89e0ac2aa37136532558a99d5532c66..595345a320e7fe224756724bc502821a9b96e503 100755 (executable)
--- a/fsf-keyring.sh
+++ b/fsf-keyring.sh
@@ -17,6 +17,7 @@ refresh-gpg-key() {
   key=$1
 
   error=999
+  # johns is the only one in keyring.debian.org at this time.
   for keyserver in keyring.debian.org keyserver.ubuntu.com pgp.mit.edu; do
     echo "Trying $keyserver..."
     set +e
@@ -51,7 +52,6 @@ fi
 KEYS+="67819B343B2AB70DED9320872C6464AF2A8E4C02 " #rms
 KEYS+="A4626CBAFF376039D2D7554497BA9CE761A0963B " #johns
 KEYS+="759C0A4A39A02A079712FB5061B826E87A80C8D6 " #johnh
-KEYS+="1487E002421112A3B6C76B545FA66D3CA7518DBF " #andrew
 KEYS+="8556112E9B88B1A8B3E3631B58A39239D50484E8 " #jeanne
 KEYS+="B125F60B7B287FF6A2B7DF8F170AF0E2954295DF " #ian
 KEYS+="36C9950D2F68254ED89C7C03F9C13A10581AB853 " #craigt
@@ -62,7 +62,8 @@ KEYS+="7CCC7ECD3D78EB384F6C02C8966951617A149C73 " #gregf
 KEYS+="2E0ECE75F8162B407D666767879738E6D6440D57 " #devinu
 KEYS+="005D03724A11C08A5A353D2C906DB6E398AA6CF6 " #miriam
 KEYS+="2D1304056F4F061DADEAE299A2C76C5425EF14E8 " #dawn
-KEYS+="5629EDBC6F32BDF1CD84B2C2592D779F4F161F0F " #savvy
+KEYS+="476B712A9FA8788EDA2089F78B656B4E5A98CE74 " #anouk
+#KEYS+="2985A29A7ECF1679063A4D5659EB02F5619B3C7E " #krzyzstof # Needs verbal confirmation and contract.
 KEYS+="D86097B5E291BA771FA64D357014A6BE08494155"  #odile
 
 if [[ -e fsf-keyring.gpg ]] ; then
@@ -83,5 +84,9 @@ gpg --export $KEYS > key-export
 check-sig-dos key-export
 mv key-export fsf-keyring.gpg
 
+# Clean up
 rm -f fsf-keyring.gpg.asc ./fsf-keyring.gpg~ key-export
+
+echo -e "You will now sign the keyring. Prepare your GPG password.\n"
+read -p "Press any key to continue..." -n1 -s
 gpg --armor --detach-sign ./fsf-keyring.gpg