From dc1db1aed33133bce3b3ebd853ab106466efbed6 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 13 Mar 2023 13:17:47 +0000 Subject: [PATCH] eclass/verify-sig: Sync with Gentoo It's from Gentoo commit 519f14fe6f74814196996da2d45c077003144db0. --- .../portage-stable/eclass/verify-sig.eclass | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/verify-sig.eclass b/sdk_container/src/third_party/portage-stable/eclass/verify-sig.eclass index 91433bf534..f67a3b10a0 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/verify-sig.eclass +++ b/sdk_container/src/third_party/portage-stable/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}" ||