From: Brian Callahan <bcallah@posteo.net>
Subject: UPDATE: sysutils/coreutils 9.4 => 9.5
To: OpenBSD Ports ML <ports@openbsd.org>
Date: Tue, 21 May 2024 13:06:38 +0000

Hi ports --

Attached is an update to the GNU coreutils. Changelog is here:
https://git.savannah.gnu.org/cgit/coreutils.git/tree/NEWS

All tests pass on amd64, but I do not have any big endian machines to
test with.

OK?

~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/coreutils/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile	19 Jan 2024 08:28:52 -0000	1.30
+++ Makefile	21 May 2024 13:03:28 -0000
@@ -1,8 +1,7 @@
 COMMENT =		file, shell and text manipulation utilities
 
-DISTNAME =		coreutils-9.4
+DISTNAME =		coreutils-9.5
 CATEGORIES =		sysutils
-REVISION =		0
 
 MAINTAINER =		Brian Callahan <bcallah@openbsd.org>
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/coreutils/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo	16 Jan 2024 22:12:45 -0000	1.15
+++ distinfo	21 May 2024 13:03:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (coreutils-9.4.tar.xz) = 6mE6TPRGEjJukXIBu7zfvTAd4h/8O1m25cB+BAsnXlI=
-SIZE (coreutils-9.4.tar.xz) = 5979200
+SHA256 (coreutils-9.5.tar.xz) = zTKO3qyS9qZl3p8yPJO3Eq8YWLwuDYjz9xAEaUcKG4o=
+SIZE (coreutils-9.5.tar.xz) = 6007136
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/coreutils/patches/patch-Makefile_in,v
retrieving revision 1.15
diff -u -p -r1.15 patch-Makefile_in
--- patches/patch-Makefile_in	16 Jan 2024 22:12:45 -0000	1.15
+++ patches/patch-Makefile_in	21 May 2024 13:03:28 -0000
@@ -3,7 +3,7 @@ XXX: Avoid rebuilding coreutils.info; ou
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -22186,6 +22186,7 @@ doc/$(am__dirstamp):
+@@ -22237,6 +22237,7 @@ doc/$(am__dirstamp):
  	@: > doc/$(am__dirstamp)
  
  $(srcdir)/doc/coreutils.info: doc/coreutils.texi $(srcdir)/doc/version.texi $(doc_coreutils_TEXINFOS)
Index: patches/patch-src_split_c
===================================================================
RCS file: patches/patch-src_split_c
diff -N patches/patch-src_split_c
--- patches/patch-src_split_c	19 Jan 2024 08:28:52 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-Fix heap buffer overflow
-
-https://github.com/coreutils/coreutils/commit/c4c5ed8f4e9cd55a12966d4f520e3a13101637d9
-https://marc.info/?l=oss-security&m=170556990821840&w=2
-
-Index: src/split.c
---- src/split.c.orig
-+++ src/split.c
-@@ -809,10 +809,7 @@ line_bytes_split (intmax_t n_bytes, char *buf, idx_t b
-             {
-               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.  */