system/coreutils: Update to 9.7

The fix for pwd(1) is now upstream, so we don't need the patch any more.
This release introduces more POSIX conformance to printf(1).

4 files changed, 5 insertions, 134 deletions

diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD
index 71dea2518..d6ff45afa 100644
--- a/system/coreutils/APKBUILD
+++ b/system/coreutils/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=coreutils
-pkgver=9.4
+pkgver=9.7
 pkgrel=0
 pkgdesc="Basic file, shell, and text manipulation utilities"
 url="https://www.gnu.org/software/coreutils/"
@@ -17,9 +17,7 @@ install="$pkgname.post-deinstall"
 source="https://ftp.gnu.org/gnu/coreutils/$pkgname-$pkgver.tar.xz
 	gnulib-tests-dont-require-gpg-passphrase.patch
 	gnulib-test-fixes.patch
-	localename-test-fix.patch
 	test-df-symlink-bindmount.patch
-	revert-gnulib-getcwd-speedup-linux.patch
 	"
 [ "${CBUILD}" != "${CHOST}" ] && source="$source
 	051_all_coreutils-mangen.patch
@@ -67,12 +65,10 @@ package() {
 	done
 }
 
-sha512sums="7c55ee23b685a0462bbbd118b04d25278c902604a0dcf3bf4f8bf81faa0500dee5a7813cba6f586d676c98e520cafd420f16479619305e94ea6798d8437561f5  coreutils-9.4.tar.xz
-fd97fccd661befc558b3afb3e32c82dd2cef511a05e6129d49540599297c1b59ab1f109e63a12f585a2348c26c28fb98330c348829d1fe61cf8149d0dd1c989c  gnulib-tests-dont-require-gpg-passphrase.patch
+sha512sums="fe81e6ba4fb492095153d5baac1eca8f07ece0957849de746a2a858cf007893cc2ded595a31a5e5d43d13216cc44b9d74a3245d9f23221ecc8cd00f428f27414  coreutils-9.7.tar.xz
+7e4bc1da5de16a036e00fef6d9387b701bbe447d21d77cc3fc28a73e0364c972dec7cdcd70a176ef339b221fad92e7feccbb1e20f3f7b114a3585b8551770de5  gnulib-tests-dont-require-gpg-passphrase.patch
 eaba7ad1c5b43d25dc96baaf6f01be5976f9f64c26ea55e1c78d6a3f12825f2f0e998aae7f2ad6d9b2637a3d11586ffe21b87fbbd3c1bb6c9898c5963cb2a32c  gnulib-test-fixes.patch
-b1509e5678a05f24d6e764c047546e5e34a7fbd5edb59c7debedb144a0096d8ac247c7e2722a5f68c90751e5280bec743c9a6ed3e1433c1916294d68d7bca109  localename-test-fix.patch
-15a91b343b6c4d6ef31b322cd2787893eacccb81a7e0202aeac17c3aa18130e6feb5ddb32f39187b4cf2a5d6a9a536a0a6f992e4da90d954a72f158d0df6e4ba  test-df-symlink-bindmount.patch
-84b8c141052a5db99f4d470a0f6f74ca01041f04e573ca0774f69a931bbe061c1b95cf5b09ab5f08f4322e04c6fc124449f368b51ccd6e837dec686b8521d86a  revert-gnulib-getcwd-speedup-linux.patch"
+15a91b343b6c4d6ef31b322cd2787893eacccb81a7e0202aeac17c3aa18130e6feb5ddb32f39187b4cf2a5d6a9a536a0a6f992e4da90d954a72f158d0df6e4ba  test-df-symlink-bindmount.patch"
 [ "${CBUILD}" != "${CHOST}" ] && sha512sums="
 bae804f057252c25452ac178c545dc2c4b4775cbfbdcfd4775edd1a4ed6507882bfac39e2b11ad01b74230ca48d761bf62f11bde5bcbc35a6e5a61cbe4a46e36  051_all_coreutils-mangen.patch
 "
diff --git a/system/coreutils/gnulib-tests-dont-require-gpg-passphrase.patch b/system/coreutils/gnulib-tests-dont-require-gpg-passphrase.patch
index b64993187..a1ec3b54f 100644
--- a/system/coreutils/gnulib-tests-dont-require-gpg-passphrase.patch
+++ b/system/coreutils/gnulib-tests-dont-require-gpg-passphrase.patch
@@ -1,6 +1,6 @@
 --- grep-3.1/gnulib-tests/test-vc-list-files-git.sh.old	2018-01-03 18:36:29.000000000 -0600
 +++ grep-3.1/gnulib-tests/test-vc-list-files-git.sh	2018-06-18 21:57:08.305562148 -0500
-@@ -32,6 +32,7 @@
+@@ -39,6 +39,7 @@
    touch d/a b c &&
    git config user.email "you@example.com" &&
    git config user.name "Your Name" &&
diff --git a/system/coreutils/localename-test-fix.patch b/system/coreutils/localename-test-fix.patch
deleted file mode 100644
index 17aaa226f..000000000
--- a/system/coreutils/localename-test-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# if defined __APPLE__ && defined __MACH__
-#  include <xlocale.h>
-# endif
-# if (__GLIBC__ >= 2 && !defined __UCLIBC__) || defined __CYGWIN__
-# if (defined __linux__ && !defined __UCLIBC__) || defined __CYGWIN__
-#  include <langinfo.h>
-# endif
-# if !defined IN_LIBINTL
---- coreutils-8.27/gnulib-tests/localename.c.old	2016-12-31 13:54:43.000000000 +0000
-+++ coreutils-8.27/gnulib-tests/localename.c	2017-07-30 16:40:47.098541270 +0000
-@@ -3111,16 +3111,19 @@
-     locale_t thread_locale = uselocale (NULL);
-     if (thread_locale != LC_GLOBAL_LOCALE)
-       {
--#  if __GLIBC__ >= 2 && !defined __UCLIBC__
-+#  if defined(_NL_LOCALE_NAME)
-+        const char *name = nl_langinfo(_NL_LOCALE_NAME(category));
-+#   if __GLIBC__ >= 2 && !defined __UCLIBC__
-         /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
-            glibc < 2.12.
-            See <https://sourceware.org/bugzilla/show_bug.cgi?id=10968>.  */
--        const char *name =
--          nl_langinfo (_NL_ITEM ((category), _NL_ITEM_INDEX (-1)));
-+	if (name[0] == '\0')
-+          name = nl_langinfo (_NL_ITEM ((category), _NL_ITEM_INDEX (-1)));
-         if (name[0] == '\0')
-           /* Fallback code for glibc < 2.4, which did not implement
-              nl_langinfo (_NL_LOCALE_NAME (category)).  */
-           name = thread_locale->__names[category];
-+#   endif
-         return name;
- #  elif (defined __FreeBSD__ || defined __DragonFly__) || (defined __APPLE__ && defined __MACH__)
-         /* FreeBSD, Mac OS X */
diff --git a/system/coreutils/revert-gnulib-getcwd-speedup-linux.patch b/system/coreutils/revert-gnulib-getcwd-speedup-linux.patch
deleted file mode 100644
index fa8f66395..000000000
--- a/system/coreutils/revert-gnulib-getcwd-speedup-linux.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From d598f8169bbc9178c59d35f0df95637a70d3377f Mon Sep 17 00:00:00 2001
-From: Zach van Rijn <me@zv.io>
-Date: Mon, 10 Apr 2023 04:09:56 -0500
-Subject: [PATCH] Revert "getcwd: Speed up on Linux. Add support for Android."
-
-This reverts commit 356a414e8c15ef3f8cc7b7157427c8ce9a9f7c1b.
-
-diff --git a/lib/getcwd.c b/lib/getcwd.c
-index 0530630c43..04b8d2df39 100644
---- a/lib/getcwd.c
-+++ b/lib/getcwd.c
-@@ -173,9 +173,6 @@ __getcwd_generic (char *buf, size_t size)
- #if HAVE_OPENAT_SUPPORT
-   int fd = AT_FDCWD;
-   bool fd_needs_closing = false;
--# if defined __linux__
--  bool proc_fs_not_mounted = false;
--# endif
- #else
-   char dots[DEEP_NESTING * sizeof ".." + BIG_FILE_NAME_COMPONENT_LENGTH + 1];
-   char *dotlist = dots;
-@@ -441,67 +438,6 @@ __getcwd_generic (char *buf, size_t size)
- 
-       thisdev = dotdev;
-       thisino = dotino;
--
--#if HAVE_OPENAT_SUPPORT
--      /* On some platforms, a system call returns the directory that FD points
--         to.  This is useful if some of the ancestor directories of the
--         directory are unreadable, because in this situation the loop that
--         climbs up the ancestor hierarchy runs into an EACCES error.
--         For example, in some Android app, /data/data/com.termux is readable,
--         but /data/data and /data are not.  */
--# if defined __linux__
--      /* On Linux, in particular, if /proc is mounted,
--           readlink ("/proc/self/fd/<fd>")
--         returns the directory, if its length is < 4096.  (If the length is
--         >= 4096, it fails with error ENAMETOOLONG, even if the buffer that we
--         pass to the readlink function would be large enough.)  */
--      if (!proc_fs_not_mounted)
--        {
--          char namebuf[14 + 10 + 1];
--          sprintf (namebuf, "/proc/self/fd/%u", (unsigned int) fd);
--          char linkbuf[4096];
--          ssize_t linklen = readlink (namebuf, linkbuf, sizeof linkbuf);
--          if (linklen < 0)
--            {
--              if (errno != ENAMETOOLONG)
--                /* If this call was not successful, the next one will likely be
--                   not successful either.  */
--                proc_fs_not_mounted = true;
--            }
--          else
--            {
--              dirroom = dirp - dir;
--              if (dirroom < linklen)
--                {
--                  if (size != 0)
--                    {
--                      __set_errno (ERANGE);
--                      goto lose;
--                    }
--                  else
--                    {
--                      char *tmp;
--                      size_t oldsize = allocated;
--
--                      allocated += linklen - dirroom;
--                      if (allocated < oldsize
--                          || ! (tmp = realloc (dir, allocated)))
--                        goto memory_exhausted;
--
--                      /* Move current contents up to the end of the buffer.  */
--                      dirp = memmove (tmp + dirroom + (allocated - oldsize),
--                                      tmp + dirroom,
--                                      oldsize - dirroom);
--                      dir = tmp;
--                    }
--                }
--              dirp -= linklen;
--              memcpy (dirp, linkbuf, linklen);
--              break;
--            }
--        }
--# endif
--#endif
-     }
- 
-   if (dirstream && __closedir (dirstream) != 0)
--- 
-2.25.1
-