commit: dd3bf5f4f347aaa0fd7f3f2d693ccdb8b72ed51b Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Tue Oct 14 21:12:22 2025 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Tue Oct 14 21:12:32 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd3bf5f4
sys-libs/glibc: add verify-sig support Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> sys-libs/glibc/Manifest | 1 + sys-libs/glibc/glibc-2.42-r1.ebuild | 7 ++++++- sys-libs/glibc/glibc-9999.ebuild | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 3327aa62610e..cfd5125a97e6 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -31,6 +31,7 @@ DIST glibc-2.41.tar.xz 19344868 BLAKE2B 4da62f489ba7a95bb069c2cfea8cf78e4d37e3a5 DIST glibc-2.42-patches-2.tar.xz 25856 BLAKE2B 26a5a3bdc7985c2193533e883445acac29ea695df30d72b6d9409aa9ec94d39a086eb6c41eb9adfc39e0de78f7ae84e0fa64a955f9866de262179ee40ce4a6b5 SHA512 1526613855b9ca65002c6853f88d77990a1fe9e6f4cc01aca51d67fc4592ed985da8c74a661d304eb8a27c6afc8592da259fe40fa08a824942a9b700942086e6 DIST glibc-2.42-patches-3.tar.xz 35164 BLAKE2B 6cbe1102291caefd2e75ba7348a35081d1ad23be7a8a869dc430dd4112976b66f3fc1d1e0819b16b8ff90224b98b97e4592875f21d72bfb5af1808f20192462d SHA512 987fadc5379de8596038f37953d2950821304330946d43e8c87722213220152a7a88d28f96208f82ee7723b90e6adf93261cfa61e4668c0bb95c0f561fdfc0f6 DIST glibc-2.42.tar.xz 19930508 BLAKE2B 6ffabfe7942034a5a4fb5097679cb47bc3431eb2a3864af07cea0cb6aa5db63fbaf6f026b3c9299e00268058a6762eb21e92499f012d552ed87d65c7ffbd0bbe SHA512 73a617db8e0f0958c0575f7a1c5a35b72b7e070b6cbdd02a9bb134995ca7ca0909f1e50d7362c53d2572d72f1879bb201a61d5275bac16136895d9a34ef0c068 +DIST glibc-2.42.tar.xz.sig 981 BLAKE2B 890e637c444982b2b07fac4607ce3e9f416c9c7688267ebd135e53878d93db95c609facfa1f347c59f23776cafb4b5df8ffb60235c89be451276202dd676dab2 SHA512 d868220778e98d24aead10a585e6a903892e4d043cd96a404634c8aa03d001d624a46a5c0fe13c86f83f66396a1f360a10990966fe377e98a722914b5087575d DIST glibc-systemd-20210729.tar.gz 1480 BLAKE2B 37722c7579df782d890e44dbab99c3de52ab466eb9de80d82405e9bb5620bf39ffc8c5f466a435bdb86ef6d36dd7019c0736573916bda6c67d02a2581e0ec979 SHA512 efd75af58b50522c28cdac7abd1fc56555bc1bb042512c90d8340c1ec09c5791b3872a305bf83723252bbde5855b75d958c041083457765c4cfd170732d09238 DIST glibc-systemd-20210814.tar.gz 1469 BLAKE2B 10fa7bcb46d4fdce9c0ab353cbd30871e9b09a347a13a9c9a3b5777f931aa3c826c158d2e49532c604d4a834f2fab4089b67495fb88d0398945dc50d45ad9ef1 SHA512 5346a9ea459a1e6ccf665389f2a294de1e16f1e3e05cdf07e3dd99ed0e4f6f8b52cc333d4bff3c75ac90ab6ce70cd4ab2b3e126f920ce7979abd6dda56315efc DIST locale-gen-2.00.tar.gz 7738 BLAKE2B cde6de5ba3400aea24d0d5f1b79471f89f09fb747c8e371e38316c7ada92f967e0865f573f23cb353d82419c234724143c0aeca9eb70eb945dfc581cc7491eb1 SHA512 b609fddb9ec5e567c008841fef3390eddb5d6e7699a8271b3b8c0ade1b44b0ac2e5d1daa8b9acabf3432e3b88110b538a96f209b1ad0f9e988b7efce66606dff diff --git a/sys-libs/glibc/glibc-2.42-r1.ebuild b/sys-libs/glibc/glibc-2.42-r1.ebuild index 59381ce71802..b7f702eb627f 100644 --- a/sys-libs/glibc/glibc-2.42-r1.ebuild +++ b/sys-libs/glibc/glibc-2.42-r1.ebuild @@ -32,8 +32,10 @@ MIN_PAX_UTILS_VER="1.3.3" # its seccomp filter!). Please double check this! MIN_SYSTEMD_VER="254.9-r1" +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/glibc.asc + inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \ - multilib systemd multiprocessing tmpfiles eapi9-ver + multilib systemd multiprocessing tmpfiles eapi9-ver verify-sig DESCRIPTION="GNU libc C library" HOMEPAGE="https://www.gnu.org/software/libc/" @@ -43,6 +45,7 @@ if [[ ${PV} == *9999 ]]; then else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" SRC_URI="mirror://gnu/glibc/${P}.tar.xz" + SRC_URI+=" verify-sig? ( mirror://gnu/glibc/${P}.tar.xz.sig )" SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz" fi @@ -121,6 +124,7 @@ BDEPEND=" >=net-dns/libidn2-2.3.0 sys-apps/gawk[mpfr] ) + verify-sig? ( sec-keys/openpgp-keys-glibc ) " COMMON_DEPEND=" gd? ( media-libs/gd:2= ) @@ -948,6 +952,7 @@ src_unpack() { [[ ${PV} == *.*.9999 ]] && EGIT_BRANCH=release/${PV%.*}/master git-r3_src_unpack else + verify-sig_verify_detached "${DISTDIR}/${P}.tar.xz" "${DISTDIR}/${P}.tar.xz.sig" unpack ${P}.tar.xz cd "${WORKDIR}" || die diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 053c0a1a2470..940a7c842fbe 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -32,8 +32,10 @@ MIN_PAX_UTILS_VER="1.3.3" # its seccomp filter!). Please double check this! MIN_SYSTEMD_VER="254.9-r1" +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/glibc.asc + inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \ - multilib systemd multiprocessing tmpfiles eapi9-ver + multilib systemd multiprocessing tmpfiles eapi9-ver verify-sig DESCRIPTION="GNU libc C library" HOMEPAGE="https://www.gnu.org/software/libc/" @@ -43,6 +45,7 @@ if [[ ${PV} == *9999 ]]; then else #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" SRC_URI="mirror://gnu/glibc/${P}.tar.xz" + SRC_URI+=" verify-sig? ( mirror://gnu/glibc/${P}.tar.xz.sig )" SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz" fi @@ -121,6 +124,7 @@ BDEPEND=" >=net-dns/libidn2-2.3.0 sys-apps/gawk[mpfr] ) + verify-sig? ( sec-keys/openpgp-keys-glibc ) " COMMON_DEPEND=" gd? ( media-libs/gd:2= ) @@ -948,6 +952,7 @@ src_unpack() { [[ ${PV} == *.*.9999 ]] && EGIT_BRANCH=release/${PV%.*}/master git-r3_src_unpack else + verify-sig_verify_detached "${DISTDIR}/${P}.tar.xz" "${DISTDIR}/${P}.tar.xz.sig" unpack ${P}.tar.xz cd "${WORKDIR}" || die
