coreutils: Upgrade to 9.6

Upgrade GNU coreutils to version 9.6
* refresh patch

Signed-off-by: Hannu Nyman <[email protected]>

diff --git a/utils/coreutils/Makefile b/utils/coreutils/Makefile
index 620707b53e3c309255c2581a3780a346e4bdd1a1..ace65675e60f70d4557fd7a696df54c2002b4b00 100644 (file)
--- a/utils/coreutils/Makefile
+++ b/utils/coreutils/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=coreutils
-PKG_VERSION:=9.3
+PKG_VERSION:=9.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/coreutils
-PKG_HASH:=adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa
+PKG_HASH:=7a0124327b398fd9eb1a6abde583389821422c744ffa10734b24f557610d3283
 
 PKG_MAINTAINER:=Jo-Philipp Wich <[email protected]>
 PKG_LICENSE:=GPL-3.0-or-later

diff --git a/utils/coreutils/patches/001-no_docs_man_tests.patch b/utils/coreutils/patches/001-no_docs_man_tests.patch
index 2bcd8fc1b9cf1ec55950546b079a043861af5047..e64ceab992540c2bc6461d075e5b571a01bffe73 100644 (file)
--- a/utils/coreutils/patches/001-no_docs_man_tests.patch
+++ b/utils/coreutils/patches/001-no_docs_man_tests.patch
@@ -10,7 +10,7 @@
  EXTRA_DIST =                          \
    .mailmap                            \
 @@ -211,6 +211,3 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib
- 
+ include $(top_srcdir)/gl/local.mk
  include $(top_srcdir)/lib/local.mk
  include $(top_srcdir)/src/local.mk
 -include $(top_srcdir)/doc/local.mk
@@ -18,7 +18,7 @@
 -include $(top_srcdir)/tests/local.mk
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -4149,11 +4149,7 @@ RECURSIVE_TARGETS = all-recursive check-
+@@ -4389,11 +4389,7 @@ RECURSIVE_TARGETS = all-recursive check-
        install-ps-recursive install-recursive installcheck-recursive \
        installdirs-recursive pdf-recursive ps-recursive \
        tags-recursive uninstall-recursive
@@ -31,22 +31,22 @@
  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
  am__vpath_adj = case $$p in \
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -4403,10 +4399,10 @@ am__DIST_COMMON = $(doc_coreutils_TEXINF
+@@ -4643,11 +4639,10 @@ am__DIST_COMMON = $(doc_coreutils_TEXINF
        $(top_srcdir)/build-aux/missing \
        $(top_srcdir)/build-aux/test-driver \
        $(top_srcdir)/build-aux/texinfo.tex \
 -      $(top_srcdir)/build-aux/ylwrap $(top_srcdir)/doc/local.mk \
--      $(top_srcdir)/lib/alloca.c $(top_srcdir)/lib/config.hin \
--      $(top_srcdir)/lib/local.mk $(top_srcdir)/man/local.mk \
--      $(top_srcdir)/src/local.mk $(top_srcdir)/src/single-binary.mk \
 +      $(top_srcdir)/build-aux/ylwrap \
-+      $(top_srcdir)/lib/alloca.c \
+       $(top_srcdir)/gl/local.mk $(top_srcdir)/lib/alloca.c \
+-      $(top_srcdir)/lib/config.hin $(top_srcdir)/lib/local.mk \
+-      $(top_srcdir)/man/local.mk $(top_srcdir)/src/local.mk \
+-      $(top_srcdir)/src/single-binary.mk \
 +      $(top_srcdir)/lib/local.mk \
 +      $(top_srcdir)/src/local.mk \
        $(top_srcdir)/tests/local.mk ABOUT-NLS AUTHORS COPYING \
        ChangeLog INSTALL NEWS README THANKS TODO build-aux/compile \
        build-aux/config.guess build-aux/config.rpath \
-@@ -4520,7 +4516,7 @@ ERROR_H = @ERROR_H@
+@@ -4770,7 +4765,7 @@ ERRNO_H = @ERRNO_H@
  ETAGS = @ETAGS@
  EUIDACCESS_LIBGEN = @EUIDACCESS_LIBGEN@
  EXEEXT = @EXEEXT@
@@ -55,7 +55,7 @@
  FDATASYNC_LIB = @FDATASYNC_LIB@
  FILE_HAS_ACL_LIB = @FILE_HAS_ACL_LIB@
  FLOAT_H = @FLOAT_H@
-@@ -6181,7 +6177,7 @@ localedir_c_make = @localedir_c_make@
+@@ -6763,7 +6758,7 @@ localedir_c_make = @localedir_c_make@
  localstatedir = @localstatedir@
  localstatedir_c = @localstatedir_c@
  localstatedir_c_make = @localstatedir_c_make@
@@ -64,30 +64,30 @@
  mandir = @mandir@
  mandir_c = @mandir_c@
  mandir_c_make = @mandir_c_make@
-@@ -6230,7 +6226,7 @@ top_build_prefix = @top_build_prefix@
+@@ -6812,7 +6807,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  ALL_RECURSIVE_TARGETS = distcheck-hook check-root
 -SUBDIRS = po . gnulib-tests
 +SUBDIRS = po
- 
- #if GNU_MAKE
- #     [nicer features that work only with GNU Make]
-@@ -8437,7 +8433,7 @@ all: $(BUILT_SOURCES)
+ EXTRA_DIST = .mailmap .prev-version .version .vg-suppressions \
+       README-install THANKS.in THANKS-to-translators THANKStt.in \
+       bootstrap bootstrap.conf build-aux/gen-lists-of-programs.sh \
+@@ -9132,7 +9127,7 @@ all: $(BUILT_SOURCES)
  .SUFFIXES: .1 .c .dvi .log .o .obj .pl .pl$(EXEEXT) .ps .sh .sh$(EXEEXT) .trs .x .xpl .xpl$(EXEEXT) .y
  am--refresh: Makefile
        @:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk $(am__configure_deps)
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(am__configure_deps)
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/gl/local.mk $(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk $(am__configure_deps)
++$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/gl/local.mk $(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \
-@@ -8459,7 +8455,7 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -9154,7 +9149,7 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
            echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
            cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
        esac;
--$(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk $(am__empty):
-+$(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(am__empty):
+-$(top_srcdir)/gl/local.mk $(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk $(am__empty):
++$(top_srcdir)/gl/local.mk $(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(am__empty):
  
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        $(SHELL) ./config.status --recheck