fix cut test failure on aarch64 rawhide

Resolves: rhbz#2424302

coreutils-8.32-DIR_COLORS.patch

@@ -1,4 +1,4 @@
-From c7b13f5e1a7ad012c510a8bdd5a8943ab4b55833 Mon Sep 17 00:00:00 2001
+From bca11e30e8a6281a8cbddc9fb196dd86ab09c955 Mon Sep 17 00:00:00 2001
 From: Kamil Dudka <kdudka@redhat.com>
 Date: Fri, 17 Jun 2016 16:58:18 +0200
 Subject: [PATCH] downstream changes to default DIR_COLORS
@@ -9,7 +9,7 @@ Subject: [PATCH] downstream changes to default DIR_COLORS
  2 files changed, 23 insertions(+), 7 deletions(-)
 
 diff --git a/DIR_COLORS b/DIR_COLORS
-index b465771..ad42b09 100644
+index 540f6cd..b4785b6 100644
 --- a/DIR_COLORS
 +++ b/DIR_COLORS
 @@ -1,3 +1,7 @@
@@ -20,27 +20,27 @@ index b465771..ad42b09 100644
  # Configuration file for dircolors, a utility to help you set the
  # LS_COLORS environment variable used by GNU ls with the --color option.
  
-@@ -10,6 +14,9 @@
+@@ -11,6 +15,9 @@
  
  # Global config options can be specified before TERM or COLORTERM entries
  
 +# For compatibility, the pattern "^COLOR.*none" is recognized as a way to
 +# disable colorization.  See https://bugzilla.redhat.com/1349579 for details.
 +
- # Below are TERM or COLORTERM entries, which can be glob patterns, which
- # restrict following config to systems with matching environment variables.
- COLORTERM ?*
-@@ -62,7 +69,7 @@ DOOR 01;35	# door
+ # ===================================================================
+ # Terminal filters
+ # ===================================================================
+@@ -70,7 +77,7 @@ DOOR 01;35	# door
  BLK 40;33;01	# block device driver
  CHR 40;33;01	# character device driver
  ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ...
 -MISSING 00      # ... and the files they point to
 +MISSING 01;37;41 # ... and the files they point to
- SETUID 37;41	# file that is setuid (u+s)
- SETGID 30;43	# file that is setgid (g+s)
- CAPABILITY 00	# file with capability (very expensive to lookup)
+ SETUID 37;41	# regular file that is setuid (u+s)
+ SETGID 30;43	# regular file that is setgid (g+s)
+ CAPABILITY 00	# regular file with capability (very expensive to lookup)
 diff --git a/DIR_COLORS.lightbgcolor b/DIR_COLORS.lightbgcolor
-index eab6258..1627b63 100644
+index e3b0ec3..39a0a4c 100644
 --- a/DIR_COLORS.lightbgcolor
 +++ b/DIR_COLORS.lightbgcolor
 @@ -1,3 +1,9 @@
@@ -53,17 +53,17 @@ index eab6258..1627b63 100644
  # Configuration file for dircolors, a utility to help you set the
  # LS_COLORS environment variable used by GNU ls with the --color option.
  
-@@ -10,6 +16,9 @@
+@@ -11,6 +17,9 @@
  
  # Global config options can be specified before TERM or COLORTERM entries
  
 +# For compatibility, the pattern "^COLOR.*none" is recognized as a way to
 +# disable colorization.  See https://bugzilla.redhat.com/1349579 for details.
 +
- # Below are TERM or COLORTERM entries, which can be glob patterns, which
- # restrict following config to systems with matching environment variables.
- COLORTERM ?*
-@@ -52,17 +61,17 @@ TERM xterm*
+ # ===================================================================
+ # Terminal filters
+ # ===================================================================
+@@ -60,17 +69,17 @@ TERM xterm*
  #NORMAL 00	# no color code at all
  #FILE 00	# regular file: use no color at all
  RESET 0		# reset to "normal" color
@@ -83,18 +83,18 @@ index eab6258..1627b63 100644
  ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ...
 -MISSING 00      # ... and the files they point to
 +MISSING 01;37;41 # ... and the files they point to
- SETUID 37;41	# file that is setuid (u+s)
- SETGID 30;43	# file that is setgid (g+s)
- CAPABILITY 00	# file with capability (very expensive to lookup)
-@@ -71,7 +80,7 @@ OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
+ SETUID 37;41	# regular file that is setuid (u+s)
+ SETGID 30;43	# regular file that is setgid (g+s)
+ CAPABILITY 00	# regular file with capability (very expensive to lookup)
+@@ -79,7 +88,7 @@ OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
  STICKY 37;44	# dir with the sticky bit set (+t) and not other-writable
  
- # This is for files with execute permission:
+ # This is for regular files with execute permission:
 -EXEC 01;32
 +EXEC 00;32
  
- # List any file extensions like '.gz' or '.tar' that you would like ls
- # to color below. Put the extension, a space, and the color init string.
+ # ===================================================================
+ # File extension attributes
 -- 
-2.34.1
+2.49.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-df-direct.patch

@@ -1,4 +1,4 @@
-From 6e36198f10a2f63b89c89ebb5d5c185b20fb3a63 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 5b9a597..6810c15 100644
+index b420606..0ccb368 100644
 --- a/doc/coreutils.texi
 +++ b/doc/coreutils.texi
-@@ -12074,6 +12074,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 5b9a597..6810c15 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 48025b9..c8efa5b 100644
+index 75e638c..ef9f0a7 100644
 --- a/src/df.c
 +++ b/src/df.c
-@@ -125,6 +125,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 48025b9..c8efa5b 100644
  /* Grand total data.  */
  static struct fs_usage grand_fsu;
  
-@@ -252,13 +255,15 @@ enum
+@@ -248,13 +251,15 @@ enum
    NO_SYNC_OPTION = CHAR_MAX + 1,
    SYNC_OPTION,
    TOTAL_OPTION,
@@ -53,16 +53,16 @@ index 48025b9..c8efa5b 100644
  
  static struct option const long_options[] =
  {
-   {"all", no_argument, NULL, 'a'},
-   {"block-size", required_argument, NULL, 'B'},
-+  {"direct", no_argument, NULL, DIRECT_OPTION},
-   {"inodes", no_argument, NULL, 'i'},
-   {"human-readable", no_argument, NULL, 'h'},
-   {"si", no_argument, NULL, 'H'},
-@@ -583,7 +588,10 @@ get_header (void)
-   for (col = 0; col < ncolumns; col++)
+   {"all", no_argument, nullptr, 'a'},
+   {"block-size", required_argument, nullptr, 'B'},
++  {"direct", no_argument, nullptr, DIRECT_OPTION},
+   {"inodes", no_argument, nullptr, 'i'},
+   {"human-readable", no_argument, nullptr, 'h'},
+   {"si", no_argument, nullptr, 'H'},
+@@ -571,7 +576,10 @@ get_header (void)
+   for (idx_t col = 0; col < ncolumns; col++)
      {
-       char *cell = NULL;
+       char *cell;
 -      char const *header = _(columns[col]->caption);
 +      char const *header = (columns[col]->field == TARGET_FIELD
 +                            && direct_statfs)?
@@ -71,7 +71,7 @@ index 48025b9..c8efa5b 100644
  
        if (columns[col]->field == SIZE_FIELD
            && (header_mode == DEFAULT_MODE
-@@ -1486,6 +1494,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)
  {
@@ -79,17 +79,17 @@ index 48025b9..c8efa5b 100644
 +    {
 +      char *resolved = canonicalize_file_name (name);
 +      if (resolved)
-+	{
-+	  get_dev (NULL, resolved, name, NULL, NULL, false, false, NULL, false);
-+	  free (resolved);
-+	  return;
-+	}
++        {
++          get_dev (NULL, resolved, name, NULL, NULL, false, false, NULL, false);
++          free (resolved);
++          return;
++        }
 +    }
 +
    if ((S_ISBLK (statp->st_mode) || S_ISCHR (statp->st_mode))
        && get_device (name))
      return;
-@@ -1556,6 +1575,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 48025b9..c8efa5b 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);
-@@ -1646,6 +1666,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,14 +107,14 @@ index 48025b9..c8efa5b 100644
          case 'i':
            if (header_mode == OUTPUT_MODE)
              {
-@@ -1742,6 +1765,13 @@ main (int argc, char **argv)
+@@ -1706,6 +1729,13 @@ main (int argc, char **argv)
          }
      }
  
 +  if (direct_statfs && show_local_fs)
 +    {
 +      error (0, 0, _("options --direct and --local (-l) are mutually "
-+		     "exclusive"));
++                     "exclusive"));
 +      usage (EXIT_FAILURE);
 +    }
 +
@@ -183,5 +183,5 @@ index 0000000..8e4cfb8
 +
 +Exit $fail
 -- 
-2.31.1
+2.52.0
 

coreutils-getgrouplist.patch

@@ -1,94 +0,0 @@
-diff --git a/lib/getugroups.c b/lib/getugroups.c
-index 299bae6..8ece29b 100644
---- a/lib/getugroups.c
-+++ b/lib/getugroups.c
-@@ -19,6 +19,9 @@
- 
- #include <config.h>
- 
-+/* We do not need this code if getgrouplist(3) is available.  */
-+#ifndef HAVE_GETGROUPLIST
-+
- #include "getugroups.h"
- 
- #include <errno.h>
-@@ -126,3 +129,4 @@ getugroups (int maxcount, gid_t *grouplist, char const *username,
- }
- 
- #endif /* HAVE_GRP_H */
-+#endif	/* have getgrouplist */
-diff --git a/lib/mgetgroups.c b/lib/mgetgroups.c
-index 76474c2..0a9d221 100644
---- a/lib/mgetgroups.c
-+++ b/lib/mgetgroups.c
-@@ -31,6 +31,7 @@
- #endif
- 
- #include "getugroups.h"
-+#include "xalloc.h"
- #include "xalloc-oversized.h"
- 
- /* Work around an incompatibility of OS X 10.11: getgrouplist
-@@ -119,9 +120,17 @@ mgetgroups (char const *username, gid_t gid, gid_t **groups)
-   /* else no username, so fall through and use getgroups. */
- #endif
- 
--  max_n_groups = (username
--                  ? getugroups (0, NULL, username, gid)
--                  : getgroups (0, NULL));
-+  if (!username)
-+    max_n_groups = getgroups(0, NULL);
-+  else
-+  {
-+#ifdef HAVE_GETGROUPLIST
-+    max_n_groups = 0;
-+    getgrouplist (username, gid, NULL, &max_n_groups);
-+#else
-+    max_n_groups = getugroups (0, NULL, username, gid);
-+#endif
-+  }
- 
-   /* If we failed to count groups because there is no supplemental
-      group support, then return an array containing just GID.
-@@ -143,10 +152,25 @@ mgetgroups (char const *username, gid_t gid, gid_t **groups)
-   if (g == NULL)
-     return -1;
- 
--  ng = (username
--        ? getugroups (max_n_groups, g, username, gid)
--        : getgroups (max_n_groups - (gid != (gid_t) -1),
--                                g + (gid != (gid_t) -1)));
-+  if (!username)
-+    ng = getgroups (max_n_groups - (gid != (gid_t)-1), g + (gid != (gid_t)-1));
-+  else
-+  {
-+#ifdef HAVE_GETGROUPLIST
-+    int e;
-+    ng = max_n_groups;
-+    while ((e = getgrouplist (username, gid, g, &ng)) == -1
-+	&& ng > max_n_groups)
-+    {
-+      max_n_groups = ng;
-+      g = xrealloc (g, max_n_groups * sizeof (GETGROUPS_T));
-+    }
-+    if (e == -1)
-+      ng = -1;
-+#else
-+    ng = getugroups (max_n_groups, g, username, gid);
-+#endif
-+  }
- 
-   if (ng < 0)
-     {
-diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
-index 62777c7..5180243 100644
---- a/m4/jm-macros.m4
-+++ b/m4/jm-macros.m4
-@@ -68,6 +68,7 @@ AC_DEFUN([coreutils_MACROS],
-     fchown
-     fchmod
-     ftruncate
-+    getgrouplist
-     iswspace
-     mkfifo
-     mbrlen

coreutils-nfsv4-acls.patch

@@ -1,625 +0,0 @@
-From 5a6af47c3db45b6303bac4dcd6da186fd5cd178c Mon Sep 17 00:00:00 2001
-From: Ondrej Valousek <ondrej.valousek.xm@renesas.com>
-Date: Fri, 2 Dec 2022 13:40:19 +0100
-Subject: [PATCH 1/3] file-has-acl: Basic support for checking NFSv4 ACLs in
- Linux.
-
-* lib/acl-internal.h (acl_nfs4_nontrivial): New declaration.
-* lib/acl-internal.c (acl_nfs4_nontrivial): New function.
-* lib/file-has-acl.c: Include <arpa/inet.h>.
-(XATTR_NAME_NFSV4_ACL, TRIVIAL_NFS4_ACL_MAX_LENGTH): New macros.
-(file_has_acl): Test for NFSv4 ACLs.
-* doc/acl-nfsv4.txt: New file.
-
-Upstream-commit: b0604a8e134dbcc307c0ffdd5ebd3693e9de7081
-Signed-off-by: Kamil Dudka <kdudka@redhat.com>
----
- doc/acl-nfsv4.txt  |  17 ++++++++
- lib/acl-internal.c | 100 +++++++++++++++++++++++++++++++++++++++++++++
- lib/acl-internal.h |   3 ++
- lib/file-has-acl.c |  21 ++++++++++
- 4 files changed, 141 insertions(+)
- create mode 100644 doc/acl-nfsv4.txt
-
-diff --git a/doc/acl-nfsv4.txt b/doc/acl-nfsv4.txt
-new file mode 100644
-index 0000000..71352f5
---- /dev/null
-+++ b/doc/acl-nfsv4.txt
-@@ -0,0 +1,17 @@
-+General introduction:
-+   https://linux.die.net/man/5/nfs4_acl
-+
-+The NFSv4 acls are defined in RFC7530 and as such, every NFSv4 server supporting ACLs
-+will support this kind of ACLs (note the difference from POSIX draft ACLs)
-+
-+The ACLs can be obtained via the nfsv4-acl-tools, i.e.
-+
-+$ nfs4_getfacl <file>
-+
-+# file: <file>
-+A::OWNER@:rwaDxtTnNcCy
-+A::GROUP@:rwaDxtTnNcy
-+A::EVERYONE@:rwaDxtTnNcy
-+
-+Gnulib is aiming to only provide a basic support of these, i.e. recognize trivial
-+and non-trivial ACLs
-diff --git a/lib/acl-internal.c b/lib/acl-internal.c
-index be244c6..4c65dff 100644
---- a/lib/acl-internal.c
-+++ b/lib/acl-internal.c
-@@ -25,6 +25,9 @@
- 
- #if USE_ACL && HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64, Cygwin >= 2.5 */
- 
-+# include <string.h>
-+# include <arpa/inet.h>
-+
- # if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
- 
- /* ACL is an ACL, from a file, stored as type ACL_TYPE_EXTENDED.
-@@ -122,6 +125,103 @@ acl_default_nontrivial (acl_t acl)
-   return (acl_entries (acl) > 0);
- }
- 
-+#  define ACE4_WHO_OWNER    "OWNER@"
-+#  define ACE4_WHO_GROUP    "GROUP@"
-+#  define ACE4_WHO_EVERYONE "EVERYONE@"
-+
-+#  define ACE4_ACCESS_ALLOWED_ACE_TYPE   0
-+#  define ACE4_ACCESS_DENIED_ACE_TYPE    1
-+
-+/* ACE flag values */
-+#  define ACE4_IDENTIFIER_GROUP          0x00000040
-+#  define ROUNDUP(x, y)                  (((x) + (y) - 1) & - (y))
-+
-+int
-+acl_nfs4_nontrivial (char *xattr, int len)
-+{
-+  int      bufs = len;
-+  uint32_t num_aces = ntohl (*((uint32_t*)(xattr))), /* Grab the number of aces in the acl */
-+           num_a_aces = 0,
-+           num_d_aces = 0;
-+  char *bufp = xattr;
-+
-+  bufp += 4;  /* sizeof(uint32_t); */
-+  bufs -= 4;
-+
-+  for (uint32_t ace_n = 0; num_aces > ace_n ; ace_n++)
-+    {
-+      int      d_ptr;
-+      uint32_t flag,
-+               wholen,
-+               type;
-+
-+      /* Get the acl type */
-+      if (bufs <= 0)
-+        return -1;
-+
-+      type = ntohl (*((uint32_t*)bufp));
-+
-+      bufp += 4;
-+      bufs -= 4;
-+      if (bufs <= 0)
-+        return -1;
-+
-+      flag = ntohl (*((uint32_t*)bufp));
-+      /* As per RFC 7530, the flag should be 0, but we are just generous to Netapp
-+       * and also accept the Group flag
-+       */
-+      if (flag & ~ACE4_IDENTIFIER_GROUP)
-+        return 1;
-+
-+      /* we skip mask -
-+       * it's too risky to test it and it does not seem to be actually needed */
-+      bufp += 2*4;
-+      bufs -= 2*4;
-+
-+      if (bufs <= 0)
-+        return -1;
-+
-+      wholen = ntohl (*((uint32_t*)bufp));
-+
-+      bufp += 4;
-+      bufs -= 4;
-+
-+      /* Get the who string */
-+      if (bufs <= 0)
-+        return -1;
-+
-+      /* for trivial ACL, we expect max 5 (typically 3) ACES, 3 Allow, 2 deny */
-+      if (((strncmp (bufp, ACE4_WHO_OWNER, wholen) == 0)
-+          || (strncmp (bufp, ACE4_WHO_GROUP, wholen) == 0))
-+          &&  wholen == 6)
-+        {
-+          if (type == ACE4_ACCESS_ALLOWED_ACE_TYPE)
-+            num_a_aces++;
-+          if (type == ACE4_ACCESS_DENIED_ACE_TYPE)
-+            num_d_aces++;
-+        }
-+      else
-+        if ((strncmp (bufp, ACE4_WHO_EVERYONE, wholen) == 0)
-+            && (type == ACE4_ACCESS_ALLOWED_ACE_TYPE)
-+            && (wholen == 9))
-+          num_a_aces++;
-+        else
-+          return 1;
-+
-+      d_ptr = ROUNDUP (wholen, 4);
-+      bufp += d_ptr;
-+      bufs -= d_ptr;
-+
-+      /* Make sure we aren't outside our domain */
-+      if (bufs < 0)
-+        return -1;
-+
-+    }
-+  return !((num_a_aces <= 3) && (num_d_aces <= 2)
-+         && (num_a_aces + num_d_aces == num_aces));
-+
-+}
-+
- # endif
- 
- #elif USE_ACL && HAVE_FACL && defined GETACL /* Solaris, Cygwin < 2.5, not HP-UX */
-diff --git a/lib/acl-internal.h b/lib/acl-internal.h
-index 9353376..2a249ff 100644
---- a/lib/acl-internal.h
-+++ b/lib/acl-internal.h
-@@ -147,6 +147,9 @@ rpl_acl_set_fd (int fd, acl_t acl)
- #   define acl_entries rpl_acl_entries
- extern int acl_entries (acl_t);
- #  endif
-+/* Return 1 if given ACL in XDR format is non-trivial
-+ * Return 0 if it is trivial */
-+extern int acl_nfs4_nontrivial (char *, int);
- 
- #  if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
- /* ACL is an ACL, from a file, stored as type ACL_TYPE_EXTENDED.
-diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c
-index e02f062..1710234 100644
---- a/lib/file-has-acl.c
-+++ b/lib/file-has-acl.c
-@@ -32,6 +32,11 @@
- #if GETXATTR_WITH_POSIX_ACLS
- # include <sys/xattr.h>
- # include <linux/xattr.h>
-+# include <arpa/inet.h>
-+# ifndef XATTR_NAME_NFSV4_ACL
-+#  define XATTR_NAME_NFSV4_ACL "system.nfs4_acl"
-+# endif
-+# define TRIVIAL_NFS4_ACL_MAX_LENGTH 128
- #endif
- 
- /* Return 1 if NAME has a nontrivial access control list,
-@@ -67,6 +72,22 @@ file_has_acl (char const *name, struct stat const *sb)
-             return 1;
-         }
- 
-+      if (ret < 0)
-+        { /* we might be on NFS, so try to check NFSv4 ACLs too */
-+          char xattr[TRIVIAL_NFS4_ACL_MAX_LENGTH];
-+
-+          errno = 0; /* we need to reset errno set by the previous getxattr() */
-+          ret = getxattr (name, XATTR_NAME_NFSV4_ACL, xattr, TRIVIAL_NFS4_ACL_MAX_LENGTH);
-+          if (ret < 0 && errno == ENODATA)
-+            ret = 0;
-+          else
-+            if (ret < 0 && errno == ERANGE)
-+              return 1;  /* we won't fit into the buffer, so non-trivial ACL is presented */
-+            else
-+              if (ret > 0)
-+                /* looks like trivial ACL, but we need to investigate further */
-+                return acl_nfs4_nontrivial (xattr, ret);
-+        }
-       if (ret < 0)
-         return - acl_errno_valid (errno);
-       return ret;
--- 
-2.38.1
-
-
-From c5266d204a446bea619fa18da8520dceb0a54192 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Fri, 23 Dec 2022 15:18:29 -0800
-Subject: [PATCH 2/3] file-has-acl: improve recent NFSv4 support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes a link failure with emacsclient on GNU/Linux.  This
-program wants file_has_acl but none of the other ACL primitives,
-so it doesn’t link acl-internal.o; this way it doesn’t need to
-link with -lacl.  While I was at it I reviewed the recent changes,
-fixed some unlikely overflow bugs, and adjusted to GNU style.
-* doc/acl-nfsv4.txt: Remove.  Its contents are now in a
-comment in lib/file-has-acl.c.
-* lib/acl-internal.c, lib/acl-internal.h: Move recent changes
-relating to acl_nfs4_nontrivial to lib/file-has-acl.c, so that
-there is no trouble linking programs that need only file_has_acl.
-* lib/file-has-acl.c (acl_nfs4_nontrivial): Move here from
-lib/acl-internal.c, so that we needn't link -lacl in
-programs that want only file_has_acl, such as emacsclient.
-Do not assume a char buffer is aligned for uint32_t.
-Check more carefully for buffer read overrun.
-Allow up to 6 ACEs, since other code does; but check
-that they’re distinct.  Avoid integer overflow.
-Use memcmp rather than strncmp to compare memory blocks.
-(file_has_acl): Preserve initial errno instead of setting to 0.
-Allocate a bit more room for trivial ACL buffer.
-Use EINVAL for botchedk NFSv4 ACLs (which shouldn’t happen).
-
-Upstream-commit: 35bd46f0c816948dc1a0430c8ba8b10a01167320
-Signed-off-by: Kamil Dudka <kdudka@redhat.com>
----
- doc/acl-nfsv4.txt  |  17 ------
- lib/acl-internal.c | 100 -----------------------------------
- lib/acl-internal.h |   3 --
- lib/file-has-acl.c | 129 +++++++++++++++++++++++++++++++++++++++------
- 4 files changed, 113 insertions(+), 136 deletions(-)
- delete mode 100644 doc/acl-nfsv4.txt
-
-diff --git a/doc/acl-nfsv4.txt b/doc/acl-nfsv4.txt
-deleted file mode 100644
-index 71352f5..0000000
---- a/doc/acl-nfsv4.txt
-+++ /dev/null
-@@ -1,17 +0,0 @@
--General introduction:
--   https://linux.die.net/man/5/nfs4_acl
--
--The NFSv4 acls are defined in RFC7530 and as such, every NFSv4 server supporting ACLs
--will support this kind of ACLs (note the difference from POSIX draft ACLs)
--
--The ACLs can be obtained via the nfsv4-acl-tools, i.e.
--
--$ nfs4_getfacl <file>
--
--# file: <file>
--A::OWNER@:rwaDxtTnNcCy
--A::GROUP@:rwaDxtTnNcy
--A::EVERYONE@:rwaDxtTnNcy
--
--Gnulib is aiming to only provide a basic support of these, i.e. recognize trivial
--and non-trivial ACLs
-diff --git a/lib/acl-internal.c b/lib/acl-internal.c
-index 4c65dff..be244c6 100644
---- a/lib/acl-internal.c
-+++ b/lib/acl-internal.c
-@@ -25,9 +25,6 @@
- 
- #if USE_ACL && HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64, Cygwin >= 2.5 */
- 
--# include <string.h>
--# include <arpa/inet.h>
--
- # if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
- 
- /* ACL is an ACL, from a file, stored as type ACL_TYPE_EXTENDED.
-@@ -125,103 +122,6 @@ acl_default_nontrivial (acl_t acl)
-   return (acl_entries (acl) > 0);
- }
- 
--#  define ACE4_WHO_OWNER    "OWNER@"
--#  define ACE4_WHO_GROUP    "GROUP@"
--#  define ACE4_WHO_EVERYONE "EVERYONE@"
--
--#  define ACE4_ACCESS_ALLOWED_ACE_TYPE   0
--#  define ACE4_ACCESS_DENIED_ACE_TYPE    1
--
--/* ACE flag values */
--#  define ACE4_IDENTIFIER_GROUP          0x00000040
--#  define ROUNDUP(x, y)                  (((x) + (y) - 1) & - (y))
--
--int
--acl_nfs4_nontrivial (char *xattr, int len)
--{
--  int      bufs = len;
--  uint32_t num_aces = ntohl (*((uint32_t*)(xattr))), /* Grab the number of aces in the acl */
--           num_a_aces = 0,
--           num_d_aces = 0;
--  char *bufp = xattr;
--
--  bufp += 4;  /* sizeof(uint32_t); */
--  bufs -= 4;
--
--  for (uint32_t ace_n = 0; num_aces > ace_n ; ace_n++)
--    {
--      int      d_ptr;
--      uint32_t flag,
--               wholen,
--               type;
--
--      /* Get the acl type */
--      if (bufs <= 0)
--        return -1;
--
--      type = ntohl (*((uint32_t*)bufp));
--
--      bufp += 4;
--      bufs -= 4;
--      if (bufs <= 0)
--        return -1;
--
--      flag = ntohl (*((uint32_t*)bufp));
--      /* As per RFC 7530, the flag should be 0, but we are just generous to Netapp
--       * and also accept the Group flag
--       */
--      if (flag & ~ACE4_IDENTIFIER_GROUP)
--        return 1;
--
--      /* we skip mask -
--       * it's too risky to test it and it does not seem to be actually needed */
--      bufp += 2*4;
--      bufs -= 2*4;
--
--      if (bufs <= 0)
--        return -1;
--
--      wholen = ntohl (*((uint32_t*)bufp));
--
--      bufp += 4;
--      bufs -= 4;
--
--      /* Get the who string */
--      if (bufs <= 0)
--        return -1;
--
--      /* for trivial ACL, we expect max 5 (typically 3) ACES, 3 Allow, 2 deny */
--      if (((strncmp (bufp, ACE4_WHO_OWNER, wholen) == 0)
--          || (strncmp (bufp, ACE4_WHO_GROUP, wholen) == 0))
--          &&  wholen == 6)
--        {
--          if (type == ACE4_ACCESS_ALLOWED_ACE_TYPE)
--            num_a_aces++;
--          if (type == ACE4_ACCESS_DENIED_ACE_TYPE)
--            num_d_aces++;
--        }
--      else
--        if ((strncmp (bufp, ACE4_WHO_EVERYONE, wholen) == 0)
--            && (type == ACE4_ACCESS_ALLOWED_ACE_TYPE)
--            && (wholen == 9))
--          num_a_aces++;
--        else
--          return 1;
--
--      d_ptr = ROUNDUP (wholen, 4);
--      bufp += d_ptr;
--      bufs -= d_ptr;
--
--      /* Make sure we aren't outside our domain */
--      if (bufs < 0)
--        return -1;
--
--    }
--  return !((num_a_aces <= 3) && (num_d_aces <= 2)
--         && (num_a_aces + num_d_aces == num_aces));
--
--}
--
- # endif
- 
- #elif USE_ACL && HAVE_FACL && defined GETACL /* Solaris, Cygwin < 2.5, not HP-UX */
-diff --git a/lib/acl-internal.h b/lib/acl-internal.h
-index 2a249ff..9353376 100644
---- a/lib/acl-internal.h
-+++ b/lib/acl-internal.h
-@@ -147,9 +147,6 @@ rpl_acl_set_fd (int fd, acl_t acl)
- #   define acl_entries rpl_acl_entries
- extern int acl_entries (acl_t);
- #  endif
--/* Return 1 if given ACL in XDR format is non-trivial
-- * Return 0 if it is trivial */
--extern int acl_nfs4_nontrivial (char *, int);
- 
- #  if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
- /* ACL is an ACL, from a file, stored as type ACL_TYPE_EXTENDED.
-diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c
-index 1710234..676523b 100644
---- a/lib/file-has-acl.c
-+++ b/lib/file-has-acl.c
-@@ -29,14 +29,97 @@
- 
- #include "acl-internal.h"
- 
--#if GETXATTR_WITH_POSIX_ACLS
-+#if USE_ACL && GETXATTR_WITH_POSIX_ACLS
-+# include <string.h>
-+# include <arpa/inet.h>
- # include <sys/xattr.h>
- # include <linux/xattr.h>
--# include <arpa/inet.h>
- # ifndef XATTR_NAME_NFSV4_ACL
- #  define XATTR_NAME_NFSV4_ACL "system.nfs4_acl"
- # endif
--# define TRIVIAL_NFS4_ACL_MAX_LENGTH 128
-+
-+enum {
-+  /* ACE4_ACCESS_ALLOWED_ACE_TYPE = 0x00000000, */
-+  ACE4_ACCESS_DENIED_ACE_TYPE  = 0x00000001,
-+  ACE4_IDENTIFIER_GROUP        = 0x00000040
-+};
-+
-+/* Return 1 if given ACL in XDR format is non-trivial, 0 if it is trivial.
-+   -1 upon failure to determine it.  Possibly change errno.  Assume that
-+   the ACL is valid, except avoid undefined behavior even if invalid.
-+
-+   See <https://linux.die.net/man/5/nfs4_acl>.  The NFSv4 acls are
-+   defined in Internet RFC 7530 and as such, every NFSv4 server
-+   supporting ACLs should support NFSv4 ACLs (they differ from from
-+   POSIX draft ACLs).  The ACLs can be obtained via the
-+   nfsv4-acl-tools, e.g., the nfs4_getfacl command.  Gnulib provides
-+   only basic support of NFSv4 ACLs, i.e., recognize trivial vs
-+   nontrivial ACLs.  */
-+
-+static int
-+acl_nfs4_nontrivial (uint32_t *xattr, ssize_t nbytes)
-+{
-+  enum { BYTES_PER_NETWORK_UINT = 4};
-+
-+  /* Grab the number of aces in the acl.  */
-+  nbytes -= BYTES_PER_NETWORK_UINT;
-+  if (nbytes < 0)
-+    return -1;
-+  uint32_t num_aces = ntohl (*xattr++);
-+  if (6 < num_aces)
-+    return 1;
-+  int ace_found = 0;
-+
-+  for (int ace_n = 0; ace_n < num_aces; ace_n++)
-+    {
-+      /* Get the acl type and flag.  Skip the mask; it's too risky to
-+         test it and it does not seem to be needed.  Get the wholen.  */
-+      nbytes -= 4 * BYTES_PER_NETWORK_UINT;
-+      if (nbytes < 0)
-+        return -1;
-+      uint32_t type = ntohl (xattr[0]);
-+      uint32_t flag = ntohl (xattr[1]);
-+      uint32_t wholen = ntohl (xattr[3]);
-+      xattr += 4;
-+      int64_t wholen4 = wholen;
-+      wholen4 = ((wholen4 + (BYTES_PER_NETWORK_UINT))
-+                 & ~ (BYTES_PER_NETWORK_UINT - 1));
-+
-+      /* Trivial ACLs have only ACE4_ACCESS_ALLOWED_ACE_TYPE or
-+         ACE4_ACCESS_DENIED_ACE_TYPE.  */
-+      if (ACE4_ACCESS_DENIED_ACE_TYPE < type)
-+        return 1;
-+
-+      /* RFC 7530 says FLAG should be 0, but be generous to NetApp and
-+         also accept the group flag.  */
-+      if (flag & ~ACE4_IDENTIFIER_GROUP)
-+        return 1;
-+
-+      /* Get the who string.  Check NBYTES - WHOLEN4 before storing
-+         into NBYTES, to avoid truncation on conversion.  */
-+      if (nbytes - wholen4 < 0)
-+        return -1;
-+      nbytes -= wholen4;
-+
-+      /* For a trivial ACL, max 6 (typically 3) ACEs, 3 allow, 3 deny.
-+         Check that there is at most one ACE of each TYPE and WHO.  */
-+      int who2
-+        = (wholen == 6 && memcmp (xattr, "OWNER@", 6) == 0 ? 0
-+           : wholen == 6 && memcmp (xattr, "GROUP@", 6) == 0 ? 2
-+           : wholen == 9 && memcmp (xattr, "EVERYONE@", 9) == 0 ? 4
-+           : -1);
-+      if (who2 < 0)
-+        return 1;
-+      int ace_found_bit = 1 << (who2 | type);
-+      if (ace_found & ace_found_bit)
-+        return 1;
-+      ace_found |= ace_found_bit;
-+
-+      xattr = (uint32_t *) ((char *) xattr + wholen4);
-+    }
-+
-+  return 0;
-+}
- #endif
- 
- /* Return 1 if NAME has a nontrivial access control list,
-@@ -56,6 +139,7 @@ file_has_acl (char const *name, struct stat const *sb)
- # if GETXATTR_WITH_POSIX_ACLS
- 
-       ssize_t ret;
-+      int initial_errno = errno;
- 
-       ret = getxattr (name, XATTR_NAME_POSIX_ACL_ACCESS, NULL, 0);
-       if (ret < 0 && errno == ENODATA)
-@@ -73,20 +157,33 @@ file_has_acl (char const *name, struct stat const *sb)
-         }
- 
-       if (ret < 0)
--        { /* we might be on NFS, so try to check NFSv4 ACLs too */
--          char xattr[TRIVIAL_NFS4_ACL_MAX_LENGTH];
--
--          errno = 0; /* we need to reset errno set by the previous getxattr() */
--          ret = getxattr (name, XATTR_NAME_NFSV4_ACL, xattr, TRIVIAL_NFS4_ACL_MAX_LENGTH);
--          if (ret < 0 && errno == ENODATA)
--            ret = 0;
-+        {
-+          /* Check for NFSv4 ACLs.  The max length of a trivial
-+             ACL is 6 words for owner, 6 for group, 7 for everyone,
-+             all times 2 because there are both allow and deny ACEs.
-+             There are 6 words for owner because of type, flag, mask,
-+             wholen, "OWNER@"+pad and similarly for group; everyone is
-+             another word to hold "EVERYONE@".  */
-+          uint32_t xattr[2 * (6 + 6 + 7)];
-+
-+          ret = getxattr (name, XATTR_NAME_NFSV4_ACL, xattr, sizeof xattr);
-+          if (ret < 0)
-+            switch (errno)
-+              {
-+              case ENODATA: return 0;
-+              case ERANGE : return 1; /* ACL must be nontrivial.  */
-+              }
-           else
--            if (ret < 0 && errno == ERANGE)
--              return 1;  /* we won't fit into the buffer, so non-trivial ACL is presented */
--            else
--              if (ret > 0)
--                /* looks like trivial ACL, but we need to investigate further */
--                return acl_nfs4_nontrivial (xattr, ret);
-+            {
-+              /* It looks like a trivial ACL, but investigate further.  */
-+              ret = acl_nfs4_nontrivial (xattr, ret);
-+              if (ret < 0)
-+                {
-+                  errno = EINVAL;
-+                  return ret;
-+                }
-+              errno = initial_errno;
-+            }
-         }
-       if (ret < 0)
-         return - acl_errno_valid (errno);
--- 
-2.38.1
-
-
-From faf965110372c82cd99e9f44f0c64f03cdabb2c1 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Tue, 27 Dec 2022 20:00:58 -0800
-Subject: [PATCH 3/3] file-has-acl: fix recently-introduced NFSv4 bug
-
-* lib/file-has-acl.c (acl_nfs4_nontrivial): Fix off-by-one
-error when rounding WHOLEN up to next multiple of 4.
-Pacify GCC 12.2.1 -Wcast-align.
-
-Upstream-commit: d65e5a8ba77595a598c9ddb8dfa09c4aea732659
-Signed-off-by: Kamil Dudka <kdudka@redhat.com>
----
- lib/file-has-acl.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c
-index 676523b..7876edc 100644
---- a/lib/file-has-acl.c
-+++ b/lib/file-has-acl.c
-@@ -81,9 +81,10 @@ acl_nfs4_nontrivial (uint32_t *xattr, ssize_t nbytes)
-       uint32_t flag = ntohl (xattr[1]);
-       uint32_t wholen = ntohl (xattr[3]);
-       xattr += 4;
--      int64_t wholen4 = wholen;
--      wholen4 = ((wholen4 + (BYTES_PER_NETWORK_UINT))
--                 & ~ (BYTES_PER_NETWORK_UINT - 1));
-+      int whowords = (wholen / BYTES_PER_NETWORK_UINT
-+                      + (wholen % BYTES_PER_NETWORK_UINT != 0));
-+      int64_t wholen4 = whowords;
-+      wholen4 *= BYTES_PER_NETWORK_UINT;
- 
-       /* Trivial ACLs have only ACE4_ACCESS_ALLOWED_ACE_TYPE or
-          ACE4_ACCESS_DENIED_ACE_TYPE.  */
-@@ -115,7 +116,7 @@ acl_nfs4_nontrivial (uint32_t *xattr, ssize_t nbytes)
-         return 1;
-       ace_found |= ace_found_bit;
- 
--      xattr = (uint32_t *) ((char *) xattr + wholen4);
-+      xattr += whowords;
-     }
- 
-   return 0;
--- 
-2.38.1
-

coreutils-provides.inc

@@ -1,9 +0,0 @@
-Provides: bundled(gnulib)
-
-# make it possible to install the latest available Adobe Reader RPM for Linux
-Provides: /bin/cat
-Provides: /bin/chmod
-Provides: /bin/echo
-Provides: /bin/ln
-Provides: /bin/rm
-Provides: /bin/touch

coreutils-python3.patch

@@ -0,0 +1,65 @@
+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
+
+---
+ init.cfg                              | 4 ++--
+ tests/d_type-check                    | 2 +-
+ tests/du/move-dir-while-traversing.sh | 6 +++---
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/init.cfg b/init.cfg
+index ac05f7b..26d9516 100644
+--- a/init.cfg
++++ b/init.cfg
+@@ -601,10 +601,10 @@ seek_data_capable_()
+ # Skip the current test if "." lacks d_type support.
+ require_dirent_d_type_()
+ {
+-  python < /dev/null \
++  python3 < /dev/null \
+     || skip_ python missing: assuming no d_type support
+ 
+-  python "$abs_srcdir"/tests/d_type-check \
++  python3 "$abs_srcdir"/tests/d_type-check \
+     || skip_ requires d_type support
+ }
+ 
+diff --git a/tests/d_type-check b/tests/d_type-check
+index 1a2f76f..42d3924 100644
+--- a/tests/d_type-check
++++ b/tests/d_type-check
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # Exit 0 if "." and "./tempfile" have useful d_type information, else 1.
+ # 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 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
+ require_trap_signame_
+ 
+ # We use a python-inotify script, so...
+-python -m pyinotify -h > /dev/null \
+-  || skip_ 'python inotify package not installed'
++python3 -m pyinotify -h > /dev/null \
++  || skip_ 'python3 inotify package not installed'
+ 
+ # Move a directory "up" while du is processing its sub-directories.
+ # While du is processing a hierarchy .../B/C/D/... this script
+@@ -33,7 +33,7 @@ python -m pyinotify -h > /dev/null \
+ # rename syscall before du finishes processing the subtree under D/.
+ 
+ cat <<'EOF' > inotify-watch-for-dir-access.py
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ import pyinotify as pn
+ import os,sys
+ 
+-- 
+2.51.0
+

coreutils-selinux.patch

@@ -1,87 +0,0 @@
-From d70ddb3eb845c494280e7365e2b889242e7e1bb9 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Mon, 4 Oct 2021 08:45:53 +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 c97a675..89fb8ec 100644
---- a/src/cp.c
-+++ b/src/cp.c
-@@ -952,7 +952,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, NULL))
-          != -1)
-     {
-@@ -1000,6 +1000,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 c9456fe..2b1bee9 100644
---- a/src/install.c
-+++ b/src/install.c
-@@ -794,7 +794,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,
-                               NULL)) != -1)
-     {
-       switch (optc)
-@@ -855,6 +855,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)
-             {
-@@ -862,6 +865,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.31.1
-

coreutils.spec

@@ -1,8 +1,9 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
-Version: 9.1
-Release: 11%{?dist}
-License: GPLv3+
+Version: 9.9
+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/
 Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
 Source1: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
@@ -10,19 +11,12 @@ Source1: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
 # which is linked as project keyring on https://savannah.gnu.org/projects/coreutils
 Source2: coreutils-keyring.gpg
 Source50:   supported_utils
-Source51:   coreutils-provides.inc
 Source105:  coreutils-colorls.sh
 Source106:  coreutils-colorls.csh
 
 # do not make coreutils-single depend on /usr/bin/coreutils
 %global __requires_exclude ^%{_bindir}/coreutils$
 
-# Make simple backups in correct dir; broken in 9.1
-Patch1: gnulib-simple-backup-fix.patch
-
-# basic support for checking NFSv4 ACLs (#2137866)
-Patch2: coreutils-nfsv4-acls.patch
-
 # disable the test-lock gnulib test prone to deadlock
 Patch100: coreutils-8.26-test-lock.patch
 
@@ -32,18 +26,23 @@ Patch101: coreutils-8.26-selinuxenable.patch
 # downstream changes to default DIR_COLORS
 Patch102: coreutils-8.32-DIR_COLORS.patch
 
+# use python3 in tests
+Patch103: coreutils-python3.patch
+
 # df --direct
 Patch104: coreutils-df-direct.patch
 
+# gnulib C23 support
+# https://github.com/coreutils/gnulib/commit/df17f4f37ed3ca373d23ad42eae51122bdb96626
+Patch105: coreutils-9.9-gnulib-c23.patch
+
+# fix cut test failure on aarch64 rawhide (rhbz#2424302)
+# https://github.com/coreutils/coreutils/commit/95044cb5eaea83d02f768feb5ab79fcf5e6ad782
+Patch106: coreutils-9.9-fix-cut-test-aarch64.patch
+
 # (sb) lin18nux/lsb compliance - multibyte functionality patch
 Patch800: coreutils-i18n.patch
 
-# getgrouplist() patch from Ulrich Drepper.
-Patch908: coreutils-getgrouplist.patch
-
-# downstream SELinux options deprecated since 2009
-Patch950: coreutils-selinux.patch
-
 Conflicts: filesystem < 3
 
 # To avoid clobbering installs
@@ -64,25 +63,40 @@ BuildRequires: libselinux-utils
 BuildRequires: make
 BuildRequires: openssl-devel
 BuildRequires: strace
+BuildRequires: systemd-devel
 BuildRequires: texinfo
 
 # For gpg verification of source tarball
 BuildRequires: gnupg2
 
 # test-only dependencies
+BuildRequires: acl
+BuildRequires: gdb
 BuildRequires: perl-interpreter
 BuildRequires: perl(FileHandle)
+BuildRequires: python3
+BuildRequires: tzdata
+%ifarch %valgrind_arches
+BuildRequires: valgrind
+%endif
+
+%if 0%{?fedora}
+BuildRequires: perl(Expect)
+BuildRequires: python3-inotify
+%endif
+
 %if 23 < 0%{?fedora} || 7 < 0%{?rhel}
 # needed by i18n test-cases
 BuildRequires: glibc-langpack-en
 BuildRequires: glibc-langpack-fr
 BuildRequires: glibc-langpack-ko
+BuildRequires: glibc-langpack-sv
 %endif
 
 Requires: %{name}-common = %{version}-%{release}
 
 Provides: coreutils-full = %{version}-%{release}
-%include %{SOURCE51}
+Provides: bundled(gnulib)
 Obsoletes: %{name} < 8.24-100
 
 %description
@@ -94,7 +108,7 @@ Summary:  coreutils multicall binary
 Suggests: coreutils-common
 Provides: coreutils = %{version}-%{release}
 Provides: coreutils%{?_isa} = %{version}-%{release}
-%include %{SOURCE51}
+Provides: bundled(gnulib)
 # To avoid clobbering installs
 Conflicts: coreutils < 8.24-100
 # Note RPM doesn't support separate buildroots for %files
@@ -111,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
 
@@ -145,16 +162,15 @@ sed src/dircolors.hin \
 find tests -name '*.sh' -perm 0644 -print -exec chmod 0755 '{}' '+'
 (echo "<<< done") 2>/dev/null
 
+# 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/$(rpm -q --queryformat '%%{VERSION}\n' gettext-devel)/" bootstrap.conf configure.ac
+
 autoreconf -fiv
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fpic"
 
-# disable -flto on ppc64le to make test-float pass (#1789115)
-%ifarch ppc64le
-CFLAGS="$CFLAGS -fno-lto"
-%endif
-
 # Upstream suggests to build with -Dlint for static analyzers:
 # https://lists.gnu.org/archive/html/coreutils/2018-06/msg00110.html
 # ... and even for production binary RPMs:
@@ -183,6 +199,7 @@ for type in separate single; do
              --cache-file=../config.cache \
              --enable-install-program=arch \
              --enable-no-install-program=kill,uptime \
+             --enable-systemd \
              --with-tty-group \
              DEFAULT_POSIX2_VERSION=200112 alternative=199209 || :
   %make_build all V=1
@@ -209,14 +226,20 @@ for type in separate single; do
   fi
   (cd $type && make DESTDIR=$RPM_BUILD_ROOT/$subdir $install)
 
+%if "%{_sbindir}" != "%{_bindir}"
   # chroot was in /usr/sbin :
-  mkdir -p $RPM_BUILD_ROOT/$subdir/{%{_bindir},%{_sbindir}}
+  mkdir -p $RPM_BUILD_ROOT/$subdir/%_sbindir
   mv $RPM_BUILD_ROOT/$subdir/{%_bindir,%_sbindir}/chroot
+%endif
 
   # Move multicall variants to *.single.
   # RemovePathPostfixes will strip that later.
   if test $type = 'single'; then
-    for dir in %{_bindir} %{_sbindir} %{_libexecdir}/%{name}; do
+    for dir in %{_bindir} \
+%if "%{_sbindir}" != "%{_bindir}"
+%{_sbindir} \
+%endif
+%{_libexecdir}/%{name}; do
       for bin in $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/$dir/*; do
         basebin=$(basename $bin)
         mv $bin $RPM_BUILD_ROOT/$dir/$basebin.single
@@ -244,7 +267,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %files single
 %{_bindir}/*.single
+%if "%{_sbindir}" != "%{_bindir}"
 %{_sbindir}/chroot.single
+%endif
 %dir %{_libexecdir}/coreutils
 %{_libexecdir}/coreutils/*.so.single
 # duplicate the license because coreutils-common does not need to be installed
@@ -261,6 +286,125 @@ 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
+
+* Mon Jun 30 2025 Lukáš Zaoral <lzaoral@redhat.com> - 9.7-4
+- stty: add support for arbitrary baud rates (rhbz#2375439)
+
+* Wed May 28 2025 Lukáš Zaoral <lzaoral@redhat.com> - 9.7-3
+- sort: fix buffer under-read (CVE-2025-5278)
+
+* Mon May 19 2025 Lukáš Zaoral <lzaoral@redhat.com> - 9.7-2
+- cp/mv: do not fail when copying of trivial NFSv4 ACLs fails (rhbz#2363149)
+
+* Wed Apr 09 2025 Lukáš Zaoral <lzaoral@redhat.com> - 9.7-1
+- rebase to latest upstream release (rhbz#2358624)
+
+* Tue Feb 25 2025 Lukáš Zaoral <lzaoral@redhat.com> - 9.6-2
+- fix 'who -m' with guessed tty names (rhbz#2343998)
+
+* Mon Jan 20 2025 Lukáš Zaoral <lzaoral@redhat.com> - 9.6-1
+- rebase to latest upstream version (rhbz#2338620)
+- sync i18n patch with SUSE (Kudos to Berny Völker!)
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 9.5-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 9.5-12
+- Rebuilt for the bin-sbin merge (2nd attempt)
+
+* Wed Nov 13 2024 Florian Weimer <fweimer@redhat.com> - 9.5-11
+- Affinity mask handling in nproc for large CPU counts (rhbz#2325167)
+
+* Fri Sep 27 2024 Lukáš Zaoral <lzaoral@redhat.com> - 9.5-10
+- fix fold -b with UTF8 locale (RHEL-60295)
+
+* Tue Aug 27 2024 Lukáš Zaoral <lzaoral@redhat.com> - 9.5-9
+- show web sessions in who output (rhbz#2307847)
+
+* Wed Aug 21 2024 Lukáš Zaoral <lzaoral@redhat.com> - 9.5-8
+- add missing systemd-devel buildrequires
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Jul 15 2024 Lukáš Zaoral <lzaoral@redhat.com> - 9.5-6
+- Rebuilt for the bin-sbin merge
+
+* Mon Jul 15 2024 Sohum Mendon <sohum.mendon@proton.me> - 9.5-5
+- fix incorrect exit status when fold is called with a non-existent file
+
+* Tue Jul 09 2024 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 9.5-4
+- Rebuilt for the bin-sbin merge
+
+* Thu Jul 04 2024 Lukáš Zaoral <lzaoral@redhat.com> - 9.5-3
+- do not buildrequire perl(Expect) on ELN
+
+* Tue Jun 04 2024 Lukáš Zaoral <lzaoral@redhat.com> - 9.5-2
+- enable LTO on ppc64le
+
+* Tue Apr 02 2024 Lukáš Zaoral <lzaoral@redhat.com> - 9.5-1
+- rebase to latest upstream version (rhbz#2272063)
+- sync i18n patch with SUSE (Kudos to Berny Völker!)
+- add some test dependencies to execute additional part of the upstream test-suite
+
+* Mon Jan 29 2024 Lukáš Zaoral <lzaoral@redhat.com> - 9.4-6
+- fix tail on kernels with 64k page sizes (RHEL-22866)
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jan 18 2024 Lukáš Zaoral <lzaoral@redhat.com> - 9.4-3
+- fix compilation on i686
+
+* Thu Jan 18 2024 Lukáš Zaoral <lzaoral@redhat.com> - 9.4-2
+- fix buffer overflow in split (CVE-2024-0684)
+
+* Fri Sep 15 2023 Lukáš Zaoral <lzaoral@redhat.com> - 9.4-1
+- new upstream release 9.4 (#2235759)
+- enable integration with systemd
+- fix the license field
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Apr 18 2023 Kamil Dudka <kdudka@redhat.com> - 9.3-1
+- remove obsolete Provides for absolute paths
+- new upstream release 9.3
+
+* Tue Apr 11 2023 Lukáš Zaoral <lzaoral@redhat.com> - 9.2-4
+- migrate to SPDX license format
+
+* Fri Mar 24 2023 Kamil Dudka <kdudka@redhat.com> - 9.2-3
+- copy: fix --reflink=auto to fallback in more cases (#2180056)
+- cksum: fix reporting of failed checks (#2180056)
+
+* Wed Mar 22 2023 Kamil Dudka <kdudka@redhat.com> - 9.2-2
+- coreutils-getgrouplist.patch: drop a patch no longer needed
+
+* Wed Mar 22 2023 Kamil Dudka <kdudka@redhat.com> - 9.2-1
+- new upstream release 9.2
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

gnulib-simple-backup-fix.patch

@@ -1,36 +0,0 @@
-commit 7347caeb9d902d3fca2c11f69a55a3e578d93bfe
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date:   Wed Apr 20 19:34:57 2022 -0700
-
-    backupfile: fix bug when renaming simple backups
-    
-    * lib/backupfile.c (backupfile_internal): Fix bug when RENAME
-    and when doing simple backups.  Problem reported by Steve Ward in:
-    https://bugs.gnu.org/55029
-
-diff --git a/lib/backupfile.c b/lib/backupfile.c
-index 1e9290a187..d9f465a3e0 100644
---- a/lib/backupfile.c
-+++ b/lib/backupfile.c
-@@ -332,7 +332,7 @@ backupfile_internal (int dir_fd, char const *file,
-     return s;
- 
-   DIR *dirp = NULL;
--  int sdir = AT_FDCWD;
-+  int sdir = dir_fd;
-   idx_t base_max = 0;
-   while (true)
-     {
-@@ -371,10 +371,9 @@ backupfile_internal (int dir_fd, char const *file,
-       if (! rename)
-         break;
- 
--      int olddirfd = sdir < 0 ? dir_fd : sdir;
--      idx_t offset = sdir < 0 ? 0 : base_offset;
-+      idx_t offset = backup_type == simple_backups ? 0 : base_offset;
-       unsigned flags = backup_type == simple_backups ? 0 : RENAME_NOREPLACE;
--      if (renameatu (olddirfd, file + offset, sdir, s + offset, flags) == 0)
-+      if (renameatu (sdir, file + offset, sdir, s + offset, flags) == 0)
-         break;
-       int e = errno;
-       if (! (e == EEXIST && extended))

sources

@@ -1,2 +1,2 @@
-SHA512 (coreutils-9.1.tar.xz.sig) = 9f0766531afd4faa3e2c337730f61db55605cf06729e9c61f644594883732c2e0b1ddb0005b492be309c53e6f45b8ff875398163a48699d52517ea49e9bdbc91
-SHA512 (coreutils-9.1.tar.xz) = a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa
+SHA512 (coreutils-9.9.tar.xz.sig) = 0a3dfdfa6b4234e2e1d42142269f959bdf3cf8f6605a50270a27eff84dd22588f182121f7dd3eeb04be45f5109d02690215065b3d3b43882874d0e165a1435d0
+SHA512 (coreutils-9.9.tar.xz) = e7b0e59f7732d2c098ea4934014f470248bd5c4764210e9200a698010a8e3b95bbb26e543f0cd73ed5a4b8e1f8cda932c73f39954d68175e4deaa47526610c65

tests/readlink-cannot-handle-recursive-symlinks/Makefile

@@ -1,63 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/coreutils/readlink-cannot-handle-recursive-symlink s
-#   Description: Test for readlink cannot handle recursive symlinks
-#   Author: Jan Scotka <jscotka@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2010 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   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, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/coreutils/readlink-cannot-handle-recursive-symlinks
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Jan Scotka <jscotka@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Test for readlink cannot handle recursive symlinks" >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
-	@echo "RunFor:          coreutils" >> $(METADATA)
-	@echo "Requires:        coreutils" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-
-	rhts-lint $(METADATA)

tests/readlink-cannot-handle-recursive-symlinks/PURPOSE

@@ -1,54 +0,0 @@
-PURPOSE of /CoreOS/coreutils/readlink-cannot-handle-recursive-symlinks
-Description: Test for readlink cannot handle recursive symlinks
-Author: Jan Scotka <jscotka@redhat.com>
-Bug summary: readlink cannot handle recursive symlinks
-
-Description:
-
-Description of problem:
-The readlink command fails with an error "Too many levels of symbolic links", even if there are only 2 levels.
-
-The readlink command from RHEL 3 and RHEL 4 and from Fedora 11 all work fine.
-
-Among other changes between RHEL 4 and RHEL 5, RHEL 5's coreutils added calls to cycle_check() in lib/canonicalize.c, but in upstream canonicalize.c (now in gnulib instead of coreutils), we see the comment:
-          /* Detect loops.  We cannot use the cycle-check module here,
-             since it's actually possible to encounter the same symlink
-             more than once in a given traversal.  However, encountering
-             the same symlink,NAME pair twice does indicate a loop.  */
-
-http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/canonicalize.c;h=4f348398fd69ae516396313d18ac294a4ca3dde3;hb=b653eda3ac4864de205419d9f41eec267cb89eeb#l262
-
-The latest canonicalize.c uses seen_triple() instead of cycle_check().
-
-
-Version-Release number of selected component (if applicable):
-coreutils-5.97-19.el5
-
-How reproducible:
-every time
-
-Steps to Reproduce:
-1. Create a directory with a symlink to itself
-       mkdir /tmp/dir
-       cd /tmp/dir
-       ln -s ../dir dirlink
-
-2. Run readlink using the 'dirlink' symlink recursively
-       readlink -v -f dirlink
-       readlink -v -f dirlink/dirlink
-       readlink -v -f dirlink/dirlink/dirlink
-  
-Actual results:
-The first readlink command on just dirlink succeeds, but the 2nd and 3rd commands fail with 
-   readlink: dirlink/dirlink: Too many levels of symbolic links
-
-Expected results:
-$ readlink -v -f dirlink
-/tmp/dir
-$ readlink -v -f dirlink/dirlink
-/tmp/dir
-$ readlink -v -f dirlink/dirlink/dirlink
-/tmp/dir
-
-
-Additional info:

tests/readlink-cannot-handle-recursive-symlinks/runtest.sh

@@ -1,60 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/coreutils/readlink-cannot-handle-recursive-symlinks
-#   Description: Test for readlink cannot handle recursive symlinks
-#   Author: Jan Scotka <jscotka@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2010 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   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, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include rhts environment
-. /usr/bin/rhts-environment.sh
-. /usr/lib/beakerlib/beakerlib.sh
-
-PACKAGE="coreutils"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
-        rlRun "pushd $TmpDir"
-        rlRun "mkdir link" 0 "Creating test directory"
-        rlRun "cd link" 0 "cd to this dir"
-        rlRun "ln -s ../link link" 0 "creating symlink to ../link -> link"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlLog "Test of readlink up to 20 iteration"
-        export TMPVAR="link"
-        for foo in `seq 20`
-          do echo $TMPVAR
-            rlRun "readlink -v -f $TMPVAR" 0 "readlink of $TMPVAR"
-            TMPVAR="$TMPVAR/link"
-        done
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd

tests/test-basics

@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# Checks that touch ls rm and foo work
-# https://www.mankier.com/1/beakerlib#Examples
-. /usr/share/beakerlib/beakerlib.sh
-
-# Set the full test name
-TEST="/examples/beakerlib/Sanity/phases"
-
-# Package being tested
-PACKAGE="coreutils"
-
-rlJournalStart
-    # Setup phase: Prepare test directory
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun 'TmpDir=$(mktemp -d)' 0 'Creating tmp directory' # no-reboot
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    # Test phase: Testing touch, ls and rm commands
-    rlPhaseStartTest
-        rlRun "touch foo" 0 "Creating the foo test file"
-        rlAssertExists "foo"
-        rlRun "ls -l foo" 0 "Listing the foo test file"
-        rlRun "rm foo" 0 "Removing the foo test file"
-        rlAssertNotExists "foo"
-        rlRun "ls -l foo" 2 "Listing foo should now report an error"
-    rlPhaseEnd
-
-    # Cleanup phase: Remove test directory
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalEnd
-
-# Print the test report
-rlJournalPrintText

tests/test_basics.yml

@@ -1,9 +0,0 @@
----
-# This first play always runs on the local staging system
-- hosts: localhost
-  tags:
-  - atomic
-  - classic
-  - container
-  roles:
-  - { role: standard-test-beakerlib, tests: [ test-basics, readlink-cannot-handle-recursive-symlinks ] }

tests/tests.yml

@@ -1,2 +0,0 @@
-# Fedora Continuous Integration: https://fedoraproject.org/wiki/CI
-- include: test_basics.yml