Re: [PR PATCH] [Updated] [WIP] coreutils: update to 9.5.

[iFoundSilentHouse <iFoundSilentHouse@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 687 bytes --]

There is an updated pull request by iFoundSilentHouse against master on the void-packages repository

https://github.com/iFoundSilentHouse/void-packages coreutils-9.5
https://github.com/void-linux/void-packages/pull/49585

[WIP] coreutils: update to 9.5.
- I tested the changes in this PR: **briefly**
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures:
  - aarch64-musl

Split buffer bug was fixed in https://github.com/coreutils/coreutils/commit/c4c5ed8f4e9cd55a12966d4f520e3a13101637d9 commit. So patch no longer needed

A patch file from https://github.com/void-linux/void-packages/pull/49585.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-coreutils-9.5-49585.patch --]
[-- Type: text/x-diff, Size: 3813 bytes --]

From cbbff315f17fc786e5be0604c81ad4e9761a118e Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Fri, 29 Mar 2024 08:37:09 +0600
Subject: [PATCH] coreutils: update to 9.5.

---
 .../patches/000-test-canonicalize.patch       | 17 ++++++++++
 srcpkgs/coreutils/patches/split.patch         | 32 -------------------
 srcpkgs/coreutils/template                    |  4 +--
 3 files changed, 19 insertions(+), 34 deletions(-)
 create mode 100644 srcpkgs/coreutils/patches/000-test-canonicalize.patch
 delete mode 100644 srcpkgs/coreutils/patches/split.patch

diff --git a/srcpkgs/coreutils/patches/000-test-canonicalize.patch b/srcpkgs/coreutils/patches/000-test-canonicalize.patch
new file mode 100644
index 00000000000000..8c29aa60dba88d
--- /dev/null
+++ b/srcpkgs/coreutils/patches/000-test-canonicalize.patch
@@ -0,0 +1,17 @@
+diff --git a/gnulib-tests/test-canonicalize.c b/gnulib-tests/test-canonicalize.c
+index 2c4fc23..89d33ed 100644
+--- a/gnulib-tests/test-canonicalize.c
++++ b/gnulib-tests/test-canonicalize.c
+@@ -394,9 +394,9 @@ main (void)
+     ASSERT (stat ("/", &st1) == 0);
+     ASSERT (stat ("//", &st2) == 0);
+     bool same = psame_inode (&st1, &st2);
+-#if defined __MVS__ || defined MUSL_LIBC
+-    /* On IBM z/OS and musl libc, "/" and "//" both canonicalize to
+-       themselves, yet they both have st_dev == st_ino == 1.  */
++#if defined __MVS__
++    /* On IBM z/OS, "/" and "//" both canonicalize to themselves, yet they both
++        have st_dev == st_ino == 1.  */
+     same = false;
+ #endif
+     if (same)
diff --git a/srcpkgs/coreutils/patches/split.patch b/srcpkgs/coreutils/patches/split.patch
deleted file mode 100644
index cd1523607c59c0..00000000000000
--- a/srcpkgs/coreutils/patches/split.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c4c5ed8f4e9cd55a12966d4f520e3a13101637d9 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Tue, 16 Jan 2024 13:48:32 -0800
-Subject: [PATCH] split: do not shrink hold buffer
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* src/split.c (line_bytes_split): Do not shrink hold buffer.
-If it’s large for this batch it’s likely to be large for the next
-batch, and for ‘split’ it’s not worth the complexity/CPU hassle to
-shrink it.  Do not assume hold_size can be bufsize.
----
- src/split.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/split.c b/src/split.c
-index 64020c859..037960a59 100644
---- a/src/split.c
-+++ b/src/split.c
-@@ -809,10 +809,7 @@ line_bytes_split (intmax_t n_bytes, char *buf, idx_t bufsize)
-             {
-               cwrite (n_out == 0, hold, n_hold);
-               n_out += n_hold;
--              if (n_hold > bufsize)
--                hold = xirealloc (hold, bufsize);
-               n_hold = 0;
--              hold_size = bufsize;
-             }
- 
-           /* Output to eol if present.  */
-
diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template
index 56ee80ade41ceb..c63851e52679cf 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -1,6 +1,6 @@
 # Template file for 'coreutils'
 pkgname=coreutils
-version=9.4
+version=9.5
 revision=1
 bootstrap=yes
 makedepends="gmp-devel acl-devel libcap-devel"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/coreutils"
 changelog="https://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob_plain;f=NEWS;hb=HEAD"
 distfiles="${GNU_SITE}/coreutils/coreutils-${version}.tar.xz"
-checksum=ea613a4cf44612326e917201bbbcdfbd301de21ffc3b59b6e5c07e040b275e52
+checksum=cd328edeac92f6a665de9f323c93b712af1858bc2e0d88f3f7100469470a1b8a
 alternatives="
  hostname:hostname:/usr/bin/hostname-coreutils
  hostname:hostname.1:/usr/share/man/man1/hostname-coreutils.1"