Github messages for voidlinux
 help / color / mirror / Atom feed
From: dkwo <dkwo@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] coreutils: update to 9.4
Date: Wed, 31 Jan 2024 19:35:59 +0100	[thread overview]
Message-ID: <20240131183559.7BEB828A45@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-48459@inbox.vuxu.org>

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

  parent reply	other threads:[~2024-01-31 18:35 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-31 17:08 [PR PATCH] " dkwo
2024-01-31 18:23 ` [PR PATCH] [Updated] " dkwo
2024-01-31 18:35 ` dkwo [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240131183559.7BEB828A45@inbox.vuxu.org \
    --to=dkwo@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).