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 CB77615808B for ; Thu, 7 Apr 2022 03:58:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5350FE0AAB; Thu, 7 Apr 2022 03:58:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 D2AA8E0A9E for ; Thu, 7 Apr 2022 03:58:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 D01DB3414F0 for ; Thu, 7 Apr 2022 03:57:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 19145391 for ; Thu, 7 Apr 2022 03:57:57 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1649303836.0e5cbc3642670e7741a551eb4775fcdc8694cd10.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/coreutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/coreutils/Manifest sys-apps/coreutils/coreutils-9.0-r2.ebuild X-VCS-Directories: sys-apps/coreutils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0e5cbc3642670e7741a551eb4775fcdc8694cd10 X-VCS-Branch: master Date: Thu, 7 Apr 2022 03:57:57 +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: 8669648e-a8c5-487d-a8ea-578d8e629e8f X-Archives-Hash: 5586bf759cb5e324c1c7ba8fcc809c2a commit: 0e5cbc3642670e7741a551eb4775fcdc8694cd10 Author: Sam James gentoo org> AuthorDate: Thu Apr 7 03:45:56 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Apr 7 03:57:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e5cbc36 sys-apps/coreutils: add verify-sig Signed-off-by: Sam James gentoo.org> sys-apps/coreutils/Manifest | 1 + sys-apps/coreutils/coreutils-9.0-r2.ebuild | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest index b820e36cb8ba..e13c336609db 100644 --- a/sys-apps/coreutils/Manifest +++ b/sys-apps/coreutils/Manifest @@ -1,3 +1,4 @@ DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145 DIST coreutils-9.0.tar.xz 5612752 BLAKE2B 59617cd25fd4c70f51bfbef851bd83e73f9c9ba5c11eb539f7f75c0184d55832e004b28e9268fb8064db145cb071ead2b9c0c3346bc35a11934ffe1b15bf17ac SHA512 9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03 +DIST coreutils-9.0.tar.xz.sig 833 BLAKE2B 1393f60361524e0a6eab5631aada50ee4124bd0e9ff3020b7593914a888f0edaec78339caee28847e85e1a1af6ea519ab9fad208db605f0c6b8a4e7ab19853a8 SHA512 1a368c92ddb57f386c188ef72f1edad7e217c983c296f9be0d27ffbaa673bf2f004c321fbaff8ae6cdebf6ffef402e3e8c69e6c8e30aca988e0ea38f2296cf30 diff --git a/sys-apps/coreutils/coreutils-9.0-r2.ebuild b/sys-apps/coreutils/coreutils-9.0-r2.ebuild index c8d7eca8e649..e55e9bf82f73 100644 --- a/sys-apps/coreutils/coreutils-9.0-r2.ebuild +++ b/sys-apps/coreutils/coreutils-9.0-r2.ebuild @@ -4,8 +4,8 @@ EAPI=7 PYTHON_COMPAT=( python3_{8..10} ) - -inherit flag-o-matic python-any-r1 toolchain-funcs +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc +inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig PATCH="${PN}-8.30-patches-01" DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)" @@ -14,7 +14,8 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz !vanilla? ( mirror://gentoo/${PATCH}.tar.xz https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz - )" + ) + verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" LICENSE="GPL-3" SLOT="0" @@ -42,6 +43,7 @@ BDEPEND=" dev-util/strace ${PYTHON_DEPS} ) + verify-sig? ( sec-keys/openpgp-keys-coreutils ) " RDEPEND+=" hostname? ( !sys-apps/net-tools[hostname] ) @@ -64,6 +66,15 @@ pkg_setup() { fi } +src_unpack() { + if use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig} + fi + + default +} + src_prepare() { local PATCHES=( # Upstream patches