gentoo auto-resync : 24:04:2024 - 23:59:27

5 files changed, 102 insertions, 0 deletions

diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 6a2fdf2ec951..e65b6da71397 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-apache-tomcat/Manifest b/sec-keys/openpgp-keys-apache-tomcat/Manifest
index 64fa38b325f5..bbe6a25170e8 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/Manifest
+++ b/sec-keys/openpgp-keys-apache-tomcat/Manifest
@@ -1,11 +1,13 @@
 DIST openpgp-keys-apache-tomcat-10.1.19-KEYS.asc 35385 BLAKE2B 1c2bba42759f901fef1cda1871c706cd5f960de4120de62361853b7e6cade3c205852215e8562e066ca675506bf1a8d424fb588dfd856cdc99bca5bcc575be06 SHA512 43d3c06e6eb776b939864a092161f70759e6f095b9b2bb7f00172cb6dca890fb88dff6f646863b882226ac490ad8082c03a84f93dfe917e7b9aab378f54612ce
 DIST openpgp-keys-apache-tomcat-10.1.20-KEYS.asc 35385 BLAKE2B 1c2bba42759f901fef1cda1871c706cd5f960de4120de62361853b7e6cade3c205852215e8562e066ca675506bf1a8d424fb588dfd856cdc99bca5bcc575be06 SHA512 43d3c06e6eb776b939864a092161f70759e6f095b9b2bb7f00172cb6dca890fb88dff6f646863b882226ac490ad8082c03a84f93dfe917e7b9aab378f54612ce
+DIST openpgp-keys-apache-tomcat-10.1.23-KEYS.asc 35385 BLAKE2B 1c2bba42759f901fef1cda1871c706cd5f960de4120de62361853b7e6cade3c205852215e8562e066ca675506bf1a8d424fb588dfd856cdc99bca5bcc575be06 SHA512 43d3c06e6eb776b939864a092161f70759e6f095b9b2bb7f00172cb6dca890fb88dff6f646863b882226ac490ad8082c03a84f93dfe917e7b9aab378f54612ce
 DIST openpgp-keys-apache-tomcat-8.5.100-KEYS.asc 44901 BLAKE2B c3661429327bc7fec4379b900bfe83d2067548c321f9ee868b7606be493f34f89911f8aa10694280876bb831790b90537d5c3f4bb5fa9af55924e7f8e631a316 SHA512 26a59a0e0cc5257b35bb9826f750172301dcdb29e1f862db4bdd372fb1e79c45d782e87766c2cd1de4504dfdf3dc532a58ede5f23a9e3539ad8a3412029e0125
 DIST openpgp-keys-apache-tomcat-8.5.99-KEYS.asc 44901 BLAKE2B c3661429327bc7fec4379b900bfe83d2067548c321f9ee868b7606be493f34f89911f8aa10694280876bb831790b90537d5c3f4bb5fa9af55924e7f8e631a316 SHA512 26a59a0e0cc5257b35bb9826f750172301dcdb29e1f862db4bdd372fb1e79c45d782e87766c2cd1de4504dfdf3dc532a58ede5f23a9e3539ad8a3412029e0125
 DIST openpgp-keys-apache-tomcat-9.0.87-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
 DIST openpgp-keys-apache-tomcat-9.0.88-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
 EBUILD openpgp-keys-apache-tomcat-10.1.19.ebuild 561 BLAKE2B b0d1d1118ac926cce2ba54feea8791f7f8ba44d2bfe2bb61b0bc11815e460d6fc3d4c4993c1552b34c1b98b7453e798b4dc70c70a1942bedcec09fc1cad05ef7 SHA512 83f6ee3b0f2e32b39136027f840557c0f94bd47b89adf990e33da1e7015f02193cd643e911828f1d6545609e39ff4b4dcb9aecd061c7cad678996122b20b1152
 EBUILD openpgp-keys-apache-tomcat-10.1.20.ebuild 561 BLAKE2B b0d1d1118ac926cce2ba54feea8791f7f8ba44d2bfe2bb61b0bc11815e460d6fc3d4c4993c1552b34c1b98b7453e798b4dc70c70a1942bedcec09fc1cad05ef7 SHA512 83f6ee3b0f2e32b39136027f840557c0f94bd47b89adf990e33da1e7015f02193cd643e911828f1d6545609e39ff4b4dcb9aecd061c7cad678996122b20b1152
+EBUILD openpgp-keys-apache-tomcat-10.1.23.ebuild 561 BLAKE2B a55b0b86507ee9b80b8d755d15c589784d29ca99d9696e4bc5024d904b419c76dd9a4ca369e976817a5c2ece3fdfddad2762f06427a1763a155893040058fe1b SHA512 35b96b247ed668b9a3c3c7a7da7e79cacb35dad1e29408364c7f61070d9c88b5650aa5391738faadb03a45101a4558df2b537fa5b469ee90024b5222846cd18e
 EBUILD openpgp-keys-apache-tomcat-8.5.100.ebuild 561 BLAKE2B 737b5559820662ce3c0b0a390b240efe14c5a7d82702b0764cb4c9a31a7699f009cb787d1fb03dd8ebcefd3c25032edfacef6dd96d4314dad3d8969f92e9343c SHA512 da39830647de9de8b52ba823b0abc712a14cb99b3b1133284caa41af313aa6fb29456806310d471f79f23202f97613694e996e1af47d71273cc0c9f6671bcccd
 EBUILD openpgp-keys-apache-tomcat-8.5.99.ebuild 561 BLAKE2B 737b5559820662ce3c0b0a390b240efe14c5a7d82702b0764cb4c9a31a7699f009cb787d1fb03dd8ebcefd3c25032edfacef6dd96d4314dad3d8969f92e9343c SHA512 da39830647de9de8b52ba823b0abc712a14cb99b3b1133284caa41af313aa6fb29456806310d471f79f23202f97613694e996e1af47d71273cc0c9f6671bcccd
 EBUILD openpgp-keys-apache-tomcat-9.0.87.ebuild 561 BLAKE2B b0d1d1118ac926cce2ba54feea8791f7f8ba44d2bfe2bb61b0bc11815e460d6fc3d4c4993c1552b34c1b98b7453e798b4dc70c70a1942bedcec09fc1cad05ef7 SHA512 83f6ee3b0f2e32b39136027f840557c0f94bd47b89adf990e33da1e7015f02193cd643e911828f1d6545609e39ff4b4dcb9aecd061c7cad678996122b20b1152
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.23.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.23.ebuild
new file mode 100644
index 000000000000..7481a3964076
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.23.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-10.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sec-keys/openpgp-keys-openssl/Manifest b/sec-keys/openpgp-keys-openssl/Manifest
index 2b8a4f99e336..87017176942a 100644
--- a/sec-keys/openpgp-keys-openssl/Manifest
+++ b/sec-keys/openpgp-keys-openssl/Manifest
@@ -22,8 +22,17 @@ DIST openssl-keys-20230801-A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C.asc 5194 BLA
 DIST openssl-keys-20230801-B7C1C14360F353A36862E4D5231C84CDDCC69C45.asc 2249 BLAKE2B a9913d00635a73636dae7ea30bf16ade55a8f56d6fa3a804ebaf736705cfb3628b4838289c9b9847d1809da94dd4c9c23d01fe0521701dd164ff5036cfa78ec3 SHA512 c7927ff7643ac4aa12f516103d76af4c56e25f3d3a3d4064ec5d11f30d9447899b18c22cfb7217488b2e5b912220269e78668655343db52f486d29788e4759fc
 DIST openssl-keys-20230801-E5E52560DD91C556DDBDA5D02064C53641C25E5D.asc 6131 BLAKE2B 36e076cb5ab722c5efe378fc70a9109c30db12bf59af3634af0b7df1cc6beaec8d1fdf5099ffbfb66ce59d51581009ed59278336238755122ba5126cf1b191e5 SHA512 ee72fff17111f437b372b0bbfaa851075125da524a8d0f861232fe9bec2da0c0933c4d0ab3fa9ad1aa9015f9ae302773d0f5eb25bea270f0a5884f0d5b9b6fc1
 DIST openssl-keys-20230801-EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5.asc 5414 BLAKE2B e079aa52ac42857eb63a3c62e752b44db93cc445e8370dafe19440056b65b50c8479ff689ea9b0dd13974d9f94230b368556084b17e077b0ed82d234e5142b92 SHA512 7858bfb779e53caa50b2ded103976b51f694ac3a99872a887c1b895394e5099c692d56cb5d7ca3a8ea168f2df6a9ca29749ecdbe9a20c8863b79346a1c63d27b
+DIST openssl-keys-20240424-5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33.asc 3050 BLAKE2B 5c785d9ed3019865fac34a0b7647ddadda30ceaed57a711c32483a1309b2160209a50b89bc9a01a1696b691999e27808ef2a44e94242478e388d963b8a2c13b4 SHA512 583a32254ea46b89e348ad14f22a784920b6ca3c75b9bd681298be94e5d367a6beedf4b320212ddd5509881e1bc88a643680c9ff2829d7a529d3f27956e2e086
+DIST openssl-keys-20240424-7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C.asc 5302 BLAKE2B 30ec164d0022c432747063e8aac63d51ba44d3f1096925376aed00d8b843835d891b01e2b4b46abd0e4567b4108ea96266a2a8949508e4767632bc01cf3901c2 SHA512 724a2ba71404c7bcb7aa6ec5ab6fe91b50c3294dc1b0791a369554505c812a142879a05663d098447f20a7383e039dcf4e0699740c4ab0ba4393c891e237bcc0
+DIST openssl-keys-20240424-8657ABB260F056B1E5190839D9C4D26D0E604491.asc 1531 BLAKE2B 7333259523feb8e79c00c8f0652544471abfc087ebbe149eed2413f8e55637fdb3138d39885a88aafecd7b8edda207542198dc2deba8a882253fd91cd5ab0ace SHA512 e3f9b5a77124fbecef6c37a1d4fe8292ccc3210eabf60d6349f704d22014dd4d3343e40dc26c65659297e2a713ddbec52662924ae93468a6e0e9709f724944a7
+DIST openssl-keys-20240424-95A9908DDFA16830BE9FB9003D30A3A9FF1360DC.asc 3505 BLAKE2B 10e4a6970366dd6c2b2633da3045cf3da0857b1ea1f84b40bf0b85b0424583030593d3eb85bab06fe9b1dcbaa7c4c5c7023cb8a5d82d9340b0741601b6a79deb SHA512 154f173c316cff4c325746de3c6c992f1a493315958bcfb6b9c273edb9921d78f8c5febb69d6e8a743d89427aacc181e90ccc8098deb97295c2c6b258867be96
+DIST openssl-keys-20240424-A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C.asc 5194 BLAKE2B e8bb04c8590ec2171f024c49439bbae04690f14db4dfac20ddc43d963659d2b3788dcd34105f8c987b0413cd5803222cdbaf5ca3b7ec8808eb43c3a8bf23da8f SHA512 fe14c26a3075019d9c876f23550d3c897b5773f4ce92d68cb578d2a266557bf00ced11a91d048d2e2448f0c453651f61faa42eb1608d9d0faed8ddd03ead7ec4
+DIST openssl-keys-20240424-B7C1C14360F353A36862E4D5231C84CDDCC69C45.asc 2249 BLAKE2B a9913d00635a73636dae7ea30bf16ade55a8f56d6fa3a804ebaf736705cfb3628b4838289c9b9847d1809da94dd4c9c23d01fe0521701dd164ff5036cfa78ec3 SHA512 c7927ff7643ac4aa12f516103d76af4c56e25f3d3a3d4064ec5d11f30d9447899b18c22cfb7217488b2e5b912220269e78668655343db52f486d29788e4759fc
+DIST openssl-keys-20240424-E5E52560DD91C556DDBDA5D02064C53641C25E5D.asc 6131 BLAKE2B 36e076cb5ab722c5efe378fc70a9109c30db12bf59af3634af0b7df1cc6beaec8d1fdf5099ffbfb66ce59d51581009ed59278336238755122ba5126cf1b191e5 SHA512 ee72fff17111f437b372b0bbfaa851075125da524a8d0f861232fe9bec2da0c0933c4d0ab3fa9ad1aa9015f9ae302773d0f5eb25bea270f0a5884f0d5b9b6fc1
+DIST openssl-keys-20240424-EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5.asc 4216 BLAKE2B c32204394c4e1240fd53197100429abf51600e71fc0e979c43a7c1f99212d4200d1df7408f08c514aed014162fb1e4bbedbf4b7cd69a80a0ca3b814da98843b3 SHA512 ad0e2a6ea817ed6ae18988bc0216bafe35fb817807c6d507efcfb957b0df238f0b326d63c5c494c9a26ce64408f81f2e021b009bc7729dc213e691b72ac31c41
 EBUILD openpgp-keys-openssl-20220316-r1.ebuild 946 BLAKE2B 56119d354169f49861664f22079a0b4d9ebca3b0fdd465c17d36974d2550f89426440929ae7b84bc20124f46b375e0b03db82d538ebca8a8f612abaa64fd764e SHA512 67b0d8f449f645c229764f185eccda99352540c2172facd2bd35fd750c4fdab4fb73acd0d54947006f7f2a74a7f48430f5e3b0cb8aaebfb6f9e7f40b91d00300
 EBUILD openpgp-keys-openssl-20221101.ebuild 1924 BLAKE2B a7b84c441dc4097fa92630e49010b160dd8fb50291d1a04904b93bb22b917467ffb0fb83ebc05b050d0f204e710b077ef24e1de524adb3120a2e6fcd999a416e SHA512 1e838c3043afe81818f6e3e231d3dc8937afc58d2543210952504ef8727a58775d5e0dd3822dcd4aa64614d6e69048a0153df13f3f4d93b714c3694396b703a5
 EBUILD openpgp-keys-openssl-20230207.ebuild 1945 BLAKE2B 99b5507d963340491d6593d549f6556af1fdf0539488eb2eb485f873726eac46c74e930bb177242247e8d594cc2afaa3c46d34943f48a0688d95492d42d47d10 SHA512 20aac37d98282468b9fe66fb567dffe6f8fd9a2d2b06d498599d2ab0bd3ab45e47982285bfb3bc4ad238e111c181998d8e4e09c6582d972608f0dd8a23f6bafb
 EBUILD openpgp-keys-openssl-20230801.ebuild 2092 BLAKE2B fa05a39b2e76441da17d43a574a258f00d2b0d81775869060e0c3e8faec3ea93ba7a962e60052af73605135a2494cc0bc570b74dab3f704def1c789bc6ffd46a SHA512 656e165f0a770648e78d42bea4c871933cbb2e170b2e59173372a07d679b6c11600336dae4498186d1276a2637cf32e2085b99e1ac42d1e6efa3a2383397f204
+EBUILD openpgp-keys-openssl-20240424.ebuild 2317 BLAKE2B a356756483c5c010eb9278be675ae50f8ff8db3bec6661a39745b9931d207abccb1804d991a6162cbd57d57cfd5ced2892d05bc7aadd822f84d9a7e1a9dbecbb SHA512 308bb180d0d418b3b607957bd036e79d1f692585463e2d16d03fa33bf44daa74585f2a9e6054cff5afd53ad2e65775f97700cafb47279d8820b4a8cbaf5ab224
 MISC metadata.xml 248 BLAKE2B 4d2533691da4a661545bc76aae55b72077dd0f54a21c67450fad5565393db92779160e268c4ac7e1557cef6ac13e9476b32c6ff6e516c3afd404ab40a28164b3 SHA512 5c660412e95fdb471f41390d1d2fe96c549f2a00c932b2ce5832a56d3ce49df6b08991bfdcabcb296434d0d6599bdb3fb1ec4dbf7373fe2effaa6655ab411184
diff --git a/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20240424.ebuild b/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20240424.ebuild
new file mode 100644
index 000000000000..f7167e3e04d1
--- /dev/null
+++ b/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20240424.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by OpenSSL"
+HOMEPAGE="https://www.openssl.org/"
+
+# See the following:
+# - https://www.openssl.org/source/
+# - https://www.openssl.org/community/otc.html
+# - https://www.openssl.org/community/omc.html
+# Mirrored from https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x8657ABB260F056B1E5190839D9C4D26D0E604491 etc (unstable results)
+# ```
+# mkdir /tmp/tmp-gpg
+# gpg --no-default-keyring --homedir=/tmp/tmp-gpg --keyserver keyserver.ubuntu.com --recv-keys "${OSSL_FINGERPRINTS[@]}" || exit 1
+#
+# for key in "${OSSL_FINGERPRINTS[@]}" ; do
+#  gpg --no-default-keyring --homedir=/tmp/tmp-gpg --export "${key}" > openssl-keys-20221101-${key}.asc
+# done
+# ```
+# Compare with e.g.:
+# for x in "${OSSL_FINGERPRINTS[@]}" ; do
+#  diff -ruN <(pgpdump /var/cache/distfiles/openssl-keys-2023*-${x}*) <(pgpdump /var/cache/distfiles/openssl-keys-2024*-${x}*) ; done
+# and/or diffoscope
+#
+# https://github.com/openssl/openssl/issues/19566
+# https://github.com/openssl/openssl/issues/19567
+
+OSSL_FINGERPRINTS=(
+	# Matt Caswell <matt@openssl.org>
+	5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33
+
+	# Paul Dale <pauli@openssl.org>
+	8657ABB260F056B1E5190839D9C4D26D0E604491
+
+	# Tim Hudson <tjh@openssl.org>
+	B7C1C14360F353A36862E4D5231C84CDDCC69C45
+
+	# Hugo Landau <hlandau@openssl.org>
+	95A9908DDFA16830BE9FB9003D30A3A9FF1360DC
+
+	# Tomas Mraz <tomas@openssl.org>
+	A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C
+
+	# Richard Levitte <levitte@openssl.org>
+	7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C
+
+	# Kurt Roeckx <kurt@openssl.org>
+	E5E52560DD91C556DDBDA5D02064C53641C25E5D
+
+	# OpenSSL OMC (see https://github.com/openssl/openssl/commit/f925bfebbb287321133b9251e72bee869a0f58b4)
+	EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5
+)
+
+ossl_key=
+for ossl_key in "${OSSL_FINGERPRINTS[@]}" ; do
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/openssl-keys-${PV}-${ossl_key}.asc"
+done
+unset ossl_key
+
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - openssl.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}