Gentoo Archives: gentoo-dev

From: Sam James <sam@g.o>
To: gentoo-dev@l.g.o
Subject: Re: [gentoo-dev] [PATCH v2] verify-sig.eclass: Use gemato openpgp-verify-detached w/ 20.0+
Date: Wed, 08 Mar 2023 22:54:24
Message-Id: 20230308225412.5414f3c8@zen
In Reply to: [gentoo-dev] [PATCH v2] verify-sig.eclass: Use gemato openpgp-verify-detached w/ 20.0+ by "Michał Górny"
1 On Wed, 8 Mar 2023 17:33:24 +0100
2 Michał Górny <mgorny@g.o> wrote:
3
4 > Use openpgp-verify-detached when app-portage/gemato-20.0 is installed.
5 > This lets us test the new code paths on ~arch with minimal risk
6 > of breakage on stable.
7 >
8 > Signed-off-by: Michał Górny <mgorny@g.o>
9 > ---
10 > eclass/verify-sig.eclass | 13 ++++++++++---
11 > 1 file changed, 10 insertions(+), 3 deletions(-)
12 >
13 > This is roughly the same patch that I've sent before, except that now
14 > it features a has_version condition to restrict the changes to ~arch
15 > gemato version.
16 >
17 > diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass
18 > index 91433bf53453..f67a3b10a0bf 100644
19 > --- a/eclass/verify-sig.eclass
20 > +++ b/eclass/verify-sig.eclass
21 > @@ -144,9 +144,16 @@ verify-sig_verify_detached() {
22 > # gpg can't handle very long TMPDIR
23 > # https://bugs.gentoo.org/854492
24 > local -x TMPDIR=/tmp
25 > - gemato gpg-wrap -K "${key}"
26 > "${extra_args[@]}" -- \
27 > - gpg --verify "${sig}" "${file}" ||
28 > - die "PGP signature verification
29 > failed"
30 > + if has_version -b ">=app-portage/gemato-20";
31
32 Do we want to log when taking this path temporarily?

Replies