From 8e261cdab4fd1bc77881cbff73b9ea962e9bd49f Mon Sep 17 00:00:00 2001 From: Hannes Braun Date: Sat, 2 May 2026 15:28:11 +0200 Subject: [PATCH] main/coreutils: upgrade to 9.11 --- main/coreutils/APKBUILD | 8 +-- main/coreutils/tests-notty-sighup.patch | 90 ------------------------- 2 files changed, 3 insertions(+), 95 deletions(-) delete mode 100644 main/coreutils/tests-notty-sighup.patch diff --git a/main/coreutils/APKBUILD b/main/coreutils/APKBUILD index 1544bbc1c18..2277fee3ff3 100644 --- a/main/coreutils/APKBUILD +++ b/main/coreutils/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Michael Mason # Maintainer: Natanael Copa pkgname=coreutils -pkgver=9.10 -pkgrel=1 +pkgver=9.11 +pkgrel=0 pkgdesc="The basic file, shell and text manipulation utilities" url="https://www.gnu.org/software/coreutils/" arch="all" @@ -22,7 +22,6 @@ subpackages="$pkgname-doc $pkgname-env $pkgname-fmt $pkgname-sha512sum:_sha512su install="$pkgname.post-deinstall" source="https://ftp.gnu.org/gnu/coreutils/coreutils-$pkgver.tar.xz renameat2-fakeroot.patch - tests-notty-sighup.patch coreutils-9.10-dash-tests.patch " @@ -124,8 +123,7 @@ _sha512sum() { } sha512sums=" -976ccfb8b906273a687ec330938a25ab72fb130988ca2fcad4fb6e12f4b621eb76b6e9ee091ad060361e95a8da26835b2484fffd3b5f9c7cdb100c1eb7b7d676 coreutils-9.10.tar.xz +73f4192747ab793fd29cccafeda35c499a11800830227ea4d26b00afb2c496dd69cb493005691d0f62a168beea6b55c1e28e82b6cf795e7370f9d53d13555410 coreutils-9.11.tar.xz 9e7f32fee800aa5c3e42fcff64eecf66ed562348569aa365986202d10a23b7af5f9f7ae269238801bbbc29ccbb195d6698f3676328d4b597ed55219b20a024ce renameat2-fakeroot.patch -d8be68328d487600af16a99ac10cf46b2c7059c9aa1df2738e4f8762f4818fbf1d45ad8338d0d0c1ea966703762562ffc1b1b028075dba1705e96df92fd2ba1c tests-notty-sighup.patch 7c0d6b65d42a1aa3a94e9a9ad24618f814a38c5c03eca5add29114badc29299aa9e744f4c814d5f6e75db5df57396c47a0cf7016ac461549e47a0eace44e8eee coreutils-9.10-dash-tests.patch " diff --git a/main/coreutils/tests-notty-sighup.patch b/main/coreutils/tests-notty-sighup.patch deleted file mode 100644 index 2800119cbe2..00000000000 --- a/main/coreutils/tests-notty-sighup.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 21d287324aa43aa3a31f39619ade0deac7fd6013 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?P=C3=A1draig=20Brady?= -Date: Tue, 24 Feb 2026 15:44:41 +0000 -Subject: [PATCH] tests: fix job control triggering test termination - -This avoids the test harness being terminated like: - make[1]: *** [Makefile:24419: check-recursive] Hangup - make[3]: *** [Makefile:24668: check-TESTS] Hangup - make: *** [Makefile:24922: check] Hangup - make[2]: *** [Makefile:24920: check-am] Hangup - make[4]: *** [Makefile:24685: tests/misc/usage_vs_refs.log] Error 129 - ... - -This happened sometimes when the tests were being run non interactively. -For example when run like: - - setsid make TESTS="tests/timeout/timeout.sh \ - tests/tail/overlay-headers.sh" SUBDIRS=. -j2 check - -Note the race window can be made bigger by adding a sleep -after tail is stopped in overlay-headers.sh - -The race can trigger the kernel to induce its job control -mechanism to prevent stuck processes. -I.e. where it sends SIGHUP + SIGCONT to a process group -when it determines that group may become orphaned, -and there are stopped processes in that group. - -* tests/tail/overlay-headers.sh: Use setsid(1) to keep the stopped -tail process in a separate process group, thus avoiding any kernel -job control protection mechanism. -* tests/timeout/timeout.sh: Use setsid(1) to avoid the kernel -checking the main process group when sleep(1) is reparented. -Fixes https://bugs.gnu.org/80477 ---- - tests/tail/overlay-headers.sh | 8 +++++++- - tests/timeout/timeout.sh | 11 ++++++++--- - 2 files changed, 15 insertions(+), 4 deletions(-) - -diff --git a/tests/tail/overlay-headers.sh b/tests/tail/overlay-headers.sh -index be9b6a7df..1e6da0a3f 100755 ---- a/tests/tail/overlay-headers.sh -+++ b/tests/tail/overlay-headers.sh -@@ -20,6 +20,8 @@ - . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src - print_ver_ tail sleep - -+setsid true || skip_ 'setsid required to control groups' -+ - # Function to count number of lines from tail - # while ignoring transient errors due to resource limits - countlines_ () -@@ -54,7 +56,11 @@ echo start > file2 || framework_failure_ - env sleep 60 & sleep=$! - - # Note don't use timeout(1) here as it currently --# does not propagate SIGCONT -+# does not propagate SIGCONT. -+# Note use setsid here to ensure we're in a separate process group -+# as we're going to STOP this tail process, and this can trigger -+# the kernel to send SIGHUP to a group if other tests have -+# processes that are reparented. (See tests/timeout/timeout.sh). - tail $fastpoll --pid=$sleep -f file1 file2 > out & pid=$! - - # Ensure tail is running -diff --git a/tests/timeout/timeout.sh b/tests/timeout/timeout.sh -index 9a395416b..fbb043312 100755 ---- a/tests/timeout/timeout.sh -+++ b/tests/timeout/timeout.sh -@@ -56,9 +56,14 @@ returns_ 124 timeout --foreground -s0 -k1 .1 sleep 10 && fail=1 - ) || fail=1 - - # Don't be confused when starting off with a child (Bug#9098). --out=$(sleep .1 & exec timeout .5 sh -c 'sleep 2; echo foo') --status=$? --test "$out" = "" && test $status = 124 || fail=1 -+# Use setsid to avoid sleep being in the test's process group, as -+# upon reparenting it can trigger an orphaned process group SIGHUP -+# (if there were stopped processes in other tests). -+if setsid true; then -+ out=$(setsid sleep .1 & exec timeout .5 sh -c 'sleep 2; echo foo') -+ status=$? -+ test "$out" = "" && test $status = 124 || fail=1 -+fi - - # Verify --verbose output - cat > exp <<\EOF --- -2.53.0 -