system/coreutils: Update to 9.1

5 files changed, 7 insertions, 207 deletions

diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD
index a91eaf7b8..949cde440 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=8.32
+pkgver=9.1
 pkgrel=0
 pkgdesc="Basic file, shell, and text manipulation utilities"
 url="https://www.gnu.org/software/coreutils/"
@@ -15,13 +15,11 @@ subpackages="$pkgname-doc"
 [ "${CBUILD}" = "${CHOST}" ] && subpackages="$subpackages $pkgname-lang"
 install="$pkgname.post-deinstall"
 source="https://ftp.gnu.org/gnu/coreutils/$pkgname-$pkgver.tar.xz
-	cp-dont-delete.patch
 	disable-csplit-io-err-test.patch
 	disable-mbrtowc-test.patch
 	gnulib-tests-dont-require-gpg-passphrase.patch
 	gnulib-test-fixes.patch
 	localename-test-fix.patch
-	ls-removed-dirs.patch
 	test-df-symlink-bindmount.patch
 	"
 [ "${CBUILD}" != "${CHOST}" ] && source="$source
@@ -39,7 +37,6 @@ build() {
 		--datarootdir=/usr/share \
 		--libexecdir=/usr/libexec \
 		--enable-nls \
-		--without-gmp \
 		--enable-no-install-program=groups,hostname,su,kill,uptime \
 		--enable-install-program=arch \
 		--with-packager="Adélie" \
@@ -71,15 +68,13 @@ package() {
 	done
 }
 
-sha512sums="1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145  coreutils-8.32.tar.xz
-96eecaaea757c0a39136733b6b5a9d97b869c50aa41d2052a293544a59a959de7dfa0412f5613e52ff946da42df5b50403b30c88c0a1a882690219fd4ee2efa9  cp-dont-delete.patch
+sha512sums="a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa  coreutils-9.1.tar.xz
 bd8b5cecba59eba30458c8afa895877d39a987b989bc06b70cd6836e0ef684677aaadcb4949b58a713779fe1df1e15e3903e9be14e306671b86b69018b75de8b  disable-csplit-io-err-test.patch
 595be7f580f8906467624959c7eddbd6d7007571d92668b6a1ea5543b73764035b44b02ab5f352c67ec6562a368f220af445edd0a0965fb9826bccfd25ddbdba  disable-mbrtowc-test.patch
 fd97fccd661befc558b3afb3e32c82dd2cef511a05e6129d49540599297c1b59ab1f109e63a12f585a2348c26c28fb98330c348829d1fe61cf8149d0dd1c989c  gnulib-tests-dont-require-gpg-passphrase.patch
-08f6de0e4c1615503a276fb7eb8abb3f1a996d3e9e4c789deb1507e9ac66364e3993591e37ee444d239c64bf3b7d61f909c0da5ead3047b75623cd846e9f868f  gnulib-test-fixes.patch
+eaba7ad1c5b43d25dc96baaf6f01be5976f9f64c26ea55e1c78d6a3f12825f2f0e998aae7f2ad6d9b2637a3d11586ffe21b87fbbd3c1bb6c9898c5963cb2a32c  gnulib-test-fixes.patch
 b1509e5678a05f24d6e764c047546e5e34a7fbd5edb59c7debedb144a0096d8ac247c7e2722a5f68c90751e5280bec743c9a6ed3e1433c1916294d68d7bca109  localename-test-fix.patch
-c7e7a03ed074d74fa836eaa6372d170b50d5719914160d9a835db25fb958e1fcfa4530231abd8f9b2323958a510750a8a5f65a5cea56555fa8a39dd8abd6e8cc  ls-removed-dirs.patch
-0b90b7721dd01bd22eba50f73bc756930dd4a8bc78ec408ce7f155a02b520375023897b9d12872030735d908208b912ea7adfac9e8b4d055e617873d982eef56  test-df-symlink-bindmount.patch"
+43bb4cb8a330dc785ff8f09685e4fb2879df49b6944e2f64f9fa34a36740f392b115b3af57d481703690b9ee6c6f48ffb385b35cd128b1b40955f69dbd68bb3d  test-df-symlink-bindmount.patch"
 [ "${CBUILD}" != "${CHOST}" ] && sha512sums="
 bae804f057252c25452ac178c545dc2c4b4775cbfbdcfd4775edd1a4ed6507882bfac39e2b11ad01b74230ca48d761bf62f11bde5bcbc35a6e5a61cbe4a46e36  051_all_coreutils-mangen.patch
 "
diff --git a/system/coreutils/cp-dont-delete.patch b/system/coreutils/cp-dont-delete.patch
deleted file mode 100644
index a60608952..000000000
--- a/system/coreutils/cp-dont-delete.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 7b5f0fa47cd04c84975250d5b5da7c98e097e99f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Wed, 1 Apr 2020 12:51:34 +0100
-Subject: cp: ensure --attributes-only doesn't remove files
-
-* src/copy.c (copy_internal): Ensure we don't unlink the destination
-unless explicitly requested.
-* tests/cp/attr-existing.sh: Add test cases.
-Fixes https://bugs.gnu.org/40352
----
- NEWS                      |  7 +++++++
- src/copy.c                |  9 +++++----
- tests/cp/attr-existing.sh | 21 ++++++++++++++++++---
- 3 files changed, 30 insertions(+), 7 deletions(-)
-
-diff --git a/src/copy.c b/src/copy.c
-index 6e5efc708..54601ce07 100644
---- a/src/copy.c
-+++ b/src/copy.c
-@@ -2211,10 +2211,11 @@ copy_internal (char const *src_name, char const *dst_name,
-                    /* Never unlink dst_name when in move mode.  */
-                    && ! x->move_mode
-                    && (x->unlink_dest_before_opening
--                       || (x->preserve_links && 1 < dst_sb.st_nlink)
--                       || (x->dereference == DEREF_NEVER
--                           && ! S_ISREG (src_sb.st_mode))
--                       ))
-+                       || (x->data_copy_required
-+                           && ((x->preserve_links && 1 < dst_sb.st_nlink)
-+                               || (x->dereference == DEREF_NEVER
-+                                   && ! S_ISREG (src_sb.st_mode))))
-+                      ))
-             {
-               if (unlink (dst_name) != 0 && errno != ENOENT)
-                 {
-diff --git a/tests/cp/attr-existing.sh b/tests/cp/attr-existing.sh
-index 59ce64183..14fc8445c 100755
---- a/tests/cp/attr-existing.sh
-+++ b/tests/cp/attr-existing.sh
-@@ -19,11 +19,26 @@
- . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
- print_ver_ cp
- 
--printf '1' > file1
--printf '2' > file2
--printf '2' > file2.exp
-+printf '1' > file1 || framework_failure_
-+printf '2' > file2 || framework_failure_
-+printf '2' > file2.exp || framework_failure_
- 
- cp --attributes-only file1 file2 || fail=1
- cmp file2 file2.exp || fail=1
- 
-+# coreutils v8.32 and before would remove destination files
-+# if hardlinked or the source was not a regular file.
-+ln file2 link2 || framework_failure_
-+cp -a --attributes-only file1 file2 || fail=1
-+cmp file2 file2.exp || fail=1
-+
-+ln -s file1 sym1 || framework_failure_
-+returns_ 1 cp -a --attributes-only sym1 file2 || fail=1
-+cmp file2 file2.exp || fail=1
-+
-+# One can still force removal though
-+cp -a --remove-destination --attributes-only sym1 file2 || fail=1
-+test -L file2 || fail=1
-+cmp file1 file2 || fail=1
-+
- Exit $fail
--- 
-cgit v1.2.1
-
diff --git a/system/coreutils/gnulib-test-fixes.patch b/system/coreutils/gnulib-test-fixes.patch
index 5455cf7cd..7876e22aa 100644
--- a/system/coreutils/gnulib-test-fixes.patch
+++ b/system/coreutils/gnulib-test-fixes.patch
@@ -9,30 +9,6 @@
    ret = getrusage (RUSAGE_SELF, &before);
    ASSERT (ret == 0);
  
---- coreutils-8.31/gnulib-tests/test-parse-datetime.c.old	2019-06-01 07:46:25.716292871 +0000
-+++ coreutils-8.31/gnulib-tests/test-parse-datetime.c	2019-06-01 22:07:59.456653669 +0000
-@@ -432,21 +432,5 @@
-   ASSERT (   parse_datetime (&result, "TZ=\"\\\\\"", &now));
-   ASSERT (   parse_datetime (&result, "TZ=\"\\\"\"", &now));
- 
--  /* Outlandishly-long time zone abbreviations should not cause problems.  */
--  {
--    static char const bufprefix[] = "TZ=\"";
--    enum { tzname_len = 2000 };
--    static char const bufsuffix[] = "0\" 1970-01-01 01:02:03.123456789";
--    enum { bufsize = sizeof bufprefix - 1 + tzname_len + sizeof bufsuffix };
--    char buf[bufsize];
--    memcpy (buf, bufprefix, sizeof bufprefix - 1);
--    memset (buf + sizeof bufprefix - 1, 'X', tzname_len);
--    strcpy (buf + bufsize - sizeof bufsuffix, bufsuffix);
--    ASSERT (parse_datetime (&result, buf, &now));
--    LOG (buf, now, result);
--    ASSERT (result.tv_sec == 1 * 60 * 60 + 2 * 60 + 3
--            && result.tv_nsec == 123456789);
--  }
--
-   return 0;
- }
 --- coreutils-8.31/gnulib-tests/test-getlogin.h	2019-01-04 10:14:43.000000000 -0600
 +++ coreutils-8.31/gnulib-tests/test-getlogin.h	2019-09-11 06:50:47.791580246 -0500
 @@ -61,6 +61,9 @@ test_getlogin_result (const char *buf, i
diff --git a/system/coreutils/ls-removed-dirs.patch b/system/coreutils/ls-removed-dirs.patch
deleted file mode 100644
index 59808345c..000000000
--- a/system/coreutils/ls-removed-dirs.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 10fcb97bd728f09d4a027eddf8ad2900f0819b0a Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Thu, 5 Mar 2020 17:25:29 -0800
-Subject: ls: restore 8.31 behavior on removed directories
-
-* src/ls.c: Do not include <sys/sycall.h>
-(print_dir): Don't worry about whether the directory is removed.
-* tests/ls/removed-directory.sh: Adjust to match new (i.e., old)
-behavior.
----
- NEWS                          |  6 ++++++
- src/ls.c                      | 22 ----------------------
- tests/ls/removed-directory.sh | 10 ++--------
- 3 files changed, 8 insertions(+), 30 deletions(-)
-
-diff --git a/src/ls.c b/src/ls.c
-index 24b983287..4acf5f44d 100644
---- a/src/ls.c
-+++ b/src/ls.c
-@@ -49,10 +49,6 @@
- # include <sys/ptem.h>
- #endif
- 
--#ifdef __linux__
--# include <sys/syscall.h>
--#endif
--
- #include <stdio.h>
- #include <assert.h>
- #include <setjmp.h>
-@@ -2896,7 +2892,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
-   struct dirent *next;
-   uintmax_t total_blocks = 0;
-   static bool first = true;
--  bool found_any_entries = false;
- 
-   errno = 0;
-   dirp = opendir (name);
-@@ -2972,7 +2967,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
-       next = readdir (dirp);
-       if (next)
-         {
--          found_any_entries = true;
-           if (! file_ignored (next->d_name))
-             {
-               enum filetype type = unknown;
-@@ -3018,22 +3012,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
-           if (errno != EOVERFLOW)
-             break;
-         }
--#ifdef __linux__
--      else if (! found_any_entries)
--        {
--          /* If readdir finds no directory entries at all, not even "." or
--             "..", then double check that the directory exists.  */
--          if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1
--              && errno != EINVAL)
--            {
--              /* We exclude EINVAL as that pertains to buffer handling,
--                 and we've passed NULL as the buffer for simplicity.
--                 ENOENT is returned if appropriate before buffer handling.  */
--              file_failure (command_line_arg, _("reading directory %s"), name);
--            }
--          break;
--        }
--#endif
-       else
-         break;
- 
-diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh
-index e8c835dab..fe8f929a1 100755
---- a/tests/ls/removed-directory.sh
-+++ b/tests/ls/removed-directory.sh
-@@ -26,20 +26,14 @@ case $host_triplet in
-   *) skip_ 'non linux kernel' ;;
- esac
- 
--LS_FAILURE=2
--
--cat <<\EOF >exp-err || framework_failure_
--ls: reading directory '.': No such file or directory
--EOF
--
- cwd=$(pwd)
- mkdir d || framework_failure_
- cd d || framework_failure_
- rmdir ../d || framework_failure_
- 
--returns_ $LS_FAILURE ls >../out 2>../err || fail=1
-+ls >../out 2>../err || fail=1
- cd "$cwd" || framework_failure_
- compare /dev/null out || fail=1
--compare exp-err err || fail=1
-+compare /dev/null err || fail=1
- 
- Exit $fail
--- 
-cgit v1.2.1
-
diff --git a/system/coreutils/test-df-symlink-bindmount.patch b/system/coreutils/test-df-symlink-bindmount.patch
index 34b334ba8..de5cdfb02 100644
--- a/system/coreutils/test-df-symlink-bindmount.patch
+++ b/system/coreutils/test-df-symlink-bindmount.patch
@@ -1,11 +1,11 @@
 --- coreutils-8.31/tests/df/df-symlink.sh	2019-01-05 05:36:22.000000000 -0500
 +++ coreutils-8.31/tests/df/df-symlink.sh	2019-05-30 23:57:10.260506897 -0400
-@@ -34,7 +34,7 @@
+@@ -35,7 +35,7 @@
  # I.e., '.' => /dev/mapper/fedora-home -> /dev/dm-2
  # Restrict this test to systems with a 1:1 mapping between
  # source and target.  This excludes for example BTRFS sub-volumes.
--if test "$(df --output=source | grep -F "$disk" | wc -l)" = 1; then
-+if test "$(df --all --output=source | grep -F "$disk" | wc -l)" = 1; then
+-if test "$(df --output=source | grep -F "$file_system" | wc -l)" = 1; then
++if test "$(df --all --output=source | grep -F "$file_system" | wc -l)" = 1; then
    df --out=source,target '.' > out || fail=1
    compare exp out || fail=1
  fi