Updated coreutils to 8.31

ee989aad · Vladimir Bashkirtsev · fb7a7e95 · ee989aad · ee989aad · ee989aad
Commit ee989aad authored Aug 30, 2019 by Vladimir Bashkirtsev
5 changed files
--- a/Makefile
+++ b/Makefile
 all: export FORCE_UNSAFE_CONFIGURE := 1
 all:
-	tar xf coreutils-8.29.tar.xz
-	patch -Np1 -d coreutils-8.29 < coreutils-8.29-i18n-1.patch
-	cd coreutils-8.29 && sed -i '/test.lock/s/^/#/' gnulib-tests/gnulib.mk
-	cd coreutils-8.29 && autoreconf -fiv
-	cd coreutils-8.29 && ./configure --build=$(CLFS_TARGET) --prefix=/usr --enable-no-install-program=kill,uptime
-	$(MAKE) -C coreutils-8.29
+	tar xf coreutils-8.31.tar.xz
+	patch -Np1 -d coreutils-8.31 < coreutils-8.31-i18n-1.patch
+	cd coreutils-8.31 && sed -i '/test.lock/s/^/#/' gnulib-tests/gnulib.mk
+	cd coreutils-8.31 && autoreconf -fiv
+	cd coreutils-8.31 && ./configure --build=$(CLFS_TARGET) --prefix=/usr --enable-no-install-program=kill,uptime
+	$(MAKE) -C coreutils-8.31
 	-if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \
-	    $(MAKE) -C coreutils-8.29 NON_ROOT_USERNAME=nobody check-root ; \
+	    $(MAKE) -C coreutils-8.31 NON_ROOT_USERNAME=nobody check-root ; \
 	    echo "dummy:x:1000:nobody" >> /etc/group ; \
-	    cd coreutils-8.29 ; \
+	    cd coreutils-8.31 ; \
 	    chown -Rv nobody . ; \
 	    su nobody -s /bin/bash -c "PATH=$$PATH make RUN_EXPENSIVE_TESTS=yes -k check || true" ; \
 	    sed -i '/dummy/d' /etc/group ; \
 	fi
-	$(MAKE) -C coreutils-8.29 install
+	$(MAKE) -C coreutils-8.31 install
 	mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date} /bin
 	mv -v /usr/bin/{dd,df,echo,false,ln,ls,mkdir,mknod} /bin
 	mv -v /usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} /bin
@@ -22,4 +22,4 @@ all:
 	mv -v /usr/share/man/man1/chroot.1 /usr/share/man/man8/chroot.8
 	sed -i s/\"1\"/\"8\"/1 /usr/share/man/man8/chroot.8
 	mv -v /usr/bin/{head,sleep,nice,test,[} /bin
-	rm -rf coreutils-8.29
+	rm -rf coreutils-8.31
--- a/build.xml
+++ b/build.xml
 <project name="coreutils">

 <target name="temporary-coreutils">
-  <property name="makedir" value="${builddir}/coreutils-8.29"/>
+  <property name="makedir" value="${builddir}/coreutils-8.31"/>
  <exec executable="tar" failonerror="true">
-   <arg line="xf packages/coreutils/coreutils-8.29.tar.xz -C ${builddir}"/>
+   <arg line="xf packages/coreutils/coreutils-8.31.tar.xz -C ${builddir}"/>
  </exec>
  <exec executable="patch" dir="${makedir}" failonerror="true">
-   <arg line="-Np1 -i ${basedir}/packages/coreutils/coreutils-8.29-noman.patch"/>
+   <arg line="-Np1 -i ${basedir}/packages/coreutils/coreutils-8.31-noman.patch"/>
  </exec>
  <echo file="${makedir}/config.cache">fu_cv_sys_stat_statfs2_bsize=yes
 gl_cv_func_working_mkstemp=yes

--- a/coreutils-8.29-i18n-1.patch
+++ b/coreutils-8.29-i18n-1.patch
-Submitted by:            DJ Lucas (dj_AT_linuxfromscratch_DOT_org)
-Date:                    2017-03-12
-Initial Package Version: 8.27
-Upstream Status:         Rejected
-Origin:                  Based on Fedora's i18n patches at
-                         http://pkgs.fedoraproject.org/cgit/rpms/coreutils.git/tree/
-Description:             Fixes i18n issues with various Coreutils programs
-
-diff -Naurp coreutils-8.27-orig/bootstrap.conf coreutils-8.27/bootstrap.conf
--- coreutils-8.27-orig/bootstrap.conf	2017-03-07 23:34:06.000000000 -0600
-+++ coreutils-8.27/bootstrap.conf	2017-03-11 23:47:38.068058445 -0600
-@@ -152,6 +152,7 @@ gnulib_modules="
+diff -uNr coreutils-8.31/bootstrap.conf coreutils-8.31-i18n-1/bootstrap.conf
+--- coreutils-8.31/bootstrap.conf	2019-03-03 14:34:26.000000000 +1030
+++ coreutils-8.31-i18n-1/bootstrap.conf	2019-08-30 14:36:51.803486413 +0930
+@@ -154,6 +154,7 @@
   maintainer-makefile
   malloc-gnu
   manywarnings
@@ -17,10 +9,10 @@ diff -Naurp coreutils-8.27-orig/bootstrap.conf coreutils-8.27/bootstrap.conf
   mbrlen
   mbrtowc
   mbsalign
-diff -Naurp coreutils-8.27-orig/configure.ac coreutils-8.27/configure.ac
--- coreutils-8.27-orig/configure.ac	2017-02-26 08:52:29.000000000 -0600
-+++ coreutils-8.27/configure.ac	2017-03-11 23:47:38.068058445 -0600
-@@ -429,6 +429,8 @@ fi
+diff -uNr coreutils-8.31/configure.ac coreutils-8.31-i18n-1/configure.ac
+--- coreutils-8.31/configure.ac	2019-03-04 18:10:55.000000000 +1030
+++ coreutils-8.31-i18n-1/configure.ac	2019-08-30 14:36:51.803486413 +0930
+@@ -438,6 +438,8 @@
 # I'm leaving it here for now.  This whole thing needs to be modernized...
 gl_WINSIZE_IN_PTEM
 
@@ -29,9 +21,9 @@ diff -Naurp coreutils-8.27-orig/configure.ac coreutils-8.27/configure.ac
 gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H
 
 if test $gl_cv_sys_tiocgwinsz_needs_termios_h = no && \
-diff -Naurp coreutils-8.27-orig/lib/linebuffer.h coreutils-8.27/lib/linebuffer.h
--- coreutils-8.27-orig/lib/linebuffer.h	2017-01-01 16:35:38.000000000 -0600
-+++ coreutils-8.27/lib/linebuffer.h	2017-03-11 23:47:13.089286391 -0600
+diff -uNr coreutils-8.31/lib/linebuffer.h coreutils-8.31-i18n-1/lib/linebuffer.h
+--- coreutils-8.31/lib/linebuffer.h	2019-01-05 02:44:43.000000000 +1030
+++ coreutils-8.31-i18n-1/lib/linebuffer.h	2019-08-30 14:36:51.803486413 +0930
 @@ -21,6 +21,11 @@
 
 # include <stdio.h>
@@ -44,7 +36,7 @@ diff -Naurp coreutils-8.27-orig/lib/linebuffer.h coreutils-8.27/lib/linebuffer.h
 /* A 'struct linebuffer' holds a line of text. */
 
 struct linebuffer
-@@ -28,6 +33,9 @@ struct linebuffer
+@@ -28,6 +33,9 @@
   size_t size;                  /* Allocated. */
   size_t length;                /* Used. */
   char *buffer;
@@ -54,16 +46,16 @@ diff -Naurp coreutils-8.27-orig/lib/linebuffer.h coreutils-8.27/lib/linebuffer.h
 };
 
 /* Initialize linebuffer LINEBUFFER for use. */
-diff -Naurp coreutils-8.27-orig/lib/mbfile.c coreutils-8.27/lib/mbfile.c
--- coreutils-8.27-orig/lib/mbfile.c	1969-12-31 18:00:00.000000000 -0600
-+++ coreutils-8.27/lib/mbfile.c	2017-03-11 23:47:38.069058397 -0600
+diff -uNr coreutils-8.31/lib/mbfile.c coreutils-8.31-i18n-1/lib/mbfile.c
+--- coreutils-8.31/lib/mbfile.c	1970-01-01 09:30:00.000000000 +0930
+++ coreutils-8.31-i18n-1/lib/mbfile.c	2019-08-30 14:36:51.804486415 +0930
 @@ -0,0 +1,3 @@
 +#include <config.h>
 +#define MBFILE_INLINE _GL_EXTERN_INLINE
 +#include "mbfile.h"
-diff -Naurp coreutils-8.27-orig/lib/mbfile.h coreutils-8.27/lib/mbfile.h
--- coreutils-8.27-orig/lib/mbfile.h	1969-12-31 18:00:00.000000000 -0600
-+++ coreutils-8.27/lib/mbfile.h	2017-03-11 23:47:38.069058397 -0600
+diff -uNr coreutils-8.31/lib/mbfile.h coreutils-8.31-i18n-1/lib/mbfile.h
+--- coreutils-8.31/lib/mbfile.h	1970-01-01 09:30:00.000000000 +0930
+++ coreutils-8.31-i18n-1/lib/mbfile.h	2019-08-30 14:36:51.804486415 +0930
 @@ -0,0 +1,255 @@
 +/* Multibyte character I/O: macros for multi-byte encodings.
 +   Copyright (C) 2001, 2005, 2009-2017 Free Software Foundation, Inc.
@@ -320,9 +312,9 @@ diff -Naurp coreutils-8.27-orig/lib/mbfile.h coreutils-8.27/lib/mbfile.h
 +_GL_INLINE_HEADER_BEGIN
 +
 +#endif /* _MBFILE_H */
-diff -Naurp coreutils-8.27-orig/m4/mbfile.m4 coreutils-8.27/m4/mbfile.m4
--- coreutils-8.27-orig/m4/mbfile.m4	1969-12-31 18:00:00.000000000 -0600
-+++ coreutils-8.27/m4/mbfile.m4	2017-03-11 23:47:38.070058349 -0600
+diff -uNr coreutils-8.31/m4/mbfile.m4 coreutils-8.31-i18n-1/m4/mbfile.m4
+--- coreutils-8.31/m4/mbfile.m4	1970-01-01 09:30:00.000000000 +0930
+++ coreutils-8.31-i18n-1/m4/mbfile.m4	2019-08-30 14:36:51.804486415 +0930
 @@ -0,0 +1,14 @@
 +# mbfile.m4 serial 7
 +dnl Copyright (C) 2005, 2008-2017 Free Software Foundation, Inc.
@@ -338,9 +330,9 @@ diff -Naurp coreutils-8.27-orig/m4/mbfile.m4 coreutils-8.27/m4/mbfile.m4
 +  AC_REQUIRE([AC_TYPE_MBSTATE_T])
 +  :
 +])
-diff -Naurp coreutils-8.27-orig/src/cut.c coreutils-8.27/src/cut.c
--- coreutils-8.27-orig/src/cut.c	2017-01-01 16:34:24.000000000 -0600
-+++ coreutils-8.27/src/cut.c	2017-03-11 23:47:59.526048471 -0600
+diff -uNr coreutils-8.31/src/cut.c coreutils-8.31-i18n-1/src/cut.c
+--- coreutils-8.31/src/cut.c	2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/src/cut.c	2019-08-30 14:36:51.804486415 +0930
 @@ -28,6 +28,11 @@
 #include <assert.h>
 #include <getopt.h>
@@ -435,7 +427,7 @@ diff -Naurp coreutils-8.27-orig/src/cut.c coreutils-8.27/src/cut.c
 /* 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
-@@ -77,15 +143,25 @@ enum operating_mode
+@@ -77,15 +143,25 @@
   {
     undefined_mode,
 
@@ -462,7 +454,7 @@ diff -Naurp coreutils-8.27-orig/src/cut.c coreutils-8.27/src/cut.c
 /* If true do not output lines containing no delimiter characters.
    Otherwise, all such lines are printed.  This option is valid only
    with field mode.  */
-@@ -97,6 +173,9 @@ static bool complement;
+@@ -97,6 +173,9 @@
 
 /* The delimiter character for field mode. */
 static unsigned char delim;
@@ -472,7 +464,7 @@ diff -Naurp coreutils-8.27-orig/src/cut.c coreutils-8.27/src/cut.c
 
 /* The delimiter for each line/record. */
 static unsigned char line_delim = '\n';
-@@ -164,7 +243,7 @@ Print selected parts of lines from each
+@@ -164,7 +243,7 @@
   -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\
@@ -481,7 +473,7 @@ diff -Naurp coreutils-8.27-orig/src/cut.c coreutils-8.27/src/cut.c
 "), stdout);
       fputs (_("\
       --complement        complement the set of selected bytes, characters\n\
-@@ -280,6 +359,82 @@ cut_bytes (FILE *stream)
+@@ -280,6 +359,82 @@
     }
 }
 
@@ -564,7 +556,7 @@ diff -Naurp coreutils-8.27-orig/src/cut.c coreutils-8.27/src/cut.c
 /* Read from stream STREAM, printing to standard output any selected fields.  */
 
 static void
-@@ -425,13 +580,211 @@ cut_fields (FILE *stream)
+@@ -425,13 +580,211 @@
     }
 }
 
@@ -779,7 +771,7 @@ diff -Naurp coreutils-8.27-orig/src/cut.c coreutils-8.27/src/cut.c
 }
 
 /* Process file FILE to standard output.
-@@ -483,6 +836,7 @@ main (int argc, char **argv)
+@@ -483,6 +836,7 @@
   bool ok;
   bool delim_specified = false;
   char *spec_list_string IF_LINT ( = NULL);
@@ -787,7 +779,7 @@ diff -Naurp coreutils-8.27-orig/src/cut.c coreutils-8.27/src/cut.c
 
   initialize_main (&argc, &argv);
   set_program_name (argv[0]);
-@@ -505,7 +859,6 @@ main (int argc, char **argv)
+@@ -505,7 +859,6 @@
       switch (optc)
         {
         case 'b':
@@ -795,7 +787,7 @@ diff -Naurp coreutils-8.27-orig/src/cut.c coreutils-8.27/src/cut.c
           /* Build the byte list. */
           if (operating_mode != undefined_mode)
             FATAL_ERROR (_("only one type of list may be specified"));
-@@ -513,6 +866,14 @@ main (int argc, char **argv)
+@@ -513,6 +866,14 @@
           spec_list_string = optarg;
           break;
 
@@ -810,7 +802,7 @@ diff -Naurp coreutils-8.27-orig/src/cut.c coreutils-8.27/src/cut.c
         case 'f':
           /* Build the field list. */
           if (operating_mode != undefined_mode)
-@@ -524,10 +885,38 @@ main (int argc, char **argv)
+@@ -524,10 +885,38 @@
         case 'd':
           /* New delimiter. */
           /* Interpret -d '' to mean 'use the NUL byte as the delimiter.'  */
@@ -853,7 +845,7 @@ diff -Naurp coreutils-8.27-orig/src/cut.c coreutils-8.27/src/cut.c
           break;
 
         case OUTPUT_DELIMITER_OPTION:
-@@ -540,6 +929,7 @@ main (int argc, char **argv)
+@@ -540,6 +929,7 @@
           break;
 
         case 'n':
@@ -861,7 +853,7 @@ diff -Naurp coreutils-8.27-orig/src/cut.c coreutils-8.27/src/cut.c
           break;
 
         case 's':
-@@ -579,15 +969,34 @@ main (int argc, char **argv)
+@@ -579,15 +969,34 @@
               | (complement ? SETFLD_COMPLEMENT : 0) );
 
   if (!delim_specified)
@@ -902,9 +894,9 @@ diff -Naurp coreutils-8.27-orig/src/cut.c coreutils-8.27/src/cut.c
     }
 
   if (optind == argc)
-diff -Naurp coreutils-8.27-orig/src/expand.c coreutils-8.27/src/expand.c
--- coreutils-8.27-orig/src/expand.c	2017-02-26 15:42:25.000000000 -0600
-+++ coreutils-8.27/src/expand.c	2017-03-11 23:49:06.758133530 -0600
+diff -uNr coreutils-8.31/src/expand.c coreutils-8.31-i18n-1/src/expand.c
+--- coreutils-8.31/src/expand.c	2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/src/expand.c	2019-08-30 14:36:51.805486418 +0930
 @@ -37,6 +37,9 @@
 #include <stdio.h>
 #include <getopt.h>
@@ -915,7 +907,7 @@ diff -Naurp coreutils-8.27-orig/src/expand.c coreutils-8.27/src/expand.c
 #include "system.h"
 #include "die.h"
 #include "xstrndup.h"
-@@ -100,19 +103,41 @@ expand (void)
+@@ -98,19 +101,41 @@
 {
   /* Input stream.  */
   FILE *fp = next_file (NULL);
@@ -961,7 +953,7 @@ diff -Naurp coreutils-8.27-orig/src/expand.c coreutils-8.27/src/expand.c
       /* The following variables have valid values only when CONVERT
          is true:  */
 
-@@ -122,17 +147,48 @@ expand (void)
+@@ -120,17 +145,48 @@
       /* Index in TAB_LIST of next tab stop to examine.  */
       size_t tab_index = 0;
 
@@ -1014,7 +1006,7 @@ diff -Naurp coreutils-8.27-orig/src/expand.c coreutils-8.27/src/expand.c
                 {
                   /* Column the next input tab stop is on.  */
                   uintmax_t next_tab_column;
-@@ -151,32 +207,34 @@ expand (void)
+@@ -149,32 +205,34 @@
                     if (putchar (' ') < 0)
                       die (EXIT_FAILURE, errno, _("write error"));
 
@@ -1057,18 +1049,18 @@ diff -Naurp coreutils-8.27-orig/src/expand.c coreutils-8.27/src/expand.c
     }
 }
 
-diff -Naurp coreutils-8.27-orig/src/expand-common.c coreutils-8.27/src/expand-common.c
--- coreutils-8.27-orig/src/expand-common.c	2017-03-01 11:22:55.000000000 -0600
-+++ coreutils-8.27/src/expand-common.c	2017-03-11 23:49:06.757133570 -0600
-@@ -18,6 +18,7 @@
- 
+diff -uNr coreutils-8.31/src/expand-common.c coreutils-8.31-i18n-1/src/expand-common.c
+--- coreutils-8.31/src/expand-common.c	2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/src/expand-common.c	2019-08-30 14:36:51.805486418 +0930
+@@ -19,6 +19,7 @@
+ #include <assert.h>
 #include <stdio.h>
 #include <sys/types.h>
 +#include <mbfile.h>
 #include "system.h"
 #include "die.h"
 #include "error.h"
-@@ -105,6 +106,119 @@ set_extend_size (uintmax_t tabval)
+@@ -126,6 +127,119 @@
   return ok;
 }
 
@@ -1188,10 +1180,10 @@ diff -Naurp coreutils-8.27-orig/src/expand-common.c coreutils-8.27/src/expand-co
 /* Add the comma or blank separated list of tab stops STOPS
    to the list of tab stops.  */
 extern void
-diff -Naurp coreutils-8.27-orig/src/expand-common.h coreutils-8.27/src/expand-common.h
--- coreutils-8.27-orig/src/expand-common.h	2017-01-01 16:34:24.000000000 -0600
-+++ coreutils-8.27/src/expand-common.h	2017-03-11 23:49:06.758133530 -0600
-@@ -34,6 +34,18 @@ extern size_t max_column_width;
+diff -uNr coreutils-8.31/src/expand-common.h coreutils-8.31-i18n-1/src/expand-common.h
+--- coreutils-8.31/src/expand-common.h	2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/src/expand-common.h	2019-08-30 14:36:51.805486418 +0930
+@@ -34,6 +34,18 @@
 /* The desired exit status.  */
 extern int exit_status;
 
@@ -1210,9 +1202,9 @@ diff -Naurp coreutils-8.27-orig/src/expand-common.h coreutils-8.27/src/expand-co
 /* Add tab stop TABVAL to the end of 'tab_list'.  */
 extern void
 add_tab_stop (uintmax_t tabval);
-diff -Naurp coreutils-8.27-orig/src/fold.c coreutils-8.27/src/fold.c
--- coreutils-8.27-orig/src/fold.c	2017-01-01 16:34:24.000000000 -0600
-+++ coreutils-8.27/src/fold.c	2017-03-11 23:49:30.982169404 -0600
+diff -uNr coreutils-8.31/src/fold.c coreutils-8.31-i18n-1/src/fold.c
+--- coreutils-8.31/src/fold.c	2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/src/fold.c	2019-08-30 14:36:51.805486418 +0930
 @@ -22,12 +22,34 @@
 #include <getopt.h>
 #include <sys/types.h>
@@ -1294,7 +1286,7 @@ diff -Naurp coreutils-8.27-orig/src/fold.c coreutils-8.27/src/fold.c
   {"spaces", no_argument, NULL, 's'},
   {"width", required_argument, NULL, 'w'},
   {GETOPT_HELP_OPTION_DECL},
-@@ -76,6 +119,7 @@ Wrap input lines in each FILE, writing t
+@@ -76,6 +119,7 @@
 
       fputs (_("\
   -b, --bytes         count bytes rather than columns\n\
@@ -1302,7 +1294,7 @@ diff -Naurp coreutils-8.27-orig/src/fold.c coreutils-8.27/src/fold.c
   -s, --spaces        break at spaces\n\
   -w, --width=WIDTH   use WIDTH columns instead of 80\n\
 "), stdout);
-@@ -93,7 +137,7 @@ Wrap input lines in each FILE, writing t
+@@ -93,7 +137,7 @@
 static size_t
 adjust_column (size_t column, char c)
 {
@@ -1311,7 +1303,7 @@ diff -Naurp coreutils-8.27-orig/src/fold.c coreutils-8.27/src/fold.c
     {
       if (c == '\b')
         {
-@@ -116,30 +160,14 @@ adjust_column (size_t column, char c)
+@@ -116,30 +160,14 @@
    to stdout, with maximum line length WIDTH.
    Return true if successful.  */
 
@@ -1344,7 +1336,7 @@ diff -Naurp coreutils-8.27-orig/src/fold.c coreutils-8.27/src/fold.c
 
   fadvise (istream, FADVISE_SEQUENTIAL);
 
-@@ -169,6 +197,15 @@ fold_file (char const *filename, size_t
+@@ -169,6 +197,15 @@
               bool found_blank = false;
               size_t logical_end = offset_out;
 
@@ -1360,7 +1352,7 @@ diff -Naurp coreutils-8.27-orig/src/fold.c coreutils-8.27/src/fold.c
               /* Look for the last blank. */
               while (logical_end)
                 {
-@@ -215,11 +252,220 @@ fold_file (char const *filename, size_t
+@@ -215,11 +252,220 @@
       line_out[offset_out++] = c;
     }
 
@@ -1582,7 +1574,7 @@ diff -Naurp coreutils-8.27-orig/src/fold.c coreutils-8.27/src/fold.c
   if (ferror (istream))
     {
       error (0, saved_errno, "%s", quotef (filename));
-@@ -252,7 +498,8 @@ main (int argc, char **argv)
+@@ -252,7 +498,8 @@
 
   atexit (close_stdout);
 
@@ -1592,7 +1584,7 @@ diff -Naurp coreutils-8.27-orig/src/fold.c coreutils-8.27/src/fold.c
 
   while ((optc = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1)
     {
-@@ -261,7 +508,15 @@ main (int argc, char **argv)
+@@ -261,7 +508,15 @@
       switch (optc)
         {
         case 'b':		/* Count bytes rather than columns. */
@@ -1609,9 +1601,9 @@ diff -Naurp coreutils-8.27-orig/src/fold.c coreutils-8.27/src/fold.c
           break;
 
         case 's':		/* Break at word boundaries. */
-diff -Naurp coreutils-8.27-orig/src/join.c coreutils-8.27/src/join.c
--- coreutils-8.27-orig/src/join.c	2017-01-01 16:34:24.000000000 -0600
-+++ coreutils-8.27/src/join.c	2017-03-11 23:47:13.091286290 -0600
+diff -uNr coreutils-8.31/src/join.c coreutils-8.31-i18n-1/src/join.c
+--- coreutils-8.31/src/join.c	2019-02-18 13:54:11.000000000 +1030
+++ coreutils-8.31-i18n-1/src/join.c	2019-08-30 14:36:51.806486420 +0930
 @@ -22,19 +22,33 @@
 #include <sys/types.h>
 #include <getopt.h>
@@ -1647,7 +1639,7 @@ diff -Naurp coreutils-8.27-orig/src/join.c coreutils-8.27/src/join.c
 /* The official name of this program (e.g., no 'g' prefix).  */
 #define PROGRAM_NAME "join"
 
-@@ -136,10 +150,12 @@ static struct outlist outlist_head;
+@@ -136,10 +150,12 @@
 /* Last element in 'outlist', where a new element can be added.  */
 static struct outlist *outlist_end = &outlist_head;
 
@@ -1664,7 +1656,7 @@ diff -Naurp coreutils-8.27-orig/src/join.c coreutils-8.27/src/join.c
 
 /* If nonzero, check that the input is correctly ordered. */
 static enum
-@@ -276,13 +292,14 @@ xfields (struct line *line)
+@@ -276,13 +292,14 @@
   if (ptr == lim)
     return;
 
@@ -1682,7 +1674,7 @@ diff -Naurp coreutils-8.27-orig/src/join.c coreutils-8.27/src/join.c
     {
       /* Skip leading blanks before the first field.  */
       while (field_sep (*ptr))
-@@ -306,6 +323,147 @@ xfields (struct line *line)
+@@ -306,6 +323,147 @@
   extract_field (line, ptr, lim - ptr);
 }
 
@@ -1830,7 +1822,7 @@ diff -Naurp coreutils-8.27-orig/src/join.c coreutils-8.27/src/join.c
 static void
 freeline (struct line *line)
 {
-@@ -327,56 +485,133 @@ keycmp (struct line const *line1, struct
+@@ -327,56 +485,133 @@
         size_t jf_1, size_t jf_2)
 {
   /* Start of field to compare in each file.  */
@@ -1987,7 +1979,7 @@ diff -Naurp coreutils-8.27-orig/src/join.c coreutils-8.27/src/join.c
 }
 
 /* Check that successive input lines PREV and CURRENT from input file
-@@ -468,6 +703,11 @@ get_line (FILE *fp, struct line **linep,
+@@ -468,6 +703,11 @@
     }
   ++line_no[which - 1];
 
@@ -1999,7 +1991,7 @@ diff -Naurp coreutils-8.27-orig/src/join.c coreutils-8.27/src/join.c
   xfields (line);
 
   if (prevline[which - 1])
-@@ -567,21 +807,28 @@ prfield (size_t n, struct line const *li
+@@ -563,21 +803,28 @@
 
 /* Output all the fields in line, other than the join field.  */
 
@@ -2031,7 +2023,7 @@ diff -Naurp coreutils-8.27-orig/src/join.c coreutils-8.27/src/join.c
       prfield (i, line);
     }
 }
-@@ -592,7 +839,6 @@ static void
+@@ -588,7 +835,6 @@
 prjoin (struct line const *line1, struct line const *line2)
 {
   const struct outlist *outlist;
@@ -2039,7 +2031,7 @@ diff -Naurp coreutils-8.27-orig/src/join.c coreutils-8.27/src/join.c
   size_t field;
   struct line const *line;
 
-@@ -626,7 +872,7 @@ prjoin (struct line const *line1, struct
+@@ -622,7 +868,7 @@
           o = o->next;
           if (o == NULL)
             break;
@@ -2048,7 +2040,7 @@ diff -Naurp coreutils-8.27-orig/src/join.c coreutils-8.27/src/join.c
         }
       putchar (eolchar);
     }
-@@ -1104,20 +1350,43 @@ main (int argc, char **argv)
+@@ -1099,20 +1345,43 @@
 
         case 't':
           {
@@ -2101,9 +2093,9 @@ diff -Naurp coreutils-8.27-orig/src/join.c coreutils-8.27/src/join.c
           }
           break;
 
-diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
--- coreutils-8.27-orig/src/pr.c	2017-01-01 16:34:24.000000000 -0600
-+++ coreutils-8.27/src/pr.c	2017-03-11 23:47:13.094286139 -0600
+diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
+--- coreutils-8.31/src/pr.c	2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/src/pr.c	2019-08-30 14:36:51.807486422 +0930
 @@ -311,6 +311,24 @@
 
 #include <getopt.h>
@@ -2148,7 +2140,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
 /* The official name of this program (e.g., no 'g' prefix).  */
 #define PROGRAM_NAME "pr"
 
-@@ -416,7 +446,20 @@ struct COLUMN
+@@ -416,7 +446,20 @@
 
 typedef struct COLUMN COLUMN;
 
@@ -2170,7 +2162,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
 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);
+@@ -428,6 +471,7 @@
 static void getoptnum (const char *n_str, int min, int *num,
                        const char *errfmt);
 static void getoptarg (char *arg, char switch_char, char *character,
@@ -2178,7 +2170,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
                        int *number);
 static void print_files (int number_of_files, char **av);
 static void init_parameters (int number_of_files);
-@@ -441,7 +485,6 @@ static void store_char (char c);
+@@ -441,7 +485,6 @@
 static void pad_down (unsigned int lines);
 static void read_rest_of_line (COLUMN *p);
 static void skip_read (COLUMN *p, int column_number);
@@ -2186,7 +2178,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
 static void cleanup (void);
 static void print_sep_string (void);
 static void separator_string (const char *optarg_S);
-@@ -453,7 +496,7 @@ static COLUMN *column_vector;
+@@ -453,7 +496,7 @@
    we store the leftmost columns contiguously in buff.
    To print a line from buff, get the index of the first character
    from line_vector[i], and print up to line_vector[i + 1]. */
@@ -2195,7 +2187,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
 
 /* Index of the position in buff where the next character
    will be stored. */
-@@ -557,7 +600,7 @@ static int chars_per_column;
+@@ -557,7 +600,7 @@
 static bool untabify_input = false;
 
 /* (-e) The input tab character. */
@@ -2204,7 +2196,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
 
 /* (-e) Tabstops are at chars_per_tab, 2*chars_per_tab, 3*chars_per_tab, ...
    where the leftmost column is 1. */
-@@ -567,7 +610,10 @@ static int chars_per_input_tab = 8;
+@@ -567,7 +610,10 @@
 static bool tabify_output = false;
 
 /* (-i) The output tab character. */
@@ -2216,7 +2208,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
 
 /* (-i) The width of the output tab. */
 static int chars_per_output_tab = 8;
-@@ -637,7 +683,13 @@ static int line_number;
+@@ -637,7 +683,13 @@
 static bool numbered_lines = false;
 
 /* (-n) Character which follows each line number. */
@@ -2231,7 +2223,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
 
 /* (-n) line counting starts with 1st line of input file (not with 1st
    line of 1st page printed). */
-@@ -690,6 +742,7 @@ static bool use_col_separator = false;
+@@ -690,6 +742,7 @@
    -a|COLUMN|-m is a 'space' and with the -J option a 'tab'. */
 static char const *col_sep_string = "";
 static int col_sep_length = 0;
@@ -2239,7 +2231,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
 static char *column_separator = (char *) " ";
 static char *line_separator = (char *) "\t";
 
-@@ -851,6 +904,13 @@ separator_string (const char *optarg_S)
+@@ -851,6 +904,13 @@
     integer_overflow ();
   col_sep_length = len;
   col_sep_string = optarg_S;
@@ -2253,7 +2245,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
 }
 
 int
-@@ -875,6 +935,21 @@ main (int argc, char **argv)
+@@ -875,6 +935,21 @@
 
   atexit (close_stdout);
 
@@ -2275,7 +2267,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
   n_files = 0;
   file_names = (argc > 1
                 ? xnmalloc (argc - 1, sizeof (char *))
-@@ -951,8 +1026,12 @@ main (int argc, char **argv)
+@@ -951,8 +1026,12 @@
           break;
         case 'e':
           if (optarg)
@@ -2290,7 +2282,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
           /* Could check tab width > 0. */
           untabify_input = true;
           break;
-@@ -965,8 +1044,12 @@ main (int argc, char **argv)
+@@ -965,8 +1044,12 @@
           break;
         case 'i':
           if (optarg)
@@ -2305,7 +2297,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
           /* Could check tab width > 0. */
           tabify_output = true;
           break;
-@@ -984,8 +1067,8 @@ main (int argc, char **argv)
+@@ -984,8 +1067,8 @@
         case 'n':
           numbered_lines = true;
           if (optarg)
@@ -2316,7 +2308,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
           break;
         case 'N':
           skip_count = false;
-@@ -1010,6 +1093,7 @@ main (int argc, char **argv)
+@@ -1010,6 +1093,7 @@
           /* Reset an additional input of -s, -S dominates -s */
           col_sep_string = "";
           col_sep_length = 0;
@@ -2324,7 +2316,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
           use_col_separator = true;
           if (optarg)
             separator_string (optarg);
-@@ -1166,10 +1250,45 @@ getoptnum (const char *n_str, int min, i
+@@ -1165,10 +1249,45 @@
    a number. */
 
 static void
@@ -2372,7 +2364,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
   if (*arg)
     {
       long int tmp_long;
-@@ -1191,6 +1310,11 @@ static void
+@@ -1190,6 +1309,11 @@
 init_parameters (int number_of_files)
 {
   int chars_used_by_number = 0;
@@ -2384,7 +2376,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
 
   lines_per_body = lines_per_page - lines_per_header - lines_per_footer;
   if (lines_per_body <= 0)
-@@ -1228,7 +1352,7 @@ init_parameters (int number_of_files)
+@@ -1227,7 +1351,7 @@
           else
             col_sep_string = column_separator;
 
@@ -2393,7 +2385,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
           use_col_separator = true;
         }
       /* It's rather pointless to define a TAB separator with column
-@@ -1258,11 +1382,11 @@ init_parameters (int number_of_files)
+@@ -1257,11 +1381,11 @@
              + TAB_WIDTH (chars_per_input_tab, chars_per_number);   */
 
       /* Estimate chars_per_text without any margin and keep it constant. */
@@ -2407,7 +2399,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
 
       /* The number is part of the column width unless we are
          printing files in parallel. */
-@@ -1271,7 +1395,7 @@ init_parameters (int number_of_files)
+@@ -1270,7 +1394,7 @@
     }
 
   int sep_chars, useful_chars;
@@ -2416,7 +2408,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
     sep_chars = INT_MAX;
   if (INT_SUBTRACT_WRAPV (chars_per_line - chars_used_by_number, sep_chars,
                           &useful_chars))
-@@ -1294,7 +1418,7 @@ init_parameters (int number_of_files)
+@@ -1293,7 +1417,7 @@
      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);
@@ -2425,7 +2417,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
 }
 
 /* Open the necessary files,
-@@ -1402,7 +1526,7 @@ init_funcs (void)
+@@ -1399,7 +1523,7 @@
 
   /* Enlarge p->start_position of first column to use the same form of
      padding_not_printed with all columns. */
@@ -2434,7 +2426,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
 
   /* This loop takes care of all but the rightmost column. */
 
-@@ -1436,7 +1560,7 @@ init_funcs (void)
+@@ -1433,7 +1557,7 @@
         }
       else
         {
@@ -2443,7 +2435,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
           h_next = h + chars_per_column;
         }
     }
-@@ -1727,9 +1851,9 @@ static void
+@@ -1724,9 +1848,9 @@
 align_column (COLUMN *p)
 {
   padding_not_printed = p->start_position;
@@ -2455,7 +2447,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
       padding_not_printed = ANYWHERE;
     }
 
-@@ -2004,13 +2128,13 @@ store_char (char c)
+@@ -2001,13 +2125,13 @@
       /* May be too generous. */
       buff = X2REALLOC (buff, &buff_allocated);
     }
@@ -2471,7 +2463,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
   char *s;
   int num_width;
 
-@@ -2027,22 +2151,24 @@ add_line_number (COLUMN *p)
+@@ -2024,22 +2148,24 @@
       /* 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. */
@@ -2500,7 +2492,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
         output_position = POS_AFTER_TAB (chars_per_output_tab,
                           output_position);
     }
-@@ -2203,7 +2329,7 @@ print_white_space (void)
+@@ -2198,7 +2324,7 @@
   while (goal - h_old > 1
          && (h_new = POS_AFTER_TAB (chars_per_output_tab, h_old)) <= goal)
     {
@@ -2509,7 +2501,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
       h_old = h_new;
     }
   while (++h_old <= goal)
-@@ -2223,6 +2349,7 @@ print_sep_string (void)
+@@ -2218,6 +2344,7 @@
 {
   char const *s = col_sep_string;
   int l = col_sep_length;
@@ -2517,7 +2509,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
 
   if (separators_not_printed <= 0)
     {
-@@ -2234,6 +2361,7 @@ print_sep_string (void)
+@@ -2229,6 +2356,7 @@
     {
       for (; separators_not_printed > 0; --separators_not_printed)
         {
@@ -2525,7 +2517,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
           while (l-- > 0)
             {
               /* 3 types of sep_strings: spaces only, spaces and chars,
-@@ -2247,12 +2375,15 @@ print_sep_string (void)
+@@ -2242,12 +2370,15 @@
                 }
               else
                 {
@@ -2542,7 +2534,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
           /* sep_string ends with some spaces */
           if (spaces_not_printed > 0)
             print_white_space ();
-@@ -2280,7 +2411,7 @@ print_clump (COLUMN *p, int n, char *clu
+@@ -2275,7 +2406,7 @@
    required number of tabs and spaces. */
 
 static void
@@ -2551,7 +2543,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
 {
   if (tabify_output)
     {
-@@ -2304,6 +2435,74 @@ print_char (char c)
+@@ -2299,6 +2430,74 @@
   putchar (c);
 }
 
@@ -2626,7 +2618,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
 /* Skip to page PAGE before printing.
    PAGE may be larger than total number of pages. */
 
-@@ -2483,9 +2682,9 @@ read_line (COLUMN *p)
+@@ -2476,9 +2675,9 @@
           align_empty_cols = false;
         }
 
@@ -2638,8 +2630,8 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
           padding_not_printed = ANYWHERE;
         }
 
-@@ -2555,7 +2754,7 @@ print_stored (COLUMN *p)
-   int i;
+@@ -2547,7 +2746,7 @@
+   COLUMN *q;
 
   int line = p->current_line++;
 -  char *first = &buff[line_vector[line]];
@@ -2647,7 +2639,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
   /* FIXME
      UMR: Uninitialized memory read:
      * This is occurring while in:
-@@ -2567,7 +2766,7 @@ print_stored (COLUMN *p)
+@@ -2559,7 +2758,7 @@
      xmalloc        [xmalloc.c:94]
      init_store_cols [pr.c:1648]
      */
@@ -2656,7 +2648,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
 
   pad_vertically = true;
 
-@@ -2586,9 +2785,9 @@ print_stored (COLUMN *p)
+@@ -2579,9 +2778,9 @@
         }
     }
 
@@ -2668,7 +2660,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
       padding_not_printed = ANYWHERE;
     }
 
-@@ -2601,8 +2800,8 @@ print_stored (COLUMN *p)
+@@ -2594,8 +2793,8 @@
   if (spaces_not_printed == 0)
     {
       output_position = p->start_position + end_vector[line];
@@ -2679,7 +2671,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
     }
 
   return true;
-@@ -2621,7 +2820,7 @@ print_stored (COLUMN *p)
+@@ -2614,7 +2813,7 @@
    number of characters is 1.) */
 
 static int
@@ -2688,7 +2680,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
 {
   unsigned char uc = c;
   char *s = clump_buff;
-@@ -2631,10 +2830,10 @@ char_to_clump (char c)
+@@ -2624,10 +2823,10 @@
   int chars;
   int chars_per_c = 8;
 
@@ -2701,7 +2693,7 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
     {
       width = TAB_WIDTH (chars_per_c, input_position);
 
-@@ -2715,6 +2914,164 @@ char_to_clump (char c)
+@@ -2708,6 +2907,164 @@
   return chars;
 }
 
@@ -2866,9 +2858,9 @@ diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
 /* We've just printed some files and need to clean up things before
    looking for more options and printing the next batch of files.
 
-diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
--- coreutils-8.27-orig/src/sort.c	2017-01-01 16:34:24.000000000 -0600
-+++ coreutils-8.27/src/sort.c	2017-03-11 23:49:22.416505389 -0600
+diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
+--- coreutils-8.31/src/sort.c	2019-02-18 13:54:43.000000000 +1030
+++ coreutils-8.31-i18n-1/src/sort.c	2019-08-30 14:36:51.808486424 +0930
 @@ -29,6 +29,14 @@
 #include <sys/wait.h>
 #include <signal.h>
@@ -2884,7 +2876,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
 #include "system.h"
 #include "argmatch.h"
 #include "die.h"
-@@ -165,14 +173,39 @@ static int decimal_point;
+@@ -161,14 +169,39 @@
 /* Thousands separator; if -1, then there isn't one.  */
 static int thousands_sep;
 
@@ -2925,7 +2917,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
 /* The kind of blanks for '-b' to skip in various options. */
 enum blanktype { bl_start, bl_end, bl_both };
 
-@@ -346,13 +379,11 @@ static bool reverse;
+@@ -342,13 +375,11 @@
    they were read if all keys compare equal.  */
 static bool stable;
 
@@ -2942,7 +2934,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
 
 /* Flag to remove consecutive duplicate lines from the output.
    Only the last of a sequence of equal lines will be output. */
-@@ -811,6 +842,46 @@ reap_all (void)
+@@ -806,6 +837,46 @@
     reap (-1);
 }
 
@@ -2989,7 +2981,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
 /* Clean up any remaining temporary files.  */
 
 static void
-@@ -1255,7 +1326,7 @@ zaptemp (char const *name)
+@@ -1274,7 +1345,7 @@
   free (node);
 }
 
@@ -2998,7 +2990,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
 
 static int
 struct_month_cmp (void const *m1, void const *m2)
-@@ -1270,7 +1341,7 @@ struct_month_cmp (void const *m1, void c
+@@ -1289,7 +1360,7 @@
 /* Initialize the character class tables. */
 
 static void
@@ -3007,7 +2999,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
 {
   size_t i;
 
-@@ -1282,7 +1353,7 @@ inittables (void)
+@@ -1301,7 +1372,7 @@
       fold_toupper[i] = toupper (i);
     }
 
@@ -3016,7 +3008,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
   /* If we're not in the "C" locale, read different names for months.  */
   if (hard_LC_TIME)
     {
-@@ -1364,6 +1435,84 @@ specify_nmerge (int oi, char c, char con
+@@ -1383,6 +1454,84 @@
     xstrtol_fatal (e, oi, c, long_options, s);
 }
 
@@ -3101,7 +3093,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
 /* Specify the amount of main memory to use when sorting.  */
 static void
 specify_sort_size (int oi, char c, char const *s)
-@@ -1597,7 +1746,7 @@ buffer_linelim (struct buffer const *buf
+@@ -1614,7 +1763,7 @@
    by KEY in LINE. */
 
 static char *
@@ -3110,7 +3102,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
 {
   char *ptr = line->text, *lim = ptr + line->length - 1;
   size_t sword = key->sword;
-@@ -1606,10 +1755,10 @@ begfield (struct line const *line, struc
+@@ -1623,10 +1772,10 @@
   /* The leading field separator itself is included in a field when -t
      is absent.  */
 
@@ -3123,7 +3115,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
           ++ptr;
         if (ptr < lim)
           ++ptr;
-@@ -1635,11 +1784,70 @@ begfield (struct line const *line, struc
+@@ -1652,11 +1801,70 @@
   return ptr;
 }
 
@@ -3195,7 +3187,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
 {
   char *ptr = line->text, *lim = ptr + line->length - 1;
   size_t eword = key->eword, echar = key->echar;
-@@ -1654,10 +1862,10 @@ limfield (struct line const *line, struc
+@@ -1671,10 +1879,10 @@
      'beginning' is the first character following the delimiting TAB.
      Otherwise, leave PTR pointing at the first 'blank' character after
      the preceding field.  */
@@ -3208,7 +3200,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
           ++ptr;
         if (ptr < lim && (eword || echar))
           ++ptr;
-@@ -1703,10 +1911,10 @@ limfield (struct line const *line, struc
+@@ -1720,10 +1928,10 @@
      */
 
   /* Make LIM point to the end of (one byte past) the current field.  */
@@ -3221,7 +3213,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
       if (newlim)
         lim = newlim;
     }
-@@ -1737,6 +1945,130 @@ limfield (struct line const *line, struc
+@@ -1754,6 +1962,130 @@
   return ptr;
 }
 
@@ -3352,7 +3344,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
 /* 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
-@@ -1823,8 +2155,22 @@ fillbuf (struct buffer *buf, FILE *fp, c
+@@ -1840,8 +2172,22 @@
                   else
                     {
                       if (key->skipsblanks)
@@ -3377,7 +3369,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
                       line->keybeg = line_start;
                     }
                 }
-@@ -1958,12 +2304,10 @@ find_unit_order (char const *number)
+@@ -1975,12 +2321,10 @@
        <none/unknown> < K/k < M < G < T < P < E < Z < Y  */
 
 static int
@@ -3393,7 +3385,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
 
   int diff = find_unit_order (a) - find_unit_order (b);
   return (diff ? diff : strnumcmp (a, b, decimal_point, thousands_sep));
-@@ -1974,7 +2318,7 @@ human_numcompare (char const *a, char co
+@@ -1991,7 +2335,7 @@
    hideously fast. */
 
 static int
@@ -3402,7 +3394,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
 {
   while (blanks[to_uchar (*a)])
     a++;
-@@ -1984,6 +2328,25 @@ numcompare (char const *a, char const *b
+@@ -2001,6 +2345,25 @@
   return strnumcmp (a, b, decimal_point, thousands_sep);
 }
 
@@ -3427,8 +3419,8 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
 +
 /* 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 once
-@@ -2034,7 +2397,7 @@ general_numcompare (char const *sa, char
+    A and B before calling strtold.  FIXME: remove this function if
+@@ -2051,7 +2414,7 @@
    Return 0 if the name in S is not recognized.  */
 
 static int
@@ -3437,7 +3429,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
 {
   size_t lo = 0;
   size_t hi = MONTHS_PER_YEAR;
-@@ -2310,15 +2673,14 @@ debug_key (struct line const *line, stru
+@@ -2327,15 +2690,14 @@
           char saved = *lim;
           *lim = '\0';
 
@@ -3455,7 +3447,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
           else if (key->general_numeric)
             ignore_value (strtold (beg, &tighter_lim));
           else if (key->numeric || key->human_numeric)
-@@ -2452,7 +2814,7 @@ key_warnings (struct keyfield const *gke
+@@ -2469,7 +2831,7 @@
       /* 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  */
@@ -3464,7 +3456,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
           && ((!key->skipsblanks && !implicit_skip)
               || (!key->skipsblanks && key->schar)
               || (!key->skipeblanks && key->echar)))
-@@ -2510,11 +2872,87 @@ key_warnings (struct keyfield const *gke
+@@ -2527,11 +2889,87 @@
     error (0, 0, _("option '-r' only applies to last-resort comparison"));
 }
 
@@ -3553,7 +3545,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
 {
   struct keyfield *key = keylist;
 
-@@ -2599,7 +3037,7 @@ keycompare (struct line const *a, struct
+@@ -2616,7 +3054,7 @@
           else if (key->human_numeric)
             diff = human_numcompare (ta, tb);
           else if (key->month)
@@ -3562,7 +3554,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
           else if (key->random)
             diff = compare_random (ta, tlena, tb, tlenb);
           else if (key->version)
-@@ -2715,6 +3153,211 @@ keycompare (struct line const *a, struct
+@@ -2732,6 +3170,211 @@
   return key->reverse ? -diff : diff;
 }
 
@@ -3774,16 +3766,16 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
 /* Compare two lines A and B, returning negative, zero, or positive
    depending on whether A compares less than, equal to, or greater than B. */
 
-@@ -2742,7 +3385,7 @@ compare (struct line const *a, struct li
+@@ -2759,7 +3402,7 @@
     diff = - NONZERO (blen);
   else if (blen == 0)
     diff = 1;
 -  else if (hard_LC_COLLATE)
 +  else if (hard_LC_COLLATE && !folding)
     {
-       /* Note xmemcoll0 is a performance enhancement as
+       /* xmemcoll0 is a performance enhancement as
          it will not unconditionally write '\0' after the
-@@ -4139,6 +4782,7 @@ set_ordering (char const *s, struct keyf
+@@ -4149,6 +4792,7 @@
           break;
         case 'f':
           key->translate = fold_toupper;
@@ -3791,7 +3783,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
           break;
         case 'g':
           key->general_numeric = true;
-@@ -4218,7 +4862,7 @@ main (int argc, char **argv)
+@@ -4228,7 +4872,7 @@
   initialize_exit_failure (SORT_FAILURE);
 
   hard_LC_COLLATE = hard_locale (LC_COLLATE);
@@ -3800,7 +3792,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
   hard_LC_TIME = hard_locale (LC_TIME);
 #endif
 
-@@ -4239,6 +4883,29 @@ main (int argc, char **argv)
+@@ -4249,6 +4893,29 @@
       thousands_sep = -1;
   }
 
@@ -3830,7 +3822,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
   have_read_stdin = false;
   inittables ();
 
-@@ -4513,13 +5180,34 @@ main (int argc, char **argv)
+@@ -4523,13 +5190,34 @@
 
         case 't':
           {
@@ -3869,7 +3861,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
                 else
                   {
                     /* Provoke with 'sort -txx'.  Complain about
-@@ -4530,9 +5218,11 @@ main (int argc, char **argv)
+@@ -4540,9 +5228,11 @@
                          quote (optarg));
                   }
               }
@@ -3883,7 +3875,7 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
           }
           break;
 
-@@ -4770,12 +5460,10 @@ main (int argc, char **argv)
+@@ -4771,12 +5461,10 @@
       sort (files, nfiles, outfile, nthreads);
     }
 
@@ -3896,9 +3888,9 @@ diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
 
   if (have_read_stdin && fclose (stdin) == EOF)
     sort_die (_("close failed"), "-");
-diff -Naurp coreutils-8.27-orig/src/unexpand.c coreutils-8.27/src/unexpand.c
--- coreutils-8.27-orig/src/unexpand.c	2017-01-01 16:34:24.000000000 -0600
-+++ coreutils-8.27/src/unexpand.c	2017-03-11 23:49:06.758133530 -0600
+diff -uNr coreutils-8.31/src/unexpand.c coreutils-8.31-i18n-1/src/unexpand.c
+--- coreutils-8.31/src/unexpand.c	2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/src/unexpand.c	2019-08-30 14:36:51.808486424 +0930
 @@ -38,6 +38,9 @@
 #include <stdio.h>
 #include <getopt.h>
@@ -3909,7 +3901,7 @@ diff -Naurp coreutils-8.27-orig/src/unexpand.c coreutils-8.27/src/unexpand.c
 #include "system.h"
 #include "die.h"
 #include "xstrndup.h"
-@@ -107,24 +110,47 @@ unexpand (void)
+@@ -107,24 +110,47 @@
 {
   /* Input stream.  */
   FILE *fp = next_file (NULL);
@@ -3960,7 +3952,7 @@ diff -Naurp coreutils-8.27-orig/src/unexpand.c coreutils-8.27/src/unexpand.c
 
       /* If true, perform translations.  */
       bool convert = true;
-@@ -158,12 +184,44 @@ unexpand (void)
+@@ -158,12 +184,44 @@
 
       do
         {
@@ -4008,7 +4000,7 @@ diff -Naurp coreutils-8.27-orig/src/unexpand.c coreutils-8.27/src/unexpand.c
 
               if (blank)
                 {
-@@ -180,16 +238,16 @@ unexpand (void)
+@@ -180,16 +238,16 @@
                       if (next_tab_column < column)
                         die (EXIT_FAILURE, 0, _("input line is too long"));
 
@@ -4028,7 +4020,7 @@ diff -Naurp coreutils-8.27-orig/src/unexpand.c coreutils-8.27/src/unexpand.c
 
                           if (! (prev_blank && column == next_tab_column))
                             {
-@@ -197,13 +255,14 @@ unexpand (void)
+@@ -197,13 +255,14 @@
                                  will be replaced by tabs.  */
                               if (column == next_tab_column)
                                 one_blank_before_tab_stop = true;
@@ -4045,7 +4037,7 @@ diff -Naurp coreutils-8.27-orig/src/unexpand.c coreutils-8.27/src/unexpand.c
                         }
 
                       /* Discard pending blanks, unless it was a single
-@@ -211,7 +270,7 @@ unexpand (void)
+@@ -211,7 +270,7 @@
                       pending = one_blank_before_tab_stop;
                     }
                 }
@@ -4054,7 +4046,7 @@ diff -Naurp coreutils-8.27-orig/src/unexpand.c coreutils-8.27/src/unexpand.c
                 {
                   /* Go back one column, and force recalculation of the
                      next tab stop.  */
-@@ -219,9 +278,9 @@ unexpand (void)
+@@ -219,9 +278,9 @@
                   next_tab_column = column;
                   tab_index -= !!tab_index;
                 }
@@ -4066,7 +4058,7 @@ diff -Naurp coreutils-8.27-orig/src/unexpand.c coreutils-8.27/src/unexpand.c
                   if (!column)
                     die (EXIT_FAILURE, 0, _("input line is too long"));
                 }
-@@ -229,8 +288,11 @@ unexpand (void)
+@@ -229,8 +288,11 @@
               if (pending)
                 {
                   if (pending > 1 && one_blank_before_tab_stop)
@@ -4080,7 +4072,7 @@ diff -Naurp coreutils-8.27-orig/src/unexpand.c coreutils-8.27/src/unexpand.c
                     die (EXIT_FAILURE, errno, _("write error"));
                   pending = 0;
                   one_blank_before_tab_stop = false;
-@@ -240,16 +302,17 @@ unexpand (void)
+@@ -240,16 +302,17 @@
               convert &= convert_entire_line || blank;
             }
 
@@ -4101,9 +4093,9 @@ diff -Naurp coreutils-8.27-orig/src/unexpand.c coreutils-8.27/src/unexpand.c
     }
 }
 
-diff -Naurp coreutils-8.27-orig/src/uniq.c coreutils-8.27/src/uniq.c
--- coreutils-8.27-orig/src/uniq.c	2017-01-01 16:34:24.000000000 -0600
-+++ coreutils-8.27/src/uniq.c	2017-03-11 23:47:13.098285938 -0600
+diff -uNr coreutils-8.31/src/uniq.c coreutils-8.31-i18n-1/src/uniq.c
+--- coreutils-8.31/src/uniq.c	2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/src/uniq.c	2019-08-30 14:36:51.809486427 +0930
 @@ -21,6 +21,17 @@
 #include <getopt.h>
 #include <sys/types.h>
@@ -4145,7 +4137,7 @@ diff -Naurp coreutils-8.27-orig/src/uniq.c coreutils-8.27/src/uniq.c
 /* The official name of this program (e.g., no 'g' prefix).  */
 #define PROGRAM_NAME "uniq"
 
-@@ -144,6 +167,10 @@ enum
+@@ -144,6 +167,10 @@
   GROUP_OPTION = CHAR_MAX + 1
 };
 
@@ -4156,7 +4148,7 @@ diff -Naurp coreutils-8.27-orig/src/uniq.c coreutils-8.27/src/uniq.c
 static struct option const longopts[] =
 {
   {"count", no_argument, NULL, 'c'},
-@@ -260,7 +287,7 @@ size_opt (char const *opt, char const *m
+@@ -260,7 +287,7 @@
    return a pointer to the beginning of the line's field to be compared. */
 
 static char * _GL_ATTRIBUTE_PURE
@@ -4165,7 +4157,7 @@ diff -Naurp coreutils-8.27-orig/src/uniq.c coreutils-8.27/src/uniq.c
 {
   size_t count;
   char const *lp = line->buffer;
-@@ -280,6 +307,83 @@ find_field (struct linebuffer const *lin
+@@ -280,6 +307,83 @@
   return line->buffer + i;
 }
 
@@ -4249,7 +4241,7 @@ diff -Naurp coreutils-8.27-orig/src/uniq.c coreutils-8.27/src/uniq.c
 /* 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.
-@@ -288,6 +392,8 @@ find_field (struct linebuffer const *lin
+@@ -288,6 +392,8 @@
 static bool
 different (char *old, char *new, size_t oldlen, size_t newlen)
 {
@@ -4258,7 +4250,7 @@ diff -Naurp coreutils-8.27-orig/src/uniq.c coreutils-8.27/src/uniq.c
   if (check_chars < oldlen)
     oldlen = check_chars;
   if (check_chars < newlen)
-@@ -295,14 +401,103 @@ different (char *old, char *new, size_t
+@@ -295,14 +401,103 @@
 
   if (ignore_case)
     {
@@ -4367,7 +4359,7 @@ diff -Naurp coreutils-8.27-orig/src/uniq.c coreutils-8.27/src/uniq.c
 
 /* Output the line in linebuffer LINE to standard output
    provided that the switches say it should be output.
-@@ -367,19 +562,38 @@ check_file (const char *infile, const ch
+@@ -367,19 +562,38 @@
       char *prevfield IF_LINT ( = NULL);
       size_t prevlen IF_LINT ( = 0);
       bool first_group_printed = false;
@@ -4406,7 +4398,7 @@ diff -Naurp coreutils-8.27-orig/src/uniq.c coreutils-8.27/src/uniq.c
           new_group = (prevline->length == 0
                        || different (thisfield, prevfield, thislen, prevlen));
 
-@@ -397,6 +611,10 @@ check_file (const char *infile, const ch
+@@ -397,6 +611,10 @@
               SWAP_LINES (prevline, thisline);
               prevfield = thisfield;
               prevlen = thislen;
@@ -4417,7 +4409,7 @@ diff -Naurp coreutils-8.27-orig/src/uniq.c coreutils-8.27/src/uniq.c
               first_group_printed = true;
             }
         }
-@@ -409,17 +627,26 @@ check_file (const char *infile, const ch
+@@ -409,17 +627,26 @@
       size_t prevlen;
       uintmax_t match_count = 0;
       bool first_delimiter = true;
@@ -4444,7 +4436,7 @@ diff -Naurp coreutils-8.27-orig/src/uniq.c coreutils-8.27/src/uniq.c
           if (readlinebuffer_delim (thisline, stdin, delimiter) == 0)
             {
               if (ferror (stdin))
-@@ -428,6 +655,14 @@ check_file (const char *infile, const ch
+@@ -428,6 +655,14 @@
             }
           thisfield = find_field (thisline);
           thislen = thisline->length - 1 - (thisfield - thisline->buffer);
@@ -4459,7 +4451,7 @@ diff -Naurp coreutils-8.27-orig/src/uniq.c coreutils-8.27/src/uniq.c
           match = !different (thisfield, prevfield, thislen, prevlen);
           match_count += match;
 
-@@ -460,6 +695,9 @@ check_file (const char *infile, const ch
+@@ -460,6 +695,9 @@
               SWAP_LINES (prevline, thisline);
               prevfield = thisfield;
               prevlen = thislen;
@@ -4469,7 +4461,7 @@ diff -Naurp coreutils-8.27-orig/src/uniq.c coreutils-8.27/src/uniq.c
               if (!match)
                 match_count = 0;
             }
-@@ -506,6 +744,19 @@ main (int argc, char **argv)
+@@ -506,6 +744,19 @@
 
   atexit (close_stdout);
 
@@ -4489,9 +4481,9 @@ diff -Naurp coreutils-8.27-orig/src/uniq.c coreutils-8.27/src/uniq.c
   skip_chars = 0;
   skip_fields = 0;
   check_chars = SIZE_MAX;
-diff -Naurp coreutils-8.27-orig/tests/expand/mb.sh coreutils-8.27/tests/expand/mb.sh
--- coreutils-8.27-orig/tests/expand/mb.sh	1969-12-31 18:00:00.000000000 -0600
-+++ coreutils-8.27/tests/expand/mb.sh	2017-03-11 23:49:06.759133489 -0600
+diff -uNr coreutils-8.31/tests/expand/mb.sh coreutils-8.31-i18n-1/tests/expand/mb.sh
+--- coreutils-8.31/tests/expand/mb.sh	1970-01-01 09:30:00.000000000 +0930
+++ coreutils-8.31-i18n-1/tests/expand/mb.sh	2019-08-30 14:36:51.809486427 +0930
 @@ -0,0 +1,183 @@
 +#!/bin/sh
 +
@@ -4676,9 +4668,9 @@ diff -Naurp coreutils-8.27-orig/tests/expand/mb.sh coreutils-8.27/tests/expand/m
 +compare exp out > /dev/null 2>&1 || fail=1
 +
 +exit $fail
-diff -Naurp coreutils-8.27-orig/tests/i18n/sort.sh coreutils-8.27/tests/i18n/sort.sh
--- coreutils-8.27-orig/tests/i18n/sort.sh	1969-12-31 18:00:00.000000000 -0600
-+++ coreutils-8.27/tests/i18n/sort.sh	2017-03-11 23:47:13.100285838 -0600
+diff -uNr coreutils-8.31/tests/i18n/sort.sh coreutils-8.31-i18n-1/tests/i18n/sort.sh
+--- coreutils-8.31/tests/i18n/sort.sh	1970-01-01 09:30:00.000000000 +0930
+++ coreutils-8.31-i18n-1/tests/i18n/sort.sh	2019-08-30 14:36:51.809486427 +0930
 @@ -0,0 +1,29 @@
 +#!/bin/sh
 +# Verify sort's multi-byte support.
@@ -4709,10 +4701,10 @@ diff -Naurp coreutils-8.27-orig/tests/i18n/sort.sh coreutils-8.27/tests/i18n/sor
 +
 +
 +Exit $fail
-diff -Naurp coreutils-8.27-orig/tests/local.mk coreutils-8.27/tests/local.mk
--- coreutils-8.27-orig/tests/local.mk	2017-02-28 22:25:37.000000000 -0600
-+++ coreutils-8.27/tests/local.mk	2017-03-11 23:47:38.072058253 -0600
-@@ -352,6 +352,8 @@ all_tests =					\
+diff -uNr coreutils-8.31/tests/local.mk coreutils-8.31-i18n-1/tests/local.mk
+--- coreutils-8.31/tests/local.mk	2019-03-04 19:06:33.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/local.mk	2019-08-30 14:36:51.809486427 +0930
+@@ -368,6 +368,8 @@
   tests/misc/sort-discrim.sh			\
   tests/misc/sort-files0-from.pl		\
   tests/misc/sort-float.sh			\
@@ -4721,7 +4713,7 @@ diff -Naurp coreutils-8.27-orig/tests/local.mk coreutils-8.27/tests/local.mk
   tests/misc/sort-h-thousands-sep.sh		\
   tests/misc/sort-merge.pl			\
   tests/misc/sort-merge-fdlimit.sh		\
-@@ -544,6 +546,7 @@ all_tests =					\
+@@ -564,6 +566,7 @@
   tests/du/threshold.sh				\
   tests/du/trailing-slash.sh			\
   tests/du/two-args.sh				\
@@ -4729,7 +4721,7 @@ diff -Naurp coreutils-8.27-orig/tests/local.mk coreutils-8.27/tests/local.mk
   tests/id/gnu-zero-uids.sh			\
   tests/id/no-context.sh			\
   tests/id/context.sh				\
-@@ -684,6 +687,7 @@ all_tests =					\
+@@ -709,6 +712,7 @@
   tests/touch/read-only.sh			\
   tests/touch/relative.sh			\
   tests/touch/trailing-slash.sh			\
@@ -4737,10 +4729,10 @@ diff -Naurp coreutils-8.27-orig/tests/local.mk coreutils-8.27/tests/local.mk
   $(all_root_tests)
 
 # See tests/factor/create-test.sh.
-diff -Naurp coreutils-8.27-orig/tests/misc/cut.pl coreutils-8.27/tests/misc/cut.pl
--- coreutils-8.27-orig/tests/misc/cut.pl	2017-01-01 16:34:24.000000000 -0600
-+++ coreutils-8.27/tests/misc/cut.pl	2017-03-11 23:47:13.100285838 -0600
-@@ -23,9 +23,11 @@ use strict;
+diff -uNr coreutils-8.31/tests/misc/cut.pl coreutils-8.31-i18n-1/tests/misc/cut.pl
+--- coreutils-8.31/tests/misc/cut.pl	2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/misc/cut.pl	2019-08-30 14:36:51.809486427 +0930
+@@ -23,9 +23,11 @@
 # Turn off localization of executable's output.
 @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
 
@@ -4754,7 +4746,7 @@ diff -Naurp coreutils-8.27-orig/tests/misc/cut.pl coreutils-8.27/tests/misc/cut.
 
 my $prog = 'cut';
 my $try = "Try '$prog --help' for more information.\n";
-@@ -240,6 +242,7 @@ if ($mb_locale ne 'C')
+@@ -240,6 +242,7 @@
         my @new_t = @$t;
         my $test_name = shift @new_t;
 
@@ -4762,10 +4754,10 @@ diff -Naurp coreutils-8.27-orig/tests/misc/cut.pl coreutils-8.27/tests/misc/cut.
         push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}];
       }
     push @Tests, @new;
-diff -Naurp coreutils-8.27-orig/tests/misc/expand.pl coreutils-8.27/tests/misc/expand.pl
--- coreutils-8.27-orig/tests/misc/expand.pl	2017-03-01 11:16:46.000000000 -0600
-+++ coreutils-8.27/tests/misc/expand.pl	2017-03-11 23:47:13.101285788 -0600
-@@ -27,6 +27,15 @@ my $prog = 'expand';
+diff -uNr coreutils-8.31/tests/misc/expand.pl coreutils-8.31-i18n-1/tests/misc/expand.pl
+--- coreutils-8.31/tests/misc/expand.pl	2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/misc/expand.pl	2019-08-30 14:36:51.810486429 +0930
+@@ -27,6 +27,15 @@
 # Turn off localization of executable's output.
 @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
 
@@ -4781,8 +4773,8 @@ diff -Naurp coreutils-8.27-orig/tests/misc/expand.pl coreutils-8.27/tests/misc/e
 my @Tests =
   (
    ['t1', '--tabs=3',     {IN=>"a\tb"}, {OUT=>"a  b"}],
-@@ -152,6 +161,8 @@ my @Tests =
-    ['trail9', '--tab=1,2 -t/5',{IN=>"\ta\tb\tc"}, {OUT=>" a   b    c"}],
+@@ -168,6 +177,8 @@
+ 
 
    # Test errors
 +   # FIXME: The following tests contain ‘quoting’ specific to LC_MESSAGES
@@ -4790,7 +4782,7 @@ diff -Naurp coreutils-8.27-orig/tests/misc/expand.pl coreutils-8.27/tests/misc/e
    ['e1', '--tabs="a"', {IN=>''}, {OUT=>''}, {EXIT=>1},
     {ERR => "$prog: tab size contains invalid character(s): 'a'\n"}],
    ['e2', "-t $UINTMAX_OFLOW", {IN=>''}, {OUT=>''}, {EXIT=>1},
-@@ -168,6 +179,37 @@ my @Tests =
+@@ -184,6 +195,37 @@
     {ERR => "$prog: '/' specifier not at start of number: '/'\n"}],
   );
 
@@ -4828,10 +4820,10 @@ diff -Naurp coreutils-8.27-orig/tests/misc/expand.pl coreutils-8.27/tests/misc/e
 my $save_temps = $ENV{DEBUG};
 my $verbose = $ENV{VERBOSE};
 
-diff -Naurp coreutils-8.27-orig/tests/misc/fold.pl coreutils-8.27/tests/misc/fold.pl
--- coreutils-8.27-orig/tests/misc/fold.pl	2017-01-01 16:34:24.000000000 -0600
-+++ coreutils-8.27/tests/misc/fold.pl	2017-03-11 23:47:13.101285788 -0600
-@@ -20,9 +20,18 @@ use strict;
+diff -uNr coreutils-8.31/tests/misc/fold.pl coreutils-8.31-i18n-1/tests/misc/fold.pl
+--- coreutils-8.31/tests/misc/fold.pl	2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/misc/fold.pl	2019-08-30 14:36:51.810486429 +0930
+@@ -20,9 +20,18 @@
 
 (my $program_name = $0) =~ s|.*/||;
 
@@ -4850,7 +4842,7 @@ diff -Naurp coreutils-8.27-orig/tests/misc/fold.pl coreutils-8.27/tests/misc/fol
 my @Tests =
   (
    ['s1', '-w2 -s', {IN=>"a\t"}, {OUT=>"a\n\t"}],
-@@ -31,9 +40,48 @@ my @Tests =
+@@ -31,9 +40,48 @@
    ['s4', '-w4 -s', {IN=>"abc ef\n"}, {OUT=>"abc \nef\n"}],
   );
 
@@ -4900,10 +4892,10 @@ diff -Naurp coreutils-8.27-orig/tests/misc/fold.pl coreutils-8.27/tests/misc/fol
 -my $prog = 'fold';
 my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
 exit $fail;
-diff -Naurp coreutils-8.27-orig/tests/misc/join.pl coreutils-8.27/tests/misc/join.pl
--- coreutils-8.27-orig/tests/misc/join.pl	2017-01-01 16:34:24.000000000 -0600
-+++ coreutils-8.27/tests/misc/join.pl	2017-03-11 23:47:13.102285737 -0600
-@@ -25,6 +25,15 @@ my $limits = getlimits ();
+diff -uNr coreutils-8.31/tests/misc/join.pl coreutils-8.31-i18n-1/tests/misc/join.pl
+--- coreutils-8.31/tests/misc/join.pl	2019-02-18 13:54:11.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/misc/join.pl	2019-08-30 14:36:51.810486429 +0930
+@@ -25,6 +25,15 @@
 
 my $prog = 'join';
 
@@ -4919,7 +4911,7 @@ diff -Naurp coreutils-8.27-orig/tests/misc/join.pl coreutils-8.27/tests/misc/joi
 my $delim = chr 0247;
 sub t_subst ($)
 {
-@@ -329,8 +338,49 @@ foreach my $t (@tv)
+@@ -333,8 +342,49 @@
     push @Tests, $new_ent;
   }
 
@@ -4969,9 +4961,9 @@ diff -Naurp coreutils-8.27-orig/tests/misc/join.pl coreutils-8.27/tests/misc/joi
 my $save_temps = $ENV{DEBUG};
 my $verbose = $ENV{VERBOSE};
 
-diff -Naurp coreutils-8.27-orig/tests/misc/sort-mb-tests.sh coreutils-8.27/tests/misc/sort-mb-tests.sh
--- coreutils-8.27-orig/tests/misc/sort-mb-tests.sh	1969-12-31 18:00:00.000000000 -0600
-+++ coreutils-8.27/tests/misc/sort-mb-tests.sh	2017-03-11 23:47:13.102285737 -0600
+diff -uNr coreutils-8.31/tests/misc/sort-mb-tests.sh coreutils-8.31-i18n-1/tests/misc/sort-mb-tests.sh
+--- coreutils-8.31/tests/misc/sort-mb-tests.sh	1970-01-01 09:30:00.000000000 +0930
+++ coreutils-8.31-i18n-1/tests/misc/sort-mb-tests.sh	2019-08-30 14:36:51.810486429 +0930
 @@ -0,0 +1,45 @@
 +#!/bin/sh
 +# Verify sort's multi-byte support.
@@ -5018,10 +5010,10 @@ diff -Naurp coreutils-8.27-orig/tests/misc/sort-mb-tests.sh coreutils-8.27/tests
 +compare exp out || { fail=1; cat out; }
 +
 +Exit $fail
-diff -Naurp coreutils-8.27-orig/tests/misc/sort-merge.pl coreutils-8.27/tests/misc/sort-merge.pl
--- coreutils-8.27-orig/tests/misc/sort-merge.pl	2017-01-01 16:34:24.000000000 -0600
-+++ coreutils-8.27/tests/misc/sort-merge.pl	2017-03-11 23:47:13.102285737 -0600
-@@ -26,6 +26,15 @@ my $prog = 'sort';
+diff -uNr coreutils-8.31/tests/misc/sort-merge.pl coreutils-8.31-i18n-1/tests/misc/sort-merge.pl
+--- coreutils-8.31/tests/misc/sort-merge.pl	2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/misc/sort-merge.pl	2019-08-30 14:36:51.810486429 +0930
+@@ -26,6 +26,15 @@
 # Turn off localization of executable's output.
 @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
 
@@ -5037,7 +5029,7 @@ diff -Naurp coreutils-8.27-orig/tests/misc/sort-merge.pl coreutils-8.27/tests/mi
 # three empty files and one that says 'foo'
 my @inputs = (+(map{{IN=> {"empty$_"=> ''}}}1..3), {IN=> {foo=> "foo\n"}});
 
-@@ -77,6 +86,39 @@ my @Tests =
+@@ -77,6 +86,39 @@
         {OUT=>$big_input}],
     );
 
@@ -5077,10 +5069,10 @@ diff -Naurp coreutils-8.27-orig/tests/misc/sort-merge.pl coreutils-8.27/tests/mi
 my $save_temps = $ENV{DEBUG};
 my $verbose = $ENV{VERBOSE};
 
-diff -Naurp coreutils-8.27-orig/tests/misc/sort.pl coreutils-8.27/tests/misc/sort.pl
--- coreutils-8.27-orig/tests/misc/sort.pl	2017-01-21 08:53:43.000000000 -0600
-+++ coreutils-8.27/tests/misc/sort.pl	2017-03-11 23:47:13.103285687 -0600
-@@ -24,10 +24,15 @@ my $prog = 'sort';
+diff -uNr coreutils-8.31/tests/misc/sort.pl coreutils-8.31-i18n-1/tests/misc/sort.pl
+--- coreutils-8.31/tests/misc/sort.pl	2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/misc/sort.pl	2019-08-30 14:36:51.811486431 +0930
+@@ -24,10 +24,15 @@
 # Turn off localization of executable's output.
 @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
 
@@ -5097,7 +5089,7 @@ diff -Naurp coreutils-8.27-orig/tests/misc/sort.pl coreutils-8.27/tests/misc/sor
 # Since each test is run with a file name and with redirected stdin,
 # the name in the diagnostic is either the file name or "-".
 # Normalize each diagnostic to use '-'.
-@@ -423,6 +428,38 @@ foreach my $t (@Tests)
+@@ -423,6 +428,38 @@
       }
   }
 
@@ -5136,7 +5128,7 @@ diff -Naurp coreutils-8.27-orig/tests/misc/sort.pl coreutils-8.27/tests/misc/sor
 @Tests = triple_test \@Tests;
 
 # Remember that triple_test creates from each test with exactly one "IN"
-@@ -432,6 +469,7 @@ foreach my $t (@Tests)
+@@ -432,6 +469,7 @@
 # Remove the IN_PIPE version of the "output-is-input" test above.
 # The others aren't susceptible because they have three inputs each.
 @Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests;
@@ -5144,10 +5136,10 @@ diff -Naurp coreutils-8.27-orig/tests/misc/sort.pl coreutils-8.27/tests/misc/sor
 
 my $save_temps = $ENV{DEBUG};
 my $verbose = $ENV{VERBOSE};
-diff -Naurp coreutils-8.27-orig/tests/misc/unexpand.pl coreutils-8.27/tests/misc/unexpand.pl
--- coreutils-8.27-orig/tests/misc/unexpand.pl	2017-01-01 16:34:24.000000000 -0600
-+++ coreutils-8.27/tests/misc/unexpand.pl	2017-03-11 23:47:13.103285687 -0600
-@@ -27,6 +27,14 @@ my $limits = getlimits ();
+diff -uNr coreutils-8.31/tests/misc/unexpand.pl coreutils-8.31-i18n-1/tests/misc/unexpand.pl
+--- coreutils-8.31/tests/misc/unexpand.pl	2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/misc/unexpand.pl	2019-08-30 14:36:51.811486431 +0930
+@@ -27,6 +27,14 @@
 
 my $prog = 'unexpand';
 
@@ -5162,7 +5154,7 @@ diff -Naurp coreutils-8.27-orig/tests/misc/unexpand.pl coreutils-8.27/tests/misc
 my @Tests =
     (
      ['a1', {IN=> ' 'x 1 ."y\n"}, {OUT=> ' 'x 1 ."y\n"}],
-@@ -128,6 +136,37 @@ my @Tests =
+@@ -128,6 +136,37 @@
      ['ts2', '-t5,8', {IN=>"x\t \t y\n"},    {OUT=>"x\t\t y\n"}],
     );
 
@@ -5200,10 +5192,10 @@ diff -Naurp coreutils-8.27-orig/tests/misc/unexpand.pl coreutils-8.27/tests/misc
 my $save_temps = $ENV{DEBUG};
 my $verbose = $ENV{VERBOSE};
 
-diff -Naurp coreutils-8.27-orig/tests/misc/uniq.pl coreutils-8.27/tests/misc/uniq.pl
--- coreutils-8.27-orig/tests/misc/uniq.pl	2017-01-01 16:34:24.000000000 -0600
-+++ coreutils-8.27/tests/misc/uniq.pl	2017-03-11 23:47:13.103285687 -0600
-@@ -23,9 +23,17 @@ my $limits = getlimits ();
+diff -uNr coreutils-8.31/tests/misc/uniq.pl coreutils-8.31-i18n-1/tests/misc/uniq.pl
+--- coreutils-8.31/tests/misc/uniq.pl	2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/misc/uniq.pl	2019-08-30 14:36:51.811486431 +0930
+@@ -23,9 +23,17 @@
 my $prog = 'uniq';
 my $try = "Try '$prog --help' for more information.\n";
 
@@ -5221,7 +5213,7 @@ diff -Naurp coreutils-8.27-orig/tests/misc/uniq.pl coreutils-8.27/tests/misc/uni
 # When possible, create a "-z"-testing variant of each test.
 sub add_z_variants($)
 {
-@@ -262,6 +270,53 @@ foreach my $t (@Tests)
+@@ -262,6 +270,53 @@
       and push @$t, {ENV=>'_POSIX2_VERSION=199209'};
   }
 
@@ -5275,10 +5267,10 @@ diff -Naurp coreutils-8.27-orig/tests/misc/uniq.pl coreutils-8.27/tests/misc/uni
 @Tests = add_z_variants \@Tests;
 @Tests = triple_test \@Tests;
 
-diff -Naurp coreutils-8.27-orig/tests/pr/pr-tests.pl coreutils-8.27/tests/pr/pr-tests.pl
--- coreutils-8.27-orig/tests/pr/pr-tests.pl	2017-01-01 16:34:24.000000000 -0600
-+++ coreutils-8.27/tests/pr/pr-tests.pl	2017-03-11 23:47:13.103285687 -0600
-@@ -24,6 +24,15 @@ use strict;
+diff -uNr coreutils-8.31/tests/pr/pr-tests.pl coreutils-8.31-i18n-1/tests/pr/pr-tests.pl
+--- coreutils-8.31/tests/pr/pr-tests.pl	2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/pr/pr-tests.pl	2019-08-30 14:36:51.812486434 +0930
+@@ -24,6 +24,15 @@
 my $prog = 'pr';
 my $normalize_strerror = "s/': .*/'/";
 
@@ -5294,7 +5286,7 @@ diff -Naurp coreutils-8.27-orig/tests/pr/pr-tests.pl coreutils-8.27/tests/pr/pr-
 my @tv = (
 
 # -b option is no longer an official option. But it's still working to
-@@ -474,8 +483,48 @@ push @Tests,
+@@ -474,8 +483,48 @@
     {IN=>{2=>"a\n"}},
      {OUT=>"a\t\t\t\t  \t\t\ta\n"} ];
 
@@ -5343,9 +5335,9 @@ diff -Naurp coreutils-8.27-orig/tests/pr/pr-tests.pl coreutils-8.27/tests/pr/pr-
 my $save_temps = $ENV{DEBUG};
 my $verbose = $ENV{VERBOSE};
 
-diff -Naurp coreutils-8.27-orig/tests/unexpand/mb.sh coreutils-8.27/tests/unexpand/mb.sh
--- coreutils-8.27-orig/tests/unexpand/mb.sh	1969-12-31 18:00:00.000000000 -0600
-+++ coreutils-8.27/tests/unexpand/mb.sh	2017-03-11 23:49:06.759133489 -0600
+diff -uNr coreutils-8.31/tests/unexpand/mb.sh coreutils-8.31-i18n-1/tests/unexpand/mb.sh
+--- coreutils-8.31/tests/unexpand/mb.sh	1970-01-01 09:30:00.000000000 +0930
+++ coreutils-8.31-i18n-1/tests/unexpand/mb.sh	2019-08-30 14:36:51.812486434 +0930
 @@ -0,0 +1,172 @@
 +#!/bin/sh
 +

--- a/coreutils-8.29-noman.patch
+++ b/coreutils-8.29-noman.patch
-diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
--- coreutils-8.29/Makefile.in	2017-12-28 04:55:58.000000000 +1030
-+++ coreutils-8.29-noman/Makefile.in	2018-06-01 12:17:50.526109553 +0930
-@@ -2596,7 +2596,7 @@
+diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in
+--- coreutils-8.31/Makefile.in	2019-03-11 10:37:54.000000000 +1030
+++ coreutils-8.31-noman/Makefile.in	2019-08-30 14:34:35.919174733 +0930
+@@ -2907,7 +2907,7 @@
 	$(top_srcdir)/build-aux/texinfo.tex \
 	$(top_srcdir)/build-aux/ylwrap $(top_srcdir)/doc/local.mk \
 	$(top_srcdir)/lib/alloca.c $(top_srcdir)/lib/config.hin \
@@ -10,7 +10,7 @@ diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
 	$(top_srcdir)/src/local.mk $(top_srcdir)/src/single-binary.mk \
 	$(top_srcdir)/tests/local.mk ABOUT-NLS AUTHORS COPYING \
 	ChangeLog INSTALL NEWS README THANKS TODO build-aux/ar-lib \
-@@ -2697,7 +2697,6 @@
+@@ -3009,7 +3009,6 @@
 EOVERFLOW_VALUE = @EOVERFLOW_VALUE@
 ERRNO_H = @ERRNO_H@
 EXEEXT = @EXEEXT@
@@ -18,7 +18,7 @@ diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
 FLOAT_H = @FLOAT_H@
 FNMATCH_H = @FNMATCH_H@
 GETADDRINFO_LIB = @GETADDRINFO_LIB@
-@@ -3978,7 +3977,6 @@
+@@ -4316,7 +4315,6 @@
 lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
@@ -26,7 +26,7 @@ diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
-@@ -4171,9 +4169,8 @@
+@@ -4510,9 +4508,8 @@
 	lib/xgetcwd.h lib/xnanosleep.h lib/xreadlink.h lib/xstrtod.h \
 	lib/xstrtol.h lib/xstrtod.c lib/xstrtod.h lib/xalloc.h \
 	lib/yesno.h src/dcgen src/dircolors.hin src/primes.h \
@@ -38,7 +38,7 @@ diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
 	tests/CuSkip.pm tests/CuTmpdir.pm tests/d_type-check \
 	tests/envvar-check tests/factor/run.sh \
 	tests/factor/create-test.sh tests/filefrag-extent-compare \
-@@ -4231,8 +4228,7 @@
+@@ -4570,8 +4567,7 @@
 MAINTAINERCLEANFILES = THANKS-to-translators lib/iconv_open-aix.h \
 	lib/iconv_open-hpux.h lib/iconv_open-irix.h \
 	lib/iconv_open-osf.h lib/iconv_open-solaris.h \
@@ -48,7 +48,7 @@ diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
 
 # Sort in traditional ASCII order, regardless of the current locale;
 # otherwise we may get into trouble with distinct strings that the
-@@ -5147,19 +5143,6 @@
+@@ -5494,19 +5490,6 @@
      }				\
    END {$$m and (warn "$@: do not use upper case in \@var{...}\n"), exit 1}'
 
@@ -68,12 +68,12 @@ diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
 # Indirections required so that we'll still be able to know the
 # complete list of our tests even if the user overrides TESTS
 # from the command line (as permitted by the test harness API).
-@@ -5990,10 +5973,10 @@
+@@ -6351,10 +6334,10 @@
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .1 .c .dvi .log .o .obj .pl .pl$(EXEEXT) .ps .sed .sh .sh$(EXEEXT) .sin .trs .x .xpl .xpl$(EXEEXT) .y
-+.SUFFIXES: .c .dvi .log .o .obj .pl .pl$(EXEEXT) .ps .sed .sh .sh$(EXEEXT) .sin .trs .xpl .xpl$(EXEEXT) .y
+-.SUFFIXES: .1 .c .dvi .log .o .obj .pl .pl$(EXEEXT) .ps .sh .sh$(EXEEXT) .trs .x .xpl .xpl$(EXEEXT) .y
+.SUFFIXES: .c .dvi .log .o .obj .pl .pl$(EXEEXT) .ps .sh .sh$(EXEEXT) .trs .xpl .xpl$(EXEEXT) .y
 am--refresh: Makefile
 	@:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk $(am__configure_deps)
@@ -81,7 +81,7 @@ diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-@@ -6015,7 +5998,7 @@
+@@ -6376,7 +6359,7 @@
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
@@ -90,7 +90,7 @@ diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
-@@ -14764,150 +14747,6 @@
+@@ -15181,151 +15164,6 @@
 
 check-local: check-texinfo
 
@@ -109,6 +109,7 @@ diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
 -@SINGLE_BINARY_FALSE@man/base32.1:    src/base32$(EXEEXT)
 -@SINGLE_BINARY_FALSE@man/base64.1:    src/base64$(EXEEXT)
 -@SINGLE_BINARY_FALSE@man/basename.1:  src/basename$(EXEEXT)
+-@SINGLE_BINARY_FALSE@man/basenc.1:    src/basenc$(EXEEXT)
 -@SINGLE_BINARY_FALSE@man/cat.1:       src/cat$(EXEEXT)
 -@SINGLE_BINARY_FALSE@man/chcon.1:     src/chcon$(EXEEXT)
 -@SINGLE_BINARY_FALSE@man/chgrp.1:     src/chgrp$(EXEEXT)

--- a/coreutils-8.29.tar.xz
+++ b/coreutils-8.29.tar.xz