commit: 519f14fe6f74814196996da2d45c077003144db0
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 08:22:12 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 19:18:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=519f14fe
verify-sig.eclass: Use gemato openpgp-verify-detached w/ 20.0+
Use openpgp-verify-detached when app-portage/gemato-20.0 is installed.
This lets us test the new code paths on ~arch with minimal risk
of breakage on stable.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
eclass/verify-sig.eclass | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass
index 91433bf53453..f67a3b10a0bf 100644
--- a/eclass/verify-sig.eclass
+++ b/eclass/verify-sig.eclass
@@ -144,9 +144,16 @@ verify-sig_verify_detached() {
# gpg can't handle very long TMPDIR
# https://bugs.gentoo.org/854492
local -x TMPDIR=/tmp
- gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \
- gpg --verify "${sig}" "${file}" ||
- die "PGP signature verification failed"
+ if has_version ">=app-portage/gemato-20"; then
+ gemato openpgp-verify-detached -K "${key}" \
+ "${extra_args[@]}" \
+ "${sig}" "${file}" ||
+ die "PGP signature verification failed"
+ else
+ gemato gpg-wrap -K "${key}" "${extra_args[@]}"
-- \
+ gpg --verify "${sig}" "${file}" ||
+ die "PGP signature verification failed"
+ fi
;;
signify)
signify -V -p "${key}" -m "${file}" -x "${sig}" ||
