From 299e0730613361b2edf32bb49e9359b493a2add7 Mon Sep 17 00:00:00 2001
From: Michael McMahon <michael@fsf.org>
Date: Fri, 30 Jan 2026 17:13:04 -0500
Subject: [PATCH] Prepare for next keyring

---
 fsf-keyring.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/fsf-keyring.sh b/fsf-keyring.sh
index 2346956..5506d3a 100755
--- a/fsf-keyring.sh
+++ b/fsf-keyring.sh
@@ -17,8 +17,8 @@ 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
+  # johns was the only one in keyring.debian.org we had.
+  for keyserver in keyserver.ubuntu.com pgp.mit.edu; do
     echo "Trying $keyserver..."
     set +e
     cmd="gpg --keyserver $keyserver --recv-keys $key"
@@ -51,7 +51,7 @@ fi
 
 KEYS+="67819B343B2AB70DED9320872C6464AF2A8E4C02 " #rms
 #KEYS+="A4626CBAFF376039D2D7554497BA9CE761A0963B " #johns
-KEYS+="759C0A4A39A02A079712FB5061B826E87A80C8D6 " #johnh
+#KEYS+="759C0A4A39A02A079712FB5061B826E87A80C8D6 " #johnh
 KEYS+="8556112E9B88B1A8B3E3631B58A39239D50484E8 " #jeanne
 KEYS+="B125F60B7B287FF6A2B7DF8F170AF0E2954295DF " #ian
 KEYS+="36C9950D2F68254ED89C7C03F9C13A10581AB853 " #craigt
@@ -64,6 +64,8 @@ KEYS+="2D1304056F4F061DADEAE299A2C76C5425EF14E8 " #dawn
 #KEYS+="476B712A9FA8788EDA2089F78B656B4E5A98CE74 " #anouk
 KEYS+="6DC9E66336DB958881AB7E43267124EFFC9CD84E " #krzyzstof
 KEYS+="D86097B5E291BA771FA64D357014A6BE08494155"  #odile
+#KEYS+="B15AB63A55816C91634A20E5554B66BAD9B5AA61"  #heshan
+#KEYS+="2E360453B09FA8869DCB21456F4A5AE2C485E0E8"  #seano
 
 if [[ -e fsf-keyring.gpg ]] ; then
   check-sig-dos fsf-keyring.gpg
-- 
2.25.1