util-linux: updated to 9.0

diff --git a/coreutils/.signature b/coreutils/.signature
index d31b9c1023d7b38061e749131698d7359ff3270c..672af9edce935e36593f0f634cd2685bfa875870 100644 (file)
--- a/coreutils/.signature
+++ b/coreutils/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/core-arm64.pub
-RWSKslkvIwb+2cbbgdOOEOsto124MBp0kXJwKsurA0mpZMcQa5Amg7sQOXKqWqmAzFi3UNcTkzSPJEvH5s7cagAMt3iM/Ni/OAI=
-SHA256 (Pkgfile) = 79a57d961850d9a10eddd9b10e8fc0792b0ccf915c246ea7f64b4554edd3cf48
+RWSKslkvIwb+2RBb6Ci6OvXhzs/jJa4IlQZIt1ekgxLGm3gFS/wNzWQ1Dq5cG+WIXChRAlAK35b1PiGLQjCtfy+F0N2MukM3iAs=
+SHA256 (Pkgfile) = 27589767cd00ef66d54093dbe20b4c78db89b3019c0740f476d6e132c2c2aa5a
 SHA256 (.footprint) = 45c2d1805ada036f538df41d4f15b3148670d9247839effbc39276b9d0c37819
-SHA256 (coreutils-8.32.tar.xz) = 4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0bcc4cfa
+SHA256 (coreutils-9.0.tar.xz) = ce30acdf4a41bc5bb30dd955e9eaa75fa216b4e3deb08889ed32433c7b3b97ce
 SHA256 (coreutils-uname.patch) = 164ad5976c67dd49f1d28d3124a6cb5395d52a23d9a3112a10a795af6069d97d
-SHA256 (arch_patch.patch) = ee8ddb4e04d89089ba6022dcc736e145cf3149f8c317d3ea114485605060fe83
+SHA256 (chmod.c.patch) = 3c5084f36a543902ee57c477318c0cec97d845c4784b8314c55e00ac86a29091

diff --git a/coreutils/Pkgfile b/coreutils/Pkgfile
index e1e1444df1376150da7994453e1dbba9dd2a0a3b..5a7cde7e9b16a415a88feb58e411c608feb8324d 100644 (file)
--- a/coreutils/Pkgfile
+++ b/coreutils/Pkgfile
@@ -5,17 +5,18 @@
 # Depends on: libgmp acl libcap
 
 name=coreutils
-version=8.32
+version=9.0
 release=1
 source=(http://ftpmirror.gnu.org/gnu/$name/$name-$version.tar.xz
         coreutils-uname.patch
-        arch_patch.patch)
+        chmod.c.patch)
 
 build() {
   cd $name-$version
 
+  # https://bugs.gnu.org/50784
+  patch -p1 -i $SRC/chmod.c.patch
   patch -p1 -i $SRC/coreutils-uname.patch
-  patch -p1 -i $SRC/arch_patch.patch
 
   export FORCE_UNSAFE_CONFIGURE=1
     

diff --git a/coreutils/arch_patch.patch b/coreutils/arch_patch.patch
deleted file mode 100644 (file)
index 42e78b7..0000000
--- a/coreutils/arch_patch.patch
+++ /dev/null
@@ -1,114 +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: [PATCH] ls: restore 8.31 behavior on removed directories
-
-* NEWS: Mention this.
-* 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/NEWS b/NEWS
-index fdc8bf5db..653e7178b 100644
---- a/NEWS
-+++ b/NEWS
-@@ -2,6 +2,12 @@ GNU coreutils NEWS                                    -*- outline -*-
- 
- * Noteworthy changes in release ?.? (????-??-??) [?]
- 
-+** Changes in behavior
-+
-+  On GNU/Linux systems, ls no longer issues an error message on
-+  directory merely because it was removed.  This reverts a change
-+  that was made in release 8.32.
-+
- 
- * Noteworthy changes in release 8.32 (2020-03-05) [stable]
- 
-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

diff --git a/coreutils/chmod.c.patch b/coreutils/chmod.c.patch
new file mode 100644 (file)
index 0000000..4e9ed63
--- /dev/null
+++ b/coreutils/chmod.c.patch
@@ -0,0 +1,25 @@
+X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blobdiff_plain;f=src%2Fchmod.c;h=57ac47f33a8c8643f8b22f29d81b8303db06b93b;hp=37b04f5006bbcd049b2ae1be1b2e0f73730e2dd5;hb=e8b56ebd536e82b15542a00c888109471936bfda;hpb=6f38c4b27921a57a2bb5d999549411c2abe2fae6
+
+diff --git a/src/chmod.c b/src/chmod.c
+index 37b04f5..57ac47f 100644
+--- a/src/chmod.c
++++ b/src/chmod.c
+@@ -44,8 +44,8 @@ struct change_status
+   enum
+     {
+       CH_NO_STAT,
+-      CH_NOT_APPLIED,
+       CH_FAILED,
++      CH_NOT_APPLIED,
+       CH_NO_CHANGE_REQUESTED,
+       CH_SUCCEEDED
+     }
+@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent)
+   if ( ! recurse)
+     fts_set (fts, ent, FTS_SKIP);
+ 
+-  return CH_NO_CHANGE_REQUESTED <= ch.status;
++  return CH_NOT_APPLIED <= ch.status;
+ }
+ 
+ /* Recursively change the modes of the specified FILES (the last entry