coreutils - update from 9.5 to 9.6

Author: citrus-it

build/coreutils/build.sh

@@ -13,12 +13,12 @@
 # }}}
 
 # Copyright 2017 OmniTI Computer Consulting, Inc.  All rights reserved.
-# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=coreutils
-VER=9.5
+VER=9.6
 PKG=file/gnu-coreutils
 SUMMARY="coreutils - GNU core utilities"
 DESC="GNU core utilities"
@@ -69,7 +69,8 @@ function post_install {
 init
 download_source $PROG $PROG $VER
 patch_source
-run_autoreconf -fi
+run_aclocal --force -I m4
+run_autoconf
 prep_build
 build
 run_testsuite check

build/coreutils/patches/gcc14.patch

@@ -1,7 +1,7 @@
 diff -wpruN --no-dereference '--exclude=*.orig' a~/m4/configmake.m4 a/m4/configmake.m4
 --- a~/m4/configmake.m4	1970-01-01 00:00:00
 +++ a/m4/configmake.m4	1970-01-01 00:00:00
-@@ -29,7 +29,7 @@ AC_DEFUN([gl_CONFIGMAKE_PREP],
+@@ -31,7 +31,7 @@ AC_DEFUN([gl_CONFIGMAKE_PREP],
    AC_SUBST([pkgdatadir], ['${datadir}/${PACKAGE}'])
    AC_SUBST([pkgincludedir], ['${includedir}/${PACKAGE}'])
    AC_SUBST([pkglibdir], ['${libdir}/${PACKAGE}'])

build/coreutils/patches/pkglibdir.patch

@@ -1,7 +1,7 @@
 diff -wpruN --no-dereference '--exclude=*.orig' a~/m4/threadlib.m4 a/m4/threadlib.m4
 --- a~/m4/threadlib.m4	1970-01-01 00:00:00
 +++ a/m4/threadlib.m4	1970-01-01 00:00:00
-@@ -242,6 +242,7 @@ AC_DEFUN([gl_PTHREADLIB_BODY],
+@@ -244,6 +244,7 @@ AC_DEFUN([gl_PTHREADLIB_BODY],
              [gl_pthread_in_glibc=yes],
              [])
            ;;

build/coreutils/patches/pthread.patch

@@ -7,4 +7,3 @@ who.c.patch
 tests_df_no-mtab-status.sh.patch
 set-permission.c.patch
 stdbuf.c.patch
-gcc14.patch

build/coreutils/patches/series

@@ -1,42 +1,22 @@
 diff -wpruN --no-dereference '--exclude=*.orig' a~/tests/df/no-mtab-status.sh a/tests/df/no-mtab-status.sh
 --- a~/tests/df/no-mtab-status.sh	1970-01-01 00:00:00
 +++ a/tests/df/no-mtab-status.sh	1970-01-01 00:00:00
-@@ -35,9 +35,13 @@ cat > k.c <<EOF || framework_failure_
+@@ -24,9 +24,6 @@ require_gcc_shared_
+ # Protect against inaccessible remote mounts etc.
+ timeout 10 df || skip_ "df fails"
+ 
+-grep '^#define HAVE_GETMNTENT 1' $CONFIG_HEADER > /dev/null \
+-      || skip_ "getmntent is not used on this system"
+-
+ # Simulate "mtab" failure.
+ cat > k.c <<EOF || framework_failure_
  #define _GNU_SOURCE
- #include <stdio.h>
+@@ -34,7 +31,7 @@ cat > k.c <<EOF || framework_failure_
+ #include <stdlib.h>
  #include <errno.h>
+ #include <fcntl.h>
 -#include <mntent.h>
++#include <sys/mnttab.h>
  #include <string.h>
+ #include <stdarg.h>
  #include <dlfcn.h>
-+#ifdef __illumos__
-+#include <sys/mnttab.h>
-+#else
-+#include <mntent.h>
-+#endif
- 
- #define STREQ(a, b) (strcmp (a, b) == 0)
- 
-@@ -69,7 +73,11 @@ FILE* fopen(const char *path, const char
-     return fopen_func(path, mode);
- }
- 
-+#ifdef __illumos__
-+int getmntent (FILE *fp, struct mnttab *mp)
-+#else
- struct mntent *getmntent (FILE *fp)
-+#end
- {
-   /* Prove that LD_PRELOAD works. */
-   static int done = 0;
-@@ -80,7 +88,11 @@ struct mntent *getmntent (FILE *fp)
-     }
-   /* Now simulate the failure. */
-   errno = ENOENT;
-+#ifdef __illumos__
-+  return -1;
-+#else
-   return NULL;
-+#endif
- }
- EOF
- 

build/coreutils/patches/tests_df_no-mtab-status.sh.patch

@@ -100,6 +100,7 @@ PASS: tests/ptx/ptx-overrun.sh
 PASS: tests/misc/xstrtol.pl
 PASS: tests/tail/overlay-headers.sh
 PASS: tests/tail/pid.sh
+PASS: tests/tail/pid-pipe.sh
 PASS: tests/od/od.pl
 PASS: tests/od/od-endian.sh
 PASS: tests/od/od-float.sh
@@ -186,6 +187,7 @@ PASS: tests/misc/printenv.sh
 PASS: tests/printf/printf.sh
 PASS: tests/printf/printf-cov.pl
 PASS: tests/printf/printf-hex.sh
+PASS: tests/printf/printf-indexed.sh
 PASS: tests/printf/printf-mb.sh
 PASS: tests/printf/printf-surprise.sh
 PASS: tests/printf/printf-quote.sh
@@ -470,7 +472,6 @@ PASS: tests/ls/m-option.sh
 PASS: tests/ls/w-option.sh
 PASS: tests/ls/multihardlink.sh
 PASS: tests/ls/no-arg.sh
-SKIP: tests/ls/no-cap.sh
 PASS: tests/ls/selinux-segfault.sh
 PASS: tests/ls/quote-align.sh
 PASS: tests/ls/size-align.sh
@@ -479,6 +480,7 @@ PASS: tests/ls/recursive.sh
 SKIP: tests/ls/removed-directory.sh
 PASS: tests/ls/root-rel-symlink-color.sh
 PASS: tests/ls/rt-1.sh
+SKIP: tests/ls/selinux.sh
 SKIP: tests/ls/slink-acl.sh
 SKIP: tests/ls/stat-dtype.sh
 PASS: tests/ls/stat-failed.sh
@@ -596,6 +598,7 @@ SKIP: tests/du/bind-mount-dir-cycle-v2.sh
 SKIP: tests/id/setgid.sh
 SKIP: tests/install/install-C-root.sh
 SKIP: tests/ls/capability.sh
+SKIP: tests/ls/no-cap.sh
 SKIP: tests/ls/nameless-uid.sh
 SKIP: tests/chcon/chcon.sh
 SKIP: tests/chroot/chroot-credentials.sh
@@ -651,13 +654,22 @@ SKIP: tests/factor/t33.sh
 SKIP: tests/factor/t34.sh
 SKIP: tests/factor/t35.sh
 SKIP: tests/factor/t36.sh
-# TOTAL: 653
-# PASS:  500
-# SKIP:  152
+SKIP: tests/factor/t37.sh
+# TOTAL: 657
+# PASS:  502
+# SKIP:  154
 # XFAIL: 0
 # FAIL:  1
 # XPASS: 0
 # ERROR: 0
+NAME="OmniOS"
+PRETTY_NAME="OmniOS Community Edition v11 r151053"
+CPE_NAME="cpe:/o:omniosce:omnios:11:151053:0"
+ID=omnios
+VERSION=r151053
+VERSION_ID=r151053
+BUILD_ID=151053.0.2025.01.12
+HOME_URL="https://omnios.org/"
 SKIP: tests/tail/inotify-race
 SKIP tests/tail/inotify-race.sh (exit status: 77)
 SKIP: tests/tail/inotify-race2
@@ -825,10 +837,10 @@ SKIP: tests/install/install-Z-selinux
 SKIP tests/install/install-Z-selinux.sh (exit status: 77)
 SKIP: tests/ls/acl
 SKIP tests/ls/acl.sh (exit status: 77)
-SKIP: tests/ls/no-cap
-SKIP tests/ls/no-cap.sh (exit status: 77)
 SKIP: tests/ls/removed-directory
 SKIP tests/ls/removed-directory.sh (exit status: 77)
+SKIP: tests/ls/selinux
+SKIP tests/ls/selinux.sh (exit status: 77)
 SKIP: tests/ls/slink-acl
 SKIP tests/ls/slink-acl.sh (exit status: 77)
 SKIP: tests/ls/stat-dtype
@@ -889,6 +901,8 @@ SKIP: tests/install/install-C-root
 SKIP tests/install/install-C-root.sh (exit status: 77)
 SKIP: tests/ls/capability
 SKIP tests/ls/capability.sh (exit status: 77)
+SKIP: tests/ls/no-cap
+SKIP tests/ls/no-cap.sh (exit status: 77)
 SKIP: tests/ls/nameless-uid
 SKIP tests/ls/nameless-uid.sh (exit status: 77)
 SKIP: tests/chcon/chcon
@@ -999,9 +1013,11 @@ SKIP: tests/factor/t35
 SKIP tests/factor/t35.sh (exit status: 77)
 SKIP: tests/factor/t36
 SKIP tests/factor/t36.sh (exit status: 77)
-# TOTAL: 653
-# PASS:  500
-# SKIP:  152
+SKIP: tests/factor/t37
+SKIP tests/factor/t37.sh (exit status: 77)
+# TOTAL: 657
+# PASS:  502
+# SKIP:  154
 # XFAIL: 0
 # FAIL:  1
 # XPASS: 0

build/coreutils/testsuite.log

@@ -31,7 +31,7 @@
 | developer/versioning/sccs		| 5.09			| https://sourceforge.net/projects/sccs/files/
 | driver/tuntap				| 1.3.3			| https://github.com/kaizawa/tuntap/tags
 | editor/vim				| 9.1			| https://www.vim.org/download.php https://github.com/vim/vim
-| file/gnu-coreutils			| 9.5			| https://ftp.gnu.org/gnu/coreutils/
+| file/gnu-coreutils			| 9.6			| https://ftp.gnu.org/gnu/coreutils/
 | file/gnu-findutils			| 4.10.0		| https://ftp.gnu.org/pub/gnu/findutils/
 | library/c++/sigcpp			| 3.6.0			| https://download.gnome.org/sources/libsigc++/cache.json https://github.com/libsigcplusplus/libsigcplusplus/blob/master/NEWS
 | library/expat				| 2.6.4			| https://github.com/libexpat/libexpat/releases