diff --git a/.gitignore b/.gitignore
index de62e8f..46d0f92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /coreutils-[0-9.]*.tar.xz
+/coreutils-[0-9.]*.tar.xz.sig
diff --git a/coreutils-4.5.3-langinfo.patch b/coreutils-4.5.3-langinfo.patch
deleted file mode 100644
index 862d9eb..0000000
--- a/coreutils-4.5.3-langinfo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/date.c b/src/date.c
-index ddb011e..619a72b 100644
---- a/src/date.c
-+++ b/src/date.c
-@@ -494,14 +494,7 @@ main (int argc, char **argv)
-       format = DATE_FMT_LANGINFO ();
-       if (! *format)
-         {
--          /* Do not wrap the following literal format string with _(...).
--             For example, suppose LC_ALL is unset, LC_TIME=POSIX,
--             and LANG="ko_KR".  In that case, POSIX says that LC_TIME
--             determines the format and contents of date and time strings
--             written by date, which means "date" must generate output
--             using the POSIX locale; but adding _() would cause "date"
--             to use a Korean translation of the format.  */
--          format = "%a %b %e %H:%M:%S %Z %Y";
-+          format = dcgettext(NULL, N_("%a %b %e %H:%M:%S %Z %Y"), LC_TIME);
-         }
-     }
- 
diff --git a/coreutils-8.2-uname-processortype.patch b/coreutils-8.2-uname-processortype.patch
index ed01ab8..44c57f5 100644
--- a/coreutils-8.2-uname-processortype.patch
+++ b/coreutils-8.2-uname-processortype.patch
@@ -1,29 +1,24 @@
+ src/uname.c | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
 diff --git a/src/uname.c b/src/uname.c
 index 6371ca2..1ad8fd7 100644
 --- a/src/uname.c
 +++ b/src/uname.c
-@@ -300,13 +300,19 @@ main (int argc, char **argv)
- 
-   if (toprint & PRINT_PROCESSOR)
-     {
--      char const *element = unknown;
-+      char *element = unknown;
- #if HAVE_SYSINFO && defined SI_ARCHITECTURE
-       {
-         static char processor[257];
-         if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
-           element = processor;
-       }
+@@ -322,6 +322,12 @@ main (int argc, char **argv)
+ # elif defined __ppc__ || defined __ppc64__
+       element = "powerpc";
+ # endif
 +#else
 +      {
-+	static struct utsname u;
-+	uname(&u);
-+	element = u.machine;
++        static struct utsname u;
++        uname(&u);
++        element = u.machine;
 +      }
  #endif
- #ifdef UNAME_PROCESSOR
+ #if HAVE_SYSINFO && defined SI_ARCHITECTURE
        if (element == unknown)
-@@ -344,7 +350,7 @@ main (int argc, char **argv)
+@@ -347,7 +353,7 @@ main (int argc, char **argv)
  
    if (toprint & PRINT_HARDWARE_PLATFORM)
      {
@@ -32,17 +27,17 @@ index 6371ca2..1ad8fd7 100644
  #if HAVE_SYSINFO && defined SI_PLATFORM
        {
          static char hardware_platform[257];
-@@ -352,6 +358,14 @@ main (int argc, char **argv)
+@@ -355,6 +361,14 @@ main (int argc, char **argv)
                            hardware_platform, sizeof hardware_platform))
            element = hardware_platform;
        }
 +#else
 +      {
-+	static struct utsname u;
-+	uname(&u);
-+	element = u.machine;
-+	if(strlen(element)==4 && element[0]=='i' && element[2]=='8' && element[3]=='6')
-+		element[1]='3';
++        static struct utsname u;
++        uname(&u);
++        element = u.machine;
++        if(strlen(element)==4 && element[0]=='i' && element[2]=='8' && element[3]=='6')
++            element[1]='3';
 +      }
  #endif
  #ifdef UNAME_HARDWARE_PLATFORM
diff --git a/coreutils-8.32-DIR_COLORS.patch b/coreutils-8.32-DIR_COLORS.patch
index c43651c..3a0375d 100644
--- a/coreutils-8.32-DIR_COLORS.patch
+++ b/coreutils-8.32-DIR_COLORS.patch
@@ -1,4 +1,4 @@
-From 81e25c8521937ecf7f444bab11fddaaf81cc3efd Mon Sep 17 00:00:00 2001
+From c7b13f5e1a7ad012c510a8bdd5a8943ab4b55833 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 bd5df23..84f2417 100644
+index b465771..ad42b09 100644
 --- a/DIR_COLORS
 +++ b/DIR_COLORS
 @@ -1,3 +1,7 @@
@@ -20,17 +20,17 @@ index bd5df23..84f2417 100644
  # Configuration file for dircolors, a utility to help you set the
  # LS_COLORS environment variable used by GNU ls with the --color option.
  
-@@ -8,6 +12,9 @@
- # The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
- # slackware version of dircolors) are recognized but ignored.
+@@ -10,6 +14,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 entries, which can be a glob patterns, to match
- # against the TERM environment variable to determine if it is colorizable.
- TERM Eterm
-@@ -59,7 +66,7 @@ DOOR 01;35	# door
+ # 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
  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 ...
@@ -38,9 +38,9 @@ index bd5df23..84f2417 100644
 +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 30;41	# file with capability
+ CAPABILITY 00	# file with capability (very expensive to lookup)
 diff --git a/DIR_COLORS.lightbgcolor b/DIR_COLORS.lightbgcolor
-index 4316832..6402854 100644
+index eab6258..1627b63 100644
 --- a/DIR_COLORS.lightbgcolor
 +++ b/DIR_COLORS.lightbgcolor
 @@ -1,3 +1,9 @@
@@ -53,17 +53,17 @@ index 4316832..6402854 100644
  # Configuration file for dircolors, a utility to help you set the
  # LS_COLORS environment variable used by GNU ls with the --color option.
  
-@@ -8,6 +14,9 @@
- # The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
- # slackware version of dircolors) are recognized but ignored.
+@@ -10,6 +16,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 entries, which can be a glob patterns, to match
- # against the TERM environment variable to determine if it is colorizable.
- TERM Eterm
-@@ -49,17 +58,17 @@ TERM xterm*
+ # 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*
  #NORMAL 00	# no color code at all
  #FILE 00	# regular file: use no color at all
  RESET 0		# reset to "normal" color
@@ -85,8 +85,8 @@ index 4316832..6402854 100644
 +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 30;41	# file with capability
-@@ -68,7 +77,7 @@ OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
+ 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
  STICKY 37;44	# dir with the sticky bit set (+t) and not other-writable
  
  # This is for files with execute permission:
@@ -94,7 +94,7 @@ index 4316832..6402854 100644
 +EXEC 00;32
  
  # List any file extensions like '.gz' or '.tar' that you would like ls
- # to colorize below. Put the extension, a space, and the color init string.
+ # to color below. Put the extension, a space, and the color init string.
 -- 
-2.21.1
+2.34.1
 
diff --git a/coreutils-9.0-autofs-no-mount.patch b/coreutils-9.0-autofs-no-mount.patch
deleted file mode 100644
index b6d6523..0000000
--- a/coreutils-9.0-autofs-no-mount.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From f4422844dbcd839ce486bcbc15b7bd5b72c9198d Mon Sep 17 00:00:00 2001
-From: Rohan Sable <rsable@redhat.com>
-Date: Mon, 7 Mar 2022 14:14:13 +0000
-Subject: [PATCH 1/2] ls: avoid triggering automounts
-
-statx() has different defaults wrt automounting
-compared to stat() or lstat(), so explicitly
-set the AT_NO_AUTOMOUNT flag to suppress that behavior,
-and avoid unintended operations or potential errors.
-
-* src/ls.c (do_statx): Pass AT_NO_AUTOMOUNT to avoid this behavior.
-Fixes https://bugs.gnu.org/54286
-
-Signed-off-by: Rohan Sable <rsable@redhat.com>
-
-Upstream-commit: 85c975df2c25bd799370b04bb294e568e001102f
-Signed-off-by: Kamil Dudka <kdudka@redhat.com>
----
- src/ls.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ls.c b/src/ls.c
-index 1047801..fe0e9f8 100644
---- a/src/ls.c
-+++ b/src/ls.c
-@@ -1175,7 +1175,7 @@ do_statx (int fd, char const *name, struct stat *st, int flags,
- {
-   struct statx stx;
-   bool want_btime = mask & STATX_BTIME;
--  int ret = statx (fd, name, flags, mask, &stx);
-+  int ret = statx (fd, name, flags | AT_NO_AUTOMOUNT, mask, &stx);
-   if (ret >= 0)
-     {
-       statx_to_stat (&stx, st);
--- 
-2.34.1
-
-
-From 3d227f9e4f3fe806064721e4b9451ee06526bc80 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Mon, 7 Mar 2022 23:29:20 +0000
-Subject: [PATCH 2/2] stat: only automount with --cached=never
-
-Revert to the default behavior before the introduction of statx().
-
-* src/stat.c (do_stat): Set AT_NO_AUTOMOUNT without --cached=never.
-* doc/coreutils.texi (stat invocation): Mention the automount
-behavior with --cached=never.
-
-Fixes https://bugs.gnu.org/54287
-
-Upstream-commit: 92cb8427c537f37edd43c5cef1909585201372ab
-Signed-off-by: Kamil Dudka <kdudka@redhat.com>
----
- doc/coreutils.texi | 1 +
- src/stat.c         | 3 +++
- 2 files changed, 4 insertions(+)
-
-diff --git a/doc/coreutils.texi b/doc/coreutils.texi
-index 19b535c..0f5c16a 100644
---- a/doc/coreutils.texi
-+++ b/doc/coreutils.texi
-@@ -12564,6 +12564,7 @@ Always read the already cached attributes if available.
- 
- @item never
- Always sychronize with the latest file system attributes.
-+This also mounts automounted files.
- 
- @item default
- Leave the caching behavior to the underlying file system.
-diff --git a/src/stat.c b/src/stat.c
-index 0c34501..803340a 100644
---- a/src/stat.c
-+++ b/src/stat.c
-@@ -1381,6 +1381,9 @@ do_stat (char const *filename, char const *format, char const *format2)
-   else if (force_sync)
-     flags |= AT_STATX_FORCE_SYNC;
- 
-+  if (! force_sync)
-+    flags |= AT_NO_AUTOMOUNT;
-+
-   fd = statx (fd, pathname, flags, format_to_mask (format), &stx);
-   if (fd < 0)
-     {
--- 
-2.34.1
-
diff --git a/coreutils-9.0-chmod-symlink.patch b/coreutils-9.0-chmod-symlink.patch
deleted file mode 100644
index fad3b7a..0000000
--- a/coreutils-9.0-chmod-symlink.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From c76e70637e529481478e26683ebd73c40621c382 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Fri, 24 Sep 2021 20:57:41 +0100
-Subject: [PATCH] chmod: fix exit status when ignoring symlinks
-
-* src/chmod.c: Reorder enum so CH_NOT_APPLIED
-can be treated as a non error.
-* tests/chmod/ignore-symlink.sh: A new test.
-* tests/local.mk: Reference the new test.
-* NEWS: Mention the bug fix.
-Fixes https://bugs.gnu.org/50784
-
-Upstream-commit: e8b56ebd536e82b15542a00c888109471936bfda
-Signed-off-by: Kamil Dudka <kdudka@redhat.com>
----
- NEWS                          |  6 ++++++
- src/chmod.c                   |  4 ++--
- tests/chmod/ignore-symlink.sh | 31 +++++++++++++++++++++++++++++++
- tests/local.mk                |  1 +
- 4 files changed, 40 insertions(+), 2 deletions(-)
- create mode 100755 tests/chmod/ignore-symlink.sh
-
-diff --git a/NEWS b/NEWS
-index f2fbcbb..5722a8b 100644
---- a/NEWS
-+++ b/NEWS
-@@ -143,6 +143,12 @@ GNU coreutils NEWS                                    -*- outline -*-
-   where avx2 instructions are supported.
-   A new --debug option will indicate if avx2 is being used.
- 
-+** Bug fixes
-+
-+  chmod -R no longer exits with error status when encountering symlinks.
-+  All files would be processed correctly, but the exit status was incorrect.
-+  [bug introduced in coreutils-9.0]
-+
- 
- * Noteworthy changes in release 8.32 (2020-03-05) [stable]
- 
-diff --git a/src/chmod.c b/src/chmod.c
-index 37b04f5..57ac47f 100644
---- a/src/chmod.c
-+++ b/src/chmod.c
-@@ -44,8 +44,8 @@ struct change_status
-   enum
-     {
-       CH_NO_STAT,
--      CH_NOT_APPLIED,
-       CH_FAILED,
-+      CH_NOT_APPLIED,
-       CH_NO_CHANGE_REQUESTED,
-       CH_SUCCEEDED
-     }
-@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent)
-   if ( ! recurse)
-     fts_set (fts, ent, FTS_SKIP);
- 
--  return CH_NO_CHANGE_REQUESTED <= ch.status;
-+  return CH_NOT_APPLIED <= ch.status;
- }
- 
- /* Recursively change the modes of the specified FILES (the last entry
-diff --git a/tests/chmod/ignore-symlink.sh b/tests/chmod/ignore-symlink.sh
-new file mode 100755
-index 0000000..5ce3de8
---- /dev/null
-+++ b/tests/chmod/ignore-symlink.sh
-@@ -0,0 +1,31 @@
-+#!/bin/sh
-+# Test for proper exit code of chmod on a processed symlink.
-+
-+# Copyright (C) 2021 Free Software Foundation, Inc.
-+
-+# This program is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-+
-+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-+print_ver_ chmod
-+
-+mkdir dir || framework_failure_
-+touch dir/f || framework_failure_
-+ln -s f dir/l || framework_failure_
-+
-+# This operation ignores symlinks but should succeed.
-+chmod u+w -R dir 2> out || fail=1
-+
-+compare /dev/null out || fail=1
-+
-+Exit $fail
-diff --git a/tests/local.mk b/tests/local.mk
-index a76c808..a2164c9 100644
---- a/tests/local.mk
-+++ b/tests/local.mk
-@@ -458,6 +458,7 @@ all_tests =					\
-   tests/chmod/c-option.sh			\
-   tests/chmod/equal-x.sh			\
-   tests/chmod/equals.sh				\
-+  tests/chmod/ignore-symlink.sh			\
-   tests/chmod/inaccessible.sh			\
-   tests/chmod/octal.sh				\
-   tests/chmod/setgid.sh				\
--- 
-2.31.1
-
diff --git a/coreutils-i18n.patch b/coreutils-i18n.patch
index f14a4ba..4ff0911 100644
--- a/coreutils-i18n.patch
+++ b/coreutils-i18n.patch
@@ -1,4 +1,4 @@
-From d53e5b885b9d82e2d9ba5d65ed8fd9b96712623f Mon Sep 17 00:00:00 2001
+From 01010419a6499768563e7b2f3fd56cf16edda75e Mon Sep 17 00:00:00 2001
 From: rpm-build <rpm-build>
 Date: Mon, 4 Oct 2021 08:54:37 +0200
 Subject: [PATCH] coreutils-i18n.patch
@@ -10,15 +10,15 @@ Subject: [PATCH] coreutils-i18n.patch
  lib/mbfile.c                |   3 +
  lib/mbfile.h                | 255 ++++++++++++
  m4/mbfile.m4                |  14 +
- src/cut.c                   | 441 +++++++++++++++++++-
+ src/cut.c                   | 508 +++++++++++++++++++++--
  src/expand-common.c         | 114 ++++++
  src/expand-common.h         |  12 +
- src/expand.c                |  90 ++++-
- src/fold.c                  | 312 +++++++++++++--
- src/join.c                  | 359 ++++++++++++++---
+ src/expand.c                |  90 +++-
+ src/fold.c                  | 312 ++++++++++++--
+ src/join.c                  | 359 ++++++++++++++--
  src/local.mk                |   4 +-
- src/pr.c                    | 443 +++++++++++++++++++--
- src/sort.c                  | 772 ++++++++++++++++++++++++++++++++++--
+ src/pr.c                    | 443 ++++++++++++++++++--
+ src/sort.c                  | 792 +++++++++++++++++++++++++++++++++---
  src/unexpand.c              | 101 ++++-
  src/uniq.c                  | 119 +++++-
  tests/Coreutils.pm          |   3 +
@@ -28,14 +28,14 @@ Subject: [PATCH] coreutils-i18n.patch
  tests/misc/expand.pl        |  42 ++
  tests/misc/fold.pl          |  50 ++-
  tests/misc/join.pl          |  50 +++
- tests/misc/sort-mb-tests.sh |  45 +++
+ tests/misc/sort-mb-tests.sh |  45 ++
  tests/misc/sort-merge.pl    |  42 ++
  tests/misc/sort.pl          |  40 +-
  tests/misc/unexpand.pl      |  39 ++
  tests/misc/uniq.pl          |  55 +++
  tests/pr/pr-tests.pl        |  49 +++
  tests/unexpand/mb.sh        | 172 ++++++++
- 31 files changed, 3640 insertions(+), 213 deletions(-)
+ 31 files changed, 3698 insertions(+), 242 deletions(-)
  create mode 100644 lib/mbfile.c
  create mode 100644 lib/mbfile.h
  create mode 100644 m4/mbfile.m4
@@ -45,10 +45,10 @@ Subject: [PATCH] coreutils-i18n.patch
  create mode 100755 tests/unexpand/mb.sh
 
 diff --git a/bootstrap.conf b/bootstrap.conf
-index aef9ec7..9486e9d 100644
+index c1399e3..60b39cf 100644
 --- a/bootstrap.conf
 +++ b/bootstrap.conf
-@@ -156,6 +156,7 @@ gnulib_modules="
+@@ -162,6 +162,7 @@ gnulib_modules="
    maintainer-makefile
    malloc-gnu
    manywarnings
@@ -57,10 +57,10 @@ index aef9ec7..9486e9d 100644
    mbrtowc
    mbsalign
 diff --git a/configure.ac b/configure.ac
-index 6960b48..8ff85f8 100644
+index 7e4afc9..4656a35 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -457,6 +457,8 @@ fi
+@@ -476,6 +476,8 @@ fi
  # I'm leaving it here for now.  This whole thing needs to be modernized...
  gl_WINSIZE_IN_PTEM
  
@@ -70,7 +70,7 @@ index 6960b48..8ff85f8 100644
  
  if test $gl_cv_sys_tiocgwinsz_needs_termios_h = no && \
 diff --git a/lib/linebuffer.h b/lib/linebuffer.h
-index 5fa5ad2..2bdbcab 100644
+index 07d45ca..af62e6c 100644
 --- a/lib/linebuffer.h
 +++ b/lib/linebuffer.h
 @@ -22,6 +22,11 @@
@@ -386,7 +386,7 @@ index 0000000..8589902
 +  :
 +])
 diff --git a/src/cut.c b/src/cut.c
-index cdf33d8..b8301d7 100644
+index 6fd8978..faef877 100644
 --- a/src/cut.c
 +++ b/src/cut.c
 @@ -28,6 +28,11 @@
@@ -483,23 +483,26 @@ index cdf33d8..b8301d7 100644
  /* This buffer is used to support the semantics of the -s option
     (or lack of same) when the specified field list includes (does
     not include) the first field.  In both of those cases, the entire
-@@ -76,15 +142,25 @@ enum operating_mode
-   {
-     undefined_mode,
+@@ -72,6 +138,29 @@ static char *field_1_buffer;
+ /* The number of bytes allocated for FIELD_1_BUFFER.  */
+ static size_t field_1_bufsize;
  
--    /* Output characters that are in the given bytes. */
++enum operating_mode
++  {
++    undefined_mode,
++
 +    /* Output bytes that are at the given positions. */
-     byte_mode,
- 
++    byte_mode,
++
 +    /* Output characters that are at the given positions. */
 +    character_mode,
 +
-     /* Output the given delimiter-separated fields. */
-     field_mode
-   };
- 
- static enum operating_mode operating_mode;
- 
++    /* Output the given delimiter-separated fields. */
++    field_mode
++  };
++
++static enum operating_mode operating_mode;
++
 +/* If nonzero, when in byte mode, don't split multibyte characters.  */
 +static int byte_mode_character_aware;
 +
@@ -510,7 +513,7 @@ index cdf33d8..b8301d7 100644
  /* If true do not output lines containing no delimiter characters.
     Otherwise, all such lines are printed.  This option is valid only
     with field mode.  */
-@@ -96,6 +172,9 @@ static bool complement;
+@@ -83,10 +172,16 @@ static bool complement;
  
  /* The delimiter character for field mode. */
  static unsigned char delim;
@@ -520,7 +523,24 @@ index cdf33d8..b8301d7 100644
  
  /* The delimiter for each line/record. */
  static unsigned char line_delim = '\n';
-@@ -163,7 +242,7 @@ Print selected parts of lines from each FILE to standard output.\n\
+ 
++/* True if the --output-delimiter=STRING option was specified.  */
++static bool output_delimiter_specified;
++
+ /* The length of output_delimiter_string.  */
+ static size_t output_delimiter_length;
+ 
+@@ -94,9 +189,6 @@ static size_t output_delimiter_length;
+    string consisting of the input delimiter.  */
+ static char *output_delimiter_string;
+ 
+-/* The output delimiter string contents, if the default.  */
+-static char output_delimiter_default[1];
+-
+ /* True if we have ever read standard input. */
+ static bool have_read_stdin;
+ 
+@@ -150,7 +242,7 @@ Print selected parts of lines from each FILE to standard output.\n\
    -f, --fields=LIST       select only these fields;  also print any line\n\
                              that contains no delimiter character, unless\n\
                              the -s option is specified\n\
@@ -529,7 +549,16 @@ index cdf33d8..b8301d7 100644
  "), stdout);
        fputs (_("\
        --complement        complement the set of selected bytes, characters\n\
-@@ -279,6 +358,82 @@ cut_bytes (FILE *stream)
+@@ -250,7 +342,7 @@ cut_bytes (FILE *stream)
+           next_item (&byte_idx);
+           if (print_kth (byte_idx))
+             {
+-              if (output_delimiter_string != output_delimiter_default)
++              if (output_delimiter_specified)
+                 {
+                   if (print_delimiter && is_range_start_index (byte_idx))
+                     {
+@@ -266,6 +358,82 @@ cut_bytes (FILE *stream)
      }
  }
  
@@ -612,10 +641,11 @@ index cdf33d8..b8301d7 100644
  /* Read from stream STREAM, printing to standard output any selected fields.  */
  
  static void
-@@ -424,13 +579,211 @@ cut_fields (FILE *stream)
+@@ -411,11 +579,218 @@ cut_fields (FILE *stream)
      }
  }
  
+-/* Process file FILE to standard output, using CUT_STREAM.
 +#if HAVE_MBRTOWC
 +static void
 +cut_fields_mb (FILE *stream)
@@ -773,11 +803,9 @@ index cdf33d8..b8301d7 100644
 +}
 +#endif
 +
- static void
- cut_stream (FILE *stream)
- {
--  if (operating_mode == byte_mode)
--    cut_bytes (stream);
++static void
++cut_stream (FILE *stream)
++{
 +#if HAVE_MBRTOWC
 +  if (MB_CUR_MAX > 1 && !force_singlebyte_mode)
 +    {
@@ -815,8 +843,7 @@ index cdf33d8..b8301d7 100644
 +          abort ();
 +        }
 +    }
-   else
--    cut_fields (stream);
++  else
 +#endif
 +    {
 +      if (operating_mode == field_mode)
@@ -824,29 +851,51 @@ index cdf33d8..b8301d7 100644
 +      else
 +        cut_bytes (stream);
 +    }
- }
++}
++
++/* Process file FILE to standard output.
+    Return true if successful.  */
  
- /* Process file FILE to standard output.
-@@ -482,6 +835,7 @@ main (int argc, char **argv)
+ static bool
+-cut_file (char const *file, void (*cut_stream) (FILE *))
++cut_file (char const *file)
+ {
+   FILE *stream;
+ 
+@@ -459,8 +834,8 @@ main (int argc, char **argv)
+   int optc;
    bool ok;
    bool delim_specified = false;
-   char *spec_list_string IF_LINT ( = NULL);
+-  bool byte_mode = false;
+-  char *spec_list_string = NULL;
++  char *spec_list_string IF_LINT ( = NULL);
 +  char mbdelim[MB_LEN_MAX + 1];
  
    initialize_main (&argc, &argv);
    set_program_name (argv[0]);
-@@ -504,7 +858,6 @@ main (int argc, char **argv)
+@@ -470,6 +845,8 @@ main (int argc, char **argv)
+ 
+   atexit (close_stdout);
+ 
++  operating_mode = undefined_mode;
++
+   /* By default, all non-delimited lines are printed.  */
+   suppress_non_delimited = false;
+ 
+@@ -481,35 +858,77 @@ main (int argc, char **argv)
        switch (optc)
          {
          case 'b':
 -        case 'c':
            /* Build the byte list. */
-           if (operating_mode != undefined_mode)
-             FATAL_ERROR (_("only one type of list may be specified"));
-@@ -512,6 +865,14 @@ main (int argc, char **argv)
-           spec_list_string = optarg;
-           break;
- 
+-          byte_mode = true;
+-          FALLTHROUGH;
++          if (operating_mode != undefined_mode)
++            FATAL_ERROR (_("only one type of list may be specified"));
++          operating_mode = byte_mode;
++          spec_list_string = optarg;
++          break;
++
 +        case 'c':
 +          /* Build the character list. */
 +          if (operating_mode != undefined_mode)
@@ -857,8 +906,14 @@ index cdf33d8..b8301d7 100644
 +
          case 'f':
            /* Build the field list. */
-           if (operating_mode != undefined_mode)
-@@ -523,10 +884,38 @@ main (int argc, char **argv)
+-          if (spec_list_string)
+-            FATAL_ERROR (_("only one list may be specified"));
++          if (operating_mode != undefined_mode)
++            FATAL_ERROR (_("only one type of list may be specified"));
++          operating_mode = field_mode;
+           spec_list_string = optarg;
+           break;
+ 
          case 'd':
            /* New delimiter. */
            /* Interpret -d '' to mean 'use the NUL byte as the delimiter.'  */
@@ -901,7 +956,13 @@ index cdf33d8..b8301d7 100644
            break;
  
          case OUTPUT_DELIMITER_OPTION:
-@@ -539,6 +928,7 @@ main (int argc, char **argv)
++          output_delimiter_specified = true;
+           /* Interpret --output-delimiter='' to mean
+              'use the NUL byte as the delimiter.'  */
+           output_delimiter_length = (optarg[0] == '\0'
+                                      ? 1 : strlen (optarg));
+-          output_delimiter_string = optarg;
++          output_delimiter_string = xstrdup (optarg);
            break;
  
          case 'n':
@@ -909,8 +970,34 @@ index cdf33d8..b8301d7 100644
            break;
  
          case 's':
-@@ -578,15 +968,34 @@ main (int argc, char **argv)
-               | (complement ? SETFLD_COMPLEMENT : 0) );
+@@ -533,40 +952,57 @@ main (int argc, char **argv)
+         }
+     }
+ 
+-  if (!spec_list_string)
++  if (operating_mode == undefined_mode)
+     FATAL_ERROR (_("you must specify a list of bytes, characters, or fields"));
+ 
+-  if (byte_mode)
+-    {
+-      if (delim_specified)
+-        FATAL_ERROR (_("an input delimiter may be specified only\
++  if (delim_specified && operating_mode != field_mode)
++    FATAL_ERROR (_("an input delimiter may be specified only\
+  when operating on fields"));
+ 
+-      if (suppress_non_delimited)
+-        FATAL_ERROR (_("suppressing non-delimited lines makes sense\n\
++  if (suppress_non_delimited && operating_mode != field_mode)
++    FATAL_ERROR (_("suppressing non-delimited lines makes sense\n\
+ \tonly when operating on fields"));
+-    }
+ 
+   set_fields (spec_list_string,
+-              ((byte_mode ? SETFLD_ERRMSG_USE_POS : 0)
+-               | (complement ? SETFLD_COMPLEMENT : 0)));
++              ( (operating_mode == field_mode) ? 0 : SETFLD_ERRMSG_USE_POS)
++              | (complement ? SETFLD_COMPLEMENT : 0) );
  
    if (!delim_specified)
 -    delim = '\t';
@@ -926,10 +1013,8 @@ index cdf33d8..b8301d7 100644
  
    if (output_delimiter_string == NULL)
      {
--      static char dummy[2];
--      dummy[0] = delim;
--      dummy[1] = '\0';
--      output_delimiter_string = dummy;
+-      output_delimiter_default[0] = delim;
+-      output_delimiter_string = output_delimiter_default;
 -      output_delimiter_length = 1;
 +#ifdef HAVE_MBRTOWC
 +      if (MB_CUR_MAX > 1 && !force_singlebyte_mode)
@@ -949,9 +1034,19 @@ index cdf33d8..b8301d7 100644
 +        }
      }
  
+-  void (*cut_stream) (FILE *) = byte_mode ? cut_bytes : cut_fields;
    if (optind == argc)
+-    ok = cut_file ("-", cut_stream);
++    ok = cut_file ("-");
+   else
+     for (ok = true; optind < argc; optind++)
+-      ok &= cut_file (argv[optind], cut_stream);
++      ok &= cut_file (argv[optind]);
+ 
+ 
+   if (have_read_stdin && fclose (stdin) == EOF)
 diff --git a/src/expand-common.c b/src/expand-common.c
-index 4deb7bd..8fd0524 100644
+index deec1bd..b39f740 100644
 --- a/src/expand-common.c
 +++ b/src/expand-common.c
 @@ -19,6 +19,7 @@
@@ -1083,7 +1178,7 @@ index 4deb7bd..8fd0524 100644
     to the list of tab stops.  */
  extern void
 diff --git a/src/expand-common.h b/src/expand-common.h
-index ac812d0..16789ab 100644
+index 5f59a0e..835b9d5 100644
 --- a/src/expand-common.h
 +++ b/src/expand-common.h
 @@ -25,6 +25,18 @@ extern size_t max_column_width;
@@ -1106,7 +1201,7 @@ index ac812d0..16789ab 100644
  extern void
  add_tab_stop (uintmax_t tabval);
 diff --git a/src/expand.c b/src/expand.c
-index 4e32bfc..902c6b4 100644
+index ed78ca8..a4cefa1 100644
 --- a/src/expand.c
 +++ b/src/expand.c
 @@ -37,6 +37,9 @@
@@ -1262,7 +1357,7 @@ index 4e32bfc..902c6b4 100644
  }
  
 diff --git a/src/fold.c b/src/fold.c
-index 94a6d37..a278783 100644
+index f07a90b..d32dbfd 100644
 --- a/src/fold.c
 +++ b/src/fold.c
 @@ -22,12 +22,34 @@
@@ -1668,7 +1763,7 @@ index 94a6d37..a278783 100644
  
          case 's':		/* Break at word boundaries. */
 diff --git a/src/join.c b/src/join.c
-index f22ffda..ad5dc0d 100644
+index f2fd172..6c7d1ed 100644
 --- a/src/join.c
 +++ b/src/join.c
 @@ -22,19 +22,33 @@
@@ -1723,7 +1818,7 @@ index f22ffda..ad5dc0d 100644
  
  /* If nonzero, check that the input is correctly ordered. */
  static enum
-@@ -276,13 +292,14 @@ xfields (struct line *line)
+@@ -280,13 +296,14 @@ xfields (struct line *line)
    if (ptr == lim)
      return;
  
@@ -1741,7 +1836,7 @@ index f22ffda..ad5dc0d 100644
      {
        /* Skip leading blanks before the first field.  */
        while (field_sep (*ptr))
-@@ -306,6 +323,147 @@ xfields (struct line *line)
+@@ -310,6 +327,147 @@ xfields (struct line *line)
    extract_field (line, ptr, lim - ptr);
  }
  
@@ -1889,7 +1984,7 @@ index f22ffda..ad5dc0d 100644
  static void
  freeline (struct line *line)
  {
-@@ -327,56 +485,133 @@ keycmp (struct line const *line1, struct line const *line2,
+@@ -331,56 +489,133 @@ keycmp (struct line const *line1, struct line const *line2,
          size_t jf_1, size_t jf_2)
  {
    /* Start of field to compare in each file.  */
@@ -2046,7 +2141,7 @@ index f22ffda..ad5dc0d 100644
  }
  
  /* Check that successive input lines PREV and CURRENT from input file
-@@ -468,6 +703,11 @@ get_line (FILE *fp, struct line **linep, int which)
+@@ -472,6 +707,11 @@ get_line (FILE *fp, struct line **linep, int which)
      }
    ++line_no[which - 1];
  
@@ -2058,7 +2153,7 @@ index f22ffda..ad5dc0d 100644
    xfields (line);
  
    if (prevline[which - 1])
-@@ -563,21 +803,28 @@ prfield (size_t n, struct line const *line)
+@@ -567,21 +807,28 @@ prfield (size_t n, struct line const *line)
  
  /* Output all the fields in line, other than the join field.  */
  
@@ -2090,7 +2185,7 @@ index f22ffda..ad5dc0d 100644
        prfield (i, line);
      }
  }
-@@ -588,7 +835,6 @@ static void
+@@ -592,7 +839,6 @@ static void
  prjoin (struct line const *line1, struct line const *line2)
  {
    const struct outlist *outlist;
@@ -2098,7 +2193,7 @@ index f22ffda..ad5dc0d 100644
    size_t field;
    struct line const *line;
  
-@@ -622,7 +868,7 @@ prjoin (struct line const *line1, struct line const *line2)
+@@ -626,7 +872,7 @@ prjoin (struct line const *line1, struct line const *line2)
            o = o->next;
            if (o == NULL)
              break;
@@ -2107,7 +2202,7 @@ index f22ffda..ad5dc0d 100644
          }
        putchar (eolchar);
      }
-@@ -1098,20 +1344,43 @@ main (int argc, char **argv)
+@@ -1102,20 +1348,43 @@ main (int argc, char **argv)
  
          case 't':
            {
@@ -2161,10 +2256,10 @@ index f22ffda..ad5dc0d 100644
            break;
  
 diff --git a/src/local.mk b/src/local.mk
-index 0c8b65d..011421a 100644
+index e1d15ce..1a5ffaa 100644
 --- a/src/local.mk
 +++ b/src/local.mk
-@@ -429,8 +429,8 @@ src_base32_CPPFLAGS = -DBASE_TYPE=32 $(AM_CPPFLAGS)
+@@ -434,8 +434,8 @@ src_base32_CPPFLAGS = -DBASE_TYPE=32 $(AM_CPPFLAGS)
  src_basenc_SOURCES = src/basenc.c
  src_basenc_CPPFLAGS = -DBASE_TYPE=42 $(AM_CPPFLAGS)
  
@@ -2176,7 +2271,7 @@ index 0c8b65d..011421a 100644
  src_wc_SOURCES = src/wc.c
  if USE_AVX2_WC_LINECOUNT
 diff --git a/src/pr.c b/src/pr.c
-index 8f84d0f..4bb5195 100644
+index 4c17c00..b4fab1c 100644
 --- a/src/pr.c
 +++ b/src/pr.c
 @@ -311,6 +311,24 @@
@@ -2314,7 +2409,7 @@ index 8f84d0f..4bb5195 100644
  static char *column_separator = (char *) " ";
  static char *line_separator = (char *) "\t";
  
-@@ -852,6 +905,13 @@ separator_string (char const *optarg_S)
+@@ -853,6 +906,13 @@ separator_string (char const *optarg_S)
      integer_overflow ();
    col_sep_length = len;
    col_sep_string = optarg_S;
@@ -2328,7 +2423,7 @@ index 8f84d0f..4bb5195 100644
  }
  
  int
-@@ -876,6 +936,21 @@ main (int argc, char **argv)
+@@ -877,6 +937,21 @@ main (int argc, char **argv)
  
    atexit (close_stdout);
  
@@ -2350,7 +2445,7 @@ index 8f84d0f..4bb5195 100644
    n_files = 0;
    file_names = (argc > 1
                  ? xnmalloc (argc - 1, sizeof (char *))
-@@ -952,8 +1027,12 @@ main (int argc, char **argv)
+@@ -953,8 +1028,12 @@ main (int argc, char **argv)
            break;
          case 'e':
            if (optarg)
@@ -2365,7 +2460,7 @@ index 8f84d0f..4bb5195 100644
            /* Could check tab width > 0. */
            untabify_input = true;
            break;
-@@ -966,8 +1045,12 @@ main (int argc, char **argv)
+@@ -967,8 +1046,12 @@ main (int argc, char **argv)
            break;
          case 'i':
            if (optarg)
@@ -2380,7 +2475,7 @@ index 8f84d0f..4bb5195 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)
@@ -2391,7 +2486,7 @@ index 8f84d0f..4bb5195 100644
            break;
          case 'N':
            skip_count = false;
-@@ -1011,6 +1094,7 @@ main (int argc, char **argv)
+@@ -1012,6 +1095,7 @@ main (int argc, char **argv)
            /* Reset an additional input of -s, -S dominates -s */
            col_sep_string = "";
            col_sep_length = 0;
@@ -2942,7 +3037,7 @@ index 8f84d0f..4bb5195 100644
     looking for more options and printing the next batch of files.
  
 diff --git a/src/sort.c b/src/sort.c
-index 5f4c817..bd9c672 100644
+index 3b775d6..a0ba243 100644
 --- a/src/sort.c
 +++ b/src/sort.c
 @@ -29,6 +29,14 @@
@@ -2960,9 +3055,9 @@ index 5f4c817..bd9c672 100644
  #include "system.h"
  #include "argmatch.h"
  #include "die.h"
-@@ -157,14 +165,39 @@ static int decimal_point;
- /* Thousands separator; if -1, then there isn't one.  */
- static int thousands_sep;
+@@ -159,14 +167,39 @@ static int thousands_sep;
+ /* We currently ignore multi-byte grouping chars.  */
+ static bool thousands_sep_ignored;
  
 +/* True if -f is specified.  */
 +static bool folding;
@@ -3001,9 +3096,9 @@ index 5f4c817..bd9c672 100644
  /* The kind of blanks for '-b' to skip in various options. */
  enum blanktype { bl_start, bl_end, bl_both };
  
-@@ -338,13 +371,11 @@ static bool reverse;
-    they were read if all keys compare equal.  */
- static bool stable;
+@@ -343,13 +376,11 @@ static bool stable;
+ /* An int value outside char range.  */
+ enum { NON_CHAR = CHAR_MAX + 1 };
  
 -/* If TAB has this value, blanks separate fields.  */
 -enum { TAB_DEFAULT = CHAR_MAX + 1 };
@@ -3018,7 +3113,7 @@ index 5f4c817..bd9c672 100644
  
  /* Flag to remove consecutive duplicate lines from the output.
     Only the last of a sequence of equal lines will be output. */
-@@ -802,6 +833,46 @@ reap_all (void)
+@@ -805,6 +836,46 @@ reap_all (void)
      reap (-1);
  }
  
@@ -3065,7 +3160,7 @@ index 5f4c817..bd9c672 100644
  /* Clean up any remaining temporary files.  */
  
  static void
-@@ -1269,7 +1340,7 @@ zaptemp (char const *name)
+@@ -1272,7 +1343,7 @@ zaptemp (char const *name)
    free (node);
  }
  
@@ -3074,7 +3169,7 @@ index 5f4c817..bd9c672 100644
  
  static int
  struct_month_cmp (void const *m1, void const *m2)
-@@ -1284,7 +1355,7 @@ struct_month_cmp (void const *m1, void const *m2)
+@@ -1287,7 +1358,7 @@ struct_month_cmp (void const *m1, void const *m2)
  /* Initialize the character class tables. */
  
  static void
@@ -3083,7 +3178,7 @@ index 5f4c817..bd9c672 100644
  {
    size_t i;
  
-@@ -1296,7 +1367,7 @@ inittables (void)
+@@ -1299,7 +1370,7 @@ inittables (void)
        fold_toupper[i] = toupper (i);
      }
  
@@ -3092,7 +3187,7 @@ index 5f4c817..bd9c672 100644
    /* If we're not in the "C" locale, read different names for months.  */
    if (hard_LC_TIME)
      {
-@@ -1378,6 +1449,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);
  }
  
@@ -3177,7 +3272,7 @@ index 5f4c817..bd9c672 100644
  /* Specify the amount of main memory to use when sorting.  */
  static void
  specify_sort_size (int oi, char c, char const *s)
-@@ -1609,7 +1758,7 @@ buffer_linelim (struct buffer const *buf)
+@@ -1612,7 +1761,7 @@ buffer_linelim (struct buffer const *buf)
     by KEY in LINE. */
  
  static char *
@@ -3186,7 +3281,7 @@ index 5f4c817..bd9c672 100644
  {
    char *ptr = line->text, *lim = ptr + line->length - 1;
    size_t sword = key->sword;
-@@ -1618,10 +1767,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.  */
  
@@ -3199,7 +3294,7 @@ index 5f4c817..bd9c672 100644
            ++ptr;
          if (ptr < lim)
            ++ptr;
-@@ -1647,11 +1796,70 @@ begfield (struct line const *line, struct keyfield const *key)
+@@ -1650,12 +1799,71 @@ begfield (struct line const *line, struct keyfield const *key)
    return ptr;
  }
  
@@ -3265,13 +3360,14 @@ index 5f4c817..bd9c672 100644
  /* Return the limit of (a pointer to the first character after) the field
     in LINE specified by KEY. */
  
- static char * _GL_ATTRIBUTE_PURE
+ ATTRIBUTE_PURE
+ static char *
 -limfield (struct line const *line, struct keyfield const *key)
 +limfield_uni (struct line const *line, struct keyfield const *key)
  {
    char *ptr = line->text, *lim = ptr + line->length - 1;
    size_t eword = key->eword, echar = key->echar;
-@@ -1666,10 +1874,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.  */
@@ -3284,7 +3380,7 @@ index 5f4c817..bd9c672 100644
            ++ptr;
          if (ptr < lim && (eword || echar))
            ++ptr;
-@@ -1715,10 +1923,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.  */
@@ -3297,7 +3393,7 @@ index 5f4c817..bd9c672 100644
        if (newlim)
          lim = newlim;
      }
-@@ -1749,6 +1957,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;
  }
  
@@ -3428,7 +3524,7 @@ index 5f4c817..bd9c672 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
-@@ -1835,8 +2167,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)
@@ -3453,9 +3549,9 @@ index 5f4c817..bd9c672 100644
                        line->keybeg = line_start;
                      }
                  }
-@@ -1970,12 +2316,10 @@ find_unit_order (char const *number)
-        <none/unknown> < K/k < M < G < T < P < E < Z < Y  */
+@@ -1976,12 +2322,10 @@ find_unit_order (char const *number)
  
+ ATTRIBUTE_PURE
  static int
 -human_numcompare (char const *a, char const *b)
 +human_numcompare (char *a, char *b)
@@ -3469,16 +3565,16 @@ index 5f4c817..bd9c672 100644
  
    int diff = find_unit_order (a) - find_unit_order (b);
    return (diff ? diff : strnumcmp (a, b, decimal_point, thousands_sep));
-@@ -1986,7 +2330,7 @@ human_numcompare (char const *a, char const *b)
-    hideously fast. */
+@@ -1993,7 +2337,7 @@ human_numcompare (char const *a, char const *b)
  
+ ATTRIBUTE_PURE
  static int
 -numcompare (char const *a, char const *b)
 +numcompare_uni (const char *a, const char *b)
  {
    while (blanks[to_uchar (*a)])
      a++;
-@@ -1996,6 +2340,25 @@ numcompare (char const *a, char const *b)
+@@ -2003,6 +2347,25 @@ numcompare (char const *a, char const *b)
    return strnumcmp (a, b, decimal_point, thousands_sep);
  }
  
@@ -3504,7 +3600,7 @@ index 5f4c817..bd9c672 100644
  /* Work around a problem whereby the long double value returned by glibc's
     strtold ("NaN", ...) contains uninitialized bits: clear all bytes of
     A and B before calling strtold.  FIXME: remove this function if
-@@ -2046,7 +2409,7 @@ general_numcompare (char const *sa, char const *sb)
+@@ -2053,7 +2416,7 @@ general_numcompare (char const *sa, char const *sb)
     Return 0 if the name in S is not recognized.  */
  
  static int
@@ -3513,7 +3609,7 @@ index 5f4c817..bd9c672 100644
  {
    size_t lo = 0;
    size_t hi = MONTHS_PER_YEAR;
-@@ -2322,15 +2685,14 @@ debug_key (struct line const *line, struct keyfield const *key)
+@@ -2329,15 +2692,14 @@ debug_key (struct line const *line, struct keyfield const *key)
            char saved = *lim;
            *lim = '\0';
  
@@ -3531,7 +3627,7 @@ index 5f4c817..bd9c672 100644
            else if (key->general_numeric)
              ignore_value (strtold (beg, &tighter_lim));
            else if (key->numeric || key->human_numeric)
-@@ -2464,7 +2826,7 @@ key_warnings (struct keyfield const *gkey, bool gkey_only)
+@@ -2483,7 +2845,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  */
@@ -3540,7 +3636,66 @@ index 5f4c817..bd9c672 100644
            && ((!key->skipsblanks && !implicit_skip)
                || (!key->skipsblanks && key->schar)
                || (!key->skipeblanks && key->echar)))
-@@ -2522,11 +2884,87 @@ key_warnings (struct keyfield const *gkey, bool gkey_only)
+@@ -2531,9 +2893,9 @@ key_warnings (struct keyfield const *gkey, bool gkey_only)
+   bool number_locale_warned = false;
+   if (basic_numeric_field_span)
+     {
+-      if (tab == TAB_DEFAULT
+-          ? thousands_sep != NON_CHAR && (isblank (to_uchar (thousands_sep)))
+-          : tab == thousands_sep)
++      if (tab_length
++          ? tab[0] == thousands_sep
++          : thousands_sep != NON_CHAR && (isblank (to_uchar (thousands_sep))))
+         {
+           error (0, 0,
+                  _("field separator %s is treated as a "
+@@ -2544,9 +2906,9 @@ key_warnings (struct keyfield const *gkey, bool gkey_only)
+     }
+   if (basic_numeric_field_span || general_numeric_field_span)
+     {
+-      if (tab == TAB_DEFAULT
+-          ? thousands_sep != NON_CHAR && (isblank (to_uchar (decimal_point)))
+-          : tab == decimal_point)
++      if (tab_length
++          ? tab[0] == decimal_point
++          : thousands_sep != NON_CHAR && (isblank (to_uchar (decimal_point))))
+         {
+           error (0, 0,
+                  _("field separator %s is treated as a "
+@@ -2554,19 +2916,19 @@ key_warnings (struct keyfield const *gkey, bool gkey_only)
+                  quote (((char []) {decimal_point, 0})));
+           number_locale_warned = true;
+         }
+-      else if (tab == '-')
++      else if (tab_length && tab[0] == '-')
+         {
+           error (0, 0,
+                  _("field separator %s is treated as a "
+                    "minus sign in numbers"),
+-                 quote (((char []) {tab, 0})));
++                 quote (((char []) {tab[0], 0})));
+         }
+-      else if (general_numeric_field_span && tab == '+')
++      else if (general_numeric_field_span && tab_length && tab[0] == '+')
+         {
+           error (0, 0,
+                  _("field separator %s is treated as a "
+                    "plus sign in numbers"),
+-                 quote (((char []) {tab, 0})));
++                 quote (((char []) {tab[0], 0})));
+         }
+     }
+ 
+@@ -2577,7 +2939,7 @@ key_warnings (struct keyfield const *gkey, bool gkey_only)
+     {
+       error (0, 0,
+              _("%snumbers use %s as a decimal point in this locale"),
+-             tab == decimal_point ? "" : _("note "),
++             (tab_length && tab[0] == decimal_point) ? "" : _("note "),
+              quote (((char []) {decimal_point, 0})));
+ 
+     }
+@@ -2610,11 +2972,87 @@ key_warnings (struct keyfield const *gkey, bool gkey_only)
      error (0, 0, _("option '-r' only applies to last-resort comparison"));
  }
  
@@ -3629,7 +3784,7 @@ index 5f4c817..bd9c672 100644
  {
    struct keyfield *key = keylist;
  
-@@ -2611,7 +3049,7 @@ keycompare (struct line const *a, struct line const *b)
+@@ -2699,7 +3137,7 @@ keycompare (struct line const *a, struct line const *b)
            else if (key->human_numeric)
              diff = human_numcompare (ta, tb);
            else if (key->month)
@@ -3638,7 +3793,7 @@ index 5f4c817..bd9c672 100644
            else if (key->random)
              diff = compare_random (ta, tlena, tb, tlenb);
            else if (key->version)
-@@ -2727,6 +3165,211 @@ keycompare (struct line const *a, struct line const *b)
+@@ -2815,6 +3253,211 @@ keycompare (struct line const *a, struct line const *b)
    return key->reverse ? -diff : diff;
  }
  
@@ -3850,7 +4005,7 @@ index 5f4c817..bd9c672 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. */
  
-@@ -2754,7 +3397,7 @@ compare (struct line const *a, struct line const *b)
+@@ -2842,7 +3485,7 @@ compare (struct line const *a, struct line const *b)
      diff = - NONZERO (blen);
    else if (blen == 0)
      diff = 1;
@@ -3859,7 +4014,7 @@ index 5f4c817..bd9c672 100644
      {
        /* xmemcoll0 is a performance enhancement as
           it will not unconditionally write '\0' after the
-@@ -4144,6 +4787,7 @@ set_ordering (char const *s, struct keyfield *key, enum blanktype blanktype)
+@@ -4226,6 +4869,7 @@ set_ordering (char const *s, struct keyfield *key, enum blanktype blanktype)
            break;
          case 'f':
            key->translate = fold_toupper;
@@ -3867,7 +4022,7 @@ index 5f4c817..bd9c672 100644
            break;
          case 'g':
            key->general_numeric = true;
-@@ -4223,7 +4867,7 @@ main (int argc, char **argv)
+@@ -4305,7 +4949,7 @@ main (int argc, char **argv)
    initialize_exit_failure (SORT_FAILURE);
  
    hard_LC_COLLATE = hard_locale (LC_COLLATE);
@@ -3876,8 +4031,8 @@ index 5f4c817..bd9c672 100644
    hard_LC_TIME = hard_locale (LC_TIME);
  #endif
  
-@@ -4244,6 +4888,29 @@ main (int argc, char **argv)
-       thousands_sep = -1;
+@@ -4328,6 +4972,29 @@ main (int argc, char **argv)
+       thousands_sep = NON_CHAR;
    }
  
 +#if HAVE_MBRTOWC
@@ -3906,7 +4061,7 @@ index 5f4c817..bd9c672 100644
    have_read_stdin = false;
    inittables ();
  
-@@ -4518,13 +5185,34 @@ main (int argc, char **argv)
+@@ -4602,13 +5269,34 @@ main (int argc, char **argv)
  
          case 't':
            {
@@ -3945,7 +4100,7 @@ index 5f4c817..bd9c672 100644
                  else
                    {
                      /* Provoke with 'sort -txx'.  Complain about
-@@ -4535,9 +5223,11 @@ main (int argc, char **argv)
+@@ -4619,9 +5307,11 @@ main (int argc, char **argv)
                           quote (optarg));
                    }
                }
@@ -3959,21 +4114,8 @@ index 5f4c817..bd9c672 100644
            }
            break;
  
-@@ -4766,12 +5456,10 @@ main (int argc, char **argv)
-       sort (files, nfiles, outfile, nthreads);
-     }
- 
--#ifdef lint
-   if (files_from)
-     readtokens0_free (&tok);
-   else
-     free (files);
--#endif
- 
-   if (have_read_stdin && fclose (stdin) == EOF)
-     sort_die (_("close failed"), "-");
 diff --git a/src/unexpand.c b/src/unexpand.c
-index cec392d..483f0ef 100644
+index 7d6100f..04cd646 100644
 --- a/src/unexpand.c
 +++ b/src/unexpand.c
 @@ -38,6 +38,9 @@
@@ -4179,7 +4321,7 @@ index cec392d..483f0ef 100644
  }
  
 diff --git a/src/uniq.c b/src/uniq.c
-index 8f6e973..752797a 100644
+index e5996f0..871d47c 100644
 --- a/src/uniq.c
 +++ b/src/uniq.c
 @@ -21,6 +21,17 @@
@@ -4230,16 +4372,16 @@ index 8f6e973..752797a 100644
  static struct option const longopts[] =
  {
    {"count", no_argument, NULL, 'c'},
-@@ -253,7 +280,7 @@ size_opt (char const *opt, char const *msgid)
-    return a pointer to the beginning of the line's field to be compared. */
+@@ -254,7 +281,7 @@ size_opt (char const *opt, char const *msgid)
  
- static char * _GL_ATTRIBUTE_PURE
+ ATTRIBUTE_PURE
+ static char *
 -find_field (struct linebuffer const *line)
 +find_field_uni (struct linebuffer *line)
  {
    size_t count;
    char const *lp = line->buffer;
-@@ -273,6 +300,83 @@ find_field (struct linebuffer const *line)
+@@ -274,6 +301,83 @@ find_field (struct linebuffer const *line)
    return line->buffer + i;
  }
  
@@ -4323,7 +4465,7 @@ index 8f6e973..752797a 100644
  /* Return false if two strings OLD and NEW match, true if not.
     OLD and NEW point not to the beginnings of the lines
     but rather to the beginnings of the fields to compare.
-@@ -493,6 +597,19 @@ main (int argc, char **argv)
+@@ -494,6 +598,19 @@ main (int argc, char **argv)
  
    atexit (close_stdout);
  
@@ -4344,7 +4486,7 @@ index 8f6e973..752797a 100644
    skip_fields = 0;
    check_chars = SIZE_MAX;
 diff --git a/tests/Coreutils.pm b/tests/Coreutils.pm
-index dc6b132..a2abc6d 100644
+index fad7ab9..c9021a6 100644
 --- a/tests/Coreutils.pm
 +++ b/tests/Coreutils.pm
 @@ -264,6 +264,9 @@ sub run_tests ($$$$$)
@@ -4582,10 +4724,10 @@ index 0000000..26c95de
 +
 +Exit $fail
 diff --git a/tests/local.mk b/tests/local.mk
-index 228d0e3..a76c808 100644
+index 0f77786..dbe1843 100644
 --- a/tests/local.mk
 +++ b/tests/local.mk
-@@ -375,6 +375,8 @@ all_tests =					\
+@@ -377,6 +377,8 @@ all_tests =					\
    tests/misc/sort-discrim.sh			\
    tests/misc/sort-files0-from.pl		\
    tests/misc/sort-float.sh			\
@@ -4594,7 +4736,7 @@ index 228d0e3..a76c808 100644
    tests/misc/sort-h-thousands-sep.sh		\
    tests/misc/sort-merge.pl			\
    tests/misc/sort-merge-fdlimit.sh		\
-@@ -573,6 +575,7 @@ all_tests =					\
+@@ -576,6 +578,7 @@ all_tests =					\
    tests/du/threshold.sh				\
    tests/du/trailing-slash.sh			\
    tests/du/two-args.sh				\
@@ -4602,7 +4744,7 @@ index 228d0e3..a76c808 100644
    tests/id/gnu-zero-uids.sh			\
    tests/id/no-context.sh			\
    tests/id/context.sh				\
-@@ -724,6 +727,7 @@ all_tests =					\
+@@ -727,6 +730,7 @@ all_tests =					\
    tests/touch/read-only.sh			\
    tests/touch/relative.sh			\
    tests/touch/trailing-slash.sh			\
@@ -4611,7 +4753,7 @@ index 228d0e3..a76c808 100644
  
  # See tests/factor/create-test.sh.
 diff --git a/tests/misc/expand.pl b/tests/misc/expand.pl
-index a10ff19..e1706c1 100755
+index 7a77e6f..27f6652 100755
 --- a/tests/misc/expand.pl
 +++ b/tests/misc/expand.pl
 @@ -27,6 +27,15 @@ my $prog = 'expand';
@@ -4678,7 +4820,7 @@ index a10ff19..e1706c1 100755
  my $verbose = $ENV{VERBOSE};
  
 diff --git a/tests/misc/fold.pl b/tests/misc/fold.pl
-index beacec9..b56afca 100755
+index 2834f92..bc1616a 100755
 --- a/tests/misc/fold.pl
 +++ b/tests/misc/fold.pl
 @@ -20,9 +20,18 @@ use strict;
@@ -4751,7 +4893,7 @@ index beacec9..b56afca 100755
  my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
  exit $fail;
 diff --git a/tests/misc/join.pl b/tests/misc/join.pl
-index bfd9e6f..75788c9 100755
+index 06ad777..be40204 100755
 --- a/tests/misc/join.pl
 +++ b/tests/misc/join.pl
 @@ -25,6 +25,15 @@ my $limits = getlimits ();
@@ -4872,7 +5014,7 @@ index 0000000..11836ba
 +
 +Exit $fail
 diff --git a/tests/misc/sort-merge.pl b/tests/misc/sort-merge.pl
-index 70d8af1..6b4840a 100755
+index 7eb4574..eda884c 100755
 --- a/tests/misc/sort-merge.pl
 +++ b/tests/misc/sort-merge.pl
 @@ -26,6 +26,15 @@ my $prog = 'sort';
@@ -4932,7 +5074,7 @@ index 70d8af1..6b4840a 100755
  my $verbose = $ENV{VERBOSE};
  
 diff --git a/tests/misc/sort.pl b/tests/misc/sort.pl
-index 86970ff..c016ff7 100755
+index 0b0adca..fd27821 100755
 --- a/tests/misc/sort.pl
 +++ b/tests/misc/sort.pl
 @@ -24,10 +24,15 @@ my $prog = 'sort';
@@ -5000,7 +5142,7 @@ index 86970ff..c016ff7 100755
  my $save_temps = $ENV{DEBUG};
  my $verbose = $ENV{VERBOSE};
 diff --git a/tests/misc/unexpand.pl b/tests/misc/unexpand.pl
-index 1c8e308..9f8ab89 100755
+index 2e1906f..fe66012 100755
 --- a/tests/misc/unexpand.pl
 +++ b/tests/misc/unexpand.pl
 @@ -27,6 +27,14 @@ my $limits = getlimits ();
@@ -5057,7 +5199,7 @@ index 1c8e308..9f8ab89 100755
  my $verbose = $ENV{VERBOSE};
  
 diff --git a/tests/misc/uniq.pl b/tests/misc/uniq.pl
-index 74d3815..aae4c7e 100755
+index aa163cd..91d617d 100755
 --- a/tests/misc/uniq.pl
 +++ b/tests/misc/uniq.pl
 @@ -23,9 +23,17 @@ my $limits = getlimits ();
@@ -5133,7 +5275,7 @@ index 74d3815..aae4c7e 100755
  @Tests = triple_test \@Tests;
  
 diff --git a/tests/pr/pr-tests.pl b/tests/pr/pr-tests.pl
-index d0ac405..ff7d472 100755
+index 7ac6d4c..ae6cc35 100755
 --- a/tests/pr/pr-tests.pl
 +++ b/tests/pr/pr-tests.pl
 @@ -24,6 +24,15 @@ use strict;
@@ -5380,5 +5522,5 @@ index 0000000..8a82d74
 +LC_ALL=C unexpand in in > out || fail=1
 +compare exp out > /dev/null 2>&1 || fail=1
 -- 
-2.31.1
+2.34.1
 
diff --git a/coreutils.spec b/coreutils.spec
index c1c4c5d..766e55b 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.0
-Release: 5%{?dist}
+Version: 9.1
+Release: 1%{?dist}
 License: GPLv3+
 Url:     https://www.gnu.org/software/coreutils/
 Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
@@ -17,12 +17,6 @@ Source106:  coreutils-colorls.csh
 # do not make coreutils-single depend on /usr/bin/coreutils
 %global __requires_exclude ^%{_bindir}/coreutils$
 
-# chmod: fix exit status when ignoring symlinks
-Patch1:   coreutils-9.0-chmod-symlink.patch
-
-# ls, stat: avoid triggering automounts (#2044981)
-Patch2:   coreutils-9.0-autofs-no-mount.patch
-
 # disable the test-lock gnulib test prone to deadlock
 Patch100: coreutils-8.26-test-lock.patch
 
@@ -31,7 +25,7 @@ Patch105: coreutils-8.26-selinuxenable.patch
 
 # downstream changes to default DIR_COLORS
 Patch102: coreutils-8.32-DIR_COLORS.patch
-#do display processor type for uname -p/-i based on uname(2) syscall
+# to be removed (#548834)
 Patch103: coreutils-8.2-uname-processortype.patch
 #df --direct
 Patch104: coreutils-df-direct.patch
@@ -41,7 +35,6 @@ Patch107: coreutils-8.4-mkdir-modenote.patch
 # sh-utils
 #add info about TZ envvar to date manpage
 Patch703: sh-utils-2.0.11-dateman.patch
-Patch713: coreutils-4.5.3-langinfo.patch
 
 # (sb) lin18nux/lsb compliance - multibyte functionality patch
 Patch800: coreutils-i18n.patch
@@ -183,7 +176,7 @@ for type in separate single; do
   if test $type = 'single'; then
     config_single='--enable-single-binary'
     config_single="$config_single --without-openssl"  # smaller/slower sha*sum
-    config_single="$config_single --without-gmp"      # expr/factor machine ints
+    config_single="$config_single --without-libgmp"   # expr/factor machine ints
   else
     config_single='--with-openssl'  # faster sha*sum
   fi
@@ -269,6 +262,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %license COPYING
 
 %changelog
+* Tue Apr 19 2022 Kamil Dudka <kdudka@redhat.com> - 9.1-1
+- new upstream release 9.1
+
 * Mon Mar 21 2022 Kamil Dudka <kdudka@redhat.com> - 9.0-5
 - ls, stat: avoid triggering automounts (#2044981)
 
diff --git a/sources b/sources
index 99d4423..1ff9c2a 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (coreutils-9.0.tar.xz) = 9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03
+SHA512 (coreutils-9.1.tar.xz.sig) = 9f0766531afd4faa3e2c337730f61db55605cf06729e9c61f644594883732c2e0b1ddb0005b492be309c53e6f45b8ff875398163a48699d52517ea49e9bdbc91
+SHA512 (coreutils-9.1.tar.xz) = a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa