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 9D78415817D for ; Thu, 20 Jun 2024 10:24:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1C65E2A2A; Thu, 20 Jun 2024 10:24:19 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AD728E2A28 for ; Thu, 20 Jun 2024 10:24:19 +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 D2D40335DC5 for ; Thu, 20 Jun 2024 10:24:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 427171C7B for ; Thu, 20 Jun 2024 10:24:17 +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: <1718878996.b534772e7ad5744049921be64ee39bbb7cd4ef6a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/util-linux/util-linux-2.40.1-r3.ebuild sys-apps/util-linux/util-linux-9999.ebuild X-VCS-Directories: sys-apps/util-linux/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b534772e7ad5744049921be64ee39bbb7cd4ef6a X-VCS-Branch: master Date: Thu, 20 Jun 2024 10:24:17 +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: 87633025-086f-448c-b41a-a719b427c893 X-Archives-Hash: 2e48af2fccd511d8e395063aed354e6b commit: b534772e7ad5744049921be64ee39bbb7cd4ef6a Author: Sam James gentoo org> AuthorDate: Thu Jun 20 10:18:47 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jun 20 10:23:16 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b534772e sys-apps/util-linux: optimize src_unpack further As mentioned in c8e331071da74d11d651ebd32bbf4efbd25e0f8e. Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.40.1-r3.ebuild | 25 +++++++++++++------------ sys-apps/util-linux/util-linux-9999.ebuild | 15 ++++++++------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild index ac289f40eb68..1205062fedfc 100644 --- a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild +++ b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild @@ -110,19 +110,20 @@ pkg_pretend() { } src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - return - fi - - if use verify-sig ; then - # Upstream sign the decompressed .tar - verify-sig_verify_detached \ - <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \ - "${DISTDIR}"/${MY_P}.tar.sign + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + return + fi + + # Upstream sign the decompressed .tar + if use verify-sig; then + einfo "Unpacking ${MY_P}.tar.xz ..." + verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \ + < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x)) + assert "Unpack failed" + else + default fi - - default } src_prepare() { diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index c9f50b8ca79a..8e74d1439e60 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -115,14 +115,15 @@ src_unpack() { return fi - if use verify-sig ; then - # Upstream sign the decompressed .tar - verify-sig_verify_detached \ - <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \ - "${DISTDIR}"/${MY_P}.tar.sign + # Upstream sign the decompressed .tar + if use verify-sig; then + einfo "Unpacking ${MY_P}.tar.xz ..." + verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \ + < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x)) + assert "Unpack failed" + else + default fi - - default } src_prepare() {