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 E19A8158089 for ; Fri, 15 Sep 2023 03:16:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D7282BC053; Fri, 15 Sep 2023 03:16:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D26C52BC04F for ; Fri, 15 Sep 2023 03:16:15 +0000 (UTC) From: Sam James To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= , Sam James Subject: [gentoo-dev] [PATCH 3/3] dev-libs/libsodium: use new verify-sig minisign support Date: Fri, 15 Sep 2023 04:15:52 +0100 Message-ID: <20230915031555.754545-3-sam@gentoo.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230915031555.754545-1-sam@gentoo.org> References: <20230915031555.754545-1-sam@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 565fce6b-b79d-4657-95c2-f6d496ae605c X-Archives-Hash: 5bd4311b0f5e5db359b6eb568910cf79 Closes: https://bugs.gentoo.org/783066 Signed-off-by: Sam James --- dev-libs/libsodium/libsodium-1.0.19-r1.ebuild | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild index cb3ef0373a0fa..d175a5ffc7f5a 100644 --- a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild +++ b/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild @@ -3,7 +3,9 @@ EAPI=8 -inherit autotools multilib-minimal +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libsodium.key +VERIFY_SIG_METHOD=minisig +inherit autotools multilib-minimal verify-sig DESCRIPTION="Portable fork of NaCl, a higher-level cryptographic library" HOMEPAGE="https://libsodium.org" @@ -41,22 +43,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch ) -src_unpack() { - # TODO: Could verify-sig.eclass support minisig? bug #783066 - MINISIGN_KEY="RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3" - - if use verify-sig ; then - ebegin "Verifying signature using app-crypt/minisign" - minisign -V \ - -P ${MINISIGN_KEY} \ - -x "${DISTDIR}"/${P}.tar.gz.minisig \ - -m "${DISTDIR}"/${P}.tar.gz - eend $? || die "Failed to verify distfile using minisign!" - fi - - default -} - src_prepare() { default -- 2.42.0