[PR PATCH] coreutils: update to 9.5.

[PR PATCH] coreutils: update to 9.5.

[iFoundSilentHouse]

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

There is a new 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

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: 2678 bytes --]

From d16f879601249169b684f2b59d7612e309060043 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.

---
 srcpkgs/coreutils/patches/split.patch | 32 ---------------------------
 srcpkgs/coreutils/template            |  4 ++--
 2 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/coreutils/patches/split.patch

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"

Re: coreutils: update to 9.5.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49585#issuecomment-2026517313

Comment:
> I tested the changes in this PR: briefly

something as core as coreutils should be tested more than briefly

Re: [WIP] coreutils: update to 9.5.

[iFoundSilentHouse]

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

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49585#issuecomment-2026589456

Comment:
How can I prevent make_check from skipping when cross-compiling? Or it's better to create separate x86_64-musl prefix?

Re: [WIP] coreutils: update to 9.5.

[iFoundSilentHouse]

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

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49585#issuecomment-2026589456

Comment:
How can I prevent make_check from skipping when cross-compiling? Or it's better to create separate x86_64-musl masterdir?

Re: [WIP] coreutils: update to 9.5.

[iFoundSilentHouse]

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

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49585#issuecomment-2026589456

Comment:
How can I prevent make_check from skipping locally when cross-compiling? Or it's better to create separate x86_64-musl masterdir?

Re: [WIP] coreutils: update to 9.5.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49585#issuecomment-2026643831

Comment:
you can't run tests when cross-compiling

see the readme for the musl masterdir

Re: [WIP] coreutils: update to 9.5.

[iFoundSilentHouse]

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

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49585#issuecomment-2028597805

Comment:
Tests that fail locally on x86_64-musl : join, expr, cut, uniq, dd/no-allocate

Re: [WIP] coreutils: update to 9.5.

[iFoundSilentHouse]

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

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49585#issuecomment-2028597805

Comment:
Tests that fail locally on x86_64-musl : join, expr, cut, uniq, dd/no-allocate. In CI: only gnulib-tests/canonicalize.c with ```test-canonicalize.c:411: assertion 'strcmp (result1, "//") == 0' failed```

Re: [WIP] coreutils: update to 9.5.

[iFoundSilentHouse]

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

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49585#issuecomment-2028597805

Comment:
Tests ```/tests``` that fail locally on x86_64-musl : join, expr, cut, uniq, dd/no-allocate. 
Tests ```/gnulib-tests``` that fail locally on x86_64-musl: canonicalize, test-getcwd.sh, test-getlogin.

In CI: only gnulib-tests/canonicalize with ```test-canonicalize.c:411: assertion 'strcmp (result1, "//") == 0' failed```

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

[iFoundSilentHouse]

[-- 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"

Re: [WIP] coreutils: update to 9.5.

[iFoundSilentHouse]

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

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49585#issuecomment-2032451356

Comment:
test-canonicalize.c patch source: https://www.mail-archive.com/bug-coreutils%40gnu.org/msg33507.html

Re: [WIP] coreutils: update to 9.5.

[iFoundSilentHouse]

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

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49585#issuecomment-2032464150

Comment:
I'm already using it for 5 days, though imo it needs more testing. @classabbyamp would you mind adding ```needs-testing``` label to this PR?

Re: coreutils: update to 9.5.

[iFoundSilentHouse]

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

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49585#issuecomment-2045341545

Comment:
Which changes were tested: 
 - cp, mv, cat, split, sort. This utils were changed fundamentally.
 - mv --exchange
 - env -a
 - chgrp --from=OWNER:GROUP

Re: coreutils: update to 9.5.

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/49585#issuecomment-2216156474

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Closed]: coreutils: update to 9.5.

[github-actions]

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

There's a closed pull request on the void-packages repository

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

Description:
- 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

Re: coreutils: update to 9.5

[lightbult]

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

New comment by lightbult on void-packages repository

https://github.com/void-linux/void-packages/pull/53189#issuecomment-2628583518

Comment:
I dont know how to solve these failing tests. If anyone could finish this PR off it would be awesome! (might even be better to go straight to coreutils 9.6 with the ls -Z patch now - test still fail on musl there sadly though)

Re: coreutils: update to 9.5

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/53189#issuecomment-2494507295

Comment:
You could get rid of the 'Merge' commit, and look at https://git.savannah.gnu.org/cgit/coreutils.git/tree/NEWS
for patches to be backported, e.g. the ones marked as `[bug introduced in coreutils-9.5]`.