CVS commit: pkgsrc/sysutils/coreutils

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Sep 24 21:40:53 UTC 2026

Modified Files:
        pkgsrc/sysutils/coreutils: Makefile distinfo
        pkgsrc/sysutils/coreutils/patches: patch-Makefile.in
Added Files:
        pkgsrc/sysutils/coreutils/patches: patch-src_tail.c
            patch-tests_date_date.pl

Log Message:
coreutils: fix two test failures using upstream patches

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 pkgsrc/sysutils/coreutils/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/sysutils/coreutils/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/coreutils/patches/patch-Makefile.in
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/coreutils/patches/patch-src_tail.c \
    pkgsrc/sysutils/coreutils/patches/patch-tests_date_date.pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/coreutils/Makefile
diff -u pkgsrc/sysutils/coreutils/Makefile:1.94 pkgsrc/sysutils/coreutils/Makefile:1.95
--- pkgsrc/sysutils/coreutils/Makefile:1.94     Thu Sep 24 14:12:59 2026
+++ pkgsrc/sysutils/coreutils/Makefile  Thu Sep 24 21:40:52 2026
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.94 2026/09/24 14:12:59 wiz Exp $
+# $NetBSD: Makefile,v 1.95 2026/09/24 21:40:52 wiz Exp $
 
 .include "../../sysutils/coreutils/Makefile.common"
 
+PKGREVISION=   1
+
 CONFLICTS=     fileutils-[0-9]* gnuls-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]*
 
 # devel/id-utils installs a 'gid' program, so conflict with it
@@ -16,12 +18,12 @@ INFO_FILES=         yes
 
 TEST_DEPENDS+=         p5-Expect>=1.11:../../devel/p5-Expect
 
-# as of 9.12
+# as of 9.12nb1
 # TOTAL: 761
 # PASS:  528
 # SKIP:  230
 # XFAIL: 0
-# FAIL:  3
+# FAIL:  1
 # XPASS: 0
 # ERROR: 0
 

Index: pkgsrc/sysutils/coreutils/distinfo
diff -u pkgsrc/sysutils/coreutils/distinfo:1.53 pkgsrc/sysutils/coreutils/distinfo:1.54
--- pkgsrc/sysutils/coreutils/distinfo:1.53     Thu Sep 24 14:12:59 2026
+++ pkgsrc/sysutils/coreutils/distinfo  Thu Sep 24 21:40:52 2026
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.53 2026/09/24 14:12:59 wiz Exp $
+$NetBSD: distinfo,v 1.54 2026/09/24 21:40:52 wiz Exp $
 
 BLAKE2s (coreutils-9.12.tar.xz) = ee4915fff2d9eb4503f67069073ae39e0d91f010171a81379f218ea44ca0dbe6
 SHA512 (coreutils-9.12.tar.xz) = f25514cf02fd25365252d9a8f6fc5f8ed063fffdcb11c7eff380e3fa632741105d11b45ded332a2af5e913f77a143b68a2bd1fbdca0085e127fb17c80c35279b
 Size (coreutils-9.12.tar.xz) = 6704996 bytes
-SHA1 (patch-Makefile.in) = 360f63e7c34e093d7ed3a4848da78a1d86bfb4ee
+SHA1 (patch-Makefile.in) = bc7f1e8ee125150996e828266ef115930642f9cc
+SHA1 (patch-src_tail.c) = 7506c029bb6b9ef5a81a8fa27646489a42927e24
+SHA1 (patch-tests_date_date.pl) = ba0e1f00bb3d687c20761d9d83e0465f43ff29ab

Index: pkgsrc/sysutils/coreutils/patches/patch-Makefile.in
diff -u pkgsrc/sysutils/coreutils/patches/patch-Makefile.in:1.5 pkgsrc/sysutils/coreutils/patches/patch-Makefile.in:1.6
--- pkgsrc/sysutils/coreutils/patches/patch-Makefile.in:1.5     Thu Feb  5 22:29:45 2026
+++ pkgsrc/sysutils/coreutils/patches/patch-Makefile.in Thu Sep 24 21:40:53 2026
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makefile.in,v 1.5 2026/02/05 22:29:45 wiz Exp $
+$NetBSD: patch-Makefile.in,v 1.6 2026/09/24 21:40:53 wiz Exp $
 
 Target for misc/gnuls package.
 Install libstdbuf.so as shared object (unstripped on Darwin).
 
---- Makefile.in.orig   2026-02-04 12:19:53.000000000 +0000
+--- Makefile.in.orig   2026-09-14 15:29:35.000000000 +0000
 +++ Makefile.in
-@@ -9677,6 +9677,9 @@ all: $(BUILT_SOURCES)
+@@ -9866,6 +9866,9 @@ all: $(BUILT_SOURCES)
  all: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
  
@@ -15,7 +15,7 @@ Install libstdbuf.so as shared object (u
  .SUFFIXES:
  .SUFFIXES: .1 .c .dvi .log .o .obj .pl .pl$(EXEEXT) .ps .sh .sh$(EXEEXT) .trs .x .y
  am--refresh: Makefile
-@@ -9799,8 +9802,8 @@ install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS)
+@@ -9988,8 +9991,8 @@ install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS)
        while read type dir files; do \
            if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
            test -z "$$files" || { \

Added files:

Index: pkgsrc/sysutils/coreutils/patches/patch-src_tail.c
diff -u /dev/null pkgsrc/sysutils/coreutils/patches/patch-src_tail.c:1.1
--- /dev/null   Thu Sep 24 21:40:53 2026
+++ pkgsrc/sysutils/coreutils/patches/patch-src_tail.c  Thu Sep 24 21:40:53 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_tail.c,v 1.1 2026/09/24 21:40:53 wiz Exp $
+
+--- src/tail.c.orig    2026-07-31 13:51:12.000000000 +0000
++++ src/tail.c
+@@ -1177,6 +1177,10 @@ tail_forever (struct File_spec *f, int n_files, double
+ 
+   static bool debugged;
+ 
++  /* Flush initial output as we might block reading a FIFO.  */
++  if (fflush (stdout) < 0)
++    write_error ();
++
+   while (true)
+     {
+       /* Use blocking I/O as an optimization, when it's easy.  */
Index: pkgsrc/sysutils/coreutils/patches/patch-tests_date_date.pl
diff -u /dev/null pkgsrc/sysutils/coreutils/patches/patch-tests_date_date.pl:1.1
--- /dev/null   Thu Sep 24 21:40:53 2026
+++ pkgsrc/sysutils/coreutils/patches/patch-tests_date_date.pl  Thu Sep 24 21:40:53 2026
@@ -0,0 +1,17 @@
+$NetBSD: patch-tests_date_date.pl,v 1.1 2026/09/24 21:40:53 wiz Exp $
+
+--- tests/date/date.pl.orig    2026-09-01 21:37:43.000000000 +0000
++++ tests/date/date.pl
+@@ -173,9 +173,9 @@ my @Tests =
+ 
+      # test for RFC-822 conformance
+      ['rfc822-1', "-R -d '$d1'", {OUT=>"Sun, 19 Jan 1997 08:17:48 +0000"},
+-      # Solaris 5.9's /bin/sh emits this diagnostic to stderr
+-      # if you don't have support for the named locale.
+-      {ERR_SUBST => q!s/^couldn't set locale correctly\n//!},
++      # Solaris 5.9's /bin/sh can emit "couldn't set locale"
++      # NetBSD 12 sh can emit "setlocale failed"
++      {ERR_SUBST => q!s/.*(?:couldn't set locale|failed setlocale).*\n//!},
+       {ENV => 'LC_ALL=de_DE TZ=UTC0'}],
+ 
+      # Relative seconds, with time.  fixed in 2.0j