Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 1/2] verify-sig.eclass: Use gemato openpgp-verify-detached
Date: Sun, 29 Jan 2023 13:03:45
Message-Id: 20230129130335.3463-1-mgorny@gentoo.org
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 eclass/verify-sig.eclass | 10 ++++++----
4 1 file changed, 6 insertions(+), 4 deletions(-)
5
6 diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass
7 index 394ce2e44427..95e8b357893a 100644
8 --- a/eclass/verify-sig.eclass
9 +++ b/eclass/verify-sig.eclass
10 @@ -65,8 +65,9 @@ case ${VERIFY_SIG_METHOD} in
11 BDEPEND="
12 verify-sig? (
13 app-crypt/gnupg
14 - >=app-portage/gemato-16
15 - )"
16 + >=app-portage/gemato-18.0
17 + )
18 + "
19 ;;
20 signify)
21 BDEPEND="verify-sig? ( app-crypt/signify )"
22 @@ -144,8 +145,9 @@ verify-sig_verify_detached() {
23 # gpg can't handle very long TMPDIR
24 # https://bugs.gentoo.org/854492
25 local -x TMPDIR=/tmp
26 - gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \
27 - gpg --verify "${sig}" "${file}" ||
28 + gemato openpgp-verify-detached -K "${key}" \
29 + "${extra_args[@]}" \
30 + "${sig}" "${file}" ||
31 die "PGP signature verification failed"
32 ;;
33 signify)
34 --
35 2.39.1

Replies