summaryrefslogtreecommitdiff
path: root/sec-keys
diff options
context:
space:
mode:
Diffstat (limited to 'sec-keys')
-rw-r--r--sec-keys/Manifest.gzbin19058 -> 19052 bytes
-rw-r--r--sec-keys/openpgp-keys-gentoo-auth/Manifest2
-rw-r--r--sec-keys/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20230329.ebuild2
-rw-r--r--sec-keys/openpgp-keys-gentoo-developers/Manifest4
-rw-r--r--sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230403.ebuild2
-rw-r--r--sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230417.ebuild233
-rw-r--r--sec-keys/openpgp-keys-gentoo-release/Manifest2
-rw-r--r--sec-keys/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20230329.ebuild2
8 files changed, 241 insertions, 6 deletions
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 2c9a5f34f3b2..43f2ffbc8ad9 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
Binary files differ
diff --git a/sec-keys/openpgp-keys-gentoo-auth/Manifest b/sec-keys/openpgp-keys-gentoo-auth/Manifest
index 854a06fa951e..db322513caa6 100644
--- a/sec-keys/openpgp-keys-gentoo-auth/Manifest
+++ b/sec-keys/openpgp-keys-gentoo-auth/Manifest
@@ -3,5 +3,5 @@ DIST gentoo-auth.asc.20220101.gz 5775 BLAKE2B fd8caa753da59bcb9597e302d2c94e6053
DIST gentoo-auth.asc.20230329.gz 3371 BLAKE2B 2d4940e50c8b415f48a0fe479b95dbe1f2ab83af8eceda582ecd9386fada54126cce2fa7e509611fe8d51b14dc1638b3aa19f87fbe2b7bb8dffc91657ead2a48 SHA512 b516104e6affbcdced8aba100a0eadb82b1fc3a6cc8ed907486e30c44e78f77dabd6dc1e02383537d13a380247f315b7c53711e3b5994242a84afeca4af755fd
EBUILD openpgp-keys-gentoo-auth-20200704.ebuild 794 BLAKE2B 6e7d8136f715bdc903da9f0df26c590b4823c8af83667b6943741f388cc0f03f12b3b5d003426822f45a27adaf28066ad5d709500de709fceb4677bfc649494c SHA512 0d18aa00933c0cc1f8dddc2b15d4ccafd69a4a0e779e4355db5667015d21ff7f99cd854dd4503f93198866458a57643fe5b2b5be94436f2507487220e6b3ba7d
EBUILD openpgp-keys-gentoo-auth-20220101.ebuild 786 BLAKE2B 10ffdd9503faffaaf806befb7fa73600cf9dbb2636d8164c7c098f88b627bc78e24f4b7b22d29780ea4f65bb64765d55d4097ddd311db3cf7142560085b74e34 SHA512 1f21a9f6eb74ecab1479726c8e2c6870ac28d3d799b730cdaaab2ec28b6cd6e2a761b94644d6edb9ae177cbbef296c492303337587432bf1839455656a9b92e8
-EBUILD openpgp-keys-gentoo-auth-20230329.ebuild 794 BLAKE2B 697c32cce5a2604fa77f7a73b3ec0537655b4ed723c53d27ee595848ee222ad388f6934583add207e262abfb680eca02b0df92689b48f1f871051834202b3af1 SHA512 2b402fc92239eb7151f4020e6ab13574d2310ca2f92790727be01cabfe5c4173a7e5de5d7318701c4b1f563db92d49ed459237f3fe693a2561fa8a991444bc00
+EBUILD openpgp-keys-gentoo-auth-20230329.ebuild 786 BLAKE2B 10ffdd9503faffaaf806befb7fa73600cf9dbb2636d8164c7c098f88b627bc78e24f4b7b22d29780ea4f65bb64765d55d4097ddd311db3cf7142560085b74e34 SHA512 1f21a9f6eb74ecab1479726c8e2c6870ac28d3d799b730cdaaab2ec28b6cd6e2a761b94644d6edb9ae177cbbef296c492303337587432bf1839455656a9b92e8
MISC metadata.xml 272 BLAKE2B 583272860b0b9615e8d57fed7ced1a93035bf0c25285d230412ac7af2e48a8156c2e9d9c0581da80f913a2748eb76579b64648fd1e22ce0bc89da66aafa30809 SHA512 19c90c888b76564e32674364a753ba2d6a0b9ce6f3a97f45bb876c32f83c8206e6ec318e0960747b2003a4c3a426994f25c6b83da8b294d575f45e80c6105d89
diff --git a/sec-keys/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20230329.ebuild b/sec-keys/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20230329.ebuild
index 671ff3427de3..b751e4d95566 100644
--- a/sec-keys/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20230329.ebuild
+++ b/sec-keys/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20230329.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-auth.asc.${PV}.
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
S=${WORKDIR}
diff --git a/sec-keys/openpgp-keys-gentoo-developers/Manifest b/sec-keys/openpgp-keys-gentoo-developers/Manifest
index 3dad165192c7..e26a2db4bb8b 100644
--- a/sec-keys/openpgp-keys-gentoo-developers/Manifest
+++ b/sec-keys/openpgp-keys-gentoo-developers/Manifest
@@ -1,7 +1,9 @@
AUX keyring-mangler.py 3005 BLAKE2B e5435432b79156c26120af950f46f9a916af7261a78b40081eb140e18b3fd4f0d2ce55cd2ed305bdd4f60b569edfb513c1151a6255838a750d37225715e87e4f SHA512 bd4dc3dee66c0f0b8b657da1fabfbda96ea03b77d1080fa1d07b14d2a9571fe91f7589131893b75548122e772678760c7722fd8a46e120c40d8dbb8cb4341dc9
DIST openpgp-keys-gentoo-developers-20230327-active-devs.gpg 3134134 BLAKE2B 31a06e5552253c494cdb8defdc81198fa55d1d2e33950415125edeff0075243ce170243188c5b016e4ecf4184c99d072d79a8b0de49a642bcdd1b4d01971ff47 SHA512 9b67b485a323f08786552a0e6dcc378cbe331accc2960b7121c344275629933733e5e268d3d5d96b70c40a541a1b6447c983fc11caadc1455d0b7609d9360b9c
DIST openpgp-keys-gentoo-developers-20230403-active-devs.gpg 3033398 BLAKE2B 233549fa600d855df1f4130224c63b10d0df3312886bef1c0486553db3025554a4fff7af104a3f0869390d53837a8d0182d830432e855273da28c753ea579d7e SHA512 33264b9ef002656f5c58dc2b2ff568d01b624c68e2e42db0d388b9a99b45c2d605df0d5db7b5029c0946f524fa7168252ba87908336e6f9ad0717c20d43cd112
+DIST openpgp-keys-gentoo-developers-20230417-active-devs.gpg 3075471 BLAKE2B a1d35a6fa32cd92662ce7913000f043d15b2875865a7839df69c7c5648b70c20c43d59cc8fbc9d5bcbd4ea48ea7e7f8063a79fef624d39c092b60b6741e793bd SHA512 4637d67ab19512c80547f029ab95ba755308f9a88c7de4d417177201620b1e48fc21b4ae2bf40770222076aab10f812a71046ce198bdcfa1d08283a3211a4755
EBUILD openpgp-keys-gentoo-developers-20230327.ebuild 7516 BLAKE2B 43511ae0601dba57fd74cacdcb54d8524daa8b7dcedfaed9db28743ba2a73fef0387be91a7d960bb1070dfa3d5cd5989f7625c7aa45a4bc66fb9936ac824f7e3 SHA512 ed9783038397f41655917fd354aca496f9bfa8b4ca54b736d5173d17308b056aa0ef87d2d9984a709fee3fc42c3d9fa2b36dc88058c2e86261989c7b47b84bf5
-EBUILD openpgp-keys-gentoo-developers-20230403.ebuild 7530 BLAKE2B a43990c1c1441f877c04ddeb45d3a96cb829c223d26986129f520219afe2e8dd43e67f9878e666fc71fbac357dc77e54426a20cc352029ed199e3374e958feb3 SHA512 9a896722504447f82d1e3431b4f9a38ac523a08c4f6e4cbb798e75133b20a2b54d4abe220b6ba5c7848804fb3b0aad9f02ede441acd36f11cd988d45c87eda50
+EBUILD openpgp-keys-gentoo-developers-20230403.ebuild 7522 BLAKE2B d48c00f39d882d632ad70651e47e06887af88a320623d6f5009ad735ff449895d18bc00838bc4fe72c905ebfbef233cffec407a359280fd4e88fb44b433e7e97 SHA512 7fa3f01773d5a3dfdc4f4221d6a15872f7eb74cbd262237fb6b5a8508b175a2e82679120efa5f686392f99402f71dfb1fcf833d5fbed76aaecb1aee37ac4ffac
+EBUILD openpgp-keys-gentoo-developers-20230417.ebuild 7530 BLAKE2B a43990c1c1441f877c04ddeb45d3a96cb829c223d26986129f520219afe2e8dd43e67f9878e666fc71fbac357dc77e54426a20cc352029ed199e3374e958feb3 SHA512 9a896722504447f82d1e3431b4f9a38ac523a08c4f6e4cbb798e75133b20a2b54d4abe220b6ba5c7848804fb3b0aad9f02ede441acd36f11cd988d45c87eda50
EBUILD openpgp-keys-gentoo-developers-99999999.ebuild 7524 BLAKE2B b25f55fc15605a7ae98ea6c232c3c52c522478eef6e7c0454560874de41639b9af22b569b45e5363481ce5b1f0e55b0fae92c9be98fdd9cdd5a7a2c1b4cbd195 SHA512 59df2a70e59e2c029f383c971e0a00cd10c11fa8c8eaaf692fca4c11645a5877f0c0a4d121257fee42442b1f9252b497ba625e1ab1c4fd4d08aaaf59d91eff1d
MISC metadata.xml 264 BLAKE2B 630ac0044f623dc63de725aae23da036b649a2d65331c06fbe9eb66d18ad1a4d3fd804cdffc4703500662b01272063af346680d2550f2fb6a262d6acee8c6789 SHA512 3cf1981080b4a7634537d20a3e837fa802c52ae5ee750531cc4aa3f8478cda78579375602bc058abbd75f9393f9681b79603c3ddd9af809a1e72f7336a708056
diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230403.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230403.ebuild
index efd0694ab707..3c30975acd6f 100644
--- a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230403.ebuild
+++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230403.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]] ; then
BDEPEND="net-misc/curl"
else
SRC_URI="https://qa-reports.gentoo.org/output/keys/active-devs-${PV}.gpg -> ${P}-active-devs.gpg"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
fi
S="${WORKDIR}"
diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230417.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230417.ebuild
new file mode 100644
index 000000000000..efd0694ab707
--- /dev/null
+++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230417.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit edo python-any-r1
+
+DESCRIPTION="Gentoo Authority Keys (GLEP 79)"
+HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
+if [[ ${PV} == 9999* ]] ; then
+ PROPERTIES="live"
+
+ BDEPEND="net-misc/curl"
+else
+ SRC_URI="https://qa-reports.gentoo.org/output/keys/active-devs-${PV}.gpg -> ${P}-active-devs.gpg"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND+="
+ $(python_gen_any_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]')
+ sec-keys/openpgp-keys-gentoo-auth
+ test? (
+ app-crypt/gnupg
+ sys-apps/grep[pcre]
+ )
+"
+
+python_check_deps() {
+ python_has_version "dev-python/python-gnupg[${PYTHON_USEDEP}]"
+}
+
+src_unpack() {
+ if [[ ${PV} == 9999* ]] ; then
+ curl https://qa-reports.gentoo.org/output/active-devs.gpg -o ${P}-active-devs.gpg || die
+ else
+ default
+ fi
+}
+
+src_compile() {
+ export GNUPGHOME="${T}"/.gnupg
+
+ get_gpg_keyring_dir() {
+ if [[ ${PV} == 9999* ]] ; then
+ echo "${WORKDIR}"
+ else
+ echo "${DISTDIR}"
+ fi
+ }
+
+ local mygpgargs=(
+ --no-autostart
+ --no-default-keyring
+ --homedir "${GNUPGHOME}"
+ )
+
+ # From verify-sig.eclass:
+ # "GPG upstream knows better than to follow the spec, so we can't
+ # override this directory. However, there is a clean fallback
+ # to GNUPGHOME."
+ addpredict /run/user
+
+ mkdir "${GNUPGHOME}" || die
+ chmod 700 "${GNUPGHOME}" || die
+
+ # Convert the binary keyring into an armored one so we can process it
+ edo gpg "${mygpgargs[@]}" --import "$(get_gpg_keyring_dir)"/${P}-active-devs.gpg
+ edo gpg "${mygpgargs[@]}" --export --armor > "${WORKDIR}"/gentoo-developers.asc
+
+ # Now strip out the keys which are expired and/or missing a signature
+ # from our L2 developer authority key
+ edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \
+ "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \
+ "${WORKDIR}"/gentoo-developers.asc \
+ "${WORKDIR}"/gentoo-developers-sanitised.asc
+}
+
+src_test() {
+ export GNUPGHOME="${T}"/tests/.gnupg
+
+ local mygpgargs=(
+ # We don't have --no-autostart here because we need
+ # to let it spawn an agent for the key generation.
+ --no-default-keyring
+ --homedir "${GNUPGHOME}"
+ )
+
+ # From verify-sig.eclass:
+ # "GPG upstream knows better than to follow the spec, so we can't
+ # override this directory. However, there is a clean fallback
+ # to GNUPGHOME."
+ addpredict /run/user
+
+ # Check each of the keys to verify they're trusted by
+ # the L2 developer key.
+ mkdir -p "${GNUPGHOME}" || die
+ chmod 700 "${GNUPGHOME}" || die
+ cd "${T}"/tests || die
+
+ # First, grab the L1 key, and mark it as ultimately trusted.
+ edo gpg "${mygpgargs[@]}" --import "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc
+ edo gpg "${mygpgargs[@]}" --import-ownertrust "${BROOT}"/usr/share/openpgp-keys/gentoo-auth-ownertrust.txt
+
+ # Generate a temporary key which isn't signed by anything to check
+ # whether we're detecting unexpected keys.
+ #
+ # The test is whether this appears in the sanitised keyring we
+ # produce in src_compile (it should not be in there).
+ #
+ # https://www.gnupg.org/documentation/manuals/gnupg/Unattended-GPG-key-generation.html
+ edo gpg "${mygpgargs[@]}" --batch --gen-key <<-EOF
+ %echo Generating temporary key for testing...
+
+ %no-protection
+ %transient-key
+ %pubring ${P}-ebuild-test-key.asc
+
+ Key-Type: 1
+ Key-Length: 2048
+ Subkey-Type: 1
+ Subkey-Length: 2048
+ Name-Real: Larry The Cow
+ Name-Email: larry@example.com
+ Expire-Date: 0
+ Handle: ${P}-ebuild-test-key
+
+ %commit
+ %echo Temporary key generated!
+ EOF
+
+ # Import the new injected key that shouldn't be signed by anything into a temporary testing keyring
+ edo gpg "${mygpgargs[@]}" --import "${T}"/tests/${P}-ebuild-test-key.asc
+
+ # Sign a tiny file with the to-be-injected key for testing rejection below
+ echo "Hello world!" > "${T}"/tests/signme || die
+ edo gpg "${mygpgargs[@]}" -u "Larry The Cow <larry@example.com>" --sign "${T}"/tests/signme || die
+
+ edo gpg "${mygpgargs[@]}" --export --armor > "${T}"/tests/tainted-keyring.asc
+
+ # keyring-mangler.py should now produce a keyring *without* it
+ edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \
+ "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \
+ "${T}"/tests/tainted-keyring.asc \
+ "${T}"/tests/gentoo-developers-sanitised.asc | tee "${T}"/tests/keyring-mangler.log
+ assert "Key mangling in tests failed?"
+
+ # Check the log to verify the injected key got detected
+ grep -q "Dropping key.*Larry The Cow" "${T}"/tests/keyring-mangler.log || die "Did not remove injected key from test keyring!"
+
+ # gnupg doesn't have an easy way for us to actually just.. ask
+ # if a key is known via WoT. So, sign a file using the key
+ # we just made, and then try to gpg --verify it, and check exit code.
+ #
+ # Let's now double check by seeing if a file signed by the injected key
+ # is rejected.
+ if gpg "${mygpgargs[@]}" --keyring "${T}"/tests/gentoo-developers-sanitised.asc --verify "${T}"/tests/signme.gpg ; then
+ die "'gpg --verify' using injected test key succeeded! This shouldn't happen!"
+ fi
+
+ # Bonus lame sanity check
+ edo gpg "${mygpgargs[@]}" --check-trustdb 2>&1 | tee "${T}"/tests/trustdb.log
+ assert "trustdb call failed!"
+
+ check_trust_levels() {
+ local mode=${1}
+
+ while IFS= read -r line; do
+ # gpg: depth: 0 valid: 1 signed: 2 trust: 0-, 0q, 0n, 0m, 0f, 1u
+ # gpg: depth: 1 valid: 2 signed: 0 trust: 0-, 0q, 0n, 0m, 2f, 0u
+ if [[ ${line} == *depth* ]] ; then
+ depth=$(echo ${line} | grep -Po "depth: [0-9]")
+ trust=$(echo ${line} | grep -Po "trust:.*")
+
+ trust_uncalculated=$(echo ${trust} | grep -Po "[0-9]-")
+ [[ ${trust_uncalculated} == 0 ]] || ${mode}
+
+ trust_insufficient=$(echo ${trust} | grep -Po "[0-9]q")
+ [[ ${trust_insufficient} == 0 ]] || ${mode}
+
+ trust_never=$(echo ${trust} | grep -Po "[0-9]n")
+ [[ ${trust_never} == 0 ]] || ${mode}
+
+ trust_marginal=$(echo ${trust} | grep -Po "[0-9]m")
+ [[ ${trust_marginal} == 0 ]] || ${mode}
+
+ trust_full=$(echo ${trust} | grep -Po "[0-9]f")
+ [[ ${trust_full} != 0 ]] || ${mode}
+
+ trust_ultimate=$(echo ${trust} | grep -Po "[0-9]u")
+ [[ ${trust_ultimate} == 1 ]] || ${mode}
+
+ echo "${trust_uncalculated}, ${trust_insufficient}"
+ fi
+ done < "${T}"/tests/trustdb.log
+ }
+
+ # First, check with the bad key still in the test keyring.
+ # This is supposed to fail, so we want it to return 1
+ check_trust_levels "return 1" && die "Trustdb passed when it should have failed!"
+
+ # Now check without the bad key in the test keyring.
+ # This one should pass.
+ #
+ # Drop the bad key first (https://superuser.com/questions/174583/how-to-delete-gpg-secret-keys-by-force-without-fingerprint)
+ keys=$(gpg "${mygpgargs[@]}" --fingerprint --with-colons --batch "Larry The Cow <larry@example.com>" \
+ | grep "^fpr" \
+ | sed -n 's/^fpr:::::::::\([[:alnum:]]\+\):/\1/p')
+
+ local key
+ for key in ${keys[@]} ; do
+ nonfatal edo gpg "${mygpgargs[@]}" --batch --yes --delete-secret-keys ${key}
+ done
+
+ edo gpg "${mygpgargs[@]}" --batch --yes --delete-keys "Larry The Cow <larry@example.com>"
+ check_trust_levels "return 0" || die "Trustdb failed when it should have passed!"
+
+ gpgconf --kill gpg-agent || die
+}
+
+src_install() {
+ insinto /usr/share/openpgp-keys
+ newins gentoo-developers-sanitised.asc gentoo-developers.asc
+
+ # TODO: install an ownertrust file like sec-keys/openpgp-keys-gentoo-auth?
+}
diff --git a/sec-keys/openpgp-keys-gentoo-release/Manifest b/sec-keys/openpgp-keys-gentoo-release/Manifest
index 98d53a4f0e1d..82f45fd46b08 100644
--- a/sec-keys/openpgp-keys-gentoo-release/Manifest
+++ b/sec-keys/openpgp-keys-gentoo-release/Manifest
@@ -4,5 +4,5 @@ DIST gentoo-release.asc.20220101.gz 16588 BLAKE2B d28eb9834bbd908fd25435a28fc857
DIST gentoo-release.asc.20230329.gz 16462 BLAKE2B 3ee5a2b9442731ff4498b448c5defe07b6fb299196f31445ba934360fff295150c0bcac037be01a1e5db97f00de1ccbfdb3a7abbf4ad0ff069d95ab42e28e680 SHA512 6e0720b0894dd80b19b769731aaa1862266371ad45c7d9e0fc9df173454b7d8b0f345dd16a47e3034d8ab34c50c3818a305f863af83edaaf7421f25bb03f4ad4
EBUILD openpgp-keys-gentoo-release-20200704.ebuild 1355 BLAKE2B a60a4ef7e29aec0034faf5bf6ff2dc87c3475da9da7c6d84cf63afe77cd52788ecdcfc666d31ea449c4065f480c19bd57436b42ffd49404432dfb943162c7546 SHA512 222b3c990f17f34a7ec0cf0a9a7b1a833c3b89cfdc32fdfa9632f45c3df05e084029a332da52c06dde955c586d907d1fb6657d7bbc0877e1a52663bfbd2a22dc
EBUILD openpgp-keys-gentoo-release-20220101.ebuild 1355 BLAKE2B a60a4ef7e29aec0034faf5bf6ff2dc87c3475da9da7c6d84cf63afe77cd52788ecdcfc666d31ea449c4065f480c19bd57436b42ffd49404432dfb943162c7546 SHA512 222b3c990f17f34a7ec0cf0a9a7b1a833c3b89cfdc32fdfa9632f45c3df05e084029a332da52c06dde955c586d907d1fb6657d7bbc0877e1a52663bfbd2a22dc
-EBUILD openpgp-keys-gentoo-release-20230329.ebuild 1363 BLAKE2B 6994493854e5ddebd9fd62907134077f7e8e24d14b495d352592ccf2fa5dd241dc791d75fbe4d8b892e18d50748802e244a0a6aef1b8b0326da56aed49606bfb SHA512 8f58c3226c59a66ce20d1b5fc13c8dc11bb270f86c6bf158c70ad5b83441eae1d986887d08479b2abc38681f9a29e1501166974b1045a962be538ead39ef3044
+EBUILD openpgp-keys-gentoo-release-20230329.ebuild 1355 BLAKE2B 1f217e2dc11d1ca7a4c0b03c0e7e40f2b5fc3080d443ddcd2402297a9579b554e0c97e24bc426434c8e997b83d9da483b36c456c2f4e0b8e19b4201c42fdc325 SHA512 dac6afa4db42cb0d8c140abeae32906df2c166a52a78a2668a30c09df87975219ba3b26aa9f656d41adba62452b8133c3dcbbcd79d3e20fb8cb564ad3c068088
MISC metadata.xml 272 BLAKE2B 583272860b0b9615e8d57fed7ced1a93035bf0c25285d230412ac7af2e48a8156c2e9d9c0581da80f913a2748eb76579b64648fd1e22ce0bc89da66aafa30809 SHA512 19c90c888b76564e32674364a753ba2d6a0b9ce6f3a97f45bb876c32f83c8206e6ec318e0960747b2003a4c3a426994f25c6b83da8b294d575f45e80c6105d89
diff --git a/sec-keys/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20230329.ebuild b/sec-keys/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20230329.ebuild
index f64625ef2cc3..67bbc763b5ef 100644
--- a/sec-keys/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20230329.ebuild
+++ b/sec-keys/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20230329.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${P
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"