fix cut test failure on aarch64 rawhide

Resolves: rhbz#2424302

coreutils-9.6-cp-improve-nfsv4-acl-support.patch

@@ -1,512 +0,0 @@
-From 6ad28e2b6627caf7b83bf893027c087b8cea1a97 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Fri, 9 May 2025 18:02:29 -0700
-Subject: [PATCH 1/2] qcopy-acl: port better to NFSv4 on GNU/Linux
-
-Problem reported by Ian Dall in <https://bugs.gnu.org/78328>
-and by Thomas Clark in <https://bugzilla.redhat.com/2363149>.
-* lib/file-has-acl.c (smack_new_label_from_file) [!HAVE_SMACK]:
-New dummy function.
-(has_xattr, get_aclinfo): New arg FD.  All callers changed.
-Remove some unnecessary MAYBE_UNUSEDs.
-(acl_get_fd_np): Fall back on acl_get_fd if this function is
-needed but not available.
-(acl_get_fdfile): New function, if needed.
-(file_has_aclinfo): Reimplement in terms of ...
-(fdfile_has_aclinfo): ... this new function,
-which also has an FD argument.
-* lib/qcopy-acl.c [USE_XATTR]: Include dirent.h, for DT_DIR etc.
-(qcopy_acl): If attr_copy_file or attr_copy_fd fail with EOPNOTSUPP,
-don’t fail if the source has a trivial ACL (this is the part
-that fixes the bug; the rest is optimization).
-
-(cherry picked from commit 8a356b77717a2e4f735ec06e326880ca1f61aadb)
----
- lib/acl.h          |   2 +
- lib/copy-acl.c     |   1 +
- lib/file-has-acl.c | 172 ++++++++++++++++++++++++++++++++-------------
- lib/qcopy-acl.c    |  29 ++++++--
- 4 files changed, 152 insertions(+), 52 deletions(-)
-
-diff --git a/lib/acl.h b/lib/acl.h
-index 90fd24e..e3c134f 100644
---- a/lib/acl.h
-+++ b/lib/acl.h
-@@ -79,6 +79,8 @@ struct aclinfo
- bool acl_errno_valid (int) _GL_ATTRIBUTE_CONST;
- int file_has_acl (char const *, struct stat const *);
- int file_has_aclinfo (char const *restrict, struct aclinfo *restrict, int);
-+int fdfile_has_aclinfo (int, char const *restrict,
-+                        struct aclinfo *restrict, int);
- 
- #if HAVE_LINUX_XATTR_H && HAVE_LISTXATTR
- bool aclinfo_has_xattr (struct aclinfo const *, char const *)
-diff --git a/lib/copy-acl.c b/lib/copy-acl.c
-index c36f64e..2fce6c7 100644
---- a/lib/copy-acl.c
-+++ b/lib/copy-acl.c
-@@ -33,6 +33,7 @@
-    a valid file descriptor, use file descriptor operations, else use
-    filename based operations on SRC_NAME. Likewise for DEST_DESC and
-    DST_NAME.
-+   MODE should be the source file's st_mode.
-    If access control lists are not available, fchmod the target file to
-    MODE.  Also sets the non-permission bits of the destination file
-    (S_ISUID, S_ISGID, S_ISVTX) to those from MODE if any are set.
-diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c
-index 66b920c..a356ee0 100644
---- a/lib/file-has-acl.c
-+++ b/lib/file-has-acl.c
-@@ -85,6 +85,13 @@ smack_new_label_from_path (MAYBE_UNUSED const char *path,
- {
-   return -1;
- }
-+static ssize_t
-+smack_new_label_from_file (MAYBE_UNUSED int fd,
-+                           MAYBE_UNUSED const char *xattr,
-+                           MAYBE_UNUSED char **label)
-+{
-+  return -1;
-+}
- # endif
- static bool
- is_smack_enabled (void)
-@@ -115,14 +122,16 @@ aclinfo_may_indicate_xattr (struct aclinfo const *ai)
- 
- static bool
- has_xattr (char const *xattr, struct aclinfo const *ai,
--           MAYBE_UNUSED char const *restrict name, MAYBE_UNUSED int flags)
-+           int fd, char const *restrict name, int flags)
- {
-   if (ai && aclinfo_has_xattr (ai, xattr))
-     return true;
-   else if (!ai || aclinfo_may_indicate_xattr (ai))
-     {
--      int ret = ((flags & ACL_SYMLINK_FOLLOW ? getxattr : lgetxattr)
--                (name, xattr, NULL, 0));
-+      int ret = (fd < 0
-+                 ? ((flags & ACL_SYMLINK_FOLLOW ? getxattr : lgetxattr)
-+                    (name, xattr, NULL, 0))
-+                 : fgetxattr (fd, xattr, NULL, 0));
-       if (0 <= ret || (errno == ERANGE || errno == E2BIG))
-         return true;
-     }
-@@ -145,11 +154,12 @@ aclinfo_has_xattr (struct aclinfo const *ai, char const *xattr)
-   return false;
- }
- 
--/* Get attributes of the file NAME into AI, if USE_ACL.
-+/* Get attributes of the file FD aka NAME into AI, if USE_ACL.
-+   Ignore FD if it is negative.
-    If FLAGS & ACL_GET_SCONTEXT, also get security context.
-    If FLAGS & ACL_SYMLINK_FOLLOW, follow symbolic links.  */
- static void
--get_aclinfo (char const *name, struct aclinfo *ai, int flags)
-+get_aclinfo (int fd, char const *name, struct aclinfo *ai, int flags)
- {
-   int scontext_err = ENOTSUP;
-   ai->buf = ai->u.__gl_acl_ch;
-@@ -163,7 +173,9 @@ get_aclinfo (char const *name, struct aclinfo *ai, int flags)
-         = (flags & ACL_SYMLINK_FOLLOW ? listxattr : llistxattr);
-       while (true)
-         {
--          ai->size = lsxattr (name, ai->buf, acl_alloc);
-+          ai->size = (fd < 0
-+                      ? lsxattr (name, ai->buf, acl_alloc)
-+                      : flistxattr (fd, ai->buf, acl_alloc));
-           if (0 < ai->size)
-             break;
-           ai->u.err = ai->size < 0 ? errno : 0;
-@@ -171,7 +183,9 @@ get_aclinfo (char const *name, struct aclinfo *ai, int flags)
-             break;
- 
-           /* The buffer was too small.  Find how large it should have been.  */
--          ssize_t size = lsxattr (name, NULL, 0);
-+          ssize_t size = (fd < 0
-+                          ? lsxattr (name, NULL, 0)
-+                          : flistxattr (fd, NULL, 0));
-           if (size <= 0)
-             {
-               ai->size = size;
-@@ -214,9 +228,13 @@ get_aclinfo (char const *name, struct aclinfo *ai, int flags)
-         {
-           if (ai->size < 0 || aclinfo_has_xattr (ai, XATTR_NAME_SMACK))
-             {
--              ssize_t r = smack_new_label_from_path (name, "security.SMACK64",
--                                                     flags & ACL_SYMLINK_FOLLOW,
--                                                     &ai->scontext);
-+              static char const SMACK64[] = "security.SMACK64";
-+              ssize_t r =
-+                (fd < 0
-+                 ? smack_new_label_from_path (name, SMACK64,
-+                                              flags & ACL_SYMLINK_FOLLOW,
-+                                              &ai->scontext)
-+                 : smack_new_label_from_file (fd, SMACK64, &ai->scontext));
-               scontext_err = r < 0 ? errno : 0;
-             }
-         }
-@@ -226,8 +244,10 @@ get_aclinfo (char const *name, struct aclinfo *ai, int flags)
-           if (ai->size < 0 || aclinfo_has_xattr (ai, XATTR_NAME_SELINUX))
-             {
-               ssize_t r =
--                ((flags & ACL_SYMLINK_FOLLOW ? getfilecon : lgetfilecon)
--                 (name, &ai->scontext));
-+                (fd < 0
-+                 ? ((flags & ACL_SYMLINK_FOLLOW ? getfilecon : lgetfilecon)
-+                    (name, &ai->scontext))
-+                 : fgetfilecon (fd, &ai->scontext));
-               scontext_err = r < 0 ? errno : 0;
- #  ifndef SE_SELINUX_INLINE
-               /* Gnulib's selinux-h module is not in use, so getfilecon and
-@@ -362,11 +382,13 @@ acl_nfs4_nontrivial (uint32_t *xattr, ssize_t nbytes)
- }
- #endif
- 
--#if (!USE_LINUX_XATTR && USE_ACL && HAVE_ACL_GET_FD \
--     && !HAVE_ACL_EXTENDED_FILE && !HAVE_ACL_TYPE_EXTENDED \
--     && !HAVE_ACL_GET_LINK_NP)
--# include <fcntl.h>
--# ifdef O_PATH
-+#if (!USE_LINUX_XATTR && USE_ACL && !HAVE_ACL_EXTENDED_FILE \
-+     && !HAVE_ACL_TYPE_EXTENDED)
-+
-+# if HAVE_ACL_GET_FD && !HAVE_ACL_GET_LINK_NP
-+#  include <fcntl.h>
-+#  ifdef O_PATH
-+#   define acl_get_fd_np(fd, type) acl_get_fd (fd)
- 
- /* Like acl_get_file, but do not follow symbolic links.  */
- static acl_t
-@@ -381,8 +403,24 @@ acl_get_link_np (char const *name, acl_type_t type)
-   errno = err;
-   return r;
- }
--#  define HAVE_ACL_GET_LINK_NP 1
-+#   define HAVE_ACL_GET_LINK_NP 1
-+#  endif
- # endif
-+
-+static acl_t
-+acl_get_fdfile (int fd, char const *name, acl_type_t type, int flags)
-+{
-+  acl_t (*get) (char const *, acl_type_t) = acl_get_file;
-+# if HAVE_ACL_GET_LINK_NP /* FreeBSD, NetBSD >= 10, Cygwin >= 2.5 */
-+  if (0 <= fd)
-+    return acl_get_fd_np (fd, type);
-+  if (! (flags & ACL_SYMLINK_FOLLOW))
-+    get = acl_get_link_np;
-+# else
-+  /* Ignore FD and FLAGS, unfortunately.  */
-+# endif
-+  return get (name, type);
-+}
- #endif
- 
- /* Return 1 if NAME has a nontrivial access control list,
-@@ -398,14 +436,35 @@ acl_get_link_np (char const *name, acl_type_t type)
-    If the d_type value is not known, use DT_UNKNOWN though this may be less
-    efficient.  */
- int
--file_has_aclinfo (MAYBE_UNUSED char const *restrict name,
-+file_has_aclinfo (char const *restrict name,
-                   struct aclinfo *restrict ai, int flags)
-+{
-+  return fdfile_has_aclinfo (-1, name, ai, flags);
-+}
-+
-+/* Return 1 if FD aka NAME has a nontrivial access control list,
-+   0 if ACLs are not supported, or if NAME has no or only a base ACL,
-+   and -1 (setting errno) on error.  Note callers can determine
-+   if ACLs are not supported as errno is set in that case also.
-+   Ignore FD if it is negative.
-+   Set *AI to ACL info regardless of return value.
-+   FLAGS should be a <dirent.h> d_type value, optionally ORed with
-+     - _GL_DT_NOTDIR if it is known that NAME is not a directory,
-+     - ACL_GET_SCONTEXT to retrieve security context and return 1 if present,
-+     - ACL_SYMLINK_FOLLOW to follow the link if NAME is a symbolic link;
-+       otherwise do not follow them if possible.
-+   If the d_type value is not known, use DT_UNKNOWN though this may be less
-+   efficient.  */
-+int
-+fdfile_has_aclinfo (MAYBE_UNUSED int fd,
-+                    MAYBE_UNUSED char const *restrict name,
-+                    struct aclinfo *restrict ai, int flags)
- {
-   MAYBE_UNUSED unsigned char d_type = flags & UCHAR_MAX;
- 
- #if USE_LINUX_XATTR
-   int initial_errno = errno;
--  get_aclinfo (name, ai, flags);
-+  get_aclinfo (fd, name, ai, flags);
- 
-   if (!aclinfo_may_indicate_xattr (ai) && ai->size <= 0)
-     {
-@@ -418,11 +477,11 @@ file_has_aclinfo (MAYBE_UNUSED char const *restrict name,
-      In earlier Fedora the two types of ACLs were mutually exclusive.
-      Attempt to work correctly on both kinds of systems.  */
- 
--  if (!has_xattr (XATTR_NAME_NFSV4_ACL, ai, name, flags))
-+  if (!has_xattr (XATTR_NAME_NFSV4_ACL, ai, fd, name, flags))
-     return
--      (has_xattr (XATTR_NAME_POSIX_ACL_ACCESS, ai, name, flags)
-+      (has_xattr (XATTR_NAME_POSIX_ACL_ACCESS, ai, fd, name, flags)
-        || ((d_type == DT_DIR || d_type == DT_UNKNOWN)
--           && has_xattr (XATTR_NAME_POSIX_ACL_DEFAULT, ai, name, flags)));
-+           && has_xattr (XATTR_NAME_POSIX_ACL_DEFAULT, ai, fd, name, flags)));
- 
-   /* A buffer large enough to hold any trivial NFSv4 ACL.
-      The max length of a trivial NFSv4 ACL is 6 words for owner,
-@@ -432,8 +491,10 @@ file_has_aclinfo (MAYBE_UNUSED char const *restrict name,
-      everyone is another word to hold "EVERYONE@".  */
-   uint32_t buf[2 * (6 + 6 + 7)];
- 
--  int ret = ((flags & ACL_SYMLINK_FOLLOW ? getxattr : lgetxattr)
--             (name, XATTR_NAME_NFSV4_ACL, buf, sizeof buf));
-+  int ret = (fd < 0
-+             ? ((flags & ACL_SYMLINK_FOLLOW ? getxattr : lgetxattr)
-+                (name, XATTR_NAME_NFSV4_ACL, buf, sizeof buf))
-+             : fgetxattr (fd, XATTR_NAME_NFSV4_ACL, buf, sizeof buf));
-   if (ret < 0)
-     switch (errno)
-       {
-@@ -467,20 +528,23 @@ file_has_aclinfo (MAYBE_UNUSED char const *restrict name,
-       /* On Linux, acl_extended_file is an optimized function: It only
-          makes two calls to getxattr(), one for ACL_TYPE_ACCESS, one for
-          ACL_TYPE_DEFAULT.  */
--    ret = ((flags & ACL_SYMLINK_FOLLOW
--            ? acl_extended_file
--            : acl_extended_file_nofollow)
--           (name));
-+    ret = (fd < 0
-+           ? ((flags & ACL_SYMLINK_FOLLOW
-+               ? acl_extended_file
-+               : acl_extended_file_nofollow)
-+              (name))
-+           : acl_extended_fd (fd));
- #   elif HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
-     /* On Mac OS X, acl_get_file (name, ACL_TYPE_ACCESS)
-        and acl_get_file (name, ACL_TYPE_DEFAULT)
-        always return NULL / EINVAL.  There is no point in making
-        these two useless calls.  The real ACL is retrieved through
--       acl_get_file (name, ACL_TYPE_EXTENDED).  */
--    acl_t acl = ((flags & ACL_SYMLINK_FOLLOW
--                  ? acl_get_file
--                  : acl_get_link_np)
--                 (name, ACL_TYPE_EXTENDED));
-+       ACL_TYPE_EXTENDED.  */
-+    acl_t acl =
-+      (fd < 0
-+       ? ((flags & ACL_SYMLINK_FOLLOW ? acl_get_file : acl_get_link_np)
-+          (name, ACL_TYPE_EXTENDED))
-+       : acl_get_fd_np (fd, ACL_TYPE_EXTENDED));
-     if (acl)
-       {
-         ret = acl_extended_nontrivial (acl);
-@@ -489,13 +553,8 @@ file_has_aclinfo (MAYBE_UNUSED char const *restrict name,
-     else
-       ret = -1;
- #   else /* FreeBSD, NetBSD >= 10, IRIX, Tru64, Cygwin >= 2.5 */
--    acl_t (*acl_get_file_or_link) (char const *, acl_type_t) = acl_get_file;
--#    if HAVE_ACL_GET_LINK_NP /* FreeBSD, NetBSD >= 10, Cygwin >= 2.5 */
--    if (! (flags & ACL_SYMLINK_FOLLOW))
--      acl_get_file_or_link = acl_get_link_np;
--#    endif
- 
--    acl_t acl = acl_get_file_or_link (name, ACL_TYPE_ACCESS);
-+    acl_t acl = acl_get_fdfile (fd, name, ACL_TYPE_ACCESS, flags);
-     if (acl)
-       {
-         ret = acl_access_nontrivial (acl);
-@@ -517,7 +576,7 @@ file_has_aclinfo (MAYBE_UNUSED char const *restrict name,
-             && (d_type == DT_DIR
-                 || (d_type == DT_UNKNOWN && !(flags & _GL_DT_NOTDIR))))
-           {
--            acl = acl_get_file_or_link (name, ACL_TYPE_DEFAULT);
-+            acl = acl_get_fdfile (fd, name, ACL_TYPE_DEFAULT, flags);
-             if (acl)
-               {
- #     ifdef __CYGWIN__ /* Cygwin >= 2.5 */
-@@ -562,7 +621,10 @@ file_has_aclinfo (MAYBE_UNUSED char const *restrict name,
- 
-       /* Solaris 10 (newer version), which has additional API declared in
-          <sys/acl.h> (acl_t) and implemented in libsec (acl_set, acl_trivial,
--         acl_fromtext, ...).  */
-+         acl_fromtext, ...).
-+
-+         Ignore FD, unfortunately.  That is better than mishandling
-+         ZFS-style ACLs, as the general case code does.  */
-       return acl_trivial (name);
- 
- #    else /* Solaris, Cygwin, general case */
-@@ -586,7 +648,9 @@ file_has_aclinfo (MAYBE_UNUSED char const *restrict name,
- 
-         for (;;)
-           {
--            count = acl (name, GETACL, alloc, entries);
-+            count = (fd < 0
-+                     ? acl (name, GETACL, alloc, entries)
-+                     : facl (fd, GETACL, alloc, entries));
-             if (count < 0 && errno == ENOSPC)
-               {
-                 /* Increase the size of the buffer.  */
-@@ -657,7 +721,9 @@ file_has_aclinfo (MAYBE_UNUSED char const *restrict name,
- 
-         for (;;)
-           {
--            count = acl (name, ACE_GETACL, alloc, entries);
-+            count = (fd < 0
-+                     ? acl (name, ACE_GETACL, alloc, entries)
-+                     : facl (fd, ACE_GETACL, alloc, entries));
-             if (count < 0 && errno == ENOSPC)
-               {
-                 /* Increase the size of the buffer.  */
-@@ -722,7 +788,9 @@ file_has_aclinfo (MAYBE_UNUSED char const *restrict name,
-         struct acl_entry entries[NACLENTRIES];
-         int count;
- 
--        count = getacl (name, NACLENTRIES, entries);
-+        count = (fd < 0
-+                 ? getacl (name, NACLENTRIES, entries)
-+                 : fgetacl (fd, NACLENTRIES, entries));
- 
-         if (count < 0)
-           {
-@@ -751,7 +819,8 @@ file_has_aclinfo (MAYBE_UNUSED char const *restrict name,
-             {
-               struct stat statbuf;
- 
--              if (stat (name, &statbuf) == -1 && errno != EOVERFLOW)
-+              if ((fd < 0 ? stat (name, &statbuf) : fstat (fd, &statbuf)) < 0
-+                  && errno != EOVERFLOW)
-                 return -1;
- 
-               return acl_nontrivial (count, entries);
-@@ -765,6 +834,7 @@ file_has_aclinfo (MAYBE_UNUSED char const *restrict name,
-         struct acl entries[NACLVENTRIES];
-         int count;
- 
-+        /* Ignore FD, unfortunately.  */
-         count = acl ((char *) name, ACL_GET, NACLVENTRIES, entries);
- 
-         if (count < 0)
-@@ -809,7 +879,9 @@ file_has_aclinfo (MAYBE_UNUSED char const *restrict name,
-           /* The docs say that type being 0 is equivalent to ACL_ANY, but it
-              is not true, in AIX 5.3.  */
-           type.u64 = ACL_ANY;
--          if (aclx_get (name, 0, &type, aclbuf, &aclsize, &mode) >= 0)
-+          if (0 <= (fd < 0
-+                    ? aclx_get (name, 0, &type, aclbuf, &aclsize, &mode)
-+                    : aclx_fget (fd, 0, &type, aclbuf, &aclsize, &mode)))
-             break;
-           if (errno == ENOSYS)
-             return 0;
-@@ -855,7 +927,10 @@ file_has_aclinfo (MAYBE_UNUSED char const *restrict name,
- 
-       union { struct acl a; char room[4096]; } u;
- 
--      if (statacl ((char *) name, STX_NORMAL, &u.a, sizeof (u)) < 0)
-+      if ((fd < 0
-+           ? statacl ((char *) name, STX_NORMAL, &u.a, sizeof u)
-+           : fstatacl (fd, STX_NORMAL, &u.a, sizeof u))
-+          < 0)
-         return -1;
- 
-       return acl_nontrivial (&u.a);
-@@ -866,6 +941,7 @@ file_has_aclinfo (MAYBE_UNUSED char const *restrict name,
-         struct acl entries[NACLENTRIES];
-         int count;
- 
-+        /* Ignore FD, unfortunately.  */
-         count = acl ((char *) name, ACL_GET, NACLENTRIES, entries);
- 
-         if (count < 0)
-diff --git a/lib/qcopy-acl.c b/lib/qcopy-acl.c
-index ad79661..282f4b2 100644
---- a/lib/qcopy-acl.c
-+++ b/lib/qcopy-acl.c
-@@ -26,6 +26,7 @@
- #if USE_XATTR
- 
- # include <attr/libattr.h>
-+# include <dirent.h>
- # include <string.h>
- 
- # if HAVE_LINUX_XATTR_H
-@@ -61,6 +62,7 @@ is_attr_permissions (const char *name, struct error_context *ctx)
-    a valid file descriptor, use file descriptor operations, else use
-    filename based operations on SRC_NAME. Likewise for DEST_DESC and
-    DST_NAME.
-+   MODE should be the source file's st_mode.
-    If access control lists are not available, fchmod the target file to
-    MODE.  Also sets the non-permission bits of the destination file
-    (S_ISUID, S_ISGID, S_ISVTX) to those from MODE if any are set.
-@@ -86,10 +88,29 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
-      Functions attr_copy_* return 0 in case we copied something OR nothing
-      to copy */
-   if (ret == 0)
--    ret = source_desc <= 0 || dest_desc <= 0
--      ? attr_copy_file (src_name, dst_name, is_attr_permissions, NULL)
--      : attr_copy_fd (src_name, source_desc, dst_name, dest_desc,
--                      is_attr_permissions, NULL);
-+    {
-+      ret = source_desc <= 0 || dest_desc <= 0
-+        ? attr_copy_file (src_name, dst_name, is_attr_permissions, NULL)
-+        : attr_copy_fd (src_name, source_desc, dst_name, dest_desc,
-+                        is_attr_permissions, NULL);
-+
-+      /* Copying can fail with EOPNOTSUPP even when the source
-+         permissions are trivial (Bug#78328).  Don't report an error
-+         in this case, as the chmod_or_fchmod suffices.  */
-+      if (ret < 0 && errno == EOPNOTSUPP)
-+        {
-+          /* fdfile_has_aclinfo cares only about DT_DIR, _GL_DT_NOTDIR,
-+             and DT_LNK (but DT_LNK is not possible here),
-+             so use _GL_DT_NOTDIR | DT_UNKNOWN for other file types.  */
-+          int flags = S_ISDIR (mode) ? DT_DIR : _GL_DT_NOTDIR | DT_UNKNOWN;
-+
-+          struct aclinfo ai;
-+          if (!fdfile_has_aclinfo (source_desc, src_name, &ai, flags))
-+            ret = 0;
-+          aclinfo_free (&ai);
-+          errno = EOPNOTSUPP;
-+        }
-+    }
- #else
-   /* no XATTR, so we proceed the old dusty way */
-   struct permission_context ctx;
--- 
-2.49.0
-
-
-From ed2bda5888829f4ebacd6dc9c86b7494dbf2a3b7 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Fri, 9 May 2025 18:48:03 -0700
-Subject: [PATCH 2/2] acl-tests: link with $(FILE_HAS_ACL_LIB)
-
-* modules/acl-tests (test_copy_acl_LDADD): Add
-$(FILE_HAS_ACL_LIB), since qcopy-acl depends on file-has-acl.
-Although this suggests that QCOPY_ACL_LIB should contain
-FILE_HAS_ACL_LIB, I’m not sure whether that’s the right course of
-action and anyway this is good enough for coreutils.
-
-(cherry picked from commit 955360a66c99bdd9ac3688519a8b521b06958fd3)
----
- gnulib-tests/gnulib.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gnulib-tests/gnulib.mk b/gnulib-tests/gnulib.mk
-index e222c63..4b78de4 100644
---- a/gnulib-tests/gnulib.mk
-+++ b/gnulib-tests/gnulib.mk
-@@ -99,7 +99,7 @@ TESTS += \
- TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
- check_PROGRAMS += test-set-mode-acl test-copy-acl test-sameacls
- test_set_mode_acl_LDADD = $(LDADD) $(LIB_ACL) $(LIBUNISTRING) @LIBINTL@ $(MBRTOWC_LIB) $(LIBC32CONV)
--test_copy_acl_LDADD = $(LDADD) $(LIB_ACL) $(QCOPY_ACL_LIB) $(LIBUNISTRING) @LIBINTL@ $(MBRTOWC_LIB) $(LIBC32CONV)
-+test_copy_acl_LDADD = $(LDADD) $(LIB_ACL) $(QCOPY_ACL_LIB) $(FILE_HAS_ACL_LIB) $(LIBUNISTRING) @LIBINTL@ $(MBRTOWC_LIB) $(LIBC32CONV)
- test_sameacls_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(MBRTOWC_LIB)
- EXTRA_DIST += test-set-mode-acl.sh test-set-mode-acl-1.sh test-set-mode-acl-2.sh test-copy-acl.sh test-copy-acl-1.sh test-copy-acl-2.sh test-set-mode-acl.c test-copy-acl.c test-sameacls.c macros.h
- 
--- 
-2.49.0
-

coreutils-9.7-stty-arbitrary-baud-rates.patch

@@ -1,669 +0,0 @@
-From 8e5ee22042931bdac6488d61c5d59bcd1b0dba5f Mon Sep 17 00:00:00 2001
-From: "H. Peter Anvin" <hpa@zytor.com>
-Date: Mon, 16 Jun 2025 14:58:01 -0700
-Subject: [PATCH 1/5] stty: arbitrary or non-a priori known speed_t support
-
-Support the case where speed_t is simply a number, and in that case
-assume that arbitrary values can be passed.  This is assumed to be the
-case when all known speed_t macros equal their own value.
-
-Try to probe for a variety of speed_t constants by trying to coax
-$(CC) into emitting macro definitions (-E -dM).  If this is not
-supported, use a fairly extensive list of constants as a
-fallback.  This both improves the test for arbitrary speed support, as
-well as allowing proper operation in the case where the constants are
-not plain numbers and allows for handing enumerated speed constants
-that were not known a priori when the source code was written.
-
-A simple shell script (mostly using sed) is used to turn the list of
-constants (probed and predefined) into a pair of conversion functions,
-baud_to_value() and value_to_baud(); string_to_baud() is then
-reimplemented as a wrapper around the latter.
-
-* src/local.mk: Generate speedlist.h.
-* src/speedgen: Portable shell script to generate speedlist.h.
-* src/stty.c: Adjust string_to_baud to
-convert from arbitrary numeric values.
-* src/termios.c: A helper used when generating speedlist.h
-
-@lzaoral:  This patch was amended to fix build failure in the
-"single-binary" mode.
-
-(cherry picked from commit 357fda90d15fd3f7dba61e1ab322b183a48d0081)
----
- src/local.mk  |  15 +++++-
- src/speedgen  |  85 ++++++++++++++++++++++++++++++
- src/stty.c    | 143 +++++++++++++++++++-------------------------------
- src/termios.c |  34 ++++++++++++
- 4 files changed, 188 insertions(+), 89 deletions(-)
- create mode 100755 src/speedgen
- create mode 100644 src/termios.c
-
-diff --git a/src/local.mk b/src/local.mk
-index fd9dc81..3b8a34e 100644
---- a/src/local.mk
-+++ b/src/local.mk
-@@ -71,7 +71,8 @@ EXTRA_DIST +=		\
-   src/dircolors.hin	\
-   src/primes.h		\
-   src/tac-pipe.c	\
--  src/extract-magic
-+  src/extract-magic	\
-+  src/speedgen
- 
- CLEANFILES += $(SCRIPTS)
- 
-@@ -672,6 +673,18 @@ src/version.h: Makefile
- 	$(AM_V_at)chmod a-w $@t
- 	$(AM_V_at)mv $@t $@
- 
-+# Target-specific termios baud rate file. This is opportunistic;
-+# if cc -E doesn't support -dM, the speedgen script still includes
-+# an extensive fallback list of common constants.
-+BUILT_SOURCES += src/speedlist.h
-+src/speedlist.h: src/termios.c lib/config.h src/speedgen
-+	$(AM_V_GEN)rm -f $@
-+	$(AM_V_at)${MKDIR_P} src
-+	$(AM_V_at)$(COMPILE) -E -dM $< 2>/dev/null |		\
-+		  $(SHELL) $(srcdir)/src/speedgen $@t
-+	$(AM_V_at)chmod a-w $@t
-+	$(AM_V_at)mv $@t $@
-+
- # Generates a list of macro invocations like:
- #   SINGLE_BINARY_PROGRAM(program_name_str, main_name)
- # once for each program list on $(single_binary_progs). Note that
-diff --git a/src/speedgen b/src/speedgen
-new file mode 100755
-index 0000000..f1647d9
---- /dev/null
-+++ b/src/speedgen
-@@ -0,0 +1,85 @@
-+#!/bin/sh -e
-+
-+out="$1"
-+tmp="$out.tmp"
-+
-+if [ -z "$out" ]; then
-+    echo "Usage: $0 outfile" 2>&1
-+    exit 1
-+fi
-+
-+s='[[:space:]]'			# For brevity's sake
-+
-+trap "rm -f '$tmp'" EXIT
-+trap "rm -f '$tmp' '$out'" ERR HUP INT QUIT TERM
-+
-+# Fallback list of speeds that are always tested for
-+defspeeds="0 50 75 110 134 150 200 300 600 1200 1800 2400 4800 7200 9600 \
-+14400 19200 28800 33600 38400 57600 76800 115200 153600 230400 307200 \
-+460800 500000 576000 614400 921600 1000000 1152000 1500000 \
-+2000000 2500000 3000000 3500000 4000000 5000000 10000000"
-+(
-+    sed -n -e "s/^$s*\#$s*define$s$s*B\\([1-9][0-9]*\\)$s.*\$/\\1/p"
-+    for s in $defspeeds; do echo "$s"; done
-+) | sort -n | uniq > "$tmp"
-+
-+cat > "$out" <<'EOF'
-+#ifndef SPEEDLIST_H
-+# define SPEEDLIST_H 1
-+
-+# if 1 \
-+EOF
-+
-+sed -e 's/^.*$/ \&\& (!defined(B&) || B& == &) \\/' < "$tmp" >> "$out"
-+
-+cat >> "$out" <<'EOF'
-+
-+#  define TERMIOS_SPEED_T_SANE 1
-+
-+# endif
-+
-+ATTRIBUTE_CONST
-+static unsigned long int
-+baud_to_value (speed_t speed)
-+{
-+# ifdef TERMIOS_SPEED_T_SANE
-+  return speed;
-+# else
-+  switch (speed)
-+    {
-+EOF
-+
-+sed -e 's/^.*$/#  ifdef B&\n      case B&: return &;\n#  endif/' \
-+    < "$tmp" >> "$out"
-+
-+cat >> "$out" <<'EOF'
-+      default: return -1;
-+    }
-+# endif
-+}
-+
-+ATTRIBUTE_CONST
-+static speed_t
-+value_to_baud (unsigned long int value)
-+{
-+# ifdef TERMIOS_SPEED_T_SANE
-+  speed_t speed = value;
-+  if (speed != value)
-+    speed = (speed_t) -1;	/* Unrepresentable (overflow?) */
-+  return speed;
-+# else
-+  switch (value)
-+    {
-+EOF
-+
-+sed -e 's/^.*$/#  ifdef B&\n      case &: return B&;\n#  endif/' \
-+    < "$tmp" >> "$out"
-+
-+cat >> "$out" <<'EOF'
-+      default: return (speed_t) -1;
-+    }
-+# endif
-+}
-+
-+#endif
-+EOF
-diff --git a/src/stty.c b/src/stty.c
-index 133b33c..561de1c 100644
---- a/src/stty.c
-+++ b/src/stty.c
-@@ -55,6 +55,7 @@
- 
- #include "system.h"
- #include "assure.h"
-+#include "c-ctype.h"
- #include "fd-reopen.h"
- #include "quote.h"
- #include "xdectoint.h"
-@@ -2172,100 +2173,66 @@ recover_mode (char const *arg, struct termios *mode)
-   return true;
- }
- 
--struct speed_map
--{
--  char const *string;		/* ASCII representation. */
--  speed_t speed;		/* Internal form. */
--  unsigned long int value;	/* Numeric value. */
--};
--
--static struct speed_map const speeds[] =
--{
--  {"0", B0, 0},
--  {"50", B50, 50},
--  {"75", B75, 75},
--  {"110", B110, 110},
--  {"134", B134, 134},
--  {"134.5", B134, 134},
--  {"150", B150, 150},
--  {"200", B200, 200},
--  {"300", B300, 300},
--  {"600", B600, 600},
--  {"1200", B1200, 1200},
--  {"1800", B1800, 1800},
--  {"2400", B2400, 2400},
--  {"4800", B4800, 4800},
--  {"9600", B9600, 9600},
--  {"19200", B19200, 19200},
--  {"38400", B38400, 38400},
--  {"exta", B19200, 19200},
--  {"extb", B38400, 38400},
--#ifdef B57600
--  {"57600", B57600, 57600},
--#endif
--#ifdef B115200
--  {"115200", B115200, 115200},
--#endif
--#ifdef B230400
--  {"230400", B230400, 230400},
--#endif
--#ifdef B460800
--  {"460800", B460800, 460800},
--#endif
--#ifdef B500000
--  {"500000", B500000, 500000},
--#endif
--#ifdef B576000
--  {"576000", B576000, 576000},
--#endif
--#ifdef B921600
--  {"921600", B921600, 921600},
--#endif
--#ifdef B1000000
--  {"1000000", B1000000, 1000000},
--#endif
--#ifdef B1152000
--  {"1152000", B1152000, 1152000},
--#endif
--#ifdef B1500000
--  {"1500000", B1500000, 1500000},
--#endif
--#ifdef B2000000
--  {"2000000", B2000000, 2000000},
--#endif
--#ifdef B2500000
--  {"2500000", B2500000, 2500000},
--#endif
--#ifdef B3000000
--  {"3000000", B3000000, 3000000},
--#endif
--#ifdef B3500000
--  {"3500000", B3500000, 3500000},
--#endif
--#ifdef B4000000
--  {"4000000", B4000000, 4000000},
--#endif
--  {nullptr, 0, 0}
--};
-+/* Autogenerated conversion functions to/from speed_t */
-+#include "speedlist.h"
- 
- ATTRIBUTE_PURE
- static speed_t
- string_to_baud (char const *arg)
- {
--  for (int i = 0; speeds[i].string != nullptr; ++i)
--    if (STREQ (arg, speeds[i].string))
--      return speeds[i].speed;
--  return (speed_t) -1;
--}
-+  char *ep;
-+  unsigned long value;
-+  unsigned char c;
- 
--ATTRIBUTE_PURE
--static unsigned long int
--baud_to_value (speed_t speed)
--{
--  for (int i = 0; speeds[i].string != nullptr; ++i)
--    if (speed == speeds[i].speed)
--      return speeds[i].value;
--  return 0;
-+  /* Explicitly disallow negative numbers.  */
-+  while (c_isspace (*arg))
-+    arg++;
-+  if (*arg == '-')
-+    return (speed_t) -1;
-+
-+  value = strtoul (arg, &ep, 10);
-+
-+  c = *ep++;
-+  if (c == '.')
-+    {
-+      /* Number includes a fraction. Round it to nearest-even.
-+         Note in particular that 134.5 must round to 134! */
-+      c = *ep++;
-+      if (c)
-+        {
-+          c -= '0';
-+          if (c > 9)
-+            {
-+              return (speed_t) -1; /* Garbage after otherwise valid number */
-+            }
-+          else if (c > 5)
-+            {
-+              value++;
-+            }
-+          else if (c == 5)
-+            {
-+              while ((c = *ep++) == '0')
-+              ; /* Skip zeroes after .5 */
-+
-+              if (c >= '1' && c <= '9')
-+                value++;                /* Nonzero digit, round up */
-+              else
-+                value += (value & 1);   /* Exactly in the middle, round even */
-+            }
-+        }
-+    }
-+  else if (c)
-+    {
-+      /* Not a valid number; check for legacy aliases "exta" and "extb" */
-+      if (STREQ (arg, "exta"))
-+        return B19200;
-+      else if (STREQ (arg, "extb"))
-+        return B38400;
-+      else
-+        return (speed_t) -1;
-+    }
-+
-+  return value_to_baud (value);
- }
- 
- static void
-diff --git a/src/termios.c b/src/termios.c
-new file mode 100644
-index 0000000..f17e12e
---- /dev/null
-+++ b/src/termios.c
-@@ -0,0 +1,34 @@
-+/* termios.c -- coax out Bxxx macros from termios.h
-+
-+   Copyright (C) 2025 Free Software Foundation, Inc.
-+
-+   This program is free software: you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation, either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
-+
-+/* This simply #includes headers which may or may not provide Bxxx
-+   constant macros.  This is run through the C preprocessor and defined
-+   macros are extracted.
-+
-+   In the case where the C preprocessor isn't capable of doing so,
-+   the script this is fed through contains a pre-defined set of common
-+   constants. */
-+
-+#include <config.h>
-+
-+#ifdef TERMIOS_NEEDS_XOPEN_SOURCE
-+# define _XOPEN_SOURCE
-+#endif
-+
-+#include <sys/types.h>
-+#include <termios.h>
-+#include <sys/ioctl.h>
--- 
-2.50.0
-
-
-From 60c9206391e2fac32639d3a143435d1dd9ec6421 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Tue, 17 Jun 2025 23:32:05 +0100
-Subject: [PATCH 2/5] tests: stty: adjust tests for arbitary speeds
-
-* tests/stty/stty-invalid.sh: Adjust to what is now invalid.
-* tests/stty/stty.sh: Add checks for valid speed variants.
-* tests/stty/bad-speed.sh: New test to ensure unsupported speeds
-are diagnosed.
-
-(cherry picked from commit efaec8078142996d958b6720b85a13b12497c3d0)
----
- tests/local.mk             |  1 +
- tests/stty/bad-speed.sh    | 50 ++++++++++++++++++++++++++++++++++++++
- tests/stty/stty-invalid.sh | 10 ++++++--
- tests/stty/stty.sh         | 10 ++++++++
- 4 files changed, 69 insertions(+), 2 deletions(-)
- create mode 100755 tests/stty/bad-speed.sh
-
-diff --git a/tests/local.mk b/tests/local.mk
-index 642d225..b68df41 100644
---- a/tests/local.mk
-+++ b/tests/local.mk
-@@ -425,6 +425,7 @@ all_tests =					\
-   tests/stat/stat-printf.pl			\
-   tests/stat/stat-slash.sh			\
-   tests/misc/stdbuf.sh				\
-+  tests/stty/bad-speed.sh			\
-   tests/stty/stty.sh				\
-   tests/stty/stty-invalid.sh			\
-   tests/stty/stty-pairs.sh			\
-diff --git a/tests/stty/bad-speed.sh b/tests/stty/bad-speed.sh
-new file mode 100755
-index 0000000..d80d2e7
---- /dev/null
-+++ b/tests/stty/bad-speed.sh
-@@ -0,0 +1,50 @@
-+#!/bin/sh
-+# Ensure we handle cfsetispeed failing
-+# which we did not before coreutils v9.1
-+
-+# Copyright (C) 2025 Free Software Foundation, Inc.
-+
-+# This program is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-+
-+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-+print_ver_ stty
-+require_gcc_shared_
-+
-+# Replace each cfsetispeed call with a call to these stubs.
-+cat > k.c <<'EOF' || framework_failure_
-+#include <stdio.h>
-+#include <errno.h>
-+#include <termios.h>
-+#include <unistd.h>
-+
-+int cfsetispeed(struct termios *termios_p, speed_t speed)
-+{
-+  /* Leave a marker so we can identify if the function was intercepted.  */
-+  fclose(fopen("preloaded", "w"));
-+
-+  errno=EINVAL;
-+  return -1;
-+}
-+EOF
-+
-+# Then compile/link it:
-+gcc_shared_ k.c k.so \
-+  || skip_ 'failed to build shared library'
-+
-+( export LD_PRELOAD=$LD_PRELOAD:./k.so
-+  returns_ 1 stty ispeed 9600 ) || fail=1
-+
-+test -e preloaded || skip_ 'LD_PRELOAD interception failed'
-+
-+Exit $fail
-diff --git a/tests/stty/stty-invalid.sh b/tests/stty/stty-invalid.sh
-index 4b87e2a..a1442a8 100755
---- a/tests/stty/stty-invalid.sh
-+++ b/tests/stty/stty-invalid.sh
-@@ -20,6 +20,7 @@
- print_ver_ stty
- require_controlling_input_terminal_
- require_trap_signame_
-+getlimits_
- 
- trap '' TTOU # Ignore SIGTTOU
- 
-@@ -50,8 +51,13 @@ if tty -s </dev/tty; then
-   returns_ 1 stty eol -F/dev/tty eol || fail=1
- fi
- 
--# coreutils <= 9.1 would not validate speeds to ispeed or ospeed
--returns_ 1 stty ispeed 420 || fail=1
-+# coreutils >= 9.8 supports arbitrary speeds on some systems
-+# so restrict tests here to invalid numbers
-+# We simulate unsupported numbers in a separate "LD_PRELOAD" test.
-+WRAP_9600="$(expr $ULONG_OFLOW - 9600)"
-+for speed in 9600.. ++9600 -$WRAP_9600 --$WRAP_9600 0x2580 96E2; do
-+  returns_ 1 stty ispeed "$speed" || fail=1
-+done
- 
- # Just in case either of the above mistakenly succeeds (and changes
- # the state of our tty), try to restore the initial state.
-diff --git a/tests/stty/stty.sh b/tests/stty/stty.sh
-index dab4cd0..c0f7494 100755
---- a/tests/stty/stty.sh
-+++ b/tests/stty/stty.sh
-@@ -95,4 +95,14 @@ for W in $(seq 80 90); do
-   test "$output_width" -le "$W" || fail=1
- done
- 
-+# Ensure we support varied numeric forms
-+# with appropriate rounding
-+if stty ispeed '9600'; then
-+  stty ispeed '  +9600' || fail=1
-+  stty ispeed '9600.49' || fail=1
-+  stty ispeed '9600.50' || fail=1
-+  stty ispeed '9599.51' || fail=1
-+  stty ispeed '  9600.' || fail=1
-+fi
-+
- Exit $fail
--- 
-2.50.0
-
-
-From a47c15eea3ffe08662415ae13873b40c7ffcdb43 Mon Sep 17 00:00:00 2001
-From: Collin Funk <collin.funk1@gmail.com>
-Date: Sat, 21 Jun 2025 22:05:19 -0700
-Subject: [PATCH 3/5] build: add src/termios.c to the tarball
-
-* src/local.mk (EXTRA_DIST): Add src/termios.c.
-
-(cherry picked from commit b7db7757831e93ca44ae59e1921bc4ebbc87974f)
----
- src/local.mk | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/local.mk b/src/local.mk
-index 3b8a34e..188dda1 100644
---- a/src/local.mk
-+++ b/src/local.mk
-@@ -72,7 +72,8 @@ EXTRA_DIST +=		\
-   src/primes.h		\
-   src/tac-pipe.c	\
-   src/extract-magic	\
--  src/speedgen
-+  src/speedgen		\
-+  src/termios.c
- 
- CLEANFILES += $(SCRIPTS)
- 
--- 
-2.50.0
-
-
-From caa439bf750193bcbed215a6676053f0b3c96e21 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Sun, 22 Jun 2025 15:01:21 +0100
-Subject: [PATCH 4/5] doc: stty: adjust description of supported speeds
-
-* doc/coreutils.texi (stty invocation): Remove now imprecise
-list of speeds given we may now support higher or arbitrary speeds.
-Mention that we may support higher or arbitrary speeds.
-
-(cherry picked from commit 8b05eca972f70858749a946ac24f08d0718c1be6)
----
- doc/coreutils.texi | 21 ++-------------------
- 1 file changed, 2 insertions(+), 19 deletions(-)
-
-diff --git a/doc/coreutils.texi b/doc/coreutils.texi
-index 6d1ee11..c04af2b 100644
---- a/doc/coreutils.texi
-+++ b/doc/coreutils.texi
-@@ -15932,25 +15932,8 @@ Print the terminal speed.
- Set the input and output speeds to @var{n}.  @var{n} can be one of: 0
- 50 75 110 134 134.5 150 200 300 600 1200 1800 2400 4800 9600 19200
- 38400 @code{exta} @code{extb}.  @code{exta} is the same as 19200;
--@code{extb} is the same as 38400.  Many systems, including GNU/Linux,
--support higher speeds.  The @command{stty} command includes support
--for speeds of
--57600,
--115200,
--230400,
--460800,
--500000,
--576000,
--921600,
--1000000,
--1152000,
--1500000,
--2000000,
--2500000,
--3000000,
--3500000,
--or
--4000000 where the system supports these.
-+@code{extb} is the same as 38400.  Many systems, support arbitrary
-+or higher speeds.
- 0 hangs up the line if @option{-clocal} is set.
- @end table
- 
--- 
-2.50.0
-
-
-From 8e48d56c2aa10f9875ffe1ec051a17f0eab6d2f9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Sun, 22 Jun 2025 16:40:04 +0100
-Subject: [PATCH 5/5] stty: stricter floating point parsing
-
-* src/stty.c (string_to_baud): Disallow extraneous characters
-after floating point numbers.
-* tests/stty/stty-invalid.sh: Add test cases.
-
-(cherry picked from commit 3d35b3c0e56bd556c90dc98c3e5e2e7289b0eb0d)
----
- src/stty.c                 | 27 +++++++++++++--------------
- tests/stty/stty-invalid.sh |  3 ++-
- 2 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/src/stty.c b/src/stty.c
-index 561de1c..0163ea4 100644
---- a/src/stty.c
-+++ b/src/stty.c
-@@ -2200,25 +2200,24 @@ string_to_baud (char const *arg)
-       c = *ep++;
-       if (c)
-         {
--          c -= '0';
--          if (c > 9)
-+          unsigned char d = c - '0';
-+          if (d > 5)
-+            value++;
-+          else if (d == 5)
-             {
--              return (speed_t) -1; /* Garbage after otherwise valid number */
--            }
--          else if (c > 5)
--            {
--              value++;
--            }
--          else if (c == 5)
--            {
--              while ((c = *ep++) == '0')
--              ; /* Skip zeroes after .5 */
-+              while ((c = *ep++) == '0'); /* Skip zeroes after .5 */
- 
--              if (c >= '1' && c <= '9')
--                value++;                /* Nonzero digit, round up */
-+              if (c)
-+                value++;                /* Nonzero, round up */
-               else
-                 value += (value & 1);   /* Exactly in the middle, round even */
-             }
-+
-+          while (c_isdigit (c)) /* Skip remaining digits.  */
-+            c = *ep++;
-+
-+          if (c)
-+            return (speed_t) -1; /* Garbage after otherwise valid number */
-         }
-     }
-   else if (c)
-diff --git a/tests/stty/stty-invalid.sh b/tests/stty/stty-invalid.sh
-index a1442a8..868ed1d 100755
---- a/tests/stty/stty-invalid.sh
-+++ b/tests/stty/stty-invalid.sh
-@@ -55,7 +55,8 @@ fi
- # so restrict tests here to invalid numbers
- # We simulate unsupported numbers in a separate "LD_PRELOAD" test.
- WRAP_9600="$(expr $ULONG_OFLOW - 9600)"
--for speed in 9600.. ++9600 -$WRAP_9600 --$WRAP_9600 0x2580 96E2; do
-+for speed in 9599.. 9600.. 9600.5. 9600.50. 9600.0. ++9600 \
-+             -$WRAP_9600 --$WRAP_9600 0x2580 96E2 9600,0 '9600.0 '; do
-   returns_ 1 stty ispeed "$speed" || fail=1
- done
- 
--- 
-2.50.0
-

coreutils-9.9-fix-cut-test-aarch64.patch

@@ -0,0 +1,28 @@
+From 95044cb5eaea83d02f768feb5ab79fcf5e6ad782 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Mon, 22 Dec 2025 17:12:48 +0000
+Subject: [PATCH] tests: avoid false failure due to ulimit on aarch64
+
+* tests/cut/cut-huge-range.sh: Add an extra 1MiB headroom,
+which was seen with aarch64.
+Reported at https://bugzilla.redhat.com/2424302
+
+Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
+Upstream-commit: 95044cb5eaea83d02f768feb5ab79fcf5e6ad782
+---
+ tests/cut/cut-huge-range.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/cut/cut-huge-range.sh b/tests/cut/cut-huge-range.sh
+index 4bd1b129d8..98d7e8f0b9 100755
+--- a/tests/cut/cut-huge-range.sh
++++ b/tests/cut/cut-huge-range.sh
+@@ -22,6 +22,7 @@ getlimits_
+ 
+ vm=$(get_min_ulimit_v_ returns_ 0 cut -b1 /dev/null) \
+   || skip_ 'shell lacks ulimit, or ASAN enabled'
++vm=$(($vm+1000))  # https://bugzilla.redhat.com/2424302
+ 
+ # Ensure we can cut up to our sentinel value.
+ # Don't use expr to subtract one,
+

coreutils-9.9-gnulib-c23.patch

@@ -0,0 +1,169 @@
+From 891761bca1aa78336e5b18c121075b6e4696c5d4 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sun, 23 Nov 2025 00:50:40 -0800
+Subject: [PATCH] Port to C23 qualifier-generic fns like strchr
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This ports Gnulib to strict C23 platforms that reject code
+like ‘char *q = strchr (P, 'x');’ when P is a pointer to const,
+because in C23 strchr is a qualifier-generic function so
+strchr (P, 'x') returns char const *.
+This patch does not attempt to do the following two things,
+which might be useful in the future:
+1. When compiling on non-C23 platforms, check user code for
+portability to platforms that define qualifier-generic functions.
+2. Port Gnulib to platforms that have qualifier-generic functions
+not listed in the C23 standard, e.g., strchrnul.  I don’t know
+of any such platforms.
+* lib/mbschr.c (mbschr):
+* lib/memchr2.c (memchr2):
+Port to C23, where functions like strchr are qualifier-generic.
+* lib/c++defs.h (_GL_FUNCDECL_SYS_NAME): New macro.
+* lib/c++defs.h (_GL_FUNCDECL_SYS):
+* lib/stdlib.in.h (bsearch):
+Use it, to prevent C23 names like strchr from acting like macros.
+* lib/string.in.h (memchr, strchr, strpbrk, strrchr):
+Do not #undef when GNULIB_POSIXCHECK is defined, as this could
+cause conforming C23 code to fail to conform.  It’s not clear why
+_GL_WARN_ON_USE_CXX; perhaps it was needed but isn’t any more?
+But for now, limit the removal of #undef to these four functions
+where #undeffing is clearly undesirable in C23.
+* lib/wchar.in.h (wmemchr): Parenthesize function name in decl,
+to prevent it from acting like a macro.
+
+Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
+Upstream-commit: df17f4f37ed3ca373d23ad42eae51122bdb96626
+---
+ lib/c++defs.h   | 12 +++++++++++-
+ lib/mbschr.c    |  2 +-
+ lib/memchr2.c   |  2 +-
+ lib/stdlib.in.h |  6 +++---
+ lib/string.in.h |  4 ----
+ lib/wchar.in.h  |  2 +-
+ 6 files changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/lib/c++defs.h b/lib/c++defs.h
+index b77979a..7384457 100644
+--- a/lib/c++defs.h
++++ b/lib/c++defs.h
+@@ -127,6 +127,16 @@
+ #define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
+   _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
+ 
++/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to
++   parenthsized func otherwise.  Parenthesization is needed in C23 if
++   the function is like strchr and so is a qualifier-generic macro
++   that expands to something more complicated.  */
++#ifdef __cplusplus
++# define _GL_FUNCDECL_SYS_NAME(func) func
++#else
++# define _GL_FUNCDECL_SYS_NAME(func) (func)
++#endif
++
+ /* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
+    declares the system function, named func, with the given prototype,
+    consisting of return type, parameters, and attributes.
+@@ -139,7 +149,7 @@
+      _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
+  */
+ #define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
+-  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters
++  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype _GL_FUNCDECL_SYS_NAME (func) parameters
+ 
+ /* _GL_CXXALIAS_RPL (func, rettype, parameters);
+    declares a C++ alias called GNULIB_NAMESPACE::func
+diff --git a/lib/mbschr.c b/lib/mbschr.c
+index c9e14b5..6582134 100644
+--- a/lib/mbschr.c
++++ b/lib/mbschr.c
+@@ -65,5 +65,5 @@ mbschr (const char *string, int c)
+       return NULL;
+     }
+   else
+-    return strchr (string, c);
++    return (char *) strchr (string, c);
+ }
+diff --git a/lib/memchr2.c b/lib/memchr2.c
+index 7493823..d7724ae 100644
+--- a/lib/memchr2.c
++++ b/lib/memchr2.c
+@@ -55,7 +55,7 @@ memchr2 (void const *s, int c1_in, int c2_in, size_t n)
+   c2 = (unsigned char) c2_in;
+ 
+   if (c1 == c2)
+-    return memchr (s, c1, n);
++    return (void *) memchr (s, c1, n);
+ 
+   /* Handle the first few bytes by reading one byte at a time.
+      Do this until VOID_PTR is aligned on a longword boundary.  */
+diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
+index bef0aaa..fd0e1e0 100644
+--- a/lib/stdlib.in.h
++++ b/lib/stdlib.in.h
+@@ -224,9 +224,9 @@ _GL_INLINE_HEADER_BEGIN
+ 
+ /* Declarations for ISO C N3322.  */
+ #if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__
+-_GL_EXTERN_C void *bsearch (const void *__key,
+-                            const void *__base, size_t __nmemb, size_t __size,
+-                            int (*__compare) (const void *, const void *))
++_GL_EXTERN_C void *_GL_FUNCDECL_SYS_NAME (bsearch)
++  (const void *__key, const void *__base, size_t __nmemb, size_t __size,
++   int (*__compare) (const void *, const void *))
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3) _GL_ARG_NONNULL ((5));
+ _GL_EXTERN_C void qsort (void *__base, size_t __nmemb, size_t __size,
+                          int (*__compare) (const void *, const void *))
+diff --git a/lib/string.in.h b/lib/string.in.h
+index fdcdd21..8b56acf 100644
+--- a/lib/string.in.h
++++ b/lib/string.in.h
+@@ -409,7 +409,6 @@ _GL_CXXALIASWARN1 (memchr, void const *,
+ _GL_CXXALIASWARN (memchr);
+ # endif
+ #elif defined GNULIB_POSIXCHECK
+-# undef memchr
+ /* Assume memchr is always declared.  */
+ _GL_WARN_ON_USE (memchr, "memchr has platform-specific bugs - "
+                  "use gnulib module memchr for portability" );
+@@ -674,7 +673,6 @@ _GL_WARN_ON_USE (stpncpy, "stpncpy is unportable - "
+ #if defined GNULIB_POSIXCHECK
+ /* strchr() does not work with multibyte strings if the locale encoding is
+    GB18030 and the character to be searched is a digit.  */
+-# undef strchr
+ /* Assume strchr is always declared.  */
+ _GL_WARN_ON_USE_CXX (strchr,
+                      const char *, char *, (const char *, int),
+@@ -981,7 +979,6 @@ _GL_CXXALIASWARN (strpbrk);
+    Even in this simple case, it does not work with multibyte strings if the
+    locale encoding is GB18030 and one of the characters to be searched is a
+    digit.  */
+-#  undef strpbrk
+ _GL_WARN_ON_USE_CXX (strpbrk,
+                      const char *, char *, (const char *, const char *),
+                      "strpbrk cannot work correctly on character strings "
+@@ -1011,7 +1008,6 @@ _GL_WARN_ON_USE (strspn, "strspn cannot work correctly on character strings "
+ #if defined GNULIB_POSIXCHECK
+ /* strrchr() does not work with multibyte strings if the locale encoding is
+    GB18030 and the character to be searched is a digit.  */
+-# undef strrchr
+ /* Assume strrchr is always declared.  */
+ _GL_WARN_ON_USE_CXX (strrchr,
+                      const char *, char *, (const char *, int),
+diff --git a/lib/wchar.in.h b/lib/wchar.in.h
+index ab602a2..6be4515 100644
+--- a/lib/wchar.in.h
++++ b/lib/wchar.in.h
+@@ -301,7 +301,7 @@ _GL_EXTERN_C int wcsncmp (const wchar_t *__s1, const wchar_t *__s2, size_t __n)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+ # ifndef __cplusplus
+-_GL_EXTERN_C wchar_t *wmemchr (const wchar_t *__s, wchar_t __wc, size_t __n)
++_GL_EXTERN_C wchar_t *(wmemchr) (const wchar_t *__s, wchar_t __wc, size_t __n)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
+ # endif
+ _GL_EXTERN_C wchar_t *wmemset (wchar_t *__s, wchar_t __wc, size_t __n)
+-- 
+2.52.0
+

coreutils-CVE-2025-5278.patch

@@ -1,107 +0,0 @@
-From 701a9bdbf78f869e0fb778ed5aede00e42517add Mon Sep 17 00:00:00 2001
-From: Pádraig Brady <P@draigBrady.com>
-Date: Tue, 20 May 2025 16:03:44 +0100
-Subject: [PATCH] sort: fix buffer under-read (CWE-127)
-
-* src/sort.c (begfield): Check pointer adjustment
-to avoid Out-of-range pointer offset (CWE-823).
-(limfield): Likewise.
-* tests/sort/sort-field-limit.sh: Add a new test,
-which triggers with ASAN or Valgrind.
-* tests/local.mk: Reference the new test.
-Fixes https://bugs.gnu.org/78507
-
-(cherry picked from commit 8c9602e3a145e9596dc1a63c6ed67865814b6633)
----
- src/sort.c                     | 12 ++++++++++--
- tests/local.mk                 |  1 +
- tests/sort/sort-field-limit.sh | 35 ++++++++++++++++++++++++++++++++++
- 3 files changed, 46 insertions(+), 2 deletions(-)
- create mode 100755 tests/sort/sort-field-limit.sh
-
-diff --git a/src/sort.c b/src/sort.c
-index b10183b..7af1a25 100644
---- a/src/sort.c
-+++ b/src/sort.c
-@@ -1644,7 +1644,11 @@ begfield (struct line const *line, struct keyfield const *key)
-       ++ptr;
- 
-   /* Advance PTR by SCHAR (if possible), but no further than LIM.  */
--  ptr = MIN (lim, ptr + schar);
-+  size_t remaining_bytes = lim - ptr;
-+  if (schar < remaining_bytes)
-+    ptr += schar;
-+  else
-+    ptr = lim;
- 
-   return ptr;
- }
-@@ -1746,7 +1750,11 @@ limfield (struct line const *line, struct keyfield const *key)
-           ++ptr;
- 
-       /* Advance PTR by ECHAR (if possible), but no further than LIM.  */
--      ptr = MIN (lim, ptr + echar);
-+      size_t remaining_bytes = lim - ptr;
-+      if (echar < remaining_bytes)
-+        ptr += echar;
-+      else
-+        ptr = lim;
-     }
- 
-   return ptr;
-diff --git a/tests/local.mk b/tests/local.mk
-index 4da6756..642d225 100644
---- a/tests/local.mk
-+++ b/tests/local.mk
-@@ -388,6 +388,7 @@ all_tests =					\
-   tests/sort/sort-debug-keys.sh			\
-   tests/sort/sort-debug-warn.sh			\
-   tests/sort/sort-discrim.sh			\
-+  tests/sort/sort-field-limit.sh		\
-   tests/sort/sort-files0-from.pl		\
-   tests/sort/sort-float.sh			\
-   tests/sort/sort-h-thousands-sep.sh		\
-diff --git a/tests/sort/sort-field-limit.sh b/tests/sort/sort-field-limit.sh
-new file mode 100755
-index 0000000..52d8e1d
---- /dev/null
-+++ b/tests/sort/sort-field-limit.sh
-@@ -0,0 +1,35 @@
-+#!/bin/sh
-+# From 7.2-9.7, this would trigger an out of bounds mem read
-+
-+# Copyright (C) 2025 Free Software Foundation, Inc.
-+
-+# This program is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-+
-+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-+print_ver_ sort
-+getlimits_
-+
-+# This issue triggers with valgrind or ASAN
-+valgrind --error-exitcode=1 sort --version 2>/dev/null &&
-+  VALGRIND='valgrind --error-exitcode=1'
-+
-+{ printf '%s\n' aa bb; } > in || framework_failure_
-+
-+_POSIX2_VERSION=200809 $VALGRIND sort +0.${SIZE_MAX}R in > out || fail=1
-+compare in out || fail=1
-+
-+_POSIX2_VERSION=200809 $VALGRIND sort +1 -1.${SIZE_MAX}R in > out || fail=1
-+compare in out || fail=1
-+
-+Exit $fail
--- 
-2.49.0
-

coreutils-df-direct.patch

@@ -1,4 +1,4 @@
-From d3117ae1bb422f771f1c19af54f81d5151f55065 Mon Sep 17 00:00:00 2001
+From 91be1a584108a6a3d96f64382bbf206c4213b3db Mon Sep 17 00:00:00 2001
 From: Kamil Dudka <kdudka@redhat.com>
 Date: Mon, 29 Mar 2010 17:20:34 +0000
 Subject: [PATCH] coreutils-df-direct.patch
@@ -11,10 +11,10 @@ Subject: [PATCH] coreutils-df-direct.patch
  create mode 100755 tests/df/direct.sh
 
 diff --git a/doc/coreutils.texi b/doc/coreutils.texi
-index d1c282f..6d1ee11 100644
+index b420606..0ccb368 100644
 --- a/doc/coreutils.texi
 +++ b/doc/coreutils.texi
-@@ -12467,6 +12467,13 @@ some systems (notably Solaris), doing this yields more up to date results,
+@@ -12597,6 +12597,13 @@ some systems (notably Solaris), doing this yields more up to date results,
  but in general this option makes @command{df} much slower, especially when
  there are many or very busy file systems.
  
@@ -29,10 +29,10 @@ index d1c282f..6d1ee11 100644
  @opindex --total
  @cindex grand total of file system size, usage and available space
 diff --git a/src/df.c b/src/df.c
-index a969c5c..c465a3f 100644
+index 75e638c..ef9f0a7 100644
 --- a/src/df.c
 +++ b/src/df.c
-@@ -122,6 +122,9 @@ static bool print_type;
+@@ -121,6 +121,9 @@ static bool print_type;
  /* If true, print a grand total at the end.  */
  static bool print_grand_total;
  
@@ -42,7 +42,7 @@ index a969c5c..c465a3f 100644
  /* Grand total data.  */
  static struct fs_usage grand_fsu;
  
-@@ -249,13 +252,15 @@ enum
+@@ -248,13 +251,15 @@ enum
    NO_SYNC_OPTION = CHAR_MAX + 1,
    SYNC_OPTION,
    TOTAL_OPTION,
@@ -59,7 +59,7 @@ index a969c5c..c465a3f 100644
    {"inodes", no_argument, nullptr, 'i'},
    {"human-readable", no_argument, nullptr, 'h'},
    {"si", no_argument, nullptr, 'H'},
-@@ -572,7 +577,10 @@ get_header (void)
+@@ -571,7 +576,10 @@ get_header (void)
    for (idx_t col = 0; col < ncolumns; col++)
      {
        char *cell;
@@ -71,7 +71,7 @@ index a969c5c..c465a3f 100644
  
        if (columns[col]->field == SIZE_FIELD
            && (header_mode == DEFAULT_MODE
-@@ -1454,6 +1462,17 @@ get_point (char const *point, const struct stat *statp)
+@@ -1446,6 +1454,17 @@ get_point (char const *point, const struct stat *statp)
  static void
  get_entry (char const *name, struct stat const *statp)
  {
@@ -89,7 +89,7 @@ index a969c5c..c465a3f 100644
    if ((S_ISBLK (statp->st_mode) || S_ISCHR (statp->st_mode))
        && get_device (name))
      return;
-@@ -1524,6 +1543,7 @@ or all file systems by default.\n\
+@@ -1516,6 +1535,7 @@ or all file systems by default.\n\
    -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n\
                             '-BM' prints sizes in units of 1,048,576 bytes;\n\
                             see SIZE format below\n\
@@ -97,7 +97,7 @@ index a969c5c..c465a3f 100644
    -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n\
    -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n\
  "), stdout);
-@@ -1618,6 +1638,9 @@ main (int argc, char **argv)
+@@ -1610,6 +1630,9 @@ main (int argc, char **argv)
                xstrtol_fatal (e, oi, c, long_options, optarg);
            }
            break;
@@ -107,7 +107,7 @@ index a969c5c..c465a3f 100644
          case 'i':
            if (header_mode == OUTPUT_MODE)
              {
-@@ -1714,6 +1737,13 @@ main (int argc, char **argv)
+@@ -1706,6 +1729,13 @@ main (int argc, char **argv)
          }
      }
  
@@ -183,5 +183,5 @@ index 0000000..8e4cfb8
 +
 +Exit $fail
 -- 
-2.49.0
+2.52.0
 

coreutils-python3.patch

@@ -1,4 +1,4 @@
-From f1a6e8d840a28eb2ab7a488e0d06450b7192c76d Mon Sep 17 00:00:00 2001
+From 8927d505ecb5334f09c48ef98ef1f464f581d0f7 Mon Sep 17 00:00:00 2001
 From: rpm-build <rpm-build>
 Date: Tue, 2 Apr 2024 14:11:26 +0100
 Subject: [PATCH] coreutils-python3.patch
@@ -10,10 +10,10 @@ Subject: [PATCH] coreutils-python3.patch
  3 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/init.cfg b/init.cfg
-index 612d287..9a6fa2d 100644
+index ac05f7b..26d9516 100644
 --- a/init.cfg
 +++ b/init.cfg
-@@ -597,10 +597,10 @@ seek_data_capable_()
+@@ -601,10 +601,10 @@ seek_data_capable_()
  # Skip the current test if "." lacks d_type support.
  require_dirent_d_type_()
  {
@@ -37,7 +37,7 @@ index 1a2f76f..42d3924 100644
  # Intended to exit 0 only on Linux/GNU systems.
  import os
 diff --git a/tests/du/move-dir-while-traversing.sh b/tests/du/move-dir-while-traversing.sh
-index 1d0a359..bd03542 100755
+index adf482b..cf9214a 100755
 --- a/tests/du/move-dir-while-traversing.sh
 +++ b/tests/du/move-dir-while-traversing.sh
 @@ -21,8 +21,8 @@ print_ver_ du
@@ -61,5 +61,5 @@ index 1d0a359..bd03542 100755
  import os,sys
  
 -- 
-2.48.1
+2.51.0
 

coreutils-selinux.patch

@@ -1,87 +0,0 @@
-From fc96cab095d704e8bf9934812dd8d6f87fbf4be4 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Wed, 30 Aug 2023 17:19:58 +0200
-Subject: [PATCH] coreutils-selinux.patch
-
----
- src/cp.c      | 19 ++++++++++++++++++-
- src/install.c | 12 +++++++++++-
- 2 files changed, 29 insertions(+), 2 deletions(-)
-
-diff --git a/src/cp.c b/src/cp.c
-index a0ec067..1169c6a 100644
---- a/src/cp.c
-+++ b/src/cp.c
-@@ -996,7 +996,7 @@ main (int argc, char **argv)
-   selinux_enabled = (0 < is_selinux_enabled ());
-   cp_option_init (&x);
- 
--  while ((c = getopt_long (argc, argv, "abdfHilLnprst:uvxPRS:TZ",
-+  while ((c = getopt_long (argc, argv, "abcdfHilLnprst:uvxPRS:TZ",
-                            long_opts, nullptr))
-          != -1)
-     {
-@@ -1048,6 +1048,23 @@ main (int argc, char **argv)
-           copy_contents = true;
-           break;
- 
-+        case 'c':
-+          fprintf (stderr, "%s: warning: option '-c' is deprecated,"
-+                  " please use '--preserve=context' instead\n", argv[0]);
-+          if (x.set_security_context)
-+            {
-+              fprintf (stderr,
-+                      "%s: cannot force target context and preserve it\n",
-+                      argv[0]);
-+              exit (1);
-+            }
-+          else if (selinux_enabled)
-+            {
-+              x.preserve_security_context = true;
-+              x.require_preserve_context = true;
-+            }
-+          break;
-+
-         case 'd':
-           x.preserve_links = true;
-           x.dereference = DEREF_NEVER;
-diff --git a/src/install.c b/src/install.c
-index b3b26ab..2d2f072 100644
---- a/src/install.c
-+++ b/src/install.c
-@@ -807,7 +807,7 @@ main (int argc, char **argv)
-   dir_arg = false;
-   umask (0);
- 
--  while ((optc = getopt_long (argc, argv, "bcCsDdg:m:o:pt:TvS:Z", long_options,
-+  while ((optc = getopt_long (argc, argv, "bcCsDdg:m:o:pPt:TvS:Z", long_options,
-                               nullptr))
-          != -1)
-     {
-@@ -872,6 +872,9 @@ main (int argc, char **argv)
-           no_target_directory = true;
-           break;
- 
-+        case 'P':
-+          fprintf (stderr, "%s: warning: option '-P' is deprecated,"
-+                  " please use '--preserve-context' instead\n", argv[0]);
-         case PRESERVE_CONTEXT_OPTION:
-           if (! selinux_enabled)
-             {
-@@ -879,6 +882,13 @@ main (int argc, char **argv)
-                              "this kernel is not SELinux-enabled"));
-               break;
-             }
-+          if (x.set_security_context)
-+            {
-+              fprintf (stderr,
-+                      "%s: cannot force target context and preserve it\n",
-+                      argv[0]);
-+              exit (1);
-+            }
-           x.preserve_security_context = true;
-           use_default_selinux_context = false;
-           break;
--- 
-2.48.1
-

coreutils.spec

@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
-Version: 9.7
+Version: 9.9
-Release: 5%{?dist}
+Release: 2%{?dist}
 # some used parts of gnulib are under various variants of LGPL
 License: GPL-3.0-or-later AND GFDL-1.3-no-invariants-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later
 Url:     https://www.gnu.org/software/coreutils/
@@ -32,29 +32,17 @@ Patch103: coreutils-python3.patch
 # df --direct
 Patch104: coreutils-df-direct.patch
 
-# cp/mv: do not fail when copying of trivial NFSv4 ACLs fails (rhbz#2363149)
+# gnulib C23 support
-# https://git.savannah.gnu.org/cgit/gnulib.git/patch?id=8a356b77717a2e4f735ec06e326880ca1f61aadb
+# https://github.com/coreutils/gnulib/commit/df17f4f37ed3ca373d23ad42eae51122bdb96626
-# https://git.savannah.gnu.org/cgit/gnulib.git/patch?id=955360a66c99bdd9ac3688519a8b521b06958fd3
+Patch105: coreutils-9.9-gnulib-c23.patch
-Patch105: coreutils-9.6-cp-improve-nfsv4-acl-support.patch
 
-# sort: fix buffer under-read (CVE-2025-5278)
+# fix cut test failure on aarch64 rawhide (rhbz#2424302)
-# https://cgit.git.savannah.gnu.org/cgit/coreutils.git/patch/?id=8c9602e3a145e9596dc1a63c6ed67865814b6633
+# https://github.com/coreutils/coreutils/commit/95044cb5eaea83d02f768feb5ab79fcf5e6ad782
-Patch106: coreutils-CVE-2025-5278.patch
+Patch106: coreutils-9.9-fix-cut-test-aarch64.patch
-
-# stty: add support for arbitrary baud rates (rhbz#2375439)
-# https://cgit.git.savannah.gnu.org/cgit/coreutils.git/patch/?id=357fda90d15fd3f7dba61e1ab322b183a48d0081
-# https://cgit.git.savannah.gnu.org/cgit/coreutils.git/patch/?id=efaec8078142996d958b6720b85a13b12497c3d0
-# https://cgit.git.savannah.gnu.org/cgit/coreutils.git/patch/?id=b7db7757831e93ca44ae59e1921bc4ebbc87974f
-# https://cgit.git.savannah.gnu.org/cgit/coreutils.git/patch/?id=8b05eca972f70858749a946ac24f08d0718c1be6
-# https://cgit.git.savannah.gnu.org/cgit/coreutils.git/patch/?id=3d35b3c0e56bd556c90dc98c3e5e2e7289b0eb0d
-Patch107: coreutils-9.7-stty-arbitrary-baud-rates.patch
 
 # (sb) lin18nux/lsb compliance - multibyte functionality patch
 Patch800: coreutils-i18n.patch
 
-# downstream SELinux options deprecated since 2009
-Patch950: coreutils-selinux.patch
-
 Conflicts: filesystem < 3
 
 # To avoid clobbering installs
@@ -137,6 +125,9 @@ packaged as a single multicall binary.
 # https://bugzilla.redhat.com/show_bug.cgi?id=1107973#c7
 Obsoletes: %{name} < 8.24-100
 
+# Gnulib translations are maintained seprately since coreutils 9.6 (#2393892)
+Requires: gnulib-l10n
+
 # info doc refers to "Specifying the Time Zone" from glibc-doc (#959597)
 Suggests: glibc-doc
 
@@ -173,7 +164,7 @@ find tests -name '*.sh' -perm 0644 -print -exec chmod 0755 '{}' '+'
 
 # FIXME: Force a newer gettext version to workaround `autoreconf -i` errors
 # with coreutils 9.6 and bundled gettext 0.19.2 from gettext-common-devel.
-sed -i 's/0.19.2/0.22.5/' bootstrap.conf configure.ac
+sed -i "s/0.19.2/$(rpm -q --queryformat '%%{VERSION}\n' gettext-devel)/" bootstrap.conf configure.ac
 
 autoreconf -fiv
 
@@ -295,6 +286,22 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %license COPYING
 
 %changelog
+* Tue Jan 13 2026 Lukáš Zaoral <lzaoral@redhat.com> - 9.9-2
+- fix cut test failure on aarch64 rawhide (rhbz#2424302)
+
+* Wed Nov 26 2025 Lukáš Zaoral <lzaoral@redhat.com> - 9.9-1
+- rebase to latest upstream release (rhbz#2413803)
+
+* Mon Sep 29 2025 Lukáš Zaoral <lzaoral@redhat.com> - 9.8-3
+- require gnulib-l10n for translations of gnulib messages (rhbz#2393892)
+
+* Thu Sep 25 2025 Lukáš Zaoral <lzaoral@redhat.com> - 9.8-2
+- tail: fix tailing larger number of lines in regular files (rhbz#2398008)
+
+* Wed Sep 24 2025 Lukáš Zaoral <lzaoral@redhat.com> - 9.8-1
+- rebase to latest upstream release (rhbz#2397467)
+- remove downstream patch for selinux options deprecated since 2009
+
 * Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 9.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
-SHA512 (coreutils-9.7.tar.xz) = fe81e6ba4fb492095153d5baac1eca8f07ece0957849de746a2a858cf007893cc2ded595a31a5e5d43d13216cc44b9d74a3245d9f23221ecc8cd00f428f27414
+SHA512 (coreutils-9.9.tar.xz.sig) = 0a3dfdfa6b4234e2e1d42142269f959bdf3cf8f6605a50270a27eff84dd22588f182121f7dd3eeb04be45f5109d02690215065b3d3b43882874d0e165a1435d0
-SHA512 (coreutils-9.7.tar.xz.sig) = 48d86a19cee3c153f01f7478847f4621685c02e59942540bb20b30e314df05230817b87d0e73acd953e79fab35718e5bea57f25fe511a2c275a85ced4b317bae
+SHA512 (coreutils-9.9.tar.xz) = e7b0e59f7732d2c098ea4934014f470248bd5c4764210e9200a698010a8e3b95bbb26e543f0cd73ed5a4b8e1f8cda932c73f39954d68175e4deaa47526610c65