commit: ee3978de3dcf67faff9bb1b39a4c87f88b070a6d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Mar 20 03:29:02 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Mar 20 03:32:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee3978de
net-libs/gnutls: wire up verify-sig for 3.7.4 We can wire up verify-sig now that a fixed version of openpgp-keys-gnutls (>= 2022020) is in tree. It remains unkeyworded while we figure out what to do about the C++ ABI breakage though. Signed-off-by: Sam James <sam <AT> gentoo.org> net-libs/gnutls/Manifest | 1 + net-libs/gnutls/gnutls-3.7.4.ebuild | 16 +++++----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest index 3158b68efb68..c96604490651 100644 --- a/net-libs/gnutls/Manifest +++ b/net-libs/gnutls/Manifest @@ -1,3 +1,4 @@ DIST gnutls-3.7.2.tar.xz 6091508 BLAKE2B f408ff65f2e08cf294b449dfac64a272a8ba40e987618960f57ee36c167a25974711ab8d11bdbd6335fbf18ac902a79b5c6b40bb6a37f4ee07549832d0611df2 SHA512 5d01d561a05379da71e4847e30ba13c2abe09f7a5c4359fd539d8bd19abad0ce87120f82ee7b6264e787bd3edbc5ae16beffa892983cbc3d59f11a1811c10329 DIST gnutls-3.7.3.tar.xz 6119292 BLAKE2B 811e6fbb62fbd35fa63e66cfcbfc3bf899cea5cece1d2a68bc650f507df0f7be9f59c707c90fa19b7ef5a52455a663da49682704e0884af06075c566afbfc0bf SHA512 3ace744affe23e284342658d6d2d2de49dd50065489cbc8be18fc7d38187253e5268ca54027ce5cd517056c249ac039a7481e4548cec04325de37ae85617d077 DIST gnutls-3.7.4.tar.xz 6131772 BLAKE2B 1c44528952275f48e4e458558c4e03c5b90dfb267482d6815f6c836f9530abb486a23ae5ea70ba2db7e272eee8e2066b259374f02a9bb9e714487466fd5994c9 SHA512 38b488ca1223d9aa8fc25756df08db6f29aaf76fb5816fdeaa14bd89fb431a2e1c495fefc64094f726337d5b89e198146ec7dc22e9a1bca6841a9d881b0d99e6 +DIST gnutls-3.7.4.tar.xz.sig 685 BLAKE2B ad485450abb916a229984f8f0d74fe7c46a0a87627f9d739f8121dccf36f4ca454007178f2a4e9bd5fffa2813363481bf80eaeee40f86e1b9c23b1f25dff7b4c SHA512 74b8badd67e215313583bd25c7b639207860af45d6f5cbcb81f1aaf46dacf0992b6d06876979594688e13dac5b8b27ba39935626374b4ddaa3e48118bbc2e7de diff --git a/net-libs/gnutls/gnutls-3.7.4.ebuild b/net-libs/gnutls/gnutls-3.7.4.ebuild index da1e22472d7f..6eaf9997a965 100644 --- a/net-libs/gnutls/gnutls-3.7.4.ebuild +++ b/net-libs/gnutls/gnutls-3.7.4.ebuild @@ -3,19 +3,13 @@ EAPI=7 -# 3.7.4 has an additional signature from a non-listed maintainer on gnutls.org -# and verify-sig.eclass dies on it. It does have a legitimate signature from -# a listed maintainer though, it's just that the eclass dislikes an extra signature -# from someone it doesn't recognise. -# https://gitlab.com/gnutls/web-pages/-/issues/3 -#VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnutls.asc - -inherit autotools multilib-minimal +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnutls.asc +inherit autotools multilib-minimal verify-sig DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols" HOMEPAGE="https://www.gnutls.org/"; SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" -#SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )" +SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )" LICENSE="GPL-3 LGPL-2.1+" SLOT="0/30" # libgnutls.so number @@ -55,8 +49,8 @@ BDEPEND=" dev-libs/softhsm:2[-bindist(-)] net-dialup/ppp net-misc/socat - )" -# verify-sig? ( sec-keys/openpgp-keys-gnutls )" + ) + verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20220320 )" DOCS=( README.md doc/certtool.cfg )
