From ec87f84093f49c9ed9484ca2066dbdc8ea1772cc Mon Sep 17 00:00:00 2001
From: Lukáš Zaoral <lzaoral@redhat.com>
Date: Jan 20 2025 11:26:44 +0000
Subject: rebase to latest upstream version


Resolves: rhbz#2338620

---

diff --git a/coreutils-8.32-DIR_COLORS.patch b/coreutils-8.32-DIR_COLORS.patch
index ee037bf..021d2a5 100644
--- a/coreutils-8.32-DIR_COLORS.patch
+++ b/coreutils-8.32-DIR_COLORS.patch
@@ -36,9 +36,9 @@ index b465771..ad42b09 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)
+ 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
 --- a/DIR_COLORS.lightbgcolor
@@ -83,13 +83,13 @@ 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)
+ 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)
 @@ -78,7 +87,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
  
diff --git a/coreutils-9.5-readutmp-web-session.patch b/coreutils-9.5-readutmp-web-session.patch
deleted file mode 100644
index 32a87fe..0000000
--- a/coreutils-9.5-readutmp-web-session.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 43f7f428a1665950233557bd97611bd5e996b5cb Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno@clisp.org>
-Date: Tue, 27 Aug 2024 11:46:33 +0200
-Subject: readutmp: In systemd mode, show sessions of type "web".
-
-Reported by Allison Karlitskaya <allison.karlitskaya@redhat.com> in
-<https://lists.gnu.org/archive/html/bug-gnulib/2024-08/msg00160.html>.
-
-* lib/readutmp.c (read_utmp_from_systemd): For a systemd session of type
-"web", add a single USER_PROCESS entry.
-
-Upstream-commit: 43f7f428a1665950233557bd97611bd5e996b5cb
-Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
----
- lib/readutmp.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/lib/readutmp.c b/lib/readutmp.c
-index 10d79d1..3c4f97b 100644
---- a/lib/readutmp.c
-+++ b/lib/readutmp.c
-@@ -867,6 +867,14 @@ read_utmp_from_systemd (idx_t *n_entries, STRUCT_UTMP **utmp_buf, int options)
-                       else if (pty != NULL)
-                         tty = pty;
-                     }
-+                  else if (strcmp (type, "web") == 0)
-+                    {
-+                      char *service;
-+                      if (sd_session_get_service (session, &service) < 0)
-+                        service = NULL;
-+
-+                      tty = service;
-+                    }
-                 }
- 
-               /* Create up to two USER_PROCESS entries: one for the seat,
--- 
-cgit v1.1
-
diff --git a/coreutils-9.6-ls-selinux-crash.patch b/coreutils-9.6-ls-selinux-crash.patch
new file mode 100644
index 0000000..70837cc
--- /dev/null
+++ b/coreutils-9.6-ls-selinux-crash.patch
@@ -0,0 +1,77 @@
+From 915004f403cb25fadb207ddfdbe6a2f43bd44fac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Fri, 17 Jan 2025 17:29:34 +0000
+Subject: [PATCH] ls: fix crash with --context
+
+* src/ls.c (main): Flag that we need to stat()
+if we're going to get security context (call file_has_aclinfo_cache).
+(file_has_aclinfo_cache): Be defensive and only lookup the device
+for the file if the stat has been performed.
+(has_capability_cache): Likewise.
+* tests/ls/selinux-segfault.sh: Add a test case.
+Reported by Bruno Haible.
+---
+ src/ls.c                     | 10 +++++-----
+ tests/ls/selinux-segfault.sh |  3 +++
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/src/ls.c b/src/ls.c
+index 3215360216..f67167f160 100644
+--- a/src/ls.c
++++ b/src/ls.c
+@@ -1768,7 +1768,7 @@ main (int argc, char **argv)
+ 
+   format_needs_stat = ((sort_type == sort_time) | (sort_type == sort_size)
+                        | (format == long_format)
+-                       | print_block_size | print_hyperlink);
++                       | print_block_size | print_hyperlink | print_scontext);
+   format_needs_type = ((! format_needs_stat)
+                        & (recursive | print_with_color | print_scontext
+                           | directories_first
+@@ -3309,7 +3309,7 @@ file_has_aclinfo_cache (char const *file, struct fileinfo *f,
+   static int unsupported_scontext_err;
+   static dev_t unsupported_device;
+ 
+-  if (f->stat.st_dev == unsupported_device)
++  if (f->stat_ok && f->stat.st_dev == unsupported_device)
+     {
+       ai->buf = ai->u.__gl_acl_ch;
+       ai->size = 0;
+@@ -3322,7 +3322,7 @@ file_has_aclinfo_cache (char const *file, struct fileinfo *f,
+   errno = 0;
+   int n = file_has_aclinfo (file, ai, flags);
+   int err = errno;
+-  if (n <= 0 && !acl_errno_valid (err))
++  if (f->stat_ok && n <= 0 && !acl_errno_valid (err))
+     {
+       unsupported_return = n;
+       unsupported_scontext = ai->scontext;
+@@ -3342,14 +3342,14 @@ has_capability_cache (char const *file, struct fileinfo *f)
+      found that has_capability fails indicating lack of support.  */
+   static dev_t unsupported_device;
+ 
+-  if (f->stat.st_dev == unsupported_device)
++  if (f->stat_ok && f->stat.st_dev == unsupported_device)
+     {
+       errno = ENOTSUP;
+       return 0;
+     }
+ 
+   bool b = has_capability (file);
+-  if ( !b && !acl_errno_valid (errno))
++  if (f->stat_ok && !b && !acl_errno_valid (errno))
+     unsupported_device = f->stat.st_dev;
+   return b;
+ }
+diff --git a/tests/ls/selinux-segfault.sh b/tests/ls/selinux-segfault.sh
+index 11623acb3f..1cac2b5fc0 100755
+--- a/tests/ls/selinux-segfault.sh
++++ b/tests/ls/selinux-segfault.sh
+@@ -30,4 +30,7 @@ mkdir sedir || framework_failure_
+ ln -sf missing sedir/broken || framework_failure_
+ returns_ 1 ls -L -R -Z -m sedir > out || fail=1
+ 
++# ls 9.6 would segfault with the following
++ls -Z . > out || fail=1
++
+ Exit $fail
diff --git a/coreutils-df-direct.patch b/coreutils-df-direct.patch
index f29a065..d19ec29 100644
--- a/coreutils-df-direct.patch
+++ b/coreutils-df-direct.patch
@@ -1,4 +1,4 @@
-From f072852456c545bd89296bc88cf59ccd63287a68 Mon Sep 17 00:00:00 2001
+From d179da4730f414069dd2c0ac995a32398718916c 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 8f7f43e..230f1f1 100644
+index ec58f6c..17cda80 100644
 --- a/doc/coreutils.texi
 +++ b/doc/coreutils.texi
-@@ -12427,6 +12427,13 @@ some systems (notably Solaris), doing this yields more up to date results,
+@@ -12467,6 +12467,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 8f7f43e..230f1f1 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 994f0e3..ceee209 100644
+index 5c7efd8..52ece19 100644
 --- a/src/df.c
 +++ b/src/df.c
-@@ -121,6 +121,9 @@ static bool print_type;
+@@ -122,6 +122,9 @@ static bool print_type;
  /* If true, print a grand total at the end.  */
  static bool print_grand_total;
  
@@ -42,7 +42,7 @@ index 994f0e3..ceee209 100644
  /* Grand total data.  */
  static struct fs_usage grand_fsu;
  
-@@ -247,13 +250,15 @@ enum
+@@ -249,13 +252,15 @@ enum
    NO_SYNC_OPTION = CHAR_MAX + 1,
    SYNC_OPTION,
    TOTAL_OPTION,
@@ -59,10 +59,10 @@ index 994f0e3..ceee209 100644
    {"inodes", no_argument, nullptr, 'i'},
    {"human-readable", no_argument, nullptr, 'h'},
    {"si", no_argument, nullptr, 'H'},
-@@ -574,7 +579,10 @@ get_header (void)
-   for (col = 0; col < ncolumns; col++)
+@@ -571,7 +576,10 @@ get_header (void)
+   for (idx_t col = 0; col < ncolumns; col++)
      {
-       char *cell = nullptr;
+       char *cell;
 -      char const *header = _(columns[col]->caption);
 +      char const *header = (columns[col]->field == TARGET_FIELD
 +                            && direct_statfs)?
@@ -71,7 +71,7 @@ index 994f0e3..ceee209 100644
  
        if (columns[col]->field == SIZE_FIELD
            && (header_mode == DEFAULT_MODE
-@@ -1471,6 +1479,17 @@ get_point (char const *point, const struct stat *statp)
+@@ -1452,6 +1460,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 994f0e3..ceee209 100644
    if ((S_ISBLK (statp->st_mode) || S_ISCHR (statp->st_mode))
        && get_device (name))
      return;
-@@ -1541,6 +1560,7 @@ or all file systems by default.\n\
+@@ -1522,6 +1541,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 994f0e3..ceee209 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);
-@@ -1631,6 +1651,9 @@ main (int argc, char **argv)
+@@ -1616,6 +1636,9 @@ main (int argc, char **argv)
                xstrtol_fatal (e, oi, c, long_options, optarg);
            }
            break;
@@ -107,7 +107,7 @@ index 994f0e3..ceee209 100644
          case 'i':
            if (header_mode == OUTPUT_MODE)
              {
-@@ -1727,6 +1750,13 @@ main (int argc, char **argv)
+@@ -1712,6 +1735,13 @@ main (int argc, char **argv)
          }
      }
  
@@ -183,5 +183,5 @@ index 0000000..8e4cfb8
 +
 +Exit $fail
 -- 
-2.44.0
+2.48.1
 
diff --git a/coreutils-i18n.patch b/coreutils-i18n.patch
index 92f35b5..e7699c1 100644
--- a/coreutils-i18n.patch
+++ b/coreutils-i18n.patch
@@ -1,4 +1,4 @@
-From a54e632beb3a3f1f980103deea1cf9a8bdd164ac Mon Sep 17 00:00:00 2001
+From a153c65067f6c09cf2cf38dc7c149aa1521c615a Mon Sep 17 00:00:00 2001
 From: rpm-build <rpm-build>
 Date: Wed, 30 Aug 2023 17:19:58 +0200
 Subject: [PATCH] coreutils-i18n.patch
@@ -21,20 +21,20 @@ Subject: [PATCH] coreutils-i18n.patch
  src/local.mk                |   4 +-
  src/pr.c                    | 443 ++++++++++++++++++--
  src/sort.c                  | 792 +++++++++++++++++++++++++++++++++---
- src/unexpand.c              | 102 ++++-
+ src/unexpand.c              | 101 ++++-
  tests/Coreutils.pm          |   3 +
  tests/expand/mb.sh          | 183 +++++++++
  tests/i18n/sort.sh          |  29 ++
  tests/local.mk              |   4 +
  tests/misc/expand.pl        |  42 ++
- tests/misc/fold.pl          |  50 ++-
+ tests/misc/fold.pl          |  51 ++-
  tests/misc/sort-mb-tests.sh |  45 ++
  tests/misc/unexpand.pl      |  39 ++
  tests/pr/pr-tests.pl        |  49 +++
  tests/sort/sort-merge.pl    |  42 ++
  tests/sort/sort.pl          |  40 +-
  tests/unexpand/mb.sh        | 172 ++++++++
- 30 files changed, 3604 insertions(+), 196 deletions(-)
+ 30 files changed, 3603 insertions(+), 197 deletions(-)
  create mode 100644 lib/mbchar.c
  create mode 100644 lib/mbchar.h
  create mode 100644 lib/mbfile.c
@@ -47,10 +47,10 @@ Subject: [PATCH] coreutils-i18n.patch
  create mode 100644 tests/unexpand/mb.sh
 
 diff --git a/bootstrap.conf b/bootstrap.conf
-index 126e1e8..b4ccebf 100644
+index 380fa11..ca80e6f 100644
 --- a/bootstrap.conf
 +++ b/bootstrap.conf
-@@ -163,6 +163,8 @@ gnulib_modules="
+@@ -165,6 +165,8 @@ gnulib_modules="
    maintainer-makefile
    malloc-gnu
    manywarnings
@@ -60,10 +60,10 @@ index 126e1e8..b4ccebf 100644
    mbrtoc32
    mbrtowc
 diff --git a/configure.ac b/configure.ac
-index 9cb6ee1..1131ce3 100644
+index bf6da2a..321016d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -504,6 +504,12 @@ fi
+@@ -505,6 +505,12 @@ fi
  # I'm leaving it here for now.  This whole thing needs to be modernized...
  gl_WINSIZE_IN_PTEM
  
@@ -77,12 +77,12 @@ index 9cb6ee1..1131ce3 100644
  
  if test $gl_cv_sys_tiocgwinsz_needs_termios_h = no && \
 diff --git a/lib/linebuffer.h b/lib/linebuffer.h
-index ae0d55d..5bf5350 100644
+index ca56f80..509b7e6 100644
 --- a/lib/linebuffer.h
 +++ b/lib/linebuffer.h
-@@ -22,6 +22,11 @@
- # include "idx.h"
- # include <stdio.h>
+@@ -27,6 +27,11 @@ extern "C" {
+ #endif
+ 
  
 +/* Get mbstate_t.  */
 +# if HAVE_WCHAR_H
@@ -92,7 +92,7 @@ index ae0d55d..5bf5350 100644
  /* A 'struct linebuffer' holds a line of text. */
  
  struct linebuffer
-@@ -29,6 +34,9 @@ struct linebuffer
+@@ -34,6 +39,9 @@ struct linebuffer
    idx_t size;                  /* Allocated. */
    idx_t length;                /* Used. */
    char *buffer;
@@ -849,7 +849,7 @@ index 0000000..83068a9
 +  :
 +])
 diff --git a/src/cut.c b/src/cut.c
-index 061e09c..6d10425 100644
+index b424997..c9f181c 100644
 --- a/src/cut.c
 +++ b/src/cut.c
 @@ -27,6 +27,11 @@
@@ -1509,7 +1509,7 @@ index 061e09c..6d10425 100644
  
    if (have_read_stdin && fclose (stdin) == EOF)
 diff --git a/src/expand-common.c b/src/expand-common.c
-index c95998d..d4386fe 100644
+index 2dbbbe4..91a90a3 100644
 --- a/src/expand-common.c
 +++ b/src/expand-common.c
 @@ -19,6 +19,7 @@
@@ -1518,9 +1518,9 @@ index c95998d..d4386fe 100644
  #include <sys/types.h>
 +#include <mbfile.h>
  #include "system.h"
+ #include "c-ctype.h"
  #include "fadvise.h"
- #include "quote.h"
-@@ -123,6 +124,119 @@ set_increment_size (uintmax_t tabval)
+@@ -123,6 +124,119 @@ set_increment_size (colno tabval)
    return ok;
  }
  
@@ -1641,10 +1641,10 @@ index c95998d..d4386fe 100644
     to the list of tab stops.  */
  extern void
 diff --git a/src/expand-common.h b/src/expand-common.h
-index 1a57108..6025652 100644
+index fe6c8ed..80a1280 100644
 --- a/src/expand-common.h
 +++ b/src/expand-common.h
-@@ -25,6 +25,18 @@ extern size_t max_column_width;
+@@ -29,6 +29,18 @@ extern idx_t max_column_width;
  /* The desired exit status.  */
  extern int exit_status;
  
@@ -1662,9 +1662,9 @@ index 1a57108..6025652 100644
 +
  /* Add tab stop TABVAL to the end of 'tab_list'.  */
  extern void
- add_tab_stop (uintmax_t tabval);
+ add_tab_stop (colno tabval);
 diff --git a/src/expand.c b/src/expand.c
-index a6176a9..60b1b8e 100644
+index 5ec7ce9..65ac315 100644
 --- a/src/expand.c
 +++ b/src/expand.c
 @@ -38,6 +38,9 @@
@@ -1725,7 +1725,7 @@ index a6176a9..60b1b8e 100644
  
 @@ -118,17 +143,48 @@ expand (void)
        /* Index in TAB_LIST of next tab stop to examine.  */
-       size_t tab_index = 0;
+       idx_t tab_index = 0;
  
 -
        /* Convert a line of text.  */
@@ -1775,8 +1775,8 @@ index a6176a9..60b1b8e 100644
 +              if (mb_iseq (c, '\t'))
                  {
                    /* Column the next input tab stop is on.  */
-                   uintmax_t next_tab_column;
-@@ -147,32 +203,34 @@ expand (void)
+                   bool last_tab;
+@@ -139,31 +195,33 @@ expand (void)
                      if (putchar (' ') < 0)
                        write_error ();
  
@@ -1795,14 +1795,13 @@ index a6176a9..60b1b8e 100644
 +              /* A leading control character could make us trip over.  */
 +              else if (!mb_iscntrl (c))
                  {
--                  column++;
-+                  column += mb_width (c);
-                   if (!column)
+-                  if (ckd_add (&column, column, 1))
++                  if (ckd_add (&column, column, mb_width (c)))
                      error (EXIT_FAILURE, 0, _("input line is too long"));
                  }
  
 -              convert &= convert_entire_line || !! isblank (c);
-+              convert &= convert_entire_line || mb_isblank (c);
++              convert &= convert_entire_line || !! mb_isblank (c);
              }
  
 -          if (c < 0)
@@ -1820,7 +1819,7 @@ index a6176a9..60b1b8e 100644
  }
  
 diff --git a/src/fold.c b/src/fold.c
-index 941ad11..bdc466d 100644
+index b64aad4..a156337 100644
 --- a/src/fold.c
 +++ b/src/fold.c
 @@ -23,10 +23,32 @@
@@ -1931,9 +1930,9 @@ index 941ad11..bdc466d 100644
 -  FILE *istream;
    int c;
    size_t column = 0;		/* Screen column where next char will go. */
-   size_t offset_out = 0;	/* Index in 'line_out' for next char. */
+   idx_t offset_out = 0;		/* Index in 'line_out' for next char. */
    static char *line_out = nullptr;
-   static size_t allocated_out = 0;
+   static idx_t allocated_out = 0;
 -  int saved_errno;
 -
 -  if (STREQ (filename, "-"))
@@ -1954,7 +1953,7 @@ index 941ad11..bdc466d 100644
  
 @@ -168,6 +196,15 @@ fold_file (char const *filename, size_t width)
                bool found_blank = false;
-               size_t logical_end = offset_out;
+               idx_t logical_end = offset_out;
  
 +              /* If LINE_OUT has no wide character,
 +                 put a new wide character in LINE_OUT
@@ -1968,7 +1967,7 @@ index 941ad11..bdc466d 100644
                /* Look for the last blank. */
                while (logical_end)
                  {
-@@ -214,13 +251,224 @@ fold_file (char const *filename, size_t width)
+@@ -212,13 +249,224 @@ fold_file (char const *filename, size_t width)
        line_out[offset_out++] = c;
      }
  
@@ -1979,7 +1978,7 @@ index 941ad11..bdc466d 100644
 +    *saved_errno = 0;
  
    if (offset_out)
-     fwrite (line_out, sizeof (char), (size_t) offset_out, stdout);
+     fwrite (line_out, sizeof (char), offset_out, stdout);
  
 +}
 +
@@ -1997,8 +1996,8 @@ index 941ad11..bdc466d 100644
 +  int convfail = 0;                /* 1, when conversion is failed. Otherwise 0. */
 +
 +  static char *line_out = NULL;
-+  size_t offset_out = 0;        /* Index in `line_out' for next char. */
-+  static size_t allocated_out = 0;
++  idx_t offset_out = 0;        /* Index in `line_out' for next char. */
++  static idx_t allocated_out = 0;
 +
 +  int increment;
 +  size_t column = 0;
@@ -2121,9 +2120,9 @@ index 941ad11..bdc466d 100644
 +          goto rescan;
 +        }
 +
-+      if (allocated_out < offset_out + mblength)
++      if (allocated_out - offset_out <= mblength)
 +        {
-+          line_out = X2REALLOC (line_out, &allocated_out);
++          line_out = xpalloc (line_out, &allocated_out, 1, -1, sizeof *line_out);
 +        }
 +
 +      memcpy (line_out + offset_out, bufpos, mblength);
@@ -2155,14 +2154,14 @@ index 941ad11..bdc466d 100644
 +    *saved_errno = 0;
 +
 +  if (offset_out)
-+    fwrite (line_out, sizeof (char), (size_t) offset_out, stdout);
++    fwrite (line_out, sizeof (char), offset_out, stdout);
 +
 +}
 +#endif
 +
 +/* Fold file FILENAME, or standard input if FILENAME is "-",
 +   to stdout, with maximum line length WIDTH.
-+   Return 0 if successful, 1 if an error occurs. */
++   Return true if successful. */
 +
 +static bool
 +fold_file (char const *filename, size_t width)
@@ -2173,12 +2172,12 @@ index 941ad11..bdc466d 100644
 +  if (STREQ (filename, "-"))
 +    {
 +      istream = stdin;
-+      have_read_stdin = 1;
++      have_read_stdin = true;
 +    }
 +  else
 +    istream = fopen (filename, "r");
 +
-+  if (istream == NULL)
++  if (istream == nullptr)
 +    {
 +      error (0, errno, "%s", filename);
 +      return false;
@@ -2195,7 +2194,7 @@ index 941ad11..bdc466d 100644
    if (STREQ (filename, "-"))
      clearerr (istream);
    else if (fclose (istream) != 0 && !saved_errno)
-@@ -251,7 +499,8 @@ main (int argc, char **argv)
+@@ -249,7 +497,8 @@ main (int argc, char **argv)
  
    atexit (close_stdout);
  
@@ -2205,7 +2204,7 @@ index 941ad11..bdc466d 100644
  
    while ((optc = getopt_long (argc, argv, shortopts, longopts, nullptr)) != -1)
      {
-@@ -260,7 +509,15 @@ main (int argc, char **argv)
+@@ -258,7 +507,15 @@ main (int argc, char **argv)
        switch (optc)
          {
          case 'b':		/* Count bytes rather than columns. */
@@ -2223,10 +2222,10 @@ index 941ad11..bdc466d 100644
  
          case 's':		/* Break at word boundaries. */
 diff --git a/src/local.mk b/src/local.mk
-index 96ee941..8fdb8fc 100644
+index fd9dc81..5133cc0 100644
 --- a/src/local.mk
 +++ b/src/local.mk
-@@ -450,8 +450,8 @@ src_base32_CPPFLAGS = -DBASE_TYPE=32 $(AM_CPPFLAGS)
+@@ -476,8 +476,8 @@ src_base32_CPPFLAGS = -DBASE_TYPE=32 $(AM_CPPFLAGS)
  src_basenc_SOURCES = src/basenc.c
  src_basenc_CPPFLAGS = -DBASE_TYPE=42 $(AM_CPPFLAGS)
  
@@ -2238,7 +2237,7 @@ index 96ee941..8fdb8fc 100644
  src_wc_SOURCES = src/wc.c
  if USE_AVX2_WC_LINECOUNT
 diff --git a/src/pr.c b/src/pr.c
-index 09c6fa8..7552b62 100644
+index e7081a0..19e0268 100644
 --- a/src/pr.c
 +++ b/src/pr.c
 @@ -312,6 +312,24 @@
@@ -2264,9 +2263,9 @@ index 09c6fa8..7552b62 100644
 +#endif
 +
  #include "system.h"
+ #include "c-ctype.h"
  #include "fadvise.h"
- #include "hard-locale.h"
-@@ -324,6 +342,18 @@
+@@ -325,6 +343,18 @@
  #include "xstrtol-error.h"
  #include "xdectoint.h"
  
@@ -2285,7 +2284,7 @@ index 09c6fa8..7552b62 100644
  /* The official name of this program (e.g., no 'g' prefix).  */
  #define PROGRAM_NAME "pr"
  
-@@ -416,7 +446,20 @@ struct COLUMN
+@@ -417,7 +447,20 @@ struct COLUMN
  
  typedef struct COLUMN COLUMN;
  
@@ -2307,9 +2306,9 @@ index 09c6fa8..7552b62 100644
  static bool read_line (COLUMN *p);
  static bool print_page (void);
  static bool print_stored (COLUMN *p);
-@@ -428,6 +471,7 @@ static void add_line_number (COLUMN *p);
- static void getoptnum (char const *n_str, int min, int *num,
-                        char const *errfmt);
+@@ -428,6 +471,7 @@ static void pad_across_to (int position);
+ static void add_line_number (COLUMN *p);
+ static int getoptnum (char const *n_str, int min, char const *errfmt);
  static void getoptarg (char *arg, char switch_char, char *character,
 +                       int *character_length, int *character_width,
                         int *number);
@@ -2442,7 +2441,7 @@ index 09c6fa8..7552b62 100644
            /* Could check tab width > 0. */
            tabify_output = true;
            break;
-@@ -985,8 +1068,8 @@ main (int argc, char **argv)
+@@ -986,8 +1069,8 @@ main (int argc, char **argv)
          case 'n':
            numbered_lines = true;
            if (optarg)
@@ -2453,7 +2452,7 @@ index 09c6fa8..7552b62 100644
            break;
          case 'N':
            skip_count = false;
-@@ -1011,6 +1094,7 @@ main (int argc, char **argv)
+@@ -1013,6 +1096,7 @@ main (int argc, char **argv)
            /* Reset an additional input of -s, -S dominates -s */
            col_sep_string = "";
            col_sep_length = 0;
@@ -2461,7 +2460,7 @@ index 09c6fa8..7552b62 100644
            use_col_separator = true;
            if (optarg)
              separator_string (optarg);
-@@ -1165,7 +1249,8 @@ getoptnum (char const *n_str, int min, int *num, char const *err)
+@@ -1168,7 +1252,8 @@ getoptnum (char const *n_str, int min, char const *err)
     a number. */
  
  static void
@@ -2471,10 +2470,10 @@ index 09c6fa8..7552b62 100644
  {
    if (!*arg)
      {
-@@ -1174,7 +1259,41 @@ getoptarg (char *arg, char switch_char, char *character, int *number)
+@@ -1177,7 +1262,41 @@ getoptarg (char *arg, char switch_char, char *character, int *number)
      }
  
-   if (!ISDIGIT (*arg))
+   if (!c_isdigit (*arg))
 -    *character = *arg++;
 +    {
 +#ifdef HAVE_MBRTOWC
@@ -2514,7 +2513,7 @@ index 09c6fa8..7552b62 100644
    if (*arg)
      {
        long int tmp_long;
-@@ -1203,6 +1322,11 @@ static void
+@@ -1206,6 +1325,11 @@ static void
  init_parameters (int number_of_files)
  {
    int chars_used_by_number = 0;
@@ -2526,7 +2525,7 @@ index 09c6fa8..7552b62 100644
  
    lines_per_body = lines_per_page - lines_per_header - lines_per_footer;
    if (lines_per_body <= 0)
-@@ -1240,7 +1364,7 @@ init_parameters (int number_of_files)
+@@ -1243,7 +1367,7 @@ init_parameters (int number_of_files)
            else
              col_sep_string = column_separator;
  
@@ -2535,7 +2534,7 @@ index 09c6fa8..7552b62 100644
            use_col_separator = true;
          }
        /* It's rather pointless to define a TAB separator with column
-@@ -1272,11 +1396,11 @@ init_parameters (int number_of_files)
+@@ -1275,11 +1399,11 @@ init_parameters (int number_of_files)
               + TAB_WIDTH (chars_per_input_tab, chars_per_number);   */
  
        /* Estimate chars_per_text without any margin and keep it constant. */
@@ -2549,7 +2548,7 @@ index 09c6fa8..7552b62 100644
  
        /* The number is part of the column width unless we are
           printing files in parallel. */
-@@ -1285,7 +1409,7 @@ init_parameters (int number_of_files)
+@@ -1288,7 +1412,7 @@ init_parameters (int number_of_files)
      }
  
    int sep_chars, useful_chars;
@@ -2558,7 +2557,7 @@ index 09c6fa8..7552b62 100644
      sep_chars = INT_MAX;
    if (ckd_sub (&useful_chars, chars_per_line - chars_used_by_number,
                 sep_chars))
-@@ -1308,7 +1432,7 @@ init_parameters (int number_of_files)
+@@ -1311,7 +1435,7 @@ init_parameters (int number_of_files)
       We've to use 8 as the lower limit, if we use chars_per_default_tab = 8
       to expand a tab which is not an input_tab-char. */
    free (clump_buff);
@@ -2567,7 +2566,7 @@ index 09c6fa8..7552b62 100644
  }
  
  /* Open the necessary files,
-@@ -1414,7 +1538,7 @@ init_funcs (void)
+@@ -1417,7 +1541,7 @@ init_funcs (void)
  
    /* Enlarge p->start_position of first column to use the same form of
       padding_not_printed with all columns. */
@@ -2576,7 +2575,7 @@ index 09c6fa8..7552b62 100644
  
    /* This loop takes care of all but the rightmost column. */
  
-@@ -1448,7 +1572,7 @@ init_funcs (void)
+@@ -1451,7 +1575,7 @@ init_funcs (void)
          }
        else
          {
@@ -2585,7 +2584,7 @@ index 09c6fa8..7552b62 100644
            h_next = h + chars_per_column;
          }
      }
-@@ -1745,9 +1869,9 @@ static void
+@@ -1748,9 +1872,9 @@ static void
  align_column (COLUMN *p)
  {
    padding_not_printed = p->start_position;
@@ -2597,9 +2596,9 @@ index 09c6fa8..7552b62 100644
        padding_not_printed = ANYWHERE;
      }
  
-@@ -2021,13 +2145,13 @@ store_char (char c)
+@@ -2024,13 +2148,13 @@ store_char (char c)
        /* May be too generous. */
-       buff = X2REALLOC (buff, &buff_allocated);
+       buff = xpalloc (buff, &buff_allocated, 1, -1, sizeof *buff);
      }
 -  buff[buff_current++] = c;
 +  buff[buff_current++] = (unsigned char) c;
@@ -2613,7 +2612,7 @@ index 09c6fa8..7552b62 100644
    char *s;
    int num_width;
  
-@@ -2044,22 +2168,24 @@ add_line_number (COLUMN *p)
+@@ -2047,22 +2171,24 @@ add_line_number (COLUMN *p)
        /* Tabification is assumed for multiple columns, also for n-separators,
           but 'default n-separator = TAB' hasn't been given priority over
           equal column_width also specified by POSIX. */
@@ -2642,7 +2641,7 @@ index 09c6fa8..7552b62 100644
          output_position = POS_AFTER_TAB (chars_per_output_tab,
                            output_position);
      }
-@@ -2218,7 +2344,7 @@ print_white_space (void)
+@@ -2221,7 +2347,7 @@ print_white_space (void)
    while (goal - h_old > 1
           && (h_new = POS_AFTER_TAB (chars_per_output_tab, h_old)) <= goal)
      {
@@ -2651,7 +2650,7 @@ index 09c6fa8..7552b62 100644
        h_old = h_new;
      }
    while (++h_old <= goal)
-@@ -2238,6 +2364,7 @@ print_sep_string (void)
+@@ -2241,6 +2367,7 @@ print_sep_string (void)
  {
    char const *s = col_sep_string;
    int l = col_sep_length;
@@ -2659,7 +2658,7 @@ index 09c6fa8..7552b62 100644
  
    if (separators_not_printed <= 0)
      {
-@@ -2249,6 +2376,7 @@ print_sep_string (void)
+@@ -2252,6 +2379,7 @@ print_sep_string (void)
      {
        for (; separators_not_printed > 0; --separators_not_printed)
          {
@@ -2667,7 +2666,7 @@ index 09c6fa8..7552b62 100644
            while (l-- > 0)
              {
                /* 3 types of sep_strings: spaces only, spaces and chars,
-@@ -2262,12 +2390,15 @@ print_sep_string (void)
+@@ -2265,12 +2393,15 @@ print_sep_string (void)
                  }
                else
                  {
@@ -2684,7 +2683,7 @@ index 09c6fa8..7552b62 100644
            /* sep_string ends with some spaces */
            if (spaces_not_printed > 0)
              print_white_space ();
-@@ -2295,7 +2426,7 @@ print_clump (COLUMN *p, int n, char *clump)
+@@ -2298,7 +2429,7 @@ print_clump (COLUMN *p, int n, char *clump)
     required number of tabs and spaces. */
  
  static void
@@ -2693,7 +2692,7 @@ index 09c6fa8..7552b62 100644
  {
    if (tabify_output)
      {
-@@ -2319,6 +2450,74 @@ print_char (char c)
+@@ -2322,6 +2453,74 @@ print_char (char c)
    putchar (c);
  }
  
@@ -2768,7 +2767,7 @@ index 09c6fa8..7552b62 100644
  /* Skip to page PAGE before printing.
     PAGE may be larger than total number of pages. */
  
-@@ -2495,9 +2694,9 @@ read_line (COLUMN *p)
+@@ -2498,9 +2697,9 @@ read_line (COLUMN *p)
            align_empty_cols = false;
          }
  
@@ -2780,7 +2779,7 @@ index 09c6fa8..7552b62 100644
            padding_not_printed = ANYWHERE;
          }
  
-@@ -2566,7 +2765,7 @@ print_stored (COLUMN *p)
+@@ -2569,7 +2768,7 @@ print_stored (COLUMN *p)
    COLUMN *q;
  
    int line = p->current_line++;
@@ -2789,7 +2788,7 @@ index 09c6fa8..7552b62 100644
    /* FIXME
       UMR: Uninitialized memory read:
       * This is occurring while in:
-@@ -2578,7 +2777,7 @@ print_stored (COLUMN *p)
+@@ -2581,7 +2780,7 @@ print_stored (COLUMN *p)
       xmalloc        [xmalloc.c:94]
       init_store_cols [pr.c:1648]
       */
@@ -2798,7 +2797,7 @@ index 09c6fa8..7552b62 100644
  
    pad_vertically = true;
  
-@@ -2598,9 +2797,9 @@ print_stored (COLUMN *p)
+@@ -2601,9 +2800,9 @@ print_stored (COLUMN *p)
          }
      }
  
@@ -2810,7 +2809,7 @@ index 09c6fa8..7552b62 100644
        padding_not_printed = ANYWHERE;
      }
  
-@@ -2613,8 +2812,8 @@ print_stored (COLUMN *p)
+@@ -2616,8 +2815,8 @@ print_stored (COLUMN *p)
    if (spaces_not_printed == 0)
      {
        output_position = p->start_position + end_vector[line];
@@ -2821,7 +2820,7 @@ index 09c6fa8..7552b62 100644
      }
  
    return true;
-@@ -2633,7 +2832,7 @@ print_stored (COLUMN *p)
+@@ -2636,7 +2835,7 @@ print_stored (COLUMN *p)
     number of characters is 1.) */
  
  static int
@@ -2830,7 +2829,7 @@ index 09c6fa8..7552b62 100644
  {
    unsigned char uc = c;
    char *s = clump_buff;
-@@ -2643,10 +2842,10 @@ char_to_clump (char c)
+@@ -2646,10 +2845,10 @@ char_to_clump (char c)
    int chars;
    int chars_per_c = 8;
  
@@ -2843,7 +2842,7 @@ index 09c6fa8..7552b62 100644
      {
        width = TAB_WIDTH (chars_per_c, input_position);
  
-@@ -2727,6 +2926,164 @@ char_to_clump (char c)
+@@ -2730,6 +2929,164 @@ char_to_clump (char c)
    return chars;
  }
  
@@ -3009,7 +3008,7 @@ index 09c6fa8..7552b62 100644
     looking for more options and printing the next batch of files.
  
 diff --git a/src/sort.c b/src/sort.c
-index 2d8324c..46331b8 100644
+index 0928fd5..8c43fd4 100644
 --- a/src/sort.c
 +++ b/src/sort.c
 @@ -29,6 +29,14 @@
@@ -3027,7 +3026,7 @@ index 2d8324c..46331b8 100644
  #include "system.h"
  #include "argmatch.h"
  #include "assure.h"
-@@ -157,14 +165,39 @@ static int thousands_sep;
+@@ -158,14 +166,39 @@ static int thousands_sep;
  /* We currently ignore multi-byte grouping chars.  */
  static bool thousands_sep_ignored;
  
@@ -3068,7 +3067,7 @@ index 2d8324c..46331b8 100644
  /* The kind of blanks for '-b' to skip in various options. */
  enum blanktype { bl_start, bl_end, bl_both };
  
-@@ -341,13 +374,11 @@ static bool stable;
+@@ -342,13 +375,11 @@ static bool stable;
  /* An int value outside char range.  */
  enum { NON_CHAR = CHAR_MAX + 1 };
  
@@ -3085,7 +3084,7 @@ index 2d8324c..46331b8 100644
  
  /* Flag to remove consecutive duplicate lines from the output.
     Only the last of a sequence of equal lines will be output. */
-@@ -804,6 +835,46 @@ reap_all (void)
+@@ -807,6 +838,46 @@ reap_all (void)
      reap (-1);
  }
  
@@ -3132,7 +3131,7 @@ index 2d8324c..46331b8 100644
  /* Clean up any remaining temporary files.  */
  
  static void
-@@ -1271,7 +1342,7 @@ zaptemp (char const *name)
+@@ -1274,7 +1345,7 @@ zaptemp (char const *name)
    free (node);
  }
  
@@ -3141,7 +3140,7 @@ index 2d8324c..46331b8 100644
  
  static int
  struct_month_cmp (void const *m1, void const *m2)
-@@ -1286,7 +1357,7 @@ struct_month_cmp (void const *m1, void const *m2)
+@@ -1289,7 +1360,7 @@ struct_month_cmp (void const *m1, void const *m2)
  /* Initialize the character class tables. */
  
  static void
@@ -3150,7 +3149,7 @@ index 2d8324c..46331b8 100644
  {
    size_t i;
  
-@@ -1298,7 +1369,7 @@ inittables (void)
+@@ -1301,7 +1372,7 @@ inittables (void)
        fold_toupper[i] = toupper (i);
      }
  
@@ -3159,7 +3158,7 @@ index 2d8324c..46331b8 100644
    /* If we're not in the "C" locale, read different names for months.  */
    if (hard_LC_TIME)
      {
-@@ -1380,6 +1451,84 @@ specify_nmerge (int oi, char c, char const *s)
+@@ -1381,6 +1452,84 @@ specify_nmerge (int oi, char c, char const *s)
      xstrtol_fatal (e, oi, c, long_options, s);
  }
  
@@ -3244,7 +3243,7 @@ index 2d8324c..46331b8 100644
  /* Specify the amount of main memory to use when sorting.  */
  static void
  specify_sort_size (int oi, char c, char const *s)
-@@ -1611,7 +1760,7 @@ buffer_linelim (struct buffer const *buf)
+@@ -1612,7 +1761,7 @@ buffer_linelim (struct buffer const *buf)
     by KEY in LINE. */
  
  static char *
@@ -3253,7 +3252,7 @@ index 2d8324c..46331b8 100644
  {
    char *ptr = line->text, *lim = ptr + line->length - 1;
    size_t sword = key->sword;
-@@ -1620,10 +1769,10 @@ begfield (struct line const *line, struct keyfield const *key)
+@@ -1621,10 +1770,10 @@ begfield (struct line const *line, struct keyfield const *key)
    /* The leading field separator itself is included in a field when -t
       is absent.  */
  
@@ -3266,7 +3265,7 @@ index 2d8324c..46331b8 100644
            ++ptr;
          if (ptr < lim)
            ++ptr;
-@@ -1649,12 +1798,71 @@ begfield (struct line const *line, struct keyfield const *key)
+@@ -1650,12 +1799,71 @@ begfield (struct line const *line, struct keyfield const *key)
    return ptr;
  }
  
@@ -3339,7 +3338,7 @@ index 2d8324c..46331b8 100644
  {
    char *ptr = line->text, *lim = ptr + line->length - 1;
    size_t eword = key->eword, echar = key->echar;
-@@ -1669,10 +1877,10 @@ limfield (struct line const *line, struct keyfield const *key)
+@@ -1670,10 +1878,10 @@ limfield (struct line const *line, struct keyfield const *key)
       'beginning' is the first character following the delimiting TAB.
       Otherwise, leave PTR pointing at the first 'blank' character after
       the preceding field.  */
@@ -3352,7 +3351,7 @@ index 2d8324c..46331b8 100644
            ++ptr;
          if (ptr < lim && (eword || echar))
            ++ptr;
-@@ -1718,10 +1926,10 @@ limfield (struct line const *line, struct keyfield const *key)
+@@ -1719,10 +1927,10 @@ limfield (struct line const *line, struct keyfield const *key)
       */
  
    /* Make LIM point to the end of (one byte past) the current field.  */
@@ -3365,7 +3364,7 @@ index 2d8324c..46331b8 100644
        if (newlim)
          lim = newlim;
      }
-@@ -1752,6 +1960,130 @@ limfield (struct line const *line, struct keyfield const *key)
+@@ -1753,6 +1961,130 @@ limfield (struct line const *line, struct keyfield const *key)
    return ptr;
  }
  
@@ -3496,7 +3495,7 @@ index 2d8324c..46331b8 100644
  /* Fill BUF reading from FP, moving buf->left bytes from the end
     of buf->buf to the beginning first.  If EOF is reached and the
     file wasn't terminated by a newline, supply one.  Set up BUF's line
-@@ -1838,8 +2170,22 @@ fillbuf (struct buffer *buf, FILE *fp, char const *file)
+@@ -1839,8 +2171,22 @@ fillbuf (struct buffer *buf, FILE *fp, char const *file)
                    else
                      {
                        if (key->skipsblanks)
@@ -3521,7 +3520,7 @@ index 2d8324c..46331b8 100644
                        line->keybeg = line_start;
                      }
                  }
-@@ -1977,12 +2323,10 @@ find_unit_order (char const *number)
+@@ -1978,12 +2324,10 @@ find_unit_order (char const *number)
  
  ATTRIBUTE_PURE
  static int
@@ -3537,7 +3536,7 @@ index 2d8324c..46331b8 100644
  
    int diff = find_unit_order (a) - find_unit_order (b);
    return (diff ? diff : strnumcmp (a, b, decimal_point, thousands_sep));
-@@ -1994,7 +2338,7 @@ human_numcompare (char const *a, char const *b)
+@@ -1995,7 +2339,7 @@ human_numcompare (char const *a, char const *b)
  
  ATTRIBUTE_PURE
  static int
@@ -3546,7 +3545,7 @@ index 2d8324c..46331b8 100644
  {
    while (blanks[to_uchar (*a)])
      a++;
-@@ -2004,6 +2348,25 @@ numcompare (char const *a, char const *b)
+@@ -2005,6 +2349,25 @@ numcompare (char const *a, char const *b)
    return strnumcmp (a, b, decimal_point, thousands_sep);
  }
  
@@ -3572,7 +3571,7 @@ index 2d8324c..46331b8 100644
  static int
  nan_compare (long double a, long double b)
  {
-@@ -2045,7 +2408,7 @@ general_numcompare (char const *sa, char const *sb)
+@@ -2046,7 +2409,7 @@ general_numcompare (char const *sa, char const *sb)
     Return 0 if the name in S is not recognized.  */
  
  static int
@@ -3581,7 +3580,7 @@ index 2d8324c..46331b8 100644
  {
    size_t lo = 0;
    size_t hi = MONTHS_PER_YEAR;
-@@ -2372,15 +2735,14 @@ debug_key (struct line const *line, struct keyfield const *key)
+@@ -2385,15 +2748,14 @@ debug_key (struct line const *line, struct keyfield const *key)
            char saved = *lim;
            *lim = '\0';
  
@@ -3599,7 +3598,7 @@ index 2d8324c..46331b8 100644
            else if (key->general_numeric)
              ignore_value (strtold (beg, &tighter_lim));
            else if (key->numeric || key->human_numeric)
-@@ -2526,7 +2888,7 @@ key_warnings (struct keyfield const *gkey, bool gkey_only)
+@@ -2539,7 +2901,7 @@ key_warnings (struct keyfield const *gkey, bool gkey_only)
        /* Warn about significant leading blanks.  */
        bool implicit_skip = key_numeric (key) || key->month;
        bool line_offset = key->eword == 0 && key->echar != 0; /* -k1.x,1.y  */
@@ -3608,7 +3607,7 @@ index 2d8324c..46331b8 100644
            && ((!key->skipsblanks && !implicit_skip)
                || (!key->skipsblanks && key->schar)
                || (!key->skipeblanks && key->echar)))
-@@ -2574,9 +2936,9 @@ key_warnings (struct keyfield const *gkey, bool gkey_only)
+@@ -2587,9 +2949,9 @@ key_warnings (struct keyfield const *gkey, bool gkey_only)
    bool number_locale_warned = false;
    if (basic_numeric_field_span)
      {
@@ -3621,7 +3620,7 @@ index 2d8324c..46331b8 100644
          {
            error (0, 0,
                   _("field separator %s is treated as a "
-@@ -2587,9 +2949,9 @@ key_warnings (struct keyfield const *gkey, bool gkey_only)
+@@ -2600,9 +2962,9 @@ key_warnings (struct keyfield const *gkey, bool gkey_only)
      }
    if (basic_numeric_field_span || general_numeric_field_span)
      {
@@ -3634,7 +3633,7 @@ index 2d8324c..46331b8 100644
          {
            error (0, 0,
                   _("field separator %s is treated as a "
-@@ -2597,19 +2959,19 @@ key_warnings (struct keyfield const *gkey, bool gkey_only)
+@@ -2610,19 +2972,19 @@ key_warnings (struct keyfield const *gkey, bool gkey_only)
                   quote (((char []) {decimal_point, 0})));
            number_locale_warned = true;
          }
@@ -3658,7 +3657,7 @@ index 2d8324c..46331b8 100644
          }
      }
  
-@@ -2620,7 +2982,7 @@ key_warnings (struct keyfield const *gkey, bool gkey_only)
+@@ -2633,7 +2995,7 @@ key_warnings (struct keyfield const *gkey, bool gkey_only)
      {
        error (0, 0,
               _("%snumbers use %s as a decimal point in this locale"),
@@ -3667,7 +3666,7 @@ index 2d8324c..46331b8 100644
               quote (((char []) {decimal_point, 0})));
  
      }
-@@ -2662,11 +3024,87 @@ diff_reversed (int diff, bool reversed)
+@@ -2675,11 +3037,87 @@ diff_reversed (int diff, bool reversed)
    return reversed ? (diff < 0) - (diff > 0) : diff;
  }
  
@@ -3756,7 +3755,7 @@ index 2d8324c..46331b8 100644
  {
    struct keyfield *key = keylist;
  
-@@ -2747,7 +3185,7 @@ keycompare (struct line const *a, struct line const *b)
+@@ -2760,7 +3198,7 @@ keycompare (struct line const *a, struct line const *b)
            else if (key->human_numeric)
              diff = human_numcompare (ta, tb);
            else if (key->month)
@@ -3765,7 +3764,7 @@ index 2d8324c..46331b8 100644
            else if (key->random)
              diff = compare_random (ta, tlena, tb, tlenb);
            else if (key->version)
-@@ -2857,6 +3295,211 @@ keycompare (struct line const *a, struct line const *b)
+@@ -2870,6 +3308,211 @@ keycompare (struct line const *a, struct line const *b)
    return diff_reversed (diff, key->reverse);
  }
  
@@ -3977,7 +3976,7 @@ index 2d8324c..46331b8 100644
  /* Compare two lines A and B, returning negative, zero, or positive
     depending on whether A compares less than, equal to, or greater than B. */
  
-@@ -2884,7 +3527,7 @@ compare (struct line const *a, struct line const *b)
+@@ -2897,7 +3540,7 @@ compare (struct line const *a, struct line const *b)
      diff = - NONZERO (blen);
    else if (blen == 0)
      diff = 1;
@@ -3986,7 +3985,7 @@ index 2d8324c..46331b8 100644
      {
        /* xmemcoll0 is a performance enhancement as
           it will not unconditionally write '\0' after the
-@@ -4272,6 +4915,7 @@ set_ordering (char const *s, struct keyfield *key, enum blanktype blanktype)
+@@ -4285,6 +4928,7 @@ set_ordering (char const *s, struct keyfield *key, enum blanktype blanktype)
            break;
          case 'f':
            key->translate = fold_toupper;
@@ -3994,7 +3993,7 @@ index 2d8324c..46331b8 100644
            break;
          case 'g':
            key->general_numeric = true;
-@@ -4351,7 +4995,7 @@ main (int argc, char **argv)
+@@ -4364,7 +5008,7 @@ main (int argc, char **argv)
    initialize_exit_failure (SORT_FAILURE);
  
    hard_LC_COLLATE = hard_locale (LC_COLLATE);
@@ -4003,7 +4002,7 @@ index 2d8324c..46331b8 100644
    hard_LC_TIME = hard_locale (LC_TIME);
  #endif
  
-@@ -4374,6 +5018,29 @@ main (int argc, char **argv)
+@@ -4387,6 +5031,29 @@ main (int argc, char **argv)
        thousands_sep = NON_CHAR;
    }
  
@@ -4033,7 +4032,7 @@ index 2d8324c..46331b8 100644
    have_read_stdin = false;
    inittables ();
  
-@@ -4644,13 +5311,34 @@ main (int argc, char **argv)
+@@ -4657,13 +5324,34 @@ main (int argc, char **argv)
  
          case 't':
            {
@@ -4072,7 +4071,7 @@ index 2d8324c..46331b8 100644
                  else
                    {
                      /* Provoke with 'sort -txx'.  Complain about
-@@ -4661,9 +5349,11 @@ main (int argc, char **argv)
+@@ -4674,9 +5362,11 @@ main (int argc, char **argv)
                             quote (optarg));
                    }
                }
@@ -4087,7 +4086,7 @@ index 2d8324c..46331b8 100644
            break;
  
 diff --git a/src/unexpand.c b/src/unexpand.c
-index aca67dd..f79c808 100644
+index ff234d7..7c36ef6 100644
 --- a/src/unexpand.c
 +++ b/src/unexpand.c
 @@ -39,6 +39,9 @@
@@ -4100,7 +4099,7 @@ index aca67dd..f79c808 100644
  #include "system.h"
  #include "expand-common.h"
  
-@@ -105,24 +108,47 @@ unexpand (void)
+@@ -105,24 +108,46 @@ unexpand (void)
  {
    /* Input stream.  */
    FILE *fp = next_file (nullptr);
@@ -4120,28 +4119,27 @@ index aca67dd..f79c808 100644
  
    if (!fp)
      return;
+ 
 +  mbf_init (mbf, fp);
 +  found_bom=check_bom(fp,&mbf);
 +
 +  if (using_utf_locale == false && found_bom == true)
-+  {
-+    /*try using some predefined locale */
- 
-+    if (set_utf_locale () != 0)
 +    {
-+      error (EXIT_FAILURE, errno, _("cannot set UTF-8 locale"));
++      /* Try using some predefined locale */
++      if (set_utf_locale () != 0)
++        {
++          error (EXIT_FAILURE, errno, _("cannot set UTF-8 locale"));
++        }
 +    }
-+  }
++
    /* The worst case is a non-blank character, then one blank, then a
       tab stop, then MAX_COLUMN_WIDTH - 1 blanks, then a non-blank; so
       allocate MAX_COLUMN_WIDTH bytes to store the blanks.  */
--  pending_blank = xmalloc (max_column_width);
-+  pending_blank = xmalloc (max_column_width * sizeof (mbf_char_t));
+-  pending_blank = ximalloc (max_column_width);
++  pending_blank = ximalloc (max_column_width * sizeof (mbf_char_t));
 +
 +  if (found_bom == true)
-+  {
 +    print_bom();
-+  }
  
    while (true)
      {
@@ -4151,7 +4149,7 @@ index aca67dd..f79c808 100644
  
        /* If true, perform translations.  */
        bool convert = true;
-@@ -156,12 +182,44 @@ unexpand (void)
+@@ -156,12 +181,44 @@ unexpand (void)
  
        do
          {
@@ -4199,10 +4197,10 @@ index aca67dd..f79c808 100644
  
                if (blank)
                  {
-@@ -178,16 +236,16 @@ unexpand (void)
-                       if (next_tab_column < column)
-                         error (EXIT_FAILURE, 0, _("input line is too long"));
+@@ -175,16 +232,16 @@ unexpand (void)
  
+                   if (convert)
+                     {
 -                      if (c == '\t')
 +                      if (mb_iseq (c, '\t'))
                          {
@@ -4219,7 +4217,7 @@ index aca67dd..f79c808 100644
  
                            if (! (prev_blank && column == next_tab_column))
                              {
-@@ -195,13 +253,14 @@ unexpand (void)
+@@ -192,13 +249,14 @@ unexpand (void)
                                   will be replaced by tabs.  */
                                if (column == next_tab_column)
                                  one_blank_before_tab_stop = true;
@@ -4236,7 +4234,7 @@ index aca67dd..f79c808 100644
                          }
  
                        /* Discard pending blanks, unless it was a single
-@@ -209,7 +268,7 @@ unexpand (void)
+@@ -206,7 +264,7 @@ unexpand (void)
                        pending = one_blank_before_tab_stop;
                      }
                  }
@@ -4245,7 +4243,7 @@ index aca67dd..f79c808 100644
                  {
                    /* Go back one column, and force recalculation of the
                       next tab stop.  */
-@@ -219,16 +278,20 @@ unexpand (void)
+@@ -216,16 +274,20 @@ unexpand (void)
                  }
                else
                  {
@@ -4270,7 +4268,7 @@ index aca67dd..f79c808 100644
                      write_error ();
                    pending = 0;
                    one_blank_before_tab_stop = false;
-@@ -238,16 +301,17 @@ unexpand (void)
+@@ -235,16 +297,17 @@ unexpand (void)
                convert &= convert_entire_line || blank;
              }
  
@@ -4292,7 +4290,7 @@ index aca67dd..f79c808 100644
  }
  
 diff --git a/tests/Coreutils.pm b/tests/Coreutils.pm
-index 18e7bea..24a141b 100644
+index b55fb9d..ac80f49 100644
 --- a/tests/Coreutils.pm
 +++ b/tests/Coreutils.pm
 @@ -269,6 +269,9 @@ sub run_tests ($$$$$)
@@ -4530,10 +4528,10 @@ index 0000000..26c95de
 +
 +Exit $fail
 diff --git a/tests/local.mk b/tests/local.mk
-index fdbf369..a6ce49c 100644
+index 12e30b4..1529db6 100644
 --- a/tests/local.mk
 +++ b/tests/local.mk
-@@ -387,6 +387,8 @@ all_tests =					\
+@@ -390,6 +390,8 @@ all_tests =					\
    tests/sort/sort-discrim.sh			\
    tests/sort/sort-files0-from.pl		\
    tests/sort/sort-float.sh			\
@@ -4542,7 +4540,7 @@ index fdbf369..a6ce49c 100644
    tests/sort/sort-h-thousands-sep.sh		\
    tests/sort/sort-merge.pl			\
    tests/sort/sort-merge-fdlimit.sh		\
-@@ -590,6 +592,7 @@ all_tests =					\
+@@ -593,6 +595,7 @@ all_tests =					\
    tests/du/threshold.sh				\
    tests/du/trailing-slash.sh			\
    tests/du/two-args.sh				\
@@ -4550,7 +4548,7 @@ index fdbf369..a6ce49c 100644
    tests/id/gnu-zero-uids.sh			\
    tests/id/no-context.sh			\
    tests/id/context.sh				\
-@@ -746,6 +749,7 @@ all_tests =					\
+@@ -749,6 +752,7 @@ all_tests =					\
    tests/touch/read-only.sh			\
    tests/touch/relative.sh			\
    tests/touch/trailing-slash.sh			\
@@ -4559,7 +4557,7 @@ index fdbf369..a6ce49c 100644
  
  # See tests/factor/create-test.sh.
 diff --git a/tests/misc/expand.pl b/tests/misc/expand.pl
-index 11f3fc4..d609a2c 100755
+index 4b07210..68b9ea1 100755
 --- a/tests/misc/expand.pl
 +++ b/tests/misc/expand.pl
 @@ -27,6 +27,15 @@ my $prog = 'expand';
@@ -4626,10 +4624,10 @@ index 11f3fc4..d609a2c 100755
  my $verbose = $ENV{VERBOSE};
  
 diff --git a/tests/misc/fold.pl b/tests/misc/fold.pl
-index 00b4362..7d51bea 100755
+index 0981ec9..ba889c8 100755
 --- a/tests/misc/fold.pl
 +++ b/tests/misc/fold.pl
-@@ -20,9 +20,18 @@ use strict;
+@@ -20,9 +20,17 @@ use strict;
  
  (my $program_name = $0) =~ s|.*/||;
  
@@ -4639,17 +4637,17 @@ index 00b4362..7d51bea 100755
 +
  # Turn off localization of executable's output.
  @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
- 
+-my $prog = 'fold';
++
 +# uncommented to enable multibyte paths
 +my $mb_locale = $ENV{LOCALE_FR_UTF8};
 +! defined $mb_locale || $mb_locale eq 'none'
 + and $mb_locale = 'C';
-+
+ 
  my @Tests =
    (
-    ['s1', '-w2 -s', {IN=>"a\t"}, {OUT=>"a\n\t"}],
-@@ -31,9 +40,48 @@ my @Tests =
-    ['s4', '-w4 -s', {IN=>"abc ef\n"}, {OUT=>"abc \nef\n"}],
+@@ -44,9 +52,48 @@ my @Tests =
+      {OUT=>"123456\n7890\nabcdef\nghij\n123456\n7890"}],
    );
  
 +# Add _POSIX2_VERSION=199209 to the environment of each test
@@ -4750,7 +4748,7 @@ index 0000000..11836ba
 +
 +Exit $fail
 diff --git a/tests/misc/unexpand.pl b/tests/misc/unexpand.pl
-index 76bcbd4..59eb819 100755
+index 27d9c17..4976335 100755
 --- a/tests/misc/unexpand.pl
 +++ b/tests/misc/unexpand.pl
 @@ -27,6 +27,14 @@ my $limits = getlimits ();
@@ -4807,7 +4805,7 @@ index 76bcbd4..59eb819 100755
  my $verbose = $ENV{VERBOSE};
  
 diff --git a/tests/pr/pr-tests.pl b/tests/pr/pr-tests.pl
-index 6b34e0b..34b4aeb 100755
+index 60e6106..3c64a08 100755
 --- a/tests/pr/pr-tests.pl
 +++ b/tests/pr/pr-tests.pl
 @@ -24,6 +24,15 @@ use strict;
@@ -4876,7 +4874,7 @@ index 6b34e0b..34b4aeb 100755
  my $verbose = $ENV{VERBOSE};
  
 diff --git a/tests/sort/sort-merge.pl b/tests/sort/sort-merge.pl
-index 89eed0c..b855d73 100755
+index a3204d3..40942a5 100755
 --- a/tests/sort/sort-merge.pl
 +++ b/tests/sort/sort-merge.pl
 @@ -26,6 +26,15 @@ my $prog = 'sort';
@@ -4936,7 +4934,7 @@ index 89eed0c..b855d73 100755
  my $verbose = $ENV{VERBOSE};
  
 diff --git a/tests/sort/sort.pl b/tests/sort/sort.pl
-index d49f65f..ebba925 100755
+index 2ee92c4..96c7965 100755
 --- a/tests/sort/sort.pl
 +++ b/tests/sort/sort.pl
 @@ -24,10 +24,15 @@ my $prog = 'sort';
@@ -5182,5 +5180,5 @@ index 0000000..8a82d74
 +LC_ALL=C unexpand in in > out || fail=1
 +compare exp out > /dev/null 2>&1 || fail=1
 -- 
-2.46.1
+2.48.1
 
diff --git a/coreutils-nproc-affinity-1.patch b/coreutils-nproc-affinity-1.patch
deleted file mode 100644
index 8748d4e..0000000
--- a/coreutils-nproc-affinity-1.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-commit 45c2456a56337ebcafe0dd9faa2bd995ccbc3357
-Author: Florian Weimer <fweimer@redhat.com>
-Date:   Mon Nov 11 14:05:53 2024 +0100
-
-    nproc: Use affinity mask even on systems with more than 1024 CPUs.
-    
-    * lib/nproc.c (num_processors_via_affinity_mask): Retry
-    with larger affinity masks if CPU_ALLOC_SIZE is available.
-
-diff --git a/lib/nproc.c b/lib/nproc.c
-index 92a07e8289..48bc3d06fa 100644
---- a/lib/nproc.c
-+++ b/lib/nproc.c
-@@ -20,6 +20,7 @@
- #include <config.h>
- #include "nproc.h"
- 
-+#include <errno.h>
- #include <limits.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -124,6 +125,33 @@ num_processors_via_affinity_mask (void)
-           return count;
-       }
-   }
-+#elif HAVE_SCHED_GETAFFINITY_LIKE_GLIBC \
-+  && defined CPU_ALLOC_SIZE /* glibc >= 2.6 */
-+  {
-+    unsigned int alloc_count = 1024;
-+    while (1)
-+      {
-+        cpu_set_t *set = CPU_ALLOC (alloc_count);
-+        if (set == NULL)
-+          return 0;
-+        unsigned int size = CPU_ALLOC_SIZE (alloc_count);
-+        if (sched_getaffinity (0, size, set) == 0)
-+          {
-+            unsigned int count = CPU_COUNT_S (size, set);
-+            CPU_FREE (set);
-+            return count;
-+          }
-+        if (errno != EINVAL)
-+          {
-+            CPU_FREE (set);
-+            return 0;
-+          }
-+        CPU_FREE (set);
-+        alloc_count *= 2;
-+        if (alloc_count == 0)
-+          return 0;
-+      }
-+  }
- #elif HAVE_SCHED_GETAFFINITY_LIKE_GLIBC /* glibc >= 2.3.4 */
-   {
-     cpu_set_t set;
diff --git a/coreutils-nproc-affinity-2.patch b/coreutils-nproc-affinity-2.patch
deleted file mode 100644
index aeca09c..0000000
--- a/coreutils-nproc-affinity-2.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-commit ee0bc695303775da5026091a65e8ec2b764f4a26
-Author: Bruno Haible <bruno@clisp.org>
-Date:   Mon Nov 11 15:40:52 2024 +0100
-
-    nproc: Use affinity mask even in out-of-memory situations.
-    
-    * lib/nproc.c (num_processors_via_affinity_mask): Use a stack-allocated
-    cpu_set_t as fallback. Add comments.
-
-diff --git a/lib/nproc.c b/lib/nproc.c
-index 48bc3d06fa..0b5898d88f 100644
---- a/lib/nproc.c
-+++ b/lib/nproc.c
-@@ -125,15 +125,25 @@ num_processors_via_affinity_mask (void)
-           return count;
-       }
-   }
--#elif HAVE_SCHED_GETAFFINITY_LIKE_GLIBC \
--  && defined CPU_ALLOC_SIZE /* glibc >= 2.6 */
-+#elif HAVE_SCHED_GETAFFINITY_LIKE_GLIBC /* glibc >= 2.3.4 */
-+  /* There are two ways to use the sched_getaffinity() function:
-+       - With a statically-sized cpu_set_t.
-+       - With a dynamically-sized cpu_set_t.
-+     Documentation:
-+     <https://www.kernel.org/doc/man-pages/online/pages/man2/sched_getaffinity.2.html>
-+     <https://www.kernel.org/doc/man-pages/online/pages/man3/CPU_SET.3.html>
-+     The second way has the advantage that it works on systems with more than
-+     1024 CPUs.  The first way has the advantage that it works also when memory
-+     is tight.  */
-+# if defined CPU_ALLOC_SIZE /* glibc >= 2.6 */
-   {
-     unsigned int alloc_count = 1024;
--    while (1)
-+    for (;;)
-       {
-         cpu_set_t *set = CPU_ALLOC (alloc_count);
-         if (set == NULL)
--          return 0;
-+          /* Out of memory.  */
-+          break;
-         unsigned int size = CPU_ALLOC_SIZE (alloc_count);
-         if (sched_getaffinity (0, size, set) == 0)
-           {
-@@ -143,16 +153,19 @@ num_processors_via_affinity_mask (void)
-           }
-         if (errno != EINVAL)
-           {
-+            /* Some other error.  */
-             CPU_FREE (set);
-             return 0;
-           }
-         CPU_FREE (set);
-+        /* Retry with some larger cpu_set_t.  */
-         alloc_count *= 2;
-         if (alloc_count == 0)
-+          /* Integer overflow.  Avoid an endless loop.  */
-           return 0;
-       }
-   }
--#elif HAVE_SCHED_GETAFFINITY_LIKE_GLIBC /* glibc >= 2.3.4 */
-+# endif
-   {
-     cpu_set_t set;
- 
diff --git a/coreutils-python3.patch b/coreutils-python3.patch
index 98fc642..e6ff471 100644
--- a/coreutils-python3.patch
+++ b/coreutils-python3.patch
@@ -1,4 +1,4 @@
-From cef9cccce395cd80cd5ac42a4fe6c3909be1c0b5 Mon Sep 17 00:00:00 2001
+From f1a6e8d840a28eb2ab7a488e0d06450b7192c76d 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 b06965a..08413ee 100644
+index 612d287..9a6fa2d 100644
 --- a/init.cfg
 +++ b/init.cfg
-@@ -581,10 +581,10 @@ seek_data_capable_()
+@@ -597,10 +597,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 830a69e..7344ddf 100755
+index 1d0a359..bd03542 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 830a69e..7344ddf 100755
  import os,sys
  
 -- 
-2.44.0
+2.48.1
 
diff --git a/coreutils-selinux.patch b/coreutils-selinux.patch
index a31c3af..91bc5b5 100644
--- a/coreutils-selinux.patch
+++ b/coreutils-selinux.patch
@@ -1,4 +1,4 @@
-From 78970c915b8556fcec4622e948a37dd8e34efe6d Mon Sep 17 00:00:00 2001
+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
@@ -9,10 +9,10 @@ Subject: [PATCH] coreutils-selinux.patch
  2 files changed, 29 insertions(+), 2 deletions(-)
 
 diff --git a/src/cp.c b/src/cp.c
-index 28b0217..897379f 100644
+index a0ec067..1169c6a 100644
 --- a/src/cp.c
 +++ b/src/cp.c
-@@ -997,7 +997,7 @@ main (int argc, char **argv)
+@@ -996,7 +996,7 @@ main (int argc, char **argv)
    selinux_enabled = (0 < is_selinux_enabled ());
    cp_option_init (&x);
  
@@ -21,7 +21,7 @@ index 28b0217..897379f 100644
                             long_opts, nullptr))
           != -1)
      {
-@@ -1049,6 +1049,23 @@ main (int argc, char **argv)
+@@ -1048,6 +1048,23 @@ main (int argc, char **argv)
            copy_contents = true;
            break;
  
@@ -46,7 +46,7 @@ index 28b0217..897379f 100644
            x.preserve_links = true;
            x.dereference = DEREF_NEVER;
 diff --git a/src/install.c b/src/install.c
-index accd0fd..b686fe9 100644
+index b3b26ab..2d2f072 100644
 --- a/src/install.c
 +++ b/src/install.c
 @@ -807,7 +807,7 @@ main (int argc, char **argv)
@@ -83,5 +83,5 @@ index accd0fd..b686fe9 100644
            use_default_selinux_context = false;
            break;
 -- 
-2.44.0
+2.48.1
 
diff --git a/coreutils.spec b/coreutils.spec
index b6b0f0f..79bf510 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
-Version: 9.5
-Release: 13%{?dist}
+Version: 9.6
+Release: 1%{?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,13 +32,9 @@ Patch103: coreutils-python3.patch
 # df --direct
 Patch104: coreutils-df-direct.patch
 
-# coreutils no longer lists Cockpit logins in `who` (rhbz#2307847)
-# https://git.savannah.gnu.org/cgit/gnulib.git/patch/?id=43f7f428a1665950233557bd97611bd5e996b5cb
-Patch105: coreutils-9.5-readutmp-web-session.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=2325167
-Patch106: coreutils-nproc-affinity-1.patch
-Patch107: coreutils-nproc-affinity-2.patch
+# ls: fix crash with --context
+# https://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=915004f403cb25fadb207ddfdbe6a2f43bd44fac
+Patch105: coreutils-9.6-ls-selinux-crash.patch
 
 # (sb) lin18nux/lsb compliance - multibyte functionality patch
 Patch800: coreutils-i18n.patch
@@ -162,6 +158,10 @@ 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/0.22.5/' bootstrap.conf configure.ac
+
 autoreconf -fiv
 
 %build
@@ -282,6 +282,10 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %license COPYING
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index d9dc6c9..498bfd9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (coreutils-9.5.tar.xz) = 2ca0deac4dc10a80fd0c6fd131252e99d457fd03b7bd626a6bc74fe5a0529c0a3d48ce1f5da1d3b3a7a150a1ce44f0fbb6b68a6ac543dfd5baa3e71f5d65401c
-SHA512 (coreutils-9.5.tar.xz.sig) = 029997e0f4ee64e561853cff7c8a124f58cc891598595b44c4a46f9813b4b71c9d677464bc8a26d294e9971832f4b87c23777fea4fac6e8e30f06ad93b9957d5
+SHA512 (coreutils-9.6.tar.xz) = 398391d7f9d77e6117b750abb8711eebdd9cd2549e7846cab26884fb2dd522b6bcfb8bf7fef35a12683e213ada7f89b817bf615628628d42aee3fa3102647b28
+SHA512 (coreutils-9.6.tar.xz.sig) = a8e578b5e1d053b49e3e2c5dc94431d17c6a14662f459b2174cea23865ccca32e5ae5c13fedb0a8345d25269a9b98cb7f463a897c9663f9f9bcaf61e5c781378