[gentoo-commits] repo/gentoo:master commit in: sys-libs/readline/

["Sam James" <sam@gentoo.org>]

commit:     9443f092c9fb6aba62e0ccff1e43a4ae077e4062
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 00:09:28 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 00:09:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9443f092

sys-libs/readline: add verify-sig

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/readline/Manifest                  |  4 ++++
 sys-libs/readline/readline-8.1_p2.ebuild    | 11 +++++++++--
 sys-libs/readline/readline-8.2_alpha.ebuild | 11 +++++++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index fec78a126892..8832613ec13f 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,4 +1,8 @@
 DIST readline-8.1.tar.gz 2993288 BLAKE2B f0feca1ea3517b2b613adacac8c997cce0e86aa2f410c82a40ce1a2e128067112b4c68dbf25b808291c28c47583345abac994ce10b8d117958afcb96ee5e7c69 SHA512 27790d0461da3093a7fee6e89a51dcab5dc61928ec42e9228ab36493b17220641d5e481ea3d8fee5ee0044c70bf960f55c7d3f1a704cf6b9c42e5c269b797e00
+DIST readline-8.1.tar.gz.sig 95 BLAKE2B 8a297ef2ebf815ac53f02d6395aa2ff9f24234aef6b9793bfcd5a610cd3a5024182ad8ec8beb75eadd5cf876c57cd56d4226075578a86e0e2421d2e9b1677aa5 SHA512 42a6052d5882f16e5b6f8cd16433d793a9cbb43cf1886b2d858dc65ce067a4c39c8dda7331e52f76426c43de02c358f9ffdaf5c8fd7b089479008c1e5aa19112
 DIST readline-8.2-alpha.tar.gz 3004737 BLAKE2B 05af0ed2bb096d579f5c25879d8917af71f73a0d3db2e5c1c06078bad3617923c88cd3741a8d3cb762177ba9bf4eac88012d9ebf4be2d0a1dfc6f0764a9a4ba0 SHA512 3f7523db5a11eebb4a1d0162cc54260b2155f32717740d0aea0bb192b17129f686400414bef4470a771d3988ad4c24fd9bf0ed9d9cf1256c142089e33c7abd31
+DIST readline-8.2-alpha.tar.gz.sig 95 BLAKE2B fa4eada4e548ee567911c54250a635fae2f5413c57e8ab1c176350a80c801cb155b23ef617305927b27801913df3bd960b4f4af480e4876f87fa01f6b1b1eab7 SHA512 7eda01c4a09d8b9283511f119cf6c30c0954290011933da51c99dd288e995bddba095250a8f506b67b0180ef69a43fd3407b74bbf508fb8588ca0aa0912cb960
 DIST readline81-001 2454 BLAKE2B 7ec4e5c39a224a70643b44b88bcfef5198e199c76f2a34f0b0ce24f1747dd46be49ddf93871c474cda64322b4358127fec4c2401d19422f84934546bbe1f3bf2 SHA512 cfbef10bdeb562a302ccf214878d02ebadf799343b3d2d7996a282f81bcfde83997ba6dcc9a8477af4dd7c73bca74105ca00a81e42ed13321672bd2930550e54
+DIST readline81-001.sig 95 BLAKE2B 7d523d0fc21772cb03aa4b5d66ea58c1a99a6c0e4a8625e89cad015cbff63cd68e08207ca5150819225300ac864806032888104bbbea64ca38ebf89e28c24b7e SHA512 7fa3747e388aecb26f2d4f8346b89b367710ea99a14618c625066b820901dc467bd156ec37340fde1f86f0fe0d6b33044c1ed5768cf8ed1a25386d32dc6419a6
 DIST readline81-002 1242 BLAKE2B 4ef0404561bd8fc5559e8e5f675ae3f12c467178a8954f54f3204c2d09b88ccec960e807c7af0ec3514b489b676e3be51f98351e377fb18e3d7a14d33d4da69d SHA512 e47c029b82cf3a4d44e85c4348f7e059c56726694c190d84186822e1c893e1c006e7ec75f33c36791112f81abd792a2e2fdae9a65cd128f3c89ff4ffd9a9a1ff
+DIST readline81-002.sig 95 BLAKE2B f85d8a65a7326d6e18b32a603c8082952e4b81c53b6a1bd1668c7b0064ecce6ef04a41e2a042f100424dbf152e4db32c0e07ff166d528aa4ac4a9bd7daf4c7a9 SHA512 9ffb6cc697499f57df133f5ebaa5e43e24d33df5eb450d94a02144e94c833424218594c366f21101bc63331c1d532299c9327bd447d0a9849b0bbedce206a5b7

diff --git a/sys-libs/readline/readline-8.1_p2.ebuild b/sys-libs/readline/readline-8.1_p2.ebuild
index 690a0d9dc008..b611b10b52ad 100644
--- a/sys-libs/readline/readline-8.1_p2.ebuild
+++ b/sys-libs/readline/readline-8.1_p2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
+inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript verify-sig
 
 # Official patches
 # See ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/
@@ -23,6 +24,7 @@ patches() {
 		local u
 		for u in mirror://gnu/${PN} ftp://ftp.cwru.edu/pub/bash ; do
 			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
+			printf "${u}/${PN}-${MY_PV}-patches/%s.sig " "$@"
 		done
 	fi
 }
@@ -33,9 +35,11 @@ HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
 case ${PV} in
 	*_alpha*|*_beta*|*_rc*)
 		SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+		SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
 	;;
 	*)
 		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
+		SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )"
 	;;
 esac
 
@@ -47,7 +51,8 @@ IUSE="static-libs +unicode utils"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-chetramey )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -63,6 +68,8 @@ PATCHES=(
 # Needed because we don't want the patches being unpacked
 # (which emits annoying and useless error messages)
 src_unpack() {
+	verify-sig_src_unpack
+
 	unpack ${MY_P}.tar.gz
 }
 

diff --git a/sys-libs/readline/readline-8.2_alpha.ebuild b/sys-libs/readline/readline-8.2_alpha.ebuild
index 65d619f5bbbd..458c21fccfda 100644
--- a/sys-libs/readline/readline-8.2_alpha.ebuild
+++ b/sys-libs/readline/readline-8.2_alpha.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
+inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript verify-sig
 
 # Official patches
 # See ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/
@@ -23,6 +24,7 @@ patches() {
 		local u
 		for u in mirror://gnu/${PN} ftp://ftp.cwru.edu/pub/bash ; do
 			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
+			printf "${u}/${PN}-${MY_PV}-patches/%s.sig " "$@"
 		done
 	fi
 }
@@ -36,9 +38,11 @@ case ${PV} in
 		inherit autotools
 
 		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+		SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
 	;;
 	*)
 		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
+		SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )"
 	;;
 esac
 
@@ -51,7 +55,8 @@ IUSE="static-libs +unicode utils"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-chetramey )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -68,6 +73,8 @@ PATCHES=(
 # Needed because we don't want the patches being unpacked
 # (which emits annoying and useless error messages)
 src_unpack() {
+	verify-sig_src_unpack
+
 	unpack ${MY_P}.tar.gz
 }