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 0EB61158087 for ; Mon, 24 Jan 2022 16:08:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D0CB2BC00F; Mon, 24 Jan 2022 16:08:42 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A3DBC2BC00F for ; Mon, 24 Jan 2022 16:08:41 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 26227342EA6 for ; Mon, 24 Jan 2022 16:08:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D682B166 for ; Mon, 24 Jan 2022 16:08:38 +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: <1643040377.5a614c66095fee76fc55e9fdea5b58e9bd39ef02.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/, sys-apps/util-linux/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/util-linux/files/util-linux-2.37.3-ioctl_ns-test-hang.patch sys-apps/util-linux/util-linux-2.37.3.ebuild X-VCS-Directories: sys-apps/util-linux/files/ sys-apps/util-linux/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5a614c66095fee76fc55e9fdea5b58e9bd39ef02 X-VCS-Branch: master Date: Mon, 24 Jan 2022 16:08:38 +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: af926ec0-01e3-42ff-b364-6a406a6dbc5e X-Archives-Hash: a342c2c3a9622749a7dabe219ef26ebb commit: 5a614c66095fee76fc55e9fdea5b58e9bd39ef02 Author: Sam James gentoo org> AuthorDate: Mon Jan 24 16:06:17 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jan 24 16:06:17 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a614c66 sys-apps/util-linux: remove duplicate patch Bug: https://bugs.gentoo.org/831978 Signed-off-by: Sam James gentoo.org> .../util-linux-2.37.3-ioctl_ns-test-hang.patch | 37 ---------------------- sys-apps/util-linux/util-linux-2.37.3.ebuild | 2 +- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/sys-apps/util-linux/files/util-linux-2.37.3-ioctl_ns-test-hang.patch b/sys-apps/util-linux/files/util-linux-2.37.3-ioctl_ns-test-hang.patch deleted file mode 100644 index 73dc0b40a049..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.37.3-ioctl_ns-test-hang.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://github.com/karelzak/util-linux/commit/597ccb7bf564f65bb059bfe420224cab0fba46ac.patch - -From 597ccb7bf564f65bb059bfe420224cab0fba46ac Mon Sep 17 00:00:00 2001 -From: Chris Hofstaedtler -Date: Fri, 20 Aug 2021 10:30:50 +0000 -Subject: [PATCH] tests: Skip lsns/ioctl_ns test if unshare fails - -Some parts of the Debian build infrastructure uses unshare to run the -package build, and that appears to cause a "nested" unshare in the -lsns/ioctl_ns test to fail. Unfortunately the tests then hang at this -point. - -Try running unshare before the actual test, and skip the test if unshare -already fails. - -[kzak@redhat.com: - add --fork to the test - - don't write to stdout/err] - -Signed-off-by: Chris Hofstaedtler -Signed-off-by: Karel Zak ---- - tests/ts/lsns/ioctl_ns | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/ts/lsns/ioctl_ns b/tests/ts/lsns/ioctl_ns -index ef6360607..fa626bfda 100755 ---- a/tests/ts/lsns/ioctl_ns -+++ b/tests/ts/lsns/ioctl_ns -@@ -34,6 +34,8 @@ ts_check_prog "mkfifo" - ts_check_prog "touch" - ts_check_prog "uniq" - -+$TS_CMD_UNSHARE --user --pid --mount-proc --fork true &> /dev/null || ts_skip "no namespace support" -+ - ts_cd "$TS_OUTDIR" - - # The parent process receives namespaces ids via FIFO_DATA from bash diff --git a/sys-apps/util-linux/util-linux-2.37.3.ebuild b/sys-apps/util-linux/util-linux-2.37.3.ebuild index 29ca2387ed7a..931702b50a7f 100644 --- a/sys-apps/util-linux/util-linux-2.37.3.ebuild +++ b/sys-apps/util-linux/util-linux-2.37.3.ebuild @@ -86,7 +86,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/${PN}-2.37.1-agetty_ctrl-c_erase.patch #804972 - "${FILESDIR}"/${P}-ioctl_ns-test-hang.patch # upstream test hang patch + "${FILESDIR}"/${PN}-2.37.2-ioctl_ns-test-hang.patch # upstream test hang patch ) src_prepare() {