[1.2] keyring fixes

Makefile

@@ -56,7 +56,7 @@ GO_BUILD_STATIC := $(GO) build $(TRIMPATH) $(GO_BUILDMODE_STATIC) \
 	$(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo osusergo" \
 	-ldflags "$(LDFLAGS_COMMON) $(LDFLAGS_STATIC) $(EXTRA_LDFLAGS)"
 
-GPG_KEYID ?= asarai@suse.de
+GPG_KEYID ?= cyphar@cyphar.com
 
 # Some targets need cgo, which is disabled by default when cross compiling.
 # Enable cgo explicitly for those.

runc.keyring

@@ -1,74 +1,3 @@
-pub   rsa4096 2016-06-21 [SC] [expires: 2031-06-18]
-      5F36C6C61B5460124A75F5A69E18AA267DDB8DB4
-uid           [ultimate] Aleksa Sarai <asarai@suse.com>
-uid           [ultimate] Aleksa Sarai <asarai@suse.de>
-sub   rsa4096 2016-06-21 [E] [expires: 2031-06-18]
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Comment: github=cyphar
-
-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
-=3/jE
------END PGP PUBLIC KEY BLOCK-----
-
 pub   ed25519 2019-06-21 [C]
       C9C370B246B09F6DBCFC744C34401015D1D2D386
 uid           [ultimate] Aleksa Sarai <cyphar@cyphar.com>
@@ -158,12 +87,12 @@ o8zT9XXXnUYRuxHRAsrpa3atQj7jDHvFlcc3VfPmUFPs0aLRy19/44xRE1FZOSur
 f7jJ1HOKSJA9zx0xWaURRTRkMTIVuMnQKZofxC96GavBDVTtZlgLzeWVnQ==
 =eHgH
 -----END PGP PUBLIC KEY BLOCK-----
-
-pub   rsa3072 2019-07-25 [SC] [expires: 2025-07-27]
+pub   rsa3072 2019-07-25 [SC] [expires: 2026-07-31]
       C020EA876CE4E06C7AB95AEF49524C6F9F638F1A
-uid           [ultimate] Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
-uid           [ultimate] Akihiro Suda <suda.kyoto@gmail.com>
-sub   rsa3072 2019-07-25 [E] [expires: 2025-07-27]
+uid           [ unknown] Akihiro Suda <suda.kyoto@gmail.com>
+uid           [ unknown] Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
+sub   rsa3072 2019-07-25 [E] [expires: 2026-07-31]
+      604B35B13047F7041179AAFB6937938CA64D95C4
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Comment: github=AkihiroSuda
@@ -178,26 +107,26 @@ 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
-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
+F4AWIQTAIOqHbOTgbHq5Wu9JUkxvn2OPGgUCaIsLuAUJDTImGQAKCRBJUkxvn2OP
+GpAODACbMT7NbsZm9Nn9TjUbMxdkReqwSTN9F2zR3J4KtFolQk/Hi38iXYgZQI4H
+M0Rdy2CDnHolVQTr4Zzo+6J0HlB5vc6TUbhyqfW40apIMOFmQbJLMxIMEUAESegX
+GfZklgBO6buPsfYVt8oWZGMZccyms/cF5r7NYrBaO928qovPGU84slm3bX0kcKDp
+NlafUGENs2GjD1kmGe4FCy7Sngz8bJsQbdL6mYLwnQ8mUCIB8QWfSrOwBjkE0Pbb
+k794ZOk0lUS2DsxEjokxklhJLKQ8KEtK4u6FZmB83xg8KgEFfCYU28gn76bf1OxW
+J8USOsXgBgqowHPygZBfyRBLn2yDkP4jUegDHi43cSxbmRzRItre+PBk617OkIXu
+cn/U/AwCGP/4bHfF7MAS+84oW3mHHvwar/oHIyJ1adaolS3Ubz6AU6otQ+bemqnZ
+aOn7zKrZ5kntEiiceON/PPKetotYltz33sA5tsWWBf6DM6bPbJu5CsB+R+rXAAAE
+ciqwV0a0I0FraWhpcm8gU3VkYSA8c3VkYS5reW90b0BnbWFpbC5jb20+iQHUBBMB
 CgA+AhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAFiEEwCDqh2zk4Gx6uVrvSVJM
-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
+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
@@ -206,16 +135,16 @@ Qf6sg0b/k6/vkVveopeeH28zb/nnVuhgGSxcbiZUrFC9EfhX4/6NNFRhE300AjeF
 bP7SoXx3qRhr993BDSP32r44hy+kYLhZP5K5oXivcITJZuGcJh49P4QuYGrnODIL
 gEhedWeePcJXFcEz09teizlWKGzd+EA3uwYd/bQelflwXkGuCLaoNv4qcH3oJDp1
 vYI0zT7hGvnz3thRLg3SOWFq5cBhnfNGXPLsoNZBzWGn2cm5MJYSKjIM470AEQEA
-AYkBvAQYAQoAJgIbDBYhBMAg6ods5OBserla70lSTG+fY48aBQJkw8uyBQkLTBmT
-AAoJEElSTG+fY48ayhsL+gLvKlfkYgxodyWKR5hOiUMKWE5tqfQY6kqrgssPYw+u
-Fn69AamQLt4I2AHRg0AHjoZEsMfR19uXZ24XwwcWwgWU6yRJgMSIK67bLvL+d686
-m2KQ2PpmfDrizUgY4J0sY+tzwNZeWxQiFy/Ni6AdEqJvJQDsrKYJ2GGWm6JMZCPw
-y3h5ouueieiEc0pvwEz2kg64uv6p8SUV1me66IXQaGseXb/BcW+Ap2WJO+IZjtNB
-qhk+V+1x5ZT6s9RecjiTDmKfZ71zyRWplkfL22+4XVEc3qLS3r0ZSzeIA4JPRf+N
-yCGjavdTNgu2bTo8iSgBq2NRT9kNwTaS8j883L0eY/JJktrfWnWE4qAuXBqLzkIl
-smspRWy0byLQrrzk9stncF/CDt5XuHPcsXOcRVXVyM+/RXqWKdNAwZO67HD4wJR9
-YR4avhGZZXguH3b0ka2zO8sxTju/09yb07NJ2qfjfWSHCmaj9KuhhE0EO625tckS
-58ceqolNBtrydoYZOc2CKw==
-=ol6W
+AYkBvAQYAQoAJgIbDBYhBMAg6ods5OBserla70lSTG+fY48aBQJoiwvJBQkNMiYq
+AAoJEElSTG+fY48aS54L/2t2DcWir5Y9G36yC6DFpUqOl03l2HwVYx4hfsItP/+4
+T299IiNmaAnTMTBVMS3fAAfYrwtf6zhAFTffPkiPU7jl2VQzx4uTC4ywf28Njiy5
+OzwL/kil96t67ot9rgOlZAc+Q8EOIeGHJMUlBq5YPY0QbuOiE7PlXZHhsbb7QdKb
+aPNDUypHLf7DHxzi5XUrcV/IRvk3QFXPiF5o6p5JcUzJMCfatlHfUQU/Z0LfrwKk
+iuFcUpxZ2QwNy/6jYZvjyLHQIn2YIoF2rg4KiTqgtRPr5AU3gmFjC225VZTQwQAz
+0xzdJgIDiB4meWoVN4hd4lFsk6JP9JzGBBJFUOmozxM/VC+9S+xzrJa6HQpI2kFC
+Awhvhfc4Em6tQYcF38W7okYCaz4izKMoT0Zff65xvLckrvx47wVu2SoCFv5avpfl
+IubFH+bmkYNUJNoY6HVUKgpF40zZwMPbD1IvffVvLZKBCrAnQMC6ZAoRmX58dJ2T
+r7LhafIgzEqVfBDNpdtqYA==
+=DrWF
 -----END PGP PUBLIC KEY BLOCK-----
 

script/keyring_validate.sh

@@ -47,7 +47,10 @@ echo "------------------------------------------------------------"
 
 # Create a dummy gpg keyring from the set of MAINTAINERS.
 while IFS="" read -r username || [ -n "$username" ]; do
-	curl -sSL "https://github.com/$username.gpg" | gpg_user "$username" --import
+	keydata="$(curl -sSL "https://github.com/$username.gpg")"
+	if ! gpg_user "$username" --import <<<"$keydata"; then
+		log "WARNING: $username does not have any GPG keys on GitHub."
+	fi
 done < <(printf '%s\n' "${maintainers[@]}")
 
 # Make sure all of the keys in the keyring have a github=... comment.