* [PR PATCH] coreutils: update to 9.4
@ 2024-01-31 17:08 dkwo
2024-01-31 18:23 ` [PR PATCH] [Updated] " dkwo
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: dkwo @ 2024-01-31 17:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 409 bytes --]
There is a new pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages coreu
https://github.com/void-linux/void-packages/pull/48459
coreutils: update to 9.4
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/48459.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-coreu-48459.patch --]
[-- Type: text/x-diff, Size: 1161 bytes --]
From a3f6936841be74b9261b18c07cd31c13c71a4044 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 31 Jan 2024 12:05:24 -0500
Subject: [PATCH] coreutils: update to 9.4
---
srcpkgs/coreutils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template
index c158130abf1f8..54dbf9412eba1 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -1,6 +1,6 @@
# Template file for 'coreutils'
pkgname=coreutils
-version=9.3
+version=9.4
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=adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa
+checksum=ea613a4cf44612326e917201bbbcdfbd301de21ffc3b59b6e5c07e040b275e52
alternatives="
hostname:hostname:/usr/bin/hostname-coreutils
hostname:hostname.1:/usr/share/man/man1/hostname-coreutils.1"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] coreutils: update to 9.4
2024-01-31 17:08 [PR PATCH] coreutils: update to 9.4 dkwo
@ 2024-01-31 18:23 ` dkwo
2024-01-31 18:35 ` dkwo
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dkwo @ 2024-01-31 18:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 414 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages coreu
https://github.com/void-linux/void-packages/pull/48459
coreutils: update to 9.4
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/48459.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-coreu-48459.patch --]
[-- Type: text/x-diff, Size: 3183 bytes --]
From 894d5be8c3eec028c03b691749fc3a15134122a5 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 31 Jan 2024 12:05:24 -0500
Subject: [PATCH] coreutils: update to 9.4
---
srcpkgs/coreutils/patches/split.patch | 32 +++++++++++++++++++++++++++
srcpkgs/coreutils/template | 8 +++----
2 files changed, 35 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/coreutils/patches/split.patch
diff --git a/srcpkgs/coreutils/patches/split.patch b/srcpkgs/coreutils/patches/split.patch
new file mode 100644
index 0000000000000..cd1523607c59c
--- /dev/null
+++ b/srcpkgs/coreutils/patches/split.patch
@@ -0,0 +1,32 @@
+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 c158130abf1f8..24ea1c76b56b3 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -1,6 +1,6 @@
# Template file for 'coreutils'
pkgname=coreutils
-version=9.3
+version=9.4
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=adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa
+checksum=ea613a4cf44612326e917201bbbcdfbd301de21ffc3b59b6e5c07e040b275e52
alternatives="
hostname:hostname:/usr/bin/hostname-coreutils
hostname:hostname.1:/usr/share/man/man1/hostname-coreutils.1"
@@ -58,8 +58,7 @@ do_configure() {
case "$XBPS_TARGET_MACHINE" in
arm*-musl)
# musl 1.1
- configure_args+=" ac_year2038_required=no"
- # this does not work: --disable-year2038
+ configure_args+=" --disable-year2038"
esac
#
# Do not install kill: provided by util-linux.
@@ -110,7 +109,6 @@ do_check() {
done
if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
- vsed -i '/tests\/tail-2\/inotify-dir-recreate/d' Makefile
vsed -i '/tests\/du\/long-from-unreadable/d' Makefile
fi
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] coreutils: update to 9.4
2024-01-31 17:08 [PR PATCH] coreutils: update to 9.4 dkwo
2024-01-31 18:23 ` [PR PATCH] [Updated] " dkwo
@ 2024-01-31 18:35 ` dkwo
2024-01-31 18:36 ` dkwo
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dkwo @ 2024-01-31 18:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 414 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages coreu
https://github.com/void-linux/void-packages/pull/48459
coreutils: update to 9.4
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/48459.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-coreu-48459.patch --]
[-- Type: text/x-diff, Size: 3243 bytes --]
From f19403ed09f24b3c5fd69010bf8ba863a59ff177 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 31 Jan 2024 12:05:24 -0500
Subject: [PATCH] coreutils: update to 9.4
---
srcpkgs/coreutils/patches/split.patch | 32 +++++++++++++++++++++++++++
srcpkgs/coreutils/template | 9 ++++----
2 files changed, 36 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/coreutils/patches/split.patch
diff --git a/srcpkgs/coreutils/patches/split.patch b/srcpkgs/coreutils/patches/split.patch
new file mode 100644
index 0000000000000..cd1523607c59c
--- /dev/null
+++ b/srcpkgs/coreutils/patches/split.patch
@@ -0,0 +1,32 @@
+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 c158130abf1f8..f4fb42d2c0802 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -1,6 +1,6 @@
# Template file for 'coreutils'
pkgname=coreutils
-version=9.3
+version=9.4
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=adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa
+checksum=ea613a4cf44612326e917201bbbcdfbd301de21ffc3b59b6e5c07e040b275e52
alternatives="
hostname:hostname:/usr/bin/hostname-coreutils
hostname:hostname.1:/usr/share/man/man1/hostname-coreutils.1"
@@ -58,8 +58,7 @@ do_configure() {
case "$XBPS_TARGET_MACHINE" in
arm*-musl)
# musl 1.1
- configure_args+=" ac_year2038_required=no"
- # this does not work: --disable-year2038
+ configure_args+=" --disable-year2038"
esac
#
# Do not install kill: provided by util-linux.
@@ -110,7 +109,7 @@ do_check() {
done
if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
- vsed -i '/tests\/tail-2\/inotify-dir-recreate/d' Makefile
+ vsed -i '/tests\/tail\/inotify-dir-recreate/d' Makefile
vsed -i '/tests\/du\/long-from-unreadable/d' Makefile
fi
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: coreutils: update to 9.4
2024-01-31 17:08 [PR PATCH] coreutils: update to 9.4 dkwo
2024-01-31 18:23 ` [PR PATCH] [Updated] " dkwo
2024-01-31 18:35 ` dkwo
@ 2024-01-31 18:36 ` dkwo
2024-01-31 18:49 ` dkwo
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dkwo @ 2024-01-31 18:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 258 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/48459#issuecomment-1919706807
Comment:
For musl, this test failure needs to be investigated: `./tests/dd/no-allocate.sh: xmalloc: cannot allocate 16665 bytes`
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: coreutils: update to 9.4
2024-01-31 17:08 [PR PATCH] coreutils: update to 9.4 dkwo
` (2 preceding siblings ...)
2024-01-31 18:36 ` dkwo
@ 2024-01-31 18:49 ` dkwo
2024-01-31 18:50 ` dkwo
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dkwo @ 2024-01-31 18:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/48459#issuecomment-1919706807
Comment:
For musl, these test failures need to be investigated:
- `./tests/dd/no-allocate.sh: xmalloc: cannot allocate 16665 bytes` in CI;
- locally: `FAIL: tests/cut/cut` `FAIL: tests/expr/expr`
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: coreutils: update to 9.4
2024-01-31 17:08 [PR PATCH] coreutils: update to 9.4 dkwo
` (3 preceding siblings ...)
2024-01-31 18:49 ` dkwo
@ 2024-01-31 18:50 ` dkwo
2024-01-31 20:50 ` dkwo
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dkwo @ 2024-01-31 18:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 353 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/48459#issuecomment-1919706807
Comment:
For musl, these test failures need to be investigated:
- `./tests/dd/no-allocate.sh: xmalloc: cannot allocate 16665 bytes` in CI;
- locally: `FAIL: tests/cut/cut` `FAIL: tests/expr/expr`, which however pass in ci
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: coreutils: update to 9.4
2024-01-31 17:08 [PR PATCH] coreutils: update to 9.4 dkwo
` (4 preceding siblings ...)
2024-01-31 18:50 ` dkwo
@ 2024-01-31 20:50 ` dkwo
2024-01-31 20:51 ` dkwo
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dkwo @ 2024-01-31 20:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 438 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/48459#issuecomment-1919706807
Comment:
For musl, these test failures need to be investigated:
- `./tests/dd/no-allocate.sh: xmalloc: cannot allocate 16665 bytes` in CI;
- locally: `FAIL: tests/cut/cut` `FAIL: tests/expr/expr`, which however pass in ci
- locally on musl 1.2.4: also `FAIL: tests/split/line-bytes` `tests/dd/no-allocate`
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: coreutils: update to 9.4
2024-01-31 17:08 [PR PATCH] coreutils: update to 9.4 dkwo
` (5 preceding siblings ...)
2024-01-31 20:50 ` dkwo
@ 2024-01-31 20:51 ` dkwo
2024-01-31 21:09 ` [PR PATCH] [Updated] " dkwo
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dkwo @ 2024-01-31 20:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 422 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/48459#issuecomment-1919706807
Comment:
For musl, these test failures need to be investigated:
- `tests/dd/no-allocate` gives `xmalloc: cannot allocate 16665 bytes` in CI;
- locally: `tests/cut/cut` `tests/expr/expr`, which however pass in ci
- locally on musl 1.2.4: also `tests/split/line-bytes` `tests/dd/no-allocate`
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] coreutils: update to 9.4
2024-01-31 17:08 [PR PATCH] coreutils: update to 9.4 dkwo
` (6 preceding siblings ...)
2024-01-31 20:51 ` dkwo
@ 2024-01-31 21:09 ` dkwo
2024-01-31 21:14 ` dkwo
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dkwo @ 2024-01-31 21:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 414 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages coreu
https://github.com/void-linux/void-packages/pull/48459
coreutils: update to 9.4
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/48459.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-coreu-48459.patch --]
[-- Type: text/x-diff, Size: 3657 bytes --]
From c4469226aff8d5f0e40886983b12f6088187f31b Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 31 Jan 2024 12:05:24 -0500
Subject: [PATCH] coreutils: update to 9.4
---
srcpkgs/coreutils/patches/split.patch | 32 +++++++++++++++++++++++++++
srcpkgs/coreutils/template | 16 ++++++--------
2 files changed, 39 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/coreutils/patches/split.patch
diff --git a/srcpkgs/coreutils/patches/split.patch b/srcpkgs/coreutils/patches/split.patch
new file mode 100644
index 0000000000000..cd1523607c59c
--- /dev/null
+++ b/srcpkgs/coreutils/patches/split.patch
@@ -0,0 +1,32 @@
+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 c158130abf1f8..fb1850070778a 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -1,6 +1,6 @@
# Template file for 'coreutils'
pkgname=coreutils
-version=9.3
+version=9.4
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=adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa
+checksum=ea613a4cf44612326e917201bbbcdfbd301de21ffc3b59b6e5c07e040b275e52
alternatives="
hostname:hostname:/usr/bin/hostname-coreutils
hostname:hostname.1:/usr/share/man/man1/hostname-coreutils.1"
@@ -58,8 +58,7 @@ do_configure() {
case "$XBPS_TARGET_MACHINE" in
arm*-musl)
# musl 1.1
- configure_args+=" ac_year2038_required=no"
- # this does not work: --disable-year2038
+ configure_args+=" --disable-year2038"
esac
#
# Do not install kill: provided by util-linux.
@@ -97,12 +96,10 @@ do_build() {
}
do_check() {
- local exeext_tests
-
- # chgrp tests fail inside a chroot
+ # Tests that fail due to being inside a chroot
vsed -i '/tests\/chgrp/d' Makefile
- # Tests that fail due to being inside a chroot
+ local exeext_tests
exeext_tests="chown lchown fchownat"
for test in $exeext_tests ; do
@@ -110,8 +107,9 @@ do_check() {
done
if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
- vsed -i '/tests\/tail-2\/inotify-dir-recreate/d' Makefile
+ vsed -i '/tests\/tail\/inotify-dir-recreate/d' Makefile
vsed -i '/tests\/du\/long-from-unreadable/d' Makefile
+ vsed -i '/tests\/dd\/dd/no-allocate/d' Makefile
fi
make check
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] coreutils: update to 9.4
2024-01-31 17:08 [PR PATCH] coreutils: update to 9.4 dkwo
` (7 preceding siblings ...)
2024-01-31 21:09 ` [PR PATCH] [Updated] " dkwo
@ 2024-01-31 21:14 ` dkwo
2024-01-31 21:21 ` dkwo
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dkwo @ 2024-01-31 21:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 414 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages coreu
https://github.com/void-linux/void-packages/pull/48459
coreutils: update to 9.4
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/48459.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-coreu-48459.patch --]
[-- Type: text/x-diff, Size: 3654 bytes --]
From c979d91d7ba77825f5feab386f61bc81c86e0589 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 31 Jan 2024 12:05:24 -0500
Subject: [PATCH] coreutils: update to 9.4
---
srcpkgs/coreutils/patches/split.patch | 32 +++++++++++++++++++++++++++
srcpkgs/coreutils/template | 16 ++++++--------
2 files changed, 39 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/coreutils/patches/split.patch
diff --git a/srcpkgs/coreutils/patches/split.patch b/srcpkgs/coreutils/patches/split.patch
new file mode 100644
index 0000000000000..cd1523607c59c
--- /dev/null
+++ b/srcpkgs/coreutils/patches/split.patch
@@ -0,0 +1,32 @@
+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 c158130abf1f8..56ee80ade41ce 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -1,6 +1,6 @@
# Template file for 'coreutils'
pkgname=coreutils
-version=9.3
+version=9.4
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=adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa
+checksum=ea613a4cf44612326e917201bbbcdfbd301de21ffc3b59b6e5c07e040b275e52
alternatives="
hostname:hostname:/usr/bin/hostname-coreutils
hostname:hostname.1:/usr/share/man/man1/hostname-coreutils.1"
@@ -58,8 +58,7 @@ do_configure() {
case "$XBPS_TARGET_MACHINE" in
arm*-musl)
# musl 1.1
- configure_args+=" ac_year2038_required=no"
- # this does not work: --disable-year2038
+ configure_args+=" --disable-year2038"
esac
#
# Do not install kill: provided by util-linux.
@@ -97,12 +96,10 @@ do_build() {
}
do_check() {
- local exeext_tests
-
- # chgrp tests fail inside a chroot
+ # Tests that fail due to being inside a chroot
vsed -i '/tests\/chgrp/d' Makefile
- # Tests that fail due to being inside a chroot
+ local exeext_tests
exeext_tests="chown lchown fchownat"
for test in $exeext_tests ; do
@@ -110,8 +107,9 @@ do_check() {
done
if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
- vsed -i '/tests\/tail-2\/inotify-dir-recreate/d' Makefile
+ vsed -i '/tests\/tail\/inotify-dir-recreate/d' Makefile
vsed -i '/tests\/du\/long-from-unreadable/d' Makefile
+ vsed -i '/tests\/dd\/no-allocate/d' Makefile
fi
make check
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: coreutils: update to 9.4
2024-01-31 17:08 [PR PATCH] coreutils: update to 9.4 dkwo
` (8 preceding siblings ...)
2024-01-31 21:14 ` dkwo
@ 2024-01-31 21:21 ` dkwo
2024-02-08 14:50 ` dkwo
2024-02-11 17:25 ` [PR PATCH] [Merged]: " leahneukirchen
11 siblings, 0 replies; 13+ messages in thread
From: dkwo @ 2024-01-31 21:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 256 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/48459#issuecomment-1919706807
Comment:
Locally on musl 1.2.4: failures for `tests/split/line-bytes` `tests/dd/no-allocate``tests/cut/cut` `tests/expr/expr`.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: coreutils: update to 9.4
2024-01-31 17:08 [PR PATCH] coreutils: update to 9.4 dkwo
` (9 preceding siblings ...)
2024-01-31 21:21 ` dkwo
@ 2024-02-08 14:50 ` dkwo
2024-02-11 17:25 ` [PR PATCH] [Merged]: " leahneukirchen
11 siblings, 0 replies; 13+ messages in thread
From: dkwo @ 2024-02-08 14:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 155 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/48459#issuecomment-1934281824
Comment:
@leahneukirchen
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Merged]: coreutils: update to 9.4
2024-01-31 17:08 [PR PATCH] coreutils: update to 9.4 dkwo
` (10 preceding siblings ...)
2024-02-08 14:50 ` dkwo
@ 2024-02-11 17:25 ` leahneukirchen
11 siblings, 0 replies; 13+ messages in thread
From: leahneukirchen @ 2024-02-11 17:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 266 bytes --]
There's a merged pull request on the void-packages repository
coreutils: update to 9.4
https://github.com/void-linux/void-packages/pull/48459
Description:
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-glibc)
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2024-02-11 17:25 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-31 17:08 [PR PATCH] coreutils: update to 9.4 dkwo
2024-01-31 18:23 ` [PR PATCH] [Updated] " dkwo
2024-01-31 18:35 ` dkwo
2024-01-31 18:36 ` dkwo
2024-01-31 18:49 ` dkwo
2024-01-31 18:50 ` dkwo
2024-01-31 20:50 ` dkwo
2024-01-31 20:51 ` dkwo
2024-01-31 21:09 ` [PR PATCH] [Updated] " dkwo
2024-01-31 21:14 ` dkwo
2024-01-31 21:21 ` dkwo
2024-02-08 14:50 ` dkwo
2024-02-11 17:25 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).