[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/, sys-apps/util-linux/

[Sam James]

commit:     5a614c66095fee76fc55e9fdea5b58e9bd39ef02
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 24 16:06:17 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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 <zeha@××××××.org>
-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@××××××.com: - add --fork to the test
-                  - don't write to stdout/err]
-
-Signed-off-by: Chris Hofstaedtler <zeha@××××××.org>
-Signed-off-by: Karel Zak <kzak@××××××.com>
----
- 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() {