tools/coreutils: update to 9.5

Update to latest stable release.

The following commits in gnulib caused a conflict in locally bootstrapped
coreutils with stable gnulib:

  8f4b4e52c991de2233b471f8e35a068866b31f01
  2749234203959df8d72cd8638d4e00a9fff450db

A module (strftime) was marked deprecated and replaced by another module
(nstrftime) in the version of gnulib that coreutils was released with
compared to the stable branch that we use for importing. Conflicts from
the previous version of coreutils are now gone, so other imported headers
are now good.

Refresh patch:
 - 000-bootstrap.patch

Remove upstreamed patch:
 - 001-bootstrap-sync.patch

Link: https://lists.gnu.org/archive/html/coreutils/2024-03/msg00132.html
Tested-by: Georgi Valkov <gvalkov@gmail.com> # MacOS
Signed-off-by: Michael Pratt <mcpratt@pm.me>
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>

diff --git a/tools/coreutils/Makefile b/tools/coreutils/Makefile
index 184281f0beee7bec2d94db2436f04d8afea327cc..f55fdcc1b20692d58667e47223a5a78c73322fce 100644 (file)
--- a/tools/coreutils/Makefile
+++ b/tools/coreutils/Makefile
@@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=coreutils
 PKG_CPE_ID:=cpe:/a:gnu:coreutils
-PKG_VERSION:=9.4
+PKG_VERSION:=9.5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/coreutils
-PKG_HASH:=5f600d9093973b0afe25393d9bc18c44f2232657f4ca0d95ea31c702eb66b739
+PKG_HASH:=767ae6a22950ec42f3ba5f7c1de79dd27800ee8e9b8642da5dedb5974a1741e5
 
 HOST_BUILD_PARALLEL := 1
 
@@ -23,13 +23,9 @@ include $(INCLUDE_DIR)/host-build.mk
 export GNULIB_SRCDIR:=$(HOST_GNULIB_SRCDIR)
 
 HOST_GNULIB_SKIP := \
-       lib/math.in.h \
-       lib/stdlib.in.h \
-       lib/string.in.h \
-       lib/uchar.in.h \
-       lib/unistd.in.h \
-       lib/wchar.in.h \
-       lib/wctype.in.h
+       lib/nstrftime.c \
+       lib/fprintftime.c \
+       lib/locale.in.h
 
 HOST_CONFIGURE_ARGS += \
        --disable-year2038 \

diff --git a/tools/coreutils/patches/000-bootstrap.patch b/tools/coreutils/patches/000-bootstrap.patch
index 3faaa946f1a23462ae01adfc3b70b414166b64e8..68db19084f1220bd204f702b91d8904e3df693a2 100644 (file)
--- a/tools/coreutils/patches/000-bootstrap.patch
+++ b/tools/coreutils/patches/000-bootstrap.patch
@@ -34,7 +34,7 @@
        if [ ! "$inst_ver" ]; then
          warn_ "Error: '$app' not found"
          ret=1
-@@ -1155,7 +1155,7 @@ autogen()
+@@ -1157,7 +1157,7 @@ autogen()
    # two just-pre-run programs.
  
    # Import from gettext.

diff --git a/tools/coreutils/patches/001-bootstrap-sync.patch b/tools/coreutils/patches/001-bootstrap-sync.patch
deleted file mode 100644 (file)
index 1b96877..0000000
--- a/tools/coreutils/patches/001-bootstrap-sync.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 9becda5d9371c16a6e5e2815c8a28158696e4a23 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Sun, 10 Dec 2023 19:04:59 +0000
-Subject: build: update gnulib submodule to latest
-
-* bootstrap: Copy from latest Gnulib,
-to fix --bootstrap-sync with other options.
----
- bootstrap | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-(limited to 'bootstrap')
-
---- a/bootstrap
-+++ b/bootstrap
-@@ -3,7 +3,7 @@
- 
- # Bootstrap this package from checked-out sources.
- 
--scriptversion=2023-07-01.18; # UTC
-+scriptversion=2023-12-10.18; # UTC
- 
- # Copyright (C) 2003-2023 Free Software Foundation, Inc.
- #
-@@ -37,7 +37,7 @@ medir=`dirname "$me"`
- 
- # A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
- 
--scriptlibversion=2023-07-01.17; # UTC
-+scriptlibversion=2023-12-10.18; # UTC
- 
- # Copyright (C) 2003-2023 Free Software Foundation, Inc.
- #
-@@ -659,7 +659,9 @@ Optional environment variables:
-                            Use this if you already have gnulib sources
-                            and history on your machine, and do not want
-                            to waste your bandwidth downloading them again.
--  GNULIB_URL               Cloneable URL of the gnulib repository.
-+  GNULIB_URL               URL of the gnulib repository.  The default is
-+                           $default_gnulib_url,
-+                           which is Gnulib's upstream repository.
- 
- Options:
-   --bootstrap-sync         if this bootstrap script is not identical to
-@@ -775,7 +777,7 @@ autopull()
-   if $use_gnulib || $bootstrap_sync; then
-     prepare_GNULIB_SRCDIR
-     if $bootstrap_sync; then
--      upgrade_bootstrap
-+      upgrade_bootstrap "$@"
-     fi
-   fi
- 
-@@ -1347,7 +1349,9 @@ Optional environment variables:
-                            have gnulib sources on your machine, and
-                            do not want to waste your bandwidth downloading
-                            them again.
--  GNULIB_URL               Cloneable URL of the gnulib repository.
-+  GNULIB_URL               URL of the gnulib repository.  The default is
-+                           $default_gnulib_url,
-+                           which is Gnulib's upstream repository.
- 
- Options:
- 
-@@ -1492,7 +1496,7 @@ check_build_prerequisites $use_git
- 
- if $bootstrap_sync; then
-   prepare_GNULIB_SRCDIR
--  upgrade_bootstrap
-+  upgrade_bootstrap "$@"
-   # Since we have now upgraded if needed, no need to try it a second time below.
-   bootstrap_sync=false
- fi