From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9D3ED158451 for ; Mon, 8 Jan 2024 14:48:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C81192BC01E; Mon, 8 Jan 2024 14:48:32 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A1C222BC014 for ; Mon, 8 Jan 2024 14:48:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C4F45343321 for ; Mon, 8 Jan 2024 14:48:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 19388AE5 for ; Mon, 8 Jan 2024 14:48:30 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1704725294.d466b3b94a8149cfb7ef4f7ac34d373b0ae4447f.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/verify-sig.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: d466b3b94a8149cfb7ef4f7ac34d373b0ae4447f X-VCS-Branch: master Date: Mon, 8 Jan 2024 14:48:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d731aaa1-f621-49a5-99ac-00a17c0be161 X-Archives-Hash: ee189dce6db589f5569b83b6f5802196 commit: d466b3b94a8149cfb7ef4f7ac34d373b0ae4447f Author: Michał Górny gentoo org> AuthorDate: Fri Jan 5 10:50:51 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Jan 8 14:48:14 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d466b3b9 verify-sig.eclass: Remove gentoo.org> eclass/verify-sig.eclass | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass index d5f71669538e..88fb17c31652 100644 --- a/eclass/verify-sig.eclass +++ b/eclass/verify-sig.eclass @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: verify-sig.eclass @@ -68,7 +68,7 @@ case ${VERIFY_SIG_METHOD} in BDEPEND=" verify-sig? ( app-crypt/gnupg - >=app-portage/gemato-16 + >=app-portage/gemato-20 ) " ;; @@ -159,16 +159,10 @@ verify-sig_verify_detached() { # gpg can't handle very long TMPDIR # https://bugs.gentoo.org/854492 local -x TMPDIR=/tmp - 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 + gemato openpgp-verify-detached -K "${key}" \ + "${extra_args[@]}" \ + "${sig}" "${file}" || + die "PGP signature verification failed" ;; signify) signify -V -p "${key}" -m "${file}" -x "${sig}" ||