system/coreutils: Update to 9.2

Fixes: #787

5 files changed, 55 insertions, 23 deletions

diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD
index 40d6c9faf..6a4c7957e 100644
--- a/system/coreutils/APKBUILD
+++ b/system/coreutils/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=coreutils
-pkgver=9.1
+pkgver=9.2
 pkgrel=0
 pkgdesc="Basic file, shell, and text manipulation utilities"
 url="https://www.gnu.org/software/coreutils/"
@@ -15,13 +15,14 @@ subpackages="$pkgname-doc"
 [ "${CBUILD}" = "${CHOST}" ] && subpackages="$subpackages $pkgname-lang"
 install="$pkgname.post-deinstall"
 source="https://ftp.gnu.org/gnu/coreutils/$pkgname-$pkgver.tar.xz
+	csplit-vm-test.patch
 	disable-csplit-io-err-test.patch
 	disable-mbrtowc-test.patch
 	gnulib-tests-dont-require-gpg-passphrase.patch
 	gnulib-test-fixes.patch
 	localename-test-fix.patch
 	test-df-symlink-bindmount.patch
-	tests-cp-proc-short-read.patch
+	test-tee-avoid-eintr.patch
 	"
 [ "${CBUILD}" != "${CHOST}" ] && source="$source
 	051_all_coreutils-mangen.patch
@@ -69,14 +70,15 @@ package() {
 	done
 }
 
-sha512sums="a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa  coreutils-9.1.tar.xz
+sha512sums="7e3108fefba4ef995cc73c64ac5f4e09827a44649a97ddd624eb61d67ce82da5ed6dc8c0f79d3e269f5cdb7d43877a61ef5b93194dd905bec432a7e31f9f479c  coreutils-9.2.tar.xz
+5f5eab0ae69b26d0906b890a7681b9b5bbfefdd87f3caf84e307d6764ec4a23ec764c18df3404d5ceda9b90b4b5fef150aac7a6d709afa0be6f90a25793fd62c  csplit-vm-test.patch
 bd8b5cecba59eba30458c8afa895877d39a987b989bc06b70cd6836e0ef684677aaadcb4949b58a713779fe1df1e15e3903e9be14e306671b86b69018b75de8b  disable-csplit-io-err-test.patch
 595be7f580f8906467624959c7eddbd6d7007571d92668b6a1ea5543b73764035b44b02ab5f352c67ec6562a368f220af445edd0a0965fb9826bccfd25ddbdba  disable-mbrtowc-test.patch
 fd97fccd661befc558b3afb3e32c82dd2cef511a05e6129d49540599297c1b59ab1f109e63a12f585a2348c26c28fb98330c348829d1fe61cf8149d0dd1c989c  gnulib-tests-dont-require-gpg-passphrase.patch
 eaba7ad1c5b43d25dc96baaf6f01be5976f9f64c26ea55e1c78d6a3f12825f2f0e998aae7f2ad6d9b2637a3d11586ffe21b87fbbd3c1bb6c9898c5963cb2a32c  gnulib-test-fixes.patch
 b1509e5678a05f24d6e764c047546e5e34a7fbd5edb59c7debedb144a0096d8ac247c7e2722a5f68c90751e5280bec743c9a6ed3e1433c1916294d68d7bca109  localename-test-fix.patch
-43bb4cb8a330dc785ff8f09685e4fb2879df49b6944e2f64f9fa34a36740f392b115b3af57d481703690b9ee6c6f48ffb385b35cd128b1b40955f69dbd68bb3d  test-df-symlink-bindmount.patch
-7dfc5d37cc22c06c88a027102482b33f46a962b6f71d9adb80225d8f68d0be0760894e4480c3f80018a4f725bb7d0779987a6d28bceb7e141e01dbad78f84c2d  tests-cp-proc-short-read.patch"
+15a91b343b6c4d6ef31b322cd2787893eacccb81a7e0202aeac17c3aa18130e6feb5ddb32f39187b4cf2a5d6a9a536a0a6f992e4da90d954a72f158d0df6e4ba  test-df-symlink-bindmount.patch
+43bf6a1934a22478c93f4680180f1d7f157c9a5f7320bd8efac3f6e850db08bb57d32f4658eca34ee711e61538ef1932bd6abf730b4d2371e1a128c6d148939f  test-tee-avoid-eintr.patch"
 [ "${CBUILD}" != "${CHOST}" ] && sha512sums="
 bae804f057252c25452ac178c545dc2c4b4775cbfbdcfd4775edd1a4ed6507882bfac39e2b11ad01b74230ca48d761bf62f11bde5bcbc35a6e5a61cbe4a46e36  051_all_coreutils-mangen.patch
 "
diff --git a/system/coreutils/csplit-vm-test.patch b/system/coreutils/csplit-vm-test.patch
new file mode 100644
index 000000000..da2e1ad15
--- /dev/null
+++ b/system/coreutils/csplit-vm-test.patch
@@ -0,0 +1,30 @@
+From aa99b99f0cc03fac8a7db00b6aec8887756a499c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Thu, 30 Mar 2023 14:28:03 +0100
+Subject: [PATCH] tests: adjust csplit VM limit
+
+* tests/misc/csplit-heap.sh: More memory is required to avoid
+a false failure on some systems.  Noticed with musl libc
+with bash as the shell.  This is confirmed to still easily
+trigger with the original memory leak being tested.
+Addresses https://bugs.gnu.org/62542
+---
+ tests/misc/csplit-heap.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/misc/csplit-heap.sh b/tests/misc/csplit-heap.sh
+index 2ba3c4500..36b286b93 100755
+--- a/tests/misc/csplit-heap.sh
++++ b/tests/misc/csplit-heap.sh
+@@ -25,7 +25,7 @@ vm=$(get_min_ulimit_v_ csplit -z f %n%1) \
+   || skip_ "this shell lacks ulimit support"
+ 
+ (
+- ulimit -v $(($vm + 1000)) \
++ ulimit -v $(($vm + 4000)) \
+    && { yes | head -n2500000; echo n; } | csplit -z - %n%1
+ ) || fail=1
+ 
+-- 
+2.26.2
+
diff --git a/system/coreutils/test-df-symlink-bindmount.patch b/system/coreutils/test-df-symlink-bindmount.patch
index de5cdfb02..cd44c9066 100644
--- a/system/coreutils/test-df-symlink-bindmount.patch
+++ b/system/coreutils/test-df-symlink-bindmount.patch
@@ -6,6 +6,6 @@
  # source and target.  This excludes for example BTRFS sub-volumes.
 -if test "$(df --output=source | grep -F "$file_system" | wc -l)" = 1; then
 +if test "$(df --all --output=source | grep -F "$file_system" | wc -l)" = 1; then
-   df --out=source,target '.' > out || fail=1
-   compare exp out || fail=1
- fi
+   # Restrict to systems with a single file system root (and have findmnt(1))
+   if test "$(findmnt -nro FSROOT | uniq | wc -l)" =  1; then
+     df --out=source,target '.' > out || fail=1
diff --git a/system/coreutils/test-tee-avoid-eintr.patch b/system/coreutils/test-tee-avoid-eintr.patch
new file mode 100644
index 000000000..c513486f7
--- /dev/null
+++ b/system/coreutils/test-tee-avoid-eintr.patch
@@ -0,0 +1,15 @@
+Upstream report: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=62542
+
+diff --git a/tests/misc/tee.sh b/tests/misc/tee.sh
+index 0b97a9ea3..444cb688a 100755
+--- a/tests/misc/tee.sh
++++ b/tests/misc/tee.sh
+@@ -99,7 +99,7 @@ dd count=20 bs=100K if=/dev/zero status=none |
+   dd count=0 oflag=nonblock status=none
+   tee || { cleanup_; touch tee.fail; }
+ } >fifo
+-test -f tee.fail && fail=1
++test -f tee.fail && fail=1 || cleanup_
+ 
+ # Ensure tee honors --output-error modes
+ read_fifo() { timeout 10 dd count=1 if=fifo of=/dev/null status=none & }
diff --git a/system/coreutils/tests-cp-proc-short-read.patch b/system/coreutils/tests-cp-proc-short-read.patch
deleted file mode 100644
index 33f0417d8..000000000
--- a/system/coreutils/tests-cp-proc-short-read.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/tests/cp/proc-short-read.sh b/tests/cp/proc-short-read.sh
-index bedb08e06..89dba8d3d 100755
---- a/tests/cp/proc-short-read.sh
-+++ b/tests/cp/proc-short-read.sh
-@@ -28,8 +28,8 @@ cp $proc_large 1    || fail=1
- cat $proc_large > 2 || fail=1
- 
- # adjust varying parts
--sed '/MHz/d; /bogomips/d;' 1 > proc.cp || framework_failure_
--sed '/MHz/d; /bogomips/d;' 2 > proc.cat || framework_failure_
-+sed '/MHz/d; /[Bb][Oo][Gg][Oo][Mm][Ii][Pp][Ss]/d;' 1 > proc.cp || framework_failure_
-+sed '/MHz/d; /[Bb][Oo][Gg][Oo][Mm][Ii][Pp][Ss]/d;' 2 > proc.cat || framework_failure_
- 
- compare proc.cp proc.cat || fail=1
-