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 C77FA15817D for ; Thu, 20 Jun 2024 10:24:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2AF53E2A2D; Thu, 20 Jun 2024 10:24:20 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 037D3E2A2D for ; Thu, 20 Jun 2024 10:24:20 +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 EBBAE33BEB9 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 572D81D0E 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.9fddd648ec082fee2718115dbe3183cbbe8adb45.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild sys-fs/btrfs-progs/btrfs-progs-9999.ebuild X-VCS-Directories: sys-fs/btrfs-progs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9fddd648ec082fee2718115dbe3183cbbe8adb45 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: 4de15f6f-3a70-4dde-9664-0e61aac2baae X-Archives-Hash: 5c3afe328314743c640fc912dd69d128 commit: 9fddd648ec082fee2718115dbe3183cbbe8adb45 Author: Sam James gentoo org> AuthorDate: Thu Jun 20 10:20:54 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=9fddd648 sys-fs/btrfs-progs: optimize src_unpack further As mentioned in c8e331071da74d11d651ebd32bbf4efbd25e0f8e. Signed-off-by: Sam James gentoo.org> sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild | 14 ++++++++------ sys-fs/btrfs-progs/btrfs-progs-9999.ebuild | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild index 40632b73ce14..b4d9a3171bef 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild @@ -96,13 +96,15 @@ pkg_setup() { if [[ ${PV} != 9999 ]]; then src_unpack() { - 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 } fi diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild index 40632b73ce14..b4d9a3171bef 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild @@ -96,13 +96,15 @@ pkg_setup() { if [[ ${PV} != 9999 ]]; then src_unpack() { - 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 } fi