Resolves: #1544392 - import gnulib's FTS module from coreutils-8.29

.gitignore

@@ -1,2 +1 @@
 /coreutils-[0-9.]*.tar.xz
-/coreutils-[0-9.]*.tar.xz.sig

coreutils-4.5.3-langinfo.patch

@@ -0,0 +1,20 @@
+diff --git a/src/date.c b/src/date.c
+index ddb011e..619a72b 100644
+--- a/src/date.c
++++ b/src/date.c
+@@ -490,14 +490,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);
+         }
+     }
+ 

coreutils-6.10-manpages.patch

@@ -0,0 +1,14 @@
+diff --git a/src/md5sum.c b/src/md5sum.c
+index 8e21609..a857d62 100644
+--- a/src/md5sum.c
++++ b/src/md5sum.c
+@@ -266,6 +266,9 @@ Print or check %s (%d-bit) checksums.\n\
+         fputs (_("\
+   -t, --text           read in text mode (default)\n\
+ "), stdout);
++  fputs (_("\
++  Note: There is no difference between binary and text mode option on GNU system.\n\
++"), stdout);
+       fputs (_("\
+ \n\
+ The following five options are useful only when verifying checksums:\n\

coreutils-8.2-uname-processortype.patch

@@ -1,24 +1,29 @@
- 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
-@@ -322,6 +322,12 @@ main (int argc, char **argv)
- # elif defined __ppc__ || defined __ppc64__
-       element = "powerpc";
- # endif
+@@ -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;
+       }
 +#else
 +      {
-+        static struct utsname u;
-+        uname(&u);
-+        element = u.machine;
++	static struct utsname u;
++	uname(&u);
++	element = u.machine;
 +      }
  #endif
- #if HAVE_SYSINFO && defined SI_ARCHITECTURE
+ #ifdef UNAME_PROCESSOR
        if (element == unknown)
-@@ -347,7 +353,7 @@ main (int argc, char **argv)
+@@ -344,7 +350,7 @@ main (int argc, char **argv)
  
    if (toprint & PRINT_HARDWARE_PLATFORM)
      {
@@ -27,17 +32,17 @@ index 6371ca2..1ad8fd7 100644
  #if HAVE_SYSINFO && defined SI_PLATFORM
        {
          static char hardware_platform[257];
-@@ -355,6 +361,14 @@ main (int argc, char **argv)
+@@ -352,6 +358,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

coreutils-8.25-DIR_COLORS.patch

@@ -0,0 +1,692 @@
+From a13bc34f1eeebdf8b87e4b5a570341bb77a62f76 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
+
+---
+ DIR_COLORS              |  41 ++++---
+ DIR_COLORS.256color     | 302 ++++++++++++++++++++++++------------------------
+ DIR_COLORS.lightbgcolor | 215 +++++++++++++++++-----------------
+ 3 files changed, 286 insertions(+), 272 deletions(-)
+
+diff --git a/DIR_COLORS b/DIR_COLORS
+index d2ea453..27af9d7 100644
+--- a/DIR_COLORS
++++ b/DIR_COLORS
+@@ -1,6 +1,10 @@
+ # Configuration file for dircolors, a utility to help you set the
+ # LS_COLORS environment variable used by GNU ls with the --color option.
+ 
++# This file goes in the /etc directory, and must be world readable.
++# You can copy this file to .dir_colors in your $HOME directory to override
++# the system defaults.
++
+ # Copyright (C) 1996-2017 Free Software Foundation, Inc.
+ # Copying and distribution of this file, with or without modification,
+ # are permitted provided the copyright notice and this notice are preserved.
+@@ -8,6 +12,9 @@
+ # The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
+ # slackware version of dircolors) are recognized but ignored.
+ 
++# 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
+@@ -56,7 +63,7 @@ DOOR 01;35	# door
+ BLK 40;33;01	# block device driver
+ CHR 40;33;01	# character device driver
+ ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ...
+-MISSING 00      # ... and the files they point to
++MISSING 01;05;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
+@@ -185,21 +192,21 @@ EXEC 01;32
+ .ogx 01;35
+ 
+ # audio formats
+-.aac 00;36
+-.au 00;36
+-.flac 00;36
+-.m4a 00;36
+-.mid 00;36
+-.midi 00;36
+-.mka 00;36
+-.mp3 00;36
+-.mpc 00;36
+-.ogg 00;36
+-.ra 00;36
+-.wav 00;36
++.aac 01;36
++.au 01;36
++.flac 01;36
++.m4a 01;36
++.mid 01;36
++.midi 01;36
++.mka 01;36
++.mp3 01;36
++.mpc 01;36
++.ogg 01;36
++.ra 01;36
++.wav 01;36
+ 
+ # https://wiki.xiph.org/MIME_Types_and_File_Extensions
+-.oga 00;36
+-.opus 00;36
+-.spx 00;36
+-.xspf 00;36
++.oga 01;36
++.opus 01;36
++.spx 01;36
++.xspf 01;36
+diff --git a/DIR_COLORS.256color b/DIR_COLORS.256color
+index d2ea453..74c34ba 100644
+--- a/DIR_COLORS.256color
++++ b/DIR_COLORS.256color
+@@ -1,3 +1,9 @@
++# Configuration file for the 256color ls utility
++
++# This file goes in the /etc directory, and must be world readable.
++# You can copy this file to .dir_colors in your $HOME directory to override
++# the system defaults.
++
+ # Configuration file for dircolors, a utility to help you set the
+ # LS_COLORS environment variable used by GNU ls with the --color option.
+ 
+@@ -8,32 +14,13 @@
+ # The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
+ # slackware version of dircolors) are recognized but ignored.
+ 
++# 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
+-TERM ansi
+-TERM *color*
+-TERM con[0-9]*x[0-9]*
+-TERM cons25
+-TERM console
+-TERM cygwin
+-TERM dtterm
+-TERM gnome
+-TERM hurd
+-TERM jfbterm
+-TERM konsole
+-TERM kterm
+-TERM linux
+-TERM linux-c
+-TERM mlterm
+-TERM putty
+-TERM rxvt*
+-TERM screen*
+-TERM st
+-TERM terminator
+-TERM tmux*
+-TERM vt100
+-TERM xterm*
++TERM *256color*
++TERM rxvt-unicode256
+ 
+ # Below are the color init strings for the basic file types. A color init
+ # string consists of one or more of the following numeric codes:
+@@ -43,29 +30,40 @@ TERM xterm*
+ # 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
+ # Background color codes:
+ # 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
++# Text color(256 colors mode) codes:
++# Valid syntax for text 256color is 38;5;<color number> , where color number
++# is number between 0 and 255.
++# You may find following command useful to search the best one for you:
++# for ((x=0; x<=255; x++));do echo -e "${x}:\033[38;5;${x}mcolor\033[000m";done
++# Background color(256 colors mode) codes:
++# Valid syntax for background 256color is 48;5;<color number> , where
++# color number is number between 0 and 255.
++# You may find following command useful to search the best one for you:
++# for ((x=0; x<=255; x++));do echo -e "${x}:\033[48;5;${x}mcolor\033[000m";done
++
+ #NORMAL 00	# no color code at all
+ #FILE 00	# regular file: use no color at all
+ RESET 0		# reset to "normal" color
+-DIR 01;34	# directory
+-LINK 01;36	# symbolic link.  (If you set this to 'target' instead of a
++DIR 38;5;33	# directory
++LINK 38;5;51	# symbolic link.  (If you set this to 'target' instead of a
+                 # numerical value, the color is as for the file pointed to.)
+ MULTIHARDLINK 00	# regular file with more than one link
+-FIFO 40;33	# pipe
+-SOCK 01;35	# socket
+-DOOR 01;35	# door
+-BLK 40;33;01	# block device driver
+-CHR 40;33;01	# character device driver
+-ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ...
+-MISSING 00      # ... and the files they point to
+-SETUID 37;41	# file that is setuid (u+s)
+-SETGID 30;43	# file that is setgid (g+s)
+-CAPABILITY 30;41	# file with capability
+-STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w)
+-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
++FIFO 40;38;5;11	# pipe
++SOCK 38;5;13	# socket
++DOOR 38;5;5	# door
++BLK 48;5;232;38;5;11	# block device driver
++CHR 48;5;232;38;5;3	# character device driver
++ORPHAN 48;5;232;38;5;9  # symlink to nonexistent file, or non-stat'able file ...
++MISSING 01;05;37;41 # ... and the files they point to
++SETUID 48;5;196;38;5;15	# file that is setuid (u+s)
++SETGID 48;5;11;38;5;16	# file that is setgid (g+s)
++CAPABILITY 48;5;196;38;5;226	# file with capability
++STICKY_OTHER_WRITABLE 48;5;10;38;5;16 # dir that is sticky and other-writable (+t,o+w)
++OTHER_WRITABLE 48;5;10;38;5;21 # dir that is other-writable (o+w) and not sticky
++STICKY 48;5;21;38;5;15	# dir with the sticky bit set (+t) and not other-writable
+ 
+ # This is for files with execute permission:
+-EXEC 01;32
++EXEC 38;5;40
+ 
+ # 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.
+@@ -83,123 +81,123 @@ EXEC 01;32
+ #.csh 01;32
+ 
+  # archives or compressed (bright red)
+-.tar 01;31
+-.tgz 01;31
+-.arc 01;31
+-.arj 01;31
+-.taz 01;31
+-.lha 01;31
+-.lz4 01;31
+-.lzh 01;31
+-.lzma 01;31
+-.tlz 01;31
+-.txz 01;31
+-.tzo 01;31
+-.t7z 01;31
+-.zip 01;31
+-.z   01;31
+-.Z   01;31
+-.dz  01;31
+-.gz  01;31
+-.lrz 01;31
+-.lz  01;31
+-.lzo 01;31
+-.xz  01;31
+-.zst 01;31
+-.tzst 01;31
+-.bz2 01;31
+-.bz  01;31
+-.tbz 01;31
+-.tbz2 01;31
+-.tz  01;31
+-.deb 01;31
+-.rpm 01;31
+-.jar 01;31
+-.war 01;31
+-.ear 01;31
+-.sar 01;31
+-.rar 01;31
+-.alz 01;31
+-.ace 01;31
+-.zoo 01;31
+-.cpio 01;31
+-.7z  01;31
+-.rz  01;31
+-.cab 01;31
+-.wim 01;31
+-.swm 01;31
+-.dwm 01;31
+-.esd 01;31
++.tar 38;5;9
++.tgz 38;5;9
++.arc 38;5;9
++.arj 38;5;9
++.taz 38;5;9
++.lha 38;5;9
++.lz4 38;5;9
++.lzh 38;5;9
++.lzma 38;5;9
++.tlz 38;5;9
++.txz 38;5;9
++.tzo 38;5;9
++.t7z 38;5;9
++.zip 38;5;9
++.z   38;5;9
++.Z   38;5;9
++.dz  38;5;9
++.gz  38;5;9
++.lrz 38;5;9
++.lz  38;5;9
++.lzo 38;5;9
++.xz  38;5;9
++.zst 38;5;9
++.tzst 38;5;9
++.bz2 38;5;9
++.bz  38;5;9
++.tbz 38;5;9
++.tbz2 38;5;9
++.tz  38;5;9
++.deb 38;5;9
++.rpm 38;5;9
++.jar 38;5;9
++.war 38;5;9
++.ear 38;5;9
++.sar 38;5;9
++.rar 38;5;9
++.alz 38;5;9
++.ace 38;5;9
++.zoo 38;5;9
++.cpio 38;5;9
++.7z  38;5;9
++.rz  38;5;9
++.cab 38;5;9
++.wim 38;5;9
++.swm 38;5;9
++.dwm 38;5;9
++.esd 38;5;9
+ 
+ # image formats
+-.jpg 01;35
+-.jpeg 01;35
+-.mjpg 01;35
+-.mjpeg 01;35
+-.gif 01;35
+-.bmp 01;35
+-.pbm 01;35
+-.pgm 01;35
+-.ppm 01;35
+-.tga 01;35
+-.xbm 01;35
+-.xpm 01;35
+-.tif 01;35
+-.tiff 01;35
+-.png 01;35
+-.svg 01;35
+-.svgz 01;35
+-.mng 01;35
+-.pcx 01;35
+-.mov 01;35
+-.mpg 01;35
+-.mpeg 01;35
+-.m2v 01;35
+-.mkv 01;35
+-.webm 01;35
+-.ogm 01;35
+-.mp4 01;35
+-.m4v 01;35
+-.mp4v 01;35
+-.vob 01;35
+-.qt  01;35
+-.nuv 01;35
+-.wmv 01;35
+-.asf 01;35
+-.rm  01;35
+-.rmvb 01;35
+-.flc 01;35
+-.avi 01;35
+-.fli 01;35
+-.flv 01;35
+-.gl 01;35
+-.dl 01;35
+-.xcf 01;35
+-.xwd 01;35
+-.yuv 01;35
+-.cgm 01;35
+-.emf 01;35
++.jpg 38;5;13
++.jpeg 38;5;13
++.mjpg 38;5;13
++.mjpeg 38;5;13
++.gif 38;5;13
++.bmp 38;5;13
++.pbm 38;5;13
++.pgm 38;5;13
++.ppm 38;5;13
++.tga 38;5;13
++.xbm 38;5;13
++.xpm 38;5;13
++.tif 38;5;13
++.tiff 38;5;13
++.png 38;5;13
++.svg 38;5;13
++.svgz 38;5;13
++.mng 38;5;13
++.pcx 38;5;13
++.mov 38;5;13
++.mpg 38;5;13
++.mpeg 38;5;13
++.m2v 38;5;13
++.mkv 38;5;13
++.webm 38;5;13
++.ogm 38;5;13
++.mp4 38;5;13
++.m4v 38;5;13
++.mp4v 38;5;13
++.vob 38;5;13
++.qt  38;5;13
++.nuv 38;5;13
++.wmv 38;5;13
++.asf 38;5;13
++.rm  38;5;13
++.rmvb 38;5;13
++.flc 38;5;13
++.avi 38;5;13
++.fli 38;5;13
++.flv 38;5;13
++.gl 38;5;13
++.dl 38;5;13
++.xcf 38;5;13
++.xwd 38;5;13
++.yuv 38;5;13
++.cgm 38;5;13
++.emf 38;5;13
+ 
+ # https://wiki.xiph.org/MIME_Types_and_File_Extensions
+-.ogv 01;35
+-.ogx 01;35
++.ogv 38;5;13
++.ogx 38;5;13
+ 
+ # audio formats
+-.aac 00;36
+-.au 00;36
+-.flac 00;36
+-.m4a 00;36
+-.mid 00;36
+-.midi 00;36
+-.mka 00;36
+-.mp3 00;36
+-.mpc 00;36
+-.ogg 00;36
+-.ra 00;36
+-.wav 00;36
++.aac 38;5;45
++.au 38;5;45
++.flac 38;5;45
++.m4a 38;5;45
++.mid 38;5;45
++.midi 38;5;45
++.mka 38;5;45
++.mp3 38;5;45
++.mpc 38;5;45
++.ogg 38;5;45
++.ra 38;5;45
++.wav 38;5;45
+ 
+ # https://wiki.xiph.org/MIME_Types_and_File_Extensions
+-.oga 00;36
+-.opus 00;36
+-.spx 00;36
+-.xspf 00;36
++.oga 38;5;45
++.opus 38;5;45
++.spx 38;5;45
++.xspf 38;5;45
+diff --git a/DIR_COLORS.lightbgcolor b/DIR_COLORS.lightbgcolor
+index d2ea453..95d6879 100644
+--- a/DIR_COLORS.lightbgcolor
++++ b/DIR_COLORS.lightbgcolor
+@@ -1,3 +1,9 @@
++# Configuration file for the color ls utility - modified for lighter backgrounds
++
++# This file goes in the /etc directory, and must be world readable.
++# You can copy this file to .dir_colors in your $HOME directory to override
++# the system defaults.
++
+ # 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.
+ 
++# 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
+@@ -46,17 +55,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
+-DIR 01;34	# directory
+-LINK 01;36	# symbolic link.  (If you set this to 'target' instead of a
++DIR 00;34	# directory
++LINK 00;36	# symbolic link.  (If you set this to 'target' instead of a
+                 # numerical value, the color is as for the file pointed to.)
+ MULTIHARDLINK 00	# regular file with more than one link
+ FIFO 40;33	# pipe
+-SOCK 01;35	# socket
+-DOOR 01;35	# door
++SOCK 00;35	# socket
++DOOR 00;35	# door
+ BLK 40;33;01	# block device driver
+ CHR 40;33;01	# character device driver
+ ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ...
+-MISSING 00      # ... and the files they point to
++MISSING 01;05;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
+@@ -65,7 +74,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:
+-EXEC 01;32
++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.
+@@ -82,107 +91,107 @@ EXEC 01;32
+ #.sh  01;32
+ #.csh 01;32
+ 
+- # archives or compressed (bright red)
+-.tar 01;31
+-.tgz 01;31
+-.arc 01;31
+-.arj 01;31
+-.taz 01;31
+-.lha 01;31
+-.lz4 01;31
+-.lzh 01;31
+-.lzma 01;31
+-.tlz 01;31
+-.txz 01;31
+-.tzo 01;31
+-.t7z 01;31
+-.zip 01;31
+-.z   01;31
+-.Z   01;31
+-.dz  01;31
+-.gz  01;31
+-.lrz 01;31
+-.lz  01;31
+-.lzo 01;31
+-.xz  01;31
+-.zst 01;31
+-.tzst 01;31
+-.bz2 01;31
+-.bz  01;31
+-.tbz 01;31
+-.tbz2 01;31
+-.tz  01;31
+-.deb 01;31
+-.rpm 01;31
+-.jar 01;31
+-.war 01;31
+-.ear 01;31
+-.sar 01;31
+-.rar 01;31
+-.alz 01;31
+-.ace 01;31
+-.zoo 01;31
+-.cpio 01;31
+-.7z  01;31
+-.rz  01;31
+-.cab 01;31
+-.wim 01;31
+-.swm 01;31
+-.dwm 01;31
+-.esd 01;31
++# archives or compressed (red)
++.tar 00;31
++.tgz 00;31
++.arc 00;31
++.arj 00;31
++.taz 00;31
++.lha 00;31
++.lz4 00;31
++.lzh 00;31
++.lzma 00;31
++.tlz 00;31
++.txz 00;31
++.tzo 00;31
++.t7z 00;31
++.zip 00;31
++.z   00;31
++.Z   00;31
++.dz  00;31
++.gz  00;31
++.lrz 00;31
++.lz  00;31
++.lzo 00;31
++.xz  00;31
++.zst 00;31
++.tzst 00;31
++.bz2 00;31
++.bz  00;31
++.tbz 00;31
++.tbz2 00;31
++.tz  00;31
++.deb 00;31
++.rpm 00;31
++.jar 00;31
++.war 00;31
++.ear 00;31
++.sar 00;31
++.rar 00;31
++.alz 00;31
++.ace 00;31
++.zoo 00;31
++.cpio 00;31
++.7z  00;31
++.rz  00;31
++.cab 00;31
++.wim 00;31
++.swm 00;31
++.dwm 00;31
++.esd 00;31
+ 
+ # image formats
+-.jpg 01;35
+-.jpeg 01;35
+-.mjpg 01;35
+-.mjpeg 01;35
+-.gif 01;35
+-.bmp 01;35
+-.pbm 01;35
+-.pgm 01;35
+-.ppm 01;35
+-.tga 01;35
+-.xbm 01;35
+-.xpm 01;35
+-.tif 01;35
+-.tiff 01;35
+-.png 01;35
+-.svg 01;35
+-.svgz 01;35
+-.mng 01;35
+-.pcx 01;35
+-.mov 01;35
+-.mpg 01;35
+-.mpeg 01;35
+-.m2v 01;35
+-.mkv 01;35
+-.webm 01;35
+-.ogm 01;35
+-.mp4 01;35
+-.m4v 01;35
+-.mp4v 01;35
+-.vob 01;35
+-.qt  01;35
+-.nuv 01;35
+-.wmv 01;35
+-.asf 01;35
+-.rm  01;35
+-.rmvb 01;35
+-.flc 01;35
+-.avi 01;35
+-.fli 01;35
+-.flv 01;35
+-.gl 01;35
+-.dl 01;35
+-.xcf 01;35
+-.xwd 01;35
+-.yuv 01;35
+-.cgm 01;35
+-.emf 01;35
++.jpg 00;35
++.jpeg 00;35
++.mjpg 00;35
++.mjpeg 00;35
++.gif 00;35
++.bmp 00;35
++.pbm 00;35
++.pgm 00;35
++.ppm 00;35
++.tga 00;35
++.xbm 00;35
++.xpm 00;35
++.tif 00;35
++.tiff 00;35
++.png 00;35
++.svg 00;35
++.svgz 00;35
++.mng 00;35
++.pcx 00;35
++.mov 00;35
++.mpg 00;35
++.mpeg 00;35
++.m2v 00;35
++.mkv 00;35
++.webm 00;35
++.ogm 00;35
++.mp4 00;35
++.m4v 00;35
++.mp4v 00;35
++.vob 00;35
++.qt  00;35
++.nuv 00;35
++.wmv 00;35
++.asf 00;35
++.rm  00;35
++.rmvb 00;35
++.flc 00;35
++.avi 00;35
++.fli 00;35
++.flv 00;35
++.gl 00;35
++.dl 00;35
++.xcf 00;35
++.xwd 00;35
++.yuv 00;35
++.cgm 00;35
++.emf 00;35
+ 
+ # https://wiki.xiph.org/MIME_Types_and_File_Extensions
+-.ogv 01;35
+-.ogx 01;35
++.ogv 00;35
++.ogx 00;35
+ 
+ # audio formats
+ .aac 00;36
+-- 
+2.5.5
+

coreutils-8.26-selinuxenable.patch

@@ -1,26 +0,0 @@
-From 6880c3dc9098b3337612850d1500b474aeb944ca Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Tue, 29 Aug 2017 17:33:51 +0200
-Subject: [PATCH] require_selinux_(): use selinuxenabled(8) if available
-
----
- init.cfg | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/init.cfg b/init.cfg
-index af6b581..f887b3a 100644
---- a/init.cfg
-+++ b/init.cfg
-@@ -114,6 +114,9 @@ require_selinux_()
-   grep 'selinuxfs$' /proc/filesystems > /dev/null \
-     || skip_ "this system lacks SELinux support"
- 
-+  # use the 'selinuxenabled' utility if available
-+  selinuxenabled; [ $? = 1 ] && skip_ "SELinux is disabled"
-+
-   # Independent of whether SELinux is enabled system-wide,
-   # the current file system may lack SELinux support.
-   # Also the current build may have SELinux support disabled.
--- 
-2.9.5
-

coreutils-8.27-CVE-2017-7476.patch

@@ -0,0 +1,189 @@
+From fc286e2b3af5b2ed9aec44b520265bb0968f1660 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Mon, 24 Apr 2017 01:43:36 -0700
+Subject: [PATCH 1/2] time_rz: fix heap buffer overflow vulnerability
+
+This issue has been assigned CVE-2017-7476 and was
+detected with American Fuzzy Lop 2.41b run on the
+coreutils date(1) program with ASAN enabled.
+
+  ERROR: AddressSanitizer: heap-buffer-overflow on address 0x...
+  WRITE of size 8 at 0x60d00000cff8 thread T0
+  #1 0x443020 in extend_abbrs lib/time_rz.c:88
+  #2 0x443356 in save_abbr lib/time_rz.c:155
+  #3 0x44393f in localtime_rz lib/time_rz.c:290
+  #4 0x41e4fe in parse_datetime2 lib/parse-datetime.y:1798
+
+A minimized reproducer is the following 120 byte TZ value,
+which goes beyond the value of ABBR_SIZE_MIN (119) on x86_64.
+Extend the aa...b portion to overwrite more of the heap.
+
+  date -d $(printf 'TZ="aaa%020daaaaaab%089d"')
+
+localtime_rz and mktime_z were affected since commit 4bc76593.
+parse_datetime was affected since commit 4e6e16b3f.
+
+* lib/time_rz.c (save_abbr): Rearrange the calculation determining
+whether there is enough buffer space available.  The rearrangement
+ensures we're only dealing with positive numbers, thus avoiding
+the problematic promotion of signed to unsigned causing an invalid
+comparison when zone_copy is more than ABBR_SIZE_MIN bytes beyond
+the start of the buffer.
+* tests/test-parse-datetime.c (main): Add a test case written by
+Paul Eggert, which overwrites enough of the heap so that
+standard glibc will fail with "free(): invalid pointer"
+without the patch applied.
+Reported and analyzed at https://bugzilla.redhat.com/1444774
+
+Upstream-commit: 94e01571507835ff59dd8ce2a0b56a4b566965a4
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ gnulib-tests/test-parse-datetime.c | 16 ++++++++++++++++
+ lib/time_rz.c                      | 15 +++++++++++++--
+ 2 files changed, 29 insertions(+), 2 deletions(-)
+
+diff --git a/gnulib-tests/test-parse-datetime.c b/gnulib-tests/test-parse-datetime.c
+index b42a51c..b6fe457 100644
+--- a/gnulib-tests/test-parse-datetime.c
++++ b/gnulib-tests/test-parse-datetime.c
+@@ -432,5 +432,21 @@ main (int argc _GL_UNUSED, char **argv)
+   ASSERT (   parse_datetime (&result, "TZ=\"\\\\\"", &now));
+   ASSERT (   parse_datetime (&result, "TZ=\"\\\"\"", &now));
+ 
++  /* Outlandishly-long time zone abbreviations should not cause problems.  */
++  {
++    static char const bufprefix[] = "TZ=\"";
++    enum { tzname_len = 2000 };
++    static char const bufsuffix[] = "0\" 1970-01-01 01:02:03.123456789";
++    enum { bufsize = sizeof bufprefix - 1 + tzname_len + sizeof bufsuffix };
++    char buf[bufsize];
++    memcpy (buf, bufprefix, sizeof bufprefix - 1);
++    memset (buf + sizeof bufprefix - 1, 'X', tzname_len);
++    strcpy (buf + bufsize - sizeof bufsuffix, bufsuffix);
++    ASSERT (parse_datetime (&result, buf, &now));
++    LOG (buf, now, result);
++    ASSERT (result.tv_sec == 1 * 60 * 60 + 2 * 60 + 3
++            && result.tv_nsec == 123456789);
++  }
++
+   return 0;
+ }
+diff --git a/lib/time_rz.c b/lib/time_rz.c
+index adb9c1c..c41a8ef 100644
+--- a/lib/time_rz.c
++++ b/lib/time_rz.c
+@@ -27,6 +27,7 @@
+ #include <time.h>
+ 
+ #include <errno.h>
++#include <limits.h>
+ #include <stdbool.h>
+ #include <stddef.h>
+ #include <stdlib.h>
+@@ -35,6 +36,10 @@
+ #include "flexmember.h"
+ #include "time-internal.h"
+ 
++#ifndef SIZE_MAX
++# define SIZE_MAX ((size_t) -1)
++#endif
++
+ #if !HAVE_TZSET
+ static void tzset (void) { }
+ #endif
+@@ -43,7 +48,7 @@ static void tzset (void) { }
+    the largest "small" request for the GNU C library malloc.  */
+ enum { DEFAULT_MXFAST = 64 * sizeof (size_t) / 4 };
+ 
+-/* Minimum size of the ABBRS member of struct abbr.  ABBRS is larger
++/* Minimum size of the ABBRS member of struct tm_zone.  ABBRS is larger
+    only in the unlikely case where an abbreviation longer than this is
+    used.  */
+ enum { ABBR_SIZE_MIN = DEFAULT_MXFAST - offsetof (struct tm_zone, abbrs) };
+@@ -150,7 +155,13 @@ save_abbr (timezone_t tz, struct tm *tm)
+           if (! (*zone_copy || (zone_copy == tz->abbrs && tz->tz_is_set)))
+             {
+               size_t zone_size = strlen (zone) + 1;
+-              if (zone_size < tz->abbrs + ABBR_SIZE_MIN - zone_copy)
++              size_t zone_used = zone_copy - tz->abbrs;
++              if (SIZE_MAX - zone_used < zone_size)
++                {
++                  errno = ENOMEM;
++                  return false;
++                }
++              if (zone_used + zone_size < ABBR_SIZE_MIN)
+                 extend_abbrs (zone_copy, zone, zone_size);
+               else
+                 {
+-- 
+2.9.3
+
+
+From 9579f90484c71e5a22f32f35189192a82e47550e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Wed, 26 Apr 2017 20:51:39 -0700
+Subject: [PATCH 2/2] date,touch: test and document large TZ security issue
+
+Add a test for CVE-2017-7476 which was fixed in gnulib at:
+http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=94e01571
+
+* tests/misc/date-tz.sh: Add a new test which overwrites enough
+of the heap to trigger a segfault, even without ASAN enabled.
+* tests/local.mk: Reference the new test.
+* NEWS: Mention the bug fix.
+
+Upstream-commit: 9287ef2b1707e2a222f8ae776ce3785abcb16fba
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ tests/local.mk        |  1 +
+ tests/misc/date-tz.sh | 26 ++++++++++++++++++++++++++
+ 2 files changed, 27 insertions(+)
+ create mode 100755 tests/misc/date-tz.sh
+
+diff --git a/tests/local.mk b/tests/local.mk
+index 9f1a853..ec0b414 100644
+--- a/tests/local.mk
++++ b/tests/local.mk
+@@ -282,6 +282,7 @@ all_tests =					\
+   tests/misc/csplit-suppress-matched.pl		\
+   tests/misc/date-debug.sh			\
+   tests/misc/date-sec.sh			\
++  tests/misc/date-tz.sh				\
+   tests/misc/dircolors.pl			\
+   tests/misc/dirname.pl				\
+   tests/misc/env-null.sh			\
+diff --git a/tests/misc/date-tz.sh b/tests/misc/date-tz.sh
+new file mode 100755
+index 0000000..3fe1579
+--- /dev/null
++++ b/tests/misc/date-tz.sh
+@@ -0,0 +1,26 @@
++#!/bin/sh
++# Verify TZ processing.
++
++# Copyright (C) 2017 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 <http://www.gnu.org/licenses/>.
++
++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
++print_ver_ date
++
++# coreutils-8.27 would overwrite the heap with large TZ values
++tz_long=$(printf '%2000s' | tr ' ' a)
++date -d "TZ=\"${tz_long}0\" 2017" || fail=1
++
++Exit $fail
+-- 
+2.9.3
+

coreutils-8.27-date-debug-test.patch

@@ -0,0 +1,50 @@
+From ee2017f191f1ad177405fbd8816df0a55127804a Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Thu, 9 Mar 2017 23:59:05 -0800
+Subject: [PATCH] tests: port to tzdb-2017a
+
+Problem reported by Bernhard Voelker in:
+http://lists.gnu.org/archive/html/coreutils/2017-03/msg00026.html
+* tests/misc/date-debug.sh: Port test to tzdb 2017a,
+and future-proof the America/Belize test.
+
+Upstream-commit: 612086660bab9bf981894da146550e9101224b17
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ tests/misc/date-debug.sh | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/tests/misc/date-debug.sh b/tests/misc/date-debug.sh
+index 48f4605..8e0b2af 100755
+--- a/tests/misc/date-debug.sh
++++ b/tests/misc/date-debug.sh
+@@ -52,10 +52,11 @@ date: output timezone: +09:00 (set from TZ="Asia/Tokyo" environment value)
+ date: final: 661095000.000000000 (epoch-seconds)
+ date: final: (Y-M-D) 1990-12-13 13:30:00 (UTC0)
+ date: final: (Y-M-D) 1990-12-13 22:30:00 (output timezone TZ=+09:00)
+-Thu Dec 13 07:30:00 CST 1990
++Thu Dec 13 07:30:00 -0600 1990
+ EOF
+ 
+-TZ=America/Belize date --debug -d "$in1" >out1 2>&1 || fail=1
++TZ=America/Belize date --debug -d "$in1" +'%a %b %e %T %z %Y' >out1 2>&1 ||
++  fail=1
+ 
+ compare exp1 out1 || fail=1
+ 
+@@ -94,10 +95,10 @@ date: output timezone: -05:00 (set from TZ="America/Lima" environment value)
+ date: final: 1.000000000 (epoch-seconds)
+ date: final: (Y-M-D) 1970-01-01 00:00:01 (UTC0)
+ date: final: (Y-M-D) 1969-12-31 19:00:01 (output timezone TZ=-05:00)
+-Wed Dec 31 19:00:01 PET 1969
++Wed Dec 31 19:00:01 -0500 1969
+ EOF
+ 
+-TZ=America/Lima date --debug -d "$in3" >out3 2>&1 || fail=1
++TZ=America/Lima date --debug -d "$in3" +'%a %b %e %T %z %Y' >out3 2>&1 || fail=1
+ compare exp3 out3 || fail=1
+ 
+ ##
+-- 
+2.9.3
+

coreutils-8.27-df-stat.patch

@@ -0,0 +1,82 @@
+From 9c4641f42bbecf63ec0a0e05caacbccd5332b831 Mon Sep 17 00:00:00 2001
+From: Philipp Thomas <pth@suse.de>
+Date: Sun, 26 Mar 2017 22:34:00 -0700
+Subject: [PATCH 1/2] df: avoid querying excluded file systems
+
+* src/df.c (filter_mount_list): Avoid stat() on
+explicitly excluded file systems, which is especially
+significant in cases like `-x nfs` which may hang.
+* NEWS: Mention the bug fix.
+
+Upstream-commit: 7c228bc55ed3fd6d56a6ad135438066de2f54a30
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ src/df.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/df.c b/src/df.c
+index 5b9e8fd..e0ebed7 100644
+--- a/src/df.c
++++ b/src/df.c
+@@ -682,9 +682,11 @@ filter_mount_list (bool devices_only)
+          On Linux we probably have me_dev populated from /proc/self/mountinfo,
+          however we still stat() in case another device was mounted later.  */
+       if ((me->me_remote && show_local_fs)
++          || (!selected_fstype (me->me_type) || excluded_fstype (me->me_type))
+           || -1 == stat (me->me_mountdir, &buf))
+         {
+-          /* If remote, and showing just local, add ME for filtering later.
++          /* If remote, and showing just local, or FS type is excluded,
++             add ME for filtering later.
+              If stat failed; add ME to be able to complain about it later.  */
+           buf.st_dev = me->me_dev;
+         }
+-- 
+2.13.6
+
+
+From 605ec5a50d341fb2d3eea6ad68316e229c7b8382 Mon Sep 17 00:00:00 2001
+From: Josef Cejka <jcejka@suse.com>
+Date: Tue, 1 Aug 2017 01:50:34 +0200
+Subject: [PATCH 2/2] df: avoid stat() for dummy file systems with -l
+
+When systemd is configured to automount a remote file system - see
+'man systemd.automount(5)', then the mount point is initially
+mounted by systemd with the file system type "autofs".
+When the resource is used later on, then the wanted file system is
+mounted over that mount point on demand.
+'df -l' triggered systemd to mount the file system because it called
+stat() on the mount point.
+Instead of single-casing "autofs" targets, we can avoid stat()ing
+all dummy file systems (which includes "autofs"), because those are
+skipped later on in get_dev() anyway.
+
+*src/df.c (filter_mount_list): Also skip dummy file systems unless
+the -a option or a specific target are given.
+* NEWS: Mention the fix.
+
+Co-authored-by: Bernhard Voelker <mail@bernhard-voelker.de>
+
+Fixes http://bugzilla.suse.com/show_bug.cgi?id=1043059
+
+Upstream-commit: a19ff5d8179a7de38109fc78278229fd96f3941a
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ src/df.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/df.c b/src/df.c
+index e0ebed7..11b5a22 100644
+--- a/src/df.c
++++ b/src/df.c
+@@ -682,6 +682,7 @@ filter_mount_list (bool devices_only)
+          On Linux we probably have me_dev populated from /proc/self/mountinfo,
+          however we still stat() in case another device was mounted later.  */
+       if ((me->me_remote && show_local_fs)
++          || (me->me_dummy && !show_all_fs && !show_listed_fs)
+           || (!selected_fstype (me->me_type) || excluded_fstype (me->me_type))
+           || -1 == stat (me->me_mountdir, &buf))
+         {
+-- 
+2.13.6
+

coreutils-8.27-fts-update.patch

@@ -0,0 +1,640 @@
+From 138ef167ed028bf739143c03c7b4ffba08ce3d27 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 12 Feb 2018 12:45:36 +0100
+Subject: [PATCH] import gnulib's FTS module from coreutils-8.29
+
+---
+ lib/fts.c  | 382 +++++++++++++++++++++++++++++++------------------------------
+ lib/fts_.h |   8 +-
+ 2 files changed, 198 insertions(+), 192 deletions(-)
+
+diff --git a/lib/fts.c b/lib/fts.c
+index fabaa97..8f2595d 100644
+--- a/lib/fts.c
++++ b/lib/fts.c
+@@ -13,7 +13,7 @@
+    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 <http://www.gnu.org/licenses/>.  */
++   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+ 
+ /*-
+  * Copyright (c) 1990, 1993, 1994
+@@ -71,11 +71,6 @@ static char sccsid[] = "@(#)fts.c       8.6 (Berkeley) 8/14/94";
+ 
+ #if ! _LIBC
+ # include "fcntl--.h"
+-# include "dirent--.h"
+-# include "unistd--.h"
+-/* FIXME - use fcntl(F_DUPFD_CLOEXEC)/openat(O_CLOEXEC) once they are
+-   supported.  */
+-# include "cloexec.h"
+ # include "flexmember.h"
+ # include "openat.h"
+ # include "same-inode.h"
+@@ -203,6 +198,14 @@ enum Fts_stat
+     while (false)
+ #endif
+ 
++#ifndef FALLTHROUGH
++# if __GNUC__ < 7
++#  define FALLTHROUGH ((void) 0)
++# else
++#  define FALLTHROUGH __attribute__ ((__fallthrough__))
++# endif
++#endif
++
+ static FTSENT   *fts_alloc (FTS *, const char *, size_t) internal_function;
+ static FTSENT   *fts_build (FTS *, int) internal_function;
+ static void      fts_lfree (FTSENT *) internal_function;
+@@ -297,14 +300,13 @@ static DIR *
+ internal_function
+ opendirat (int fd, char const *dir, int extra_flags, int *pdir_fd)
+ {
+-  int new_fd = openat (fd, dir,
+-                       (O_RDONLY | O_DIRECTORY | O_NOCTTY | O_NONBLOCK
+-                        | extra_flags));
++  int open_flags = (O_RDONLY | O_CLOEXEC | O_DIRECTORY | O_NOCTTY
++                    | O_NONBLOCK | extra_flags);
++  int new_fd = openat (fd, dir, open_flags);
+   DIR *dirp;
+ 
+   if (new_fd < 0)
+     return NULL;
+-  set_cloexec_flag (new_fd, true);
+   dirp = fdopendir (new_fd);
+   if (dirp)
+     *pdir_fd = new_fd;
+@@ -367,15 +369,13 @@ static int
+ internal_function
+ diropen (FTS const *sp, char const *dir)
+ {
+-  int open_flags = (O_SEARCH | O_DIRECTORY | O_NOCTTY | O_NONBLOCK
++  int open_flags = (O_SEARCH | O_CLOEXEC | O_DIRECTORY | O_NOCTTY | O_NONBLOCK
+                     | (ISSET (FTS_PHYSICAL) ? O_NOFOLLOW : 0)
+                     | (ISSET (FTS_NOATIME) ? O_NOATIME : 0));
+ 
+   int fd = (ISSET (FTS_CWDFD)
+             ? openat (sp->fts_cwd_fd, dir, open_flags)
+             : open (dir, open_flags));
+-  if (0 <= fd)
+-    set_cloexec_flag (fd, true);
+   return fd;
+ }
+ 
+@@ -471,6 +471,7 @@ fts_open (char * const *argv,
+                 if ((parent = fts_alloc(sp, "", 0)) == NULL)
+                         goto mem2;
+                 parent->fts_level = FTS_ROOTPARENTLEVEL;
++                parent->fts_n_dirs_remaining = -1;
+           }
+ 
+         /* The classic fts implementation would call fts_stat with
+@@ -657,39 +658,139 @@ fts_close (FTS *sp)
+         return (0);
+ }
+ 
++/* Minimum link count of a traditional Unix directory.  When leaf
++   optimization is OK and MIN_DIR_NLINK <= st_nlink, then st_nlink is
++   an upper bound on the number of subdirectories (counting "." and
++   "..").  */
++enum { MIN_DIR_NLINK = 2 };
++
++/* Whether leaf optimization is OK for a directory.  */
++enum leaf_optimization
++  {
++    /* st_nlink is not reliable for this directory's subdirectories.  */
++    NO_LEAF_OPTIMIZATION,
++
++    /* Leaf optimization is OK, but is not useful for avoiding stat calls.  */
++    OK_LEAF_OPTIMIZATION,
++
++    /* Leaf optimization is not only OK: it is useful for avoiding
++       stat calls, because dirent.d_type does not work.  */
++    NOSTAT_LEAF_OPTIMIZATION
++  };
++
+ #if defined __linux__ \
+   && HAVE_SYS_VFS_H && HAVE_FSTATFS && HAVE_STRUCT_STATFS_F_TYPE
+ 
+ # include <sys/vfs.h>
+ 
+ /* Linux-specific constants from coreutils' src/fs.h */
+-# define S_MAGIC_TMPFS 0x1021994
++# define S_MAGIC_AFS 0x5346414F
+ # define S_MAGIC_NFS 0x6969
++# define S_MAGIC_PROC 0x9FA0
+ # define S_MAGIC_REISERFS 0x52654973
++# define S_MAGIC_TMPFS 0x1021994
+ # define S_MAGIC_XFS 0x58465342
+-# define S_MAGIC_PROC 0x9FA0
+ 
+-/* Return false if it is easy to determine the file system type of
+-   the directory on which DIR_FD is open, and sorting dirents on
+-   inode numbers is known not to improve traversal performance with
+-   that type of file system.  Otherwise, return true.  */
++# ifdef HAVE___FSWORD_T
++typedef __fsword_t fsword;
++# else
++typedef long int fsword;
++# endif
++
++/* Map a stat.st_dev number to a file system type number f_ftype.  */
++struct dev_type
++{
++  dev_t st_dev;
++  fsword f_type;
++};
++
++/* Use a tiny initial size.  If a traversal encounters more than
++   a few devices, the cost of growing/rehashing this table will be
++   rendered negligible by the number of inodes processed.  */
++enum { DEV_TYPE_HT_INITIAL_SIZE = 13 };
++
++static size_t
++dev_type_hash (void const *x, size_t table_size)
++{
++  struct dev_type const *ax = x;
++  uintmax_t dev = ax->st_dev;
++  return dev % table_size;
++}
++
+ static bool
+-dirent_inode_sort_may_be_useful (int dir_fd)
++dev_type_compare (void const *x, void const *y)
++{
++  struct dev_type const *ax = x;
++  struct dev_type const *ay = y;
++  return ax->st_dev == ay->st_dev;
++}
++
++/* Return the file system type of P, or 0 if not known.
++   Try to cache known values.  */
++
++static fsword
++filesystem_type (FTSENT const *p)
++{
++  FTS *sp = p->fts_fts;
++  Hash_table *h = sp->fts_leaf_optimization_works_ht;
++  struct dev_type *ent;
++  struct statfs fs_buf;
++
++  /* If we're not in CWDFD mode, don't bother with this optimization,
++     since the caller is not serious about performance.  */
++  if (!ISSET (FTS_CWDFD))
++    return 0;
++
++  if (! h)
++    h = sp->fts_leaf_optimization_works_ht
++      = hash_initialize (DEV_TYPE_HT_INITIAL_SIZE, NULL, dev_type_hash,
++                         dev_type_compare, free);
++  if (h)
++    {
++      struct dev_type tmp;
++      tmp.st_dev = p->fts_statp->st_dev;
++      ent = hash_lookup (h, &tmp);
++      if (ent)
++        return ent->f_type;
++    }
++
++  /* Look-up failed.  Query directly and cache the result.  */
++  if (fstatfs (p->fts_fts->fts_cwd_fd, &fs_buf) != 0)
++    return 0;
++
++  if (h)
++    {
++      struct dev_type *t2 = malloc (sizeof *t2);
++      if (t2)
++        {
++          t2->st_dev = p->fts_statp->st_dev;
++          t2->f_type = fs_buf.f_type;
++
++          ent = hash_insert (h, t2);
++          if (ent)
++            fts_assert (ent == t2);
++          else
++            free (t2);
++        }
++    }
++
++  return fs_buf.f_type;
++}
++
++/* Return false if it is easy to determine the file system type of the
++   directory P, and sorting dirents on inode numbers is known not to
++   improve traversal performance with that type of file system.
++   Otherwise, return true.  */
++static bool
++dirent_inode_sort_may_be_useful (FTSENT const *p)
+ {
+   /* Skip the sort only if we can determine efficiently
+      that skipping it is the right thing to do.
+      The cost of performing an unnecessary sort is negligible,
+      while the cost of *not* performing it can be O(N^2) with
+      a very large constant.  */
+-  struct statfs fs_buf;
+-
+-  /* If fstatfs fails, assume sorting would be useful.  */
+-  if (fstatfs (dir_fd, &fs_buf) != 0)
+-    return true;
+ 
+-  /* FIXME: what about when f_type is not an integral type?
+-     deal with that if/when it's encountered.  */
+-  switch (fs_buf.f_type)
++  switch (filesystem_type (p))
+     {
+     case S_MAGIC_TMPFS:
+     case S_MAGIC_NFS:
+@@ -702,134 +803,58 @@ dirent_inode_sort_may_be_useful (int dir_fd)
+     }
+ }
+ 
+-/* Given a file descriptor DIR_FD open on a directory D,
+-   return true if it is valid to apply the leaf-optimization
+-   technique of counting directories in D via stat.st_nlink.  */
+-static bool
+-leaf_optimization_applies (int dir_fd)
++/* Given an FTS entry P for a directory D,
++   return true if it is both useful and valid to apply leaf optimization.
++   The optimization is useful only for file systems that lack usable
++   dirent.d_type info.  The optimization is valid if an st_nlink value
++   of at least MIN_DIR_NLINK is an upper bound on the number of
++   subdirectories of D, counting "." and ".."  as subdirectories.  */
++static enum leaf_optimization
++leaf_optimization (FTSENT const *p)
+ {
+-  struct statfs fs_buf;
+-
+-  /* If fstatfs fails, assume we can't use the optimization.  */
+-  if (fstatfs (dir_fd, &fs_buf) != 0)
+-    return false;
+-
+-  /* FIXME: do we need to detect AFS mount points?  I doubt it,
+-     unless fstatfs can report S_MAGIC_REISERFS for such a directory.  */
+-
+-  switch (fs_buf.f_type)
++  switch (filesystem_type (p))
+     {
+-      /* List here the file system types that lack usable dirent.d_type
++      /* List here the file system types that may lack usable dirent.d_type
+          info, yet for which the optimization does apply.  */
+     case S_MAGIC_REISERFS:
+-    case S_MAGIC_XFS:
+-      return true;
+-
+-      /* Explicitly list here any other file system type for which the
+-         optimization is not applicable, but need documentation.  */
++    case S_MAGIC_XFS: /* XFS lacked it until 2013-08-22 commit.  */
++      return NOSTAT_LEAF_OPTIMIZATION;
++
++    case 0:
++      /* Leaf optimization is unsafe if the file system type is unknown.  */
++      FALLTHROUGH;
++    case S_MAGIC_AFS:
++      /* Although AFS mount points are not counted in st_nlink, they
++         act like directories.  See <https://bugs.debian.org/143111>.  */
++      FALLTHROUGH;
+     case S_MAGIC_NFS:
+       /* NFS provides usable dirent.d_type but not necessarily for all entries
+          of large directories, so as per <https://bugzilla.redhat.com/1252549>
+          NFS should return true.  However st_nlink values are not accurate on
+          all implementations as per <https://bugzilla.redhat.com/1299169>.  */
+-      /* fall through */
++      FALLTHROUGH;
+     case S_MAGIC_PROC:
+-      /* Per <http://bugs.debian.org/143111> /proc may have
+-         bogus stat.st_nlink values.  */
+-      /* fall through */
++      /* Per <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=143111> /proc
++         may have bogus stat.st_nlink values.  */
++      return NO_LEAF_OPTIMIZATION;
++
+     default:
+-      return false;
++      return OK_LEAF_OPTIMIZATION;
+     }
+ }
+ 
+ #else
+ static bool
+-dirent_inode_sort_may_be_useful (int dir_fd _GL_UNUSED) { return true; }
+-static bool
+-leaf_optimization_applies (int dir_fd _GL_UNUSED) { return false; }
+-#endif
+-
+-/* link-count-optimization entry:
+-   map a stat.st_dev number to a boolean: leaf_optimization_works */
+-struct LCO_ent
++dirent_inode_sort_may_be_useful (FTSENT const *p _GL_UNUSED)
+ {
+-  dev_t st_dev;
+-  bool opt_ok;
+-};
+-
+-/* Use a tiny initial size.  If a traversal encounters more than
+-   a few devices, the cost of growing/rehashing this table will be
+-   rendered negligible by the number of inodes processed.  */
+-enum { LCO_HT_INITIAL_SIZE = 13 };
+-
+-static size_t
+-LCO_hash (void const *x, size_t table_size)
+-{
+-  struct LCO_ent const *ax = x;
+-  return (uintmax_t) ax->st_dev % table_size;
++  return true;
+ }
+-
+-static bool
+-LCO_compare (void const *x, void const *y)
++static enum leaf_optimization
++leaf_optimization (FTSENT const *p _GL_UNUSED)
+ {
+-  struct LCO_ent const *ax = x;
+-  struct LCO_ent const *ay = y;
+-  return ax->st_dev == ay->st_dev;
+-}
+-
+-/* Ask the same question as leaf_optimization_applies, but query
+-   the cache first (FTS.fts_leaf_optimization_works_ht), and if necessary,
+-   update that cache.  */
+-static bool
+-link_count_optimize_ok (FTSENT const *p)
+-{
+-  FTS *sp = p->fts_fts;
+-  Hash_table *h = sp->fts_leaf_optimization_works_ht;
+-  struct LCO_ent tmp;
+-  struct LCO_ent *ent;
+-  bool opt_ok;
+-  struct LCO_ent *t2;
+-
+-  /* If we're not in CWDFD mode, don't bother with this optimization,
+-     since the caller is not serious about performance. */
+-  if (!ISSET(FTS_CWDFD))
+-    return false;
+-
+-  /* map st_dev to the boolean, leaf_optimization_works */
+-  if (h == NULL)
+-    {
+-      h = sp->fts_leaf_optimization_works_ht
+-        = hash_initialize (LCO_HT_INITIAL_SIZE, NULL, LCO_hash,
+-                           LCO_compare, free);
+-      if (h == NULL)
+-        return false;
+-    }
+-  tmp.st_dev = p->fts_statp->st_dev;
+-  ent = hash_lookup (h, &tmp);
+-  if (ent)
+-    return ent->opt_ok;
+-
+-  /* Look-up failed.  Query directly and cache the result.  */
+-  t2 = malloc (sizeof *t2);
+-  if (t2 == NULL)
+-    return false;
+-
+-  /* Is it ok to perform the optimization in the dir, FTS_CWD_FD?  */
+-  opt_ok = leaf_optimization_applies (sp->fts_cwd_fd);
+-  t2->opt_ok = opt_ok;
+-  t2->st_dev = p->fts_statp->st_dev;
+-
+-  ent = hash_insert (h, t2);
+-  if (ent == NULL)
+-    {
+-      /* insertion failed */
+-      free (t2);
+-      return false;
+-    }
+-  fts_assert (ent == t2);
+-
+-  return opt_ok;
++  return NO_LEAF_OPTIMIZATION;
+ }
++#endif
+ 
+ /*
+  * Special case of "/" at the end of the file name so that slashes aren't
+@@ -1016,13 +1041,11 @@ check_for_dir:
+                     if (p->fts_statp->st_size == FTS_STAT_REQUIRED)
+                       {
+                         FTSENT *parent = p->fts_parent;
+-                        if (FTS_ROOTLEVEL < p->fts_level
+-                            /* ->fts_n_dirs_remaining is not valid
+-                               for command-line-specified names.  */
+-                            && parent->fts_n_dirs_remaining == 0
++                        if (parent->fts_n_dirs_remaining == 0
+                             && ISSET(FTS_NOSTAT)
+                             && ISSET(FTS_PHYSICAL)
+-                            && link_count_optimize_ok (parent))
++                            && (leaf_optimization (parent)
++                                == NOSTAT_LEAF_OPTIMIZATION))
+                           {
+                             /* nothing more needed */
+                           }
+@@ -1031,7 +1054,8 @@ check_for_dir:
+                             p->fts_info = fts_stat(sp, p, false);
+                             if (S_ISDIR(p->fts_statp->st_mode)
+                                 && p->fts_level != FTS_ROOTLEVEL
+-                                && parent->fts_n_dirs_remaining)
++                                && 0 < parent->fts_n_dirs_remaining
++                                && parent->fts_n_dirs_remaining != (nlink_t) -1)
+                                   parent->fts_n_dirs_remaining--;
+                           }
+                       }
+@@ -1300,8 +1324,6 @@ fts_build (register FTS *sp, int type)
+         bool descend;
+         bool doadjust;
+         ptrdiff_t level;
+-        nlink_t nlinks;
+-        bool nostat;
+         size_t len, maxlen, new_len;
+         char *cp;
+         int dir_fd;
+@@ -1372,24 +1394,6 @@ fts_build (register FTS *sp, int type)
+         max_entries = sp->fts_compar ? SIZE_MAX : FTS_MAX_READDIR_ENTRIES;
+ 
+         /*
+-         * Nlinks is the number of possible entries of type directory in the
+-         * directory if we're cheating on stat calls, 0 if we're not doing
+-         * any stat calls at all, (nlink_t) -1 if we're statting everything.
+-         */
+-        if (type == BNAMES) {
+-                nlinks = 0;
+-                /* Be quiet about nostat, GCC. */
+-                nostat = false;
+-        } else if (ISSET(FTS_NOSTAT) && ISSET(FTS_PHYSICAL)) {
+-                nlinks = (cur->fts_statp->st_nlink
+-                          - (ISSET(FTS_SEEDOT) ? 0 : 2));
+-                nostat = true;
+-        } else {
+-                nlinks = -1;
+-                nostat = false;
+-        }
+-
+-        /*
+          * If we're going to need to stat anything or we want to descend
+          * and stay in the directory, chdir.  If this fails we keep going,
+          * but set a flag so we don't chdir after the post-order visit.
+@@ -1410,15 +1414,22 @@ fts_build (register FTS *sp, int type)
+                the required dirp and dir_fd.  */
+             descend = true;
+           }
+-        else if (nlinks || type == BREAD) {
++        else
++          {
++            /* Try to descend unless it is a names-only fts_children,
++               or the directory is known to lack subdirectories.  */
++            descend = (type != BNAMES
++                       && ! (ISSET (FTS_NOSTAT) && ISSET (FTS_PHYSICAL)
++                             && ! ISSET (FTS_SEEDOT)
++                             && cur->fts_statp->st_nlink == MIN_DIR_NLINK
++                             && (leaf_optimization (cur)
++                                 != NO_LEAF_OPTIMIZATION)));
++            if (descend || type == BREAD)
++              {
+                 if (ISSET(FTS_CWDFD))
+-                  {
+-                    dir_fd = dup (dir_fd);
+-                    if (0 <= dir_fd)
+-                      set_cloexec_flag (dir_fd, true);
+-                  }
++                  dir_fd = fcntl (dir_fd, F_DUPFD_CLOEXEC, STDERR_FILENO + 1);
+                 if (dir_fd < 0 || fts_safe_changedir(sp, cur, dir_fd, NULL)) {
+-                        if (nlinks && type == BREAD)
++                        if (descend && type == BREAD)
+                                 cur->fts_errno = errno;
+                         cur->fts_flags |= FTS_DONTCHDIR;
+                         descend = false;
+@@ -1428,8 +1439,8 @@ fts_build (register FTS *sp, int type)
+                         cur->fts_dirp = NULL;
+                 } else
+                         descend = true;
+-        } else
+-                descend = false;
++              }
++          }
+ 
+         /*
+          * Figure out the max file name length that can be stored in the
+@@ -1460,7 +1471,6 @@ fts_build (register FTS *sp, int type)
+         tail = NULL;
+         nitems = 0;
+         while (cur->fts_dirp) {
+-                bool is_dir;
+                 size_t d_namelen;
+                 __set_errno (0);
+                 struct dirent *dp = readdir(cur->fts_dirp);
+@@ -1561,19 +1571,10 @@ mem1:                           saved_errno = errno;
+                            to caller, when possible.  */
+                         set_stat_type (p->fts_statp, D_TYPE (dp));
+                         fts_set_stat_required(p, !skip_stat);
+-                        is_dir = (ISSET(FTS_PHYSICAL)
+-                                  && DT_MUST_BE(dp, DT_DIR));
+                 } else {
+                         p->fts_info = fts_stat(sp, p, false);
+-                        is_dir = (p->fts_info == FTS_D
+-                                  || p->fts_info == FTS_DC
+-                                  || p->fts_info == FTS_DOT);
+                 }
+ 
+-                /* Decrement link count if applicable. */
+-                if (nlinks > 0 && is_dir)
+-                        nlinks -= nostat;
+-
+                 /* We walk in directory order so "ls -f" doesn't get upset. */
+                 p->fts_link = NULL;
+                 if (head == NULL)
+@@ -1645,8 +1646,7 @@ mem1:                           saved_errno = errno;
+            inode numbers.  */
+         if (nitems > _FTS_INODE_SORT_DIR_ENTRIES_THRESHOLD
+             && !sp->fts_compar
+-            && ISSET (FTS_CWDFD)
+-            && dirent_inode_sort_may_be_useful (sp->fts_cwd_fd)) {
++            && dirent_inode_sort_may_be_useful (cur)) {
+                 sp->fts_compar = fts_compare_ino;
+                 head = fts_sort (sp, head, nitems);
+                 sp->fts_compar = NULL;
+@@ -1769,7 +1769,7 @@ fd_ring_check (FTS const *sp)
+   I_ring fd_w = sp->fts_fd_ring;
+ 
+   int cwd_fd = sp->fts_cwd_fd;
+-  cwd_fd = dup (cwd_fd);
++  cwd_fd = fcntl (cwd_fd, F_DUPFD_CLOEXEC, STDERR_FILENO + 1);
+   char *dot = getcwdat (cwd_fd, NULL, 0);
+   error (0, 0, "===== check ===== cwd: %s", dot);
+   free (dot);
+@@ -1778,7 +1778,8 @@ fd_ring_check (FTS const *sp)
+       int fd = i_ring_pop (&fd_w);
+       if (0 <= fd)
+         {
+-          int parent_fd = openat (cwd_fd, "..", O_SEARCH | O_NOATIME);
++          int open_flags = O_SEARCH | O_CLOEXEC | O_NOATIME;
++          int parent_fd = openat (cwd_fd, "..", open_flags);
+           if (parent_fd < 0)
+             {
+               // Warn?
+@@ -1807,7 +1808,6 @@ internal_function
+ fts_stat(FTS *sp, register FTSENT *p, bool follow)
+ {
+         struct stat *sbp = p->fts_statp;
+-        int saved_errno;
+ 
+         if (p->fts_level == FTS_ROOTLEVEL && ISSET(FTS_COMFOLLOW))
+                 follow = true;
+@@ -1819,13 +1819,12 @@ fts_stat(FTS *sp, register FTSENT *p, bool follow)
+          */
+         if (ISSET(FTS_LOGICAL) || follow) {
+                 if (stat(p->fts_accpath, sbp)) {
+-                        saved_errno = errno;
+                         if (errno == ENOENT
+                             && lstat(p->fts_accpath, sbp) == 0) {
+                                 __set_errno (0);
+                                 return (FTS_SLNONE);
+                         }
+-                        p->fts_errno = saved_errno;
++                        p->fts_errno = errno;
+                         goto err;
+                 }
+         } else if (fstatat(sp->fts_cwd_fd, p->fts_accpath, sbp,
+@@ -1836,8 +1835,11 @@ err:            memset(sbp, 0, sizeof(struct stat));
+         }
+ 
+         if (S_ISDIR(sbp->st_mode)) {
+-                p->fts_n_dirs_remaining = (sbp->st_nlink
+-                                           - (ISSET(FTS_SEEDOT) ? 0 : 2));
++                p->fts_n_dirs_remaining
++                  = ((sbp->st_nlink < MIN_DIR_NLINK
++                      || p->fts_level <= FTS_ROOTLEVEL)
++                     ? -1
++                     : sbp->st_nlink - (ISSET (FTS_SEEDOT) ? 0 : MIN_DIR_NLINK));
+                 if (ISDOT(p->fts_name)) {
+                         /* Command-line "." and ".." are real directories. */
+                         return (p->fts_level == FTS_ROOTLEVEL ? FTS_D : FTS_DOT);
+diff --git a/lib/fts_.h b/lib/fts_.h
+index 46fd0df..f84e45d 100644
+--- a/lib/fts_.h
++++ b/lib/fts_.h
+@@ -13,7 +13,7 @@
+    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 <http://www.gnu.org/licenses/>.  */
++   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+ 
+ /*
+  * Copyright (c) 1989, 1993
+@@ -220,7 +220,11 @@ typedef struct _ftsent {
+         ptrdiff_t fts_level;            /* depth (-1 to N) */
+ 
+         size_t fts_namelen;             /* strlen(fts_name) */
+-        nlink_t fts_n_dirs_remaining;   /* count down from st_nlink */
++
++        /* If not (nlink_t) -1, an upper bound on the number of
++           remaining subdirectories of interest.  If this becomes
++           zero, some work can be avoided.  */
++        nlink_t fts_n_dirs_remaining;
+ 
+ # define FTS_D           1              /* preorder directory */
+ # define FTS_DC          2              /* directory that causes cycles */
+-- 
+2.13.6
+

coreutils-8.27-ptx-int-overflow.patch

@@ -0,0 +1,547 @@
+From 7408a9758924a1ccbabf9fcab401a31ef1b7c755 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Thu, 17 Aug 2017 12:02:16 -0700
+Subject: [PATCH] ptx: fix some integer overflow bugs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Lukas Zachar at:
+http://bugzilla.redhat.com/1482445
+* src/ptx.c (line_width, gap_size, maximum_word_length)
+(reference_max_width, half_line_width, before_max_width)
+(keyafter_max_width, truncation_string_length, compare_words)
+(compare_occurs, search_table, find_occurs_in_text, print_spaces)
+(fix_output_parameters, define_all_fields):
+Use ptrdiff_t, not int, for object offsets and sizes.
+(WORD, OCCURS): Use ptrdiff_t, not short int.
+(WORD_TABLE, number_of_occurs, generate_all_output):
+Prefer ptrdiff_t to size_t where either will do.
+(total_line_count, file_line_count, OCCURS, fix_output_parameters)
+(define_all_fields):
+Use intmax_t, not int, for line counts.
+(DELTA): Remove.  All uses changed.
+(OCCURS, find_occurs_in_text, fix_output_parameters):
+Use int, not size_t, for file indexes.
+(tail_truncation, before_truncation, keyafter_truncation)
+(head_truncation, search_table, define_all_fields)
+(generate_all_output):
+Use bool for booleans.
+(digest_word_file, find_occurs_in_text):
+Use x2nrealloc instead of checking for overflow by hand.
+(find_occurs_in_text, fix_output_parameters, define_all_fields):
+Omit unnecessary cast.
+(fix_output_parameters): Don’t assume integers fit in 11 digits.
+(fix_output_parameters, define_all_fields):
+Use sprintf return value rather than calling strlen.
+(define_all_fields): Do not rely on sprintf to generate a string
+that may contain more than INT_MAX bytes.
+(main): Use xstrtoimax, not xstrtoul.
+Use xnmalloc to catch integer overflow.
+
+Upstream-commit: 1d9765a764790cc68ec52c16d7ccbf633c404f0e
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ src/ptx.c | 194 +++++++++++++++++++++++++++++---------------------------------
+ 1 file changed, 91 insertions(+), 103 deletions(-)
+
+diff --git a/src/ptx.c b/src/ptx.c
+index c0c9733..2aababf 100644
+--- a/src/ptx.c
++++ b/src/ptx.c
+@@ -59,9 +59,9 @@
+ /* Global definitions.  */
+ 
+ /* FIXME: There are many unchecked integer overflows in this file,
+-   that will cause this command to misbehave given large inputs or
+-   options.  Many of the "int" values below should be "size_t" or
+-   something else like that.  */
++   and in theory they could cause this command to have undefined
++   behavior given large inputs or options.  This command should
++   diagnose any such overflow and exit.  */
+ 
+ /* Program options.  */
+ 
+@@ -77,8 +77,8 @@ static bool gnu_extensions = true;	/* trigger all GNU extensions */
+ static bool auto_reference = false;	/* refs are 'file_name:line_number:' */
+ static bool input_reference = false;	/* refs at beginning of input lines */
+ static bool right_reference = false;	/* output refs after right context  */
+-static int line_width = 72;	/* output line width in characters */
+-static int gap_size = 3;	/* number of spaces between output fields */
++static ptrdiff_t line_width = 72;	/* output line width in characters */
++static ptrdiff_t gap_size = 3;	/* number of spaces between output fields */
+ static const char *truncation_string = "/";
+                                 /* string used to mark line truncations */
+ static const char *macro_name = "xx";	/* macro name for roff or TeX output */
+@@ -105,8 +105,8 @@ static struct regex_data context_regex;	/* end of context */
+ static struct regex_data word_regex;	/* keyword */
+ 
+ /* A BLOCK delimit a region in memory of arbitrary size, like the copy of a
+-   whole file.  A WORD is something smaller, its length should fit in a
+-   short integer.  A WORD_TABLE may contain several WORDs.  */
++   whole file.  A WORD is similar, except it is intended for smaller regions.
++   A WORD_TABLE may contain several WORDs.  */
+ 
+ typedef struct
+   {
+@@ -118,7 +118,7 @@ BLOCK;
+ typedef struct
+   {
+     char *start;		/* pointer to beginning of region */
+-    short int size;		/* length of the region */
++    ptrdiff_t size;		/* length of the region */
+   }
+ WORD;
+ 
+@@ -126,7 +126,7 @@ typedef struct
+   {
+     WORD *start;		/* array of WORDs */
+     size_t alloc;		/* allocated length */
+-    size_t length;		/* number of used entries */
++    ptrdiff_t length;		/* number of used entries */
+   }
+ WORD_TABLE;
+ 
+@@ -149,10 +149,10 @@ static struct re_registers word_regs;
+ static char word_fastmap[CHAR_SET_SIZE];
+ 
+ /* Maximum length of any word read.  */
+-static int maximum_word_length;
++static ptrdiff_t maximum_word_length;
+ 
+ /* Maximum width of any reference used.  */
+-static int reference_max_width;
++static ptrdiff_t reference_max_width;
+ 
+ /* Ignore and Only word tables.  */
+ 
+@@ -162,9 +162,9 @@ static WORD_TABLE only_table;		/* table of words to select */
+ /* Source text table, and scanning macros.  */
+ 
+ static int number_input_files;	/* number of text input files */
+-static int total_line_count;	/* total number of lines seen so far */
++static intmax_t total_line_count;	/* total number of lines seen so far */
+ static const char **input_file_name;	/* array of text input file names */
+-static int *file_line_count;	/* array of 'total_line_count' values at end */
++static intmax_t *file_line_count;	/* array of line count values at end */
+ 
+ static BLOCK *text_buffers;	/* files to study */
+ 
+@@ -219,20 +219,18 @@ static BLOCK *text_buffers;	/* files to study */
+ 
+    When automatic references are used, the 'reference' value is the
+    overall line number in all input files read so far, in this case, it
+-   is of type (int).  When input references are used, the 'reference'
++   is of type intmax_t.  When input references are used, the 'reference'
+    value indicates the distance between the keyword beginning and the
+-   start of the reference field, it is of type (DELTA) and usually
++   start of the reference field, and it fits in ptrdiff_t and is usually
+    negative.  */
+ 
+-typedef short int DELTA;	/* to hold displacement within one context */
+-
+ typedef struct
+   {
+     WORD key;			/* description of the keyword */
+-    DELTA left;			/* distance to left context start */
+-    DELTA right;		/* distance to right context end */
+-    int reference;		/* reference descriptor */
+-    size_t file_index;		/* corresponding file  */
++    ptrdiff_t left;		/* distance to left context start */
++    ptrdiff_t right;		/* distance to right context end */
++    intmax_t reference;		/* reference descriptor */
++    int file_index;		/* corresponding file  */
+   }
+ OCCURS;
+ 
+@@ -241,7 +239,7 @@ OCCURS;
+ 
+ static OCCURS *occurs_table[1];	/* all words retained from the read text */
+ static size_t occurs_alloc[1];	/* allocated size of occurs_table */
+-static size_t number_of_occurs[1]; /* number of used slots in occurs_table */
++static ptrdiff_t number_of_occurs[1]; /* number of used slots in occurs_table */
+ 
+ 
+ /* Communication among output routines.  */
+@@ -249,10 +247,17 @@ static size_t number_of_occurs[1]; /* number of used slots in occurs_table */
+ /* Indicate if special output processing is requested for each character.  */
+ static char edited_flag[CHAR_SET_SIZE];
+ 
+-static int half_line_width;	/* half of line width, reference excluded */
+-static int before_max_width;	/* maximum width of before field */
+-static int keyafter_max_width;	/* maximum width of keyword-and-after field */
+-static int truncation_string_length;/* length of string that flags truncation */
++/* Half of line width, reference excluded.  */
++static ptrdiff_t half_line_width;
++
++/* Maximum width of before field.  */
++static ptrdiff_t before_max_width;
++
++/* Maximum width of keyword-and-after field.  */
++static ptrdiff_t keyafter_max_width;
++
++/* Length of string that flags truncation.  */
++static ptrdiff_t truncation_string_length;
+ 
+ /* When context is limited by lines, wraparound may happen on final output:
+    the 'head' pointer gives access to some supplementary left context which
+@@ -261,16 +266,16 @@ static int truncation_string_length;/* length of string that flags truncation */
+    beginning of the output line. */
+ 
+ static BLOCK tail;		/* tail field */
+-static int tail_truncation;	/* flag truncation after the tail field */
++static bool tail_truncation;	/* flag truncation after the tail field */
+ 
+ static BLOCK before;		/* before field */
+-static int before_truncation;	/* flag truncation before the before field */
++static bool before_truncation;	/* flag truncation before the before field */
+ 
+ static BLOCK keyafter;		/* keyword-and-after field */
+-static int keyafter_truncation;	/* flag truncation after the keyafter field */
++static bool keyafter_truncation; /* flag truncation after the keyafter field */
+ 
+ static BLOCK head;		/* head field */
+-static int head_truncation;	/* flag truncation before the head field */
++static bool head_truncation;	/* flag truncation before the head field */
+ 
+ static BLOCK reference;		/* reference field for input reference mode */
+ 
+@@ -540,8 +545,8 @@ compare_words (const void *void_first, const void *void_second)
+ {
+ #define first ((const WORD *) void_first)
+ #define second ((const WORD *) void_second)
+-  int length;			/* minimum of two lengths */
+-  int counter;			/* cursor in words */
++  ptrdiff_t length;		/* minimum of two lengths */
++  ptrdiff_t counter;		/* cursor in words */
+   int value;			/* value of comparison */
+ 
+   length = first->size < second->size ? first->size : second->size;
+@@ -567,7 +572,7 @@ compare_words (const void *void_first, const void *void_second)
+         }
+     }
+ 
+-  return first->size - second->size;
++  return first->size < second->size ? -1 : first->size > second->size;
+ #undef first
+ #undef second
+ }
+@@ -586,21 +591,21 @@ compare_occurs (const void *void_first, const void *void_second)
+   int value;
+ 
+   value = compare_words (&first->key, &second->key);
+-  return value == 0 ? first->key.start - second->key.start : value;
++  return (value ? value
++          : first->key.start < second->key.start ? -1
++          : first->key.start > second->key.start);
+ #undef first
+ #undef second
+ }
+ 
+-/*------------------------------------------------------------.
+-| Return !0 if WORD appears in TABLE.  Uses a binary search.  |
+-`------------------------------------------------------------*/
++/* True if WORD appears in TABLE.  Uses a binary search.  */
+ 
+-static int _GL_ATTRIBUTE_PURE
++static bool _GL_ATTRIBUTE_PURE
+ search_table (WORD *word, WORD_TABLE *table)
+ {
+-  int lowest;			/* current lowest possible index */
+-  int highest;			/* current highest possible index */
+-  int middle;			/* current middle index */
++  ptrdiff_t lowest;		/* current lowest possible index */
++  ptrdiff_t highest;		/* current highest possible index */
++  ptrdiff_t middle;		/* current middle index */
+   int value;			/* value from last comparison */
+ 
+   lowest = 0;
+@@ -614,9 +619,9 @@ search_table (WORD *word, WORD_TABLE *table)
+       else if (value > 0)
+         lowest = middle + 1;
+       else
+-        return 1;
++        return true;
+     }
+-  return 0;
++  return false;
+ }
+ 
+ /*---------------------------------------------------------------------.
+@@ -713,14 +718,8 @@ digest_word_file (const char *file_name, WORD_TABLE *table)
+       if (cursor > word_start)
+         {
+           if (table->length == table->alloc)
+-            {
+-              if ((SIZE_MAX / sizeof *table->start - 1) / 2 < table->alloc)
+-                xalloc_die ();
+-              table->alloc = table->alloc * 2 + 1;
+-              table->start = xrealloc (table->start,
+-                                       table->alloc * sizeof *table->start);
+-            }
+-
++            table->start = x2nrealloc (table->start, &table->alloc,
++                                       sizeof *table->start);
+           table->start[table->length].start = word_start;
+           table->start[table->length].size = cursor - word_start;
+           table->length++;
+@@ -744,13 +743,13 @@ digest_word_file (const char *file_name, WORD_TABLE *table)
+ `----------------------------------------------------------------------*/
+ 
+ static void
+-find_occurs_in_text (size_t file_index)
++find_occurs_in_text (int file_index)
+ {
+   char *cursor;			/* for scanning the source text */
+   char *scan;			/* for scanning the source text also */
+   char *line_start;		/* start of the current input line */
+   char *line_scan;		/* newlines scanned until this point */
+-  int reference_length;		/* length of reference in input mode */
++  ptrdiff_t reference_length;	/* length of reference in input mode */
+   WORD possible_key;		/* possible key, to ease searches */
+   OCCURS *occurs_cursor;	/* current OCCURS under construction */
+ 
+@@ -946,16 +945,9 @@ find_occurs_in_text (size_t file_index)
+              where it will be constructed.  */
+ 
+           if (number_of_occurs[0] == occurs_alloc[0])
+-            {
+-              if ((SIZE_MAX / sizeof *occurs_table[0] - 1) / 2
+-                  < occurs_alloc[0])
+-                xalloc_die ();
+-              occurs_alloc[0] = occurs_alloc[0] * 2 + 1;
+-              occurs_table[0] =
+-                xrealloc (occurs_table[0],
+-                          occurs_alloc[0] * sizeof *occurs_table[0]);
+-            }
+-
++            occurs_table[0] = x2nrealloc (occurs_table[0],
++                                          &occurs_alloc[0],
++                                          sizeof *occurs_table[0]);
+           occurs_cursor = occurs_table[0] + number_of_occurs[0];
+ 
+           /* Define the reference field, if any.  */
+@@ -990,8 +982,7 @@ find_occurs_in_text (size_t file_index)
+                  of the reference.  The reference position is simply the
+                  value of 'line_start'.  */
+ 
+-              occurs_cursor->reference
+-                = (DELTA) (line_start - possible_key.start);
++              occurs_cursor->reference = line_start - possible_key.start;
+               if (reference_length > reference_max_width)
+                 reference_max_width = reference_length;
+             }
+@@ -1023,11 +1014,9 @@ find_occurs_in_text (size_t file_index)
+ `-----------------------------------------*/
+ 
+ static void
+-print_spaces (int number)
++print_spaces (ptrdiff_t number)
+ {
+-  int counter;
+-
+-  for (counter = number; counter > 0; counter--)
++  for (ptrdiff_t counter = number; counter > 0; counter--)
+     putchar (' ');
+ }
+ 
+@@ -1200,10 +1189,9 @@ print_field (BLOCK field)
+ static void
+ fix_output_parameters (void)
+ {
+-  size_t file_index;		/* index in text input file arrays */
+-  int line_ordinal;		/* line ordinal value for reference */
+-  char ordinal_string[12];	/* edited line ordinal for reference */
+-  int reference_width;		/* width for the whole reference */
++  int file_index;		/* index in text input file arrays */
++  intmax_t line_ordinal;	/* line ordinal value for reference */
++  ptrdiff_t reference_width;	/* width for the whole reference */
+   int character;		/* character ordinal */
+   const char *cursor;		/* cursor in some constant strings */
+ 
+@@ -1219,15 +1207,15 @@ fix_output_parameters (void)
+           line_ordinal = file_line_count[file_index] + 1;
+           if (file_index > 0)
+             line_ordinal -= file_line_count[file_index - 1];
+-          sprintf (ordinal_string, "%d", line_ordinal);
+-          reference_width = strlen (ordinal_string);
++          char ordinal_string[INT_BUFSIZE_BOUND (intmax_t)];
++          reference_width = sprintf (ordinal_string, "%"PRIdMAX, line_ordinal);
+           if (input_file_name[file_index])
+             reference_width += strlen (input_file_name[file_index]);
+           if (reference_width > reference_max_width)
+             reference_max_width = reference_width;
+         }
+       reference_max_width++;
+-      reference.start = xmalloc ((size_t) reference_max_width + 1);
++      reference.start = xmalloc (reference_max_width + 1);
+     }
+ 
+   /* If the reference appears to the left of the output line, reserve some
+@@ -1355,14 +1343,14 @@ fix_output_parameters (void)
+ static void
+ define_all_fields (OCCURS *occurs)
+ {
+-  int tail_max_width;		/* allowable width of tail field */
+-  int head_max_width;		/* allowable width of head field */
++  ptrdiff_t tail_max_width;	/* allowable width of tail field */
++  ptrdiff_t head_max_width;	/* allowable width of head field */
+   char *cursor;			/* running cursor in source text */
+   char *left_context_start;	/* start of left context */
+   char *right_context_end;	/* end of right context */
+   char *left_field_start;	/* conservative start for 'head'/'before' */
+   const char *file_name;	/* file name for reference */
+-  int line_ordinal;		/* line ordinal for reference */
++  intmax_t line_ordinal;	/* line ordinal for reference */
+   const char *buffer_start;	/* start of buffered file for this occurs */
+   const char *buffer_end;	/* end of buffered file for this occurs */
+ 
+@@ -1435,7 +1423,7 @@ define_all_fields (OCCURS *occurs)
+       before_truncation = cursor > left_context_start;
+     }
+   else
+-    before_truncation = 0;
++    before_truncation = false;
+ 
+   SKIP_WHITE (before.start, buffer_end);
+ 
+@@ -1468,11 +1456,11 @@ define_all_fields (OCCURS *occurs)
+ 
+       if (tail.end > tail.start)
+         {
+-          keyafter_truncation = 0;
++          keyafter_truncation = false;
+           tail_truncation = truncation_string && tail.end < right_context_end;
+         }
+       else
+-        tail_truncation = 0;
++        tail_truncation = false;
+ 
+       SKIP_WHITE_BACKWARDS (tail.end, tail.start);
+     }
+@@ -1483,7 +1471,7 @@ define_all_fields (OCCURS *occurs)
+ 
+       tail.start = NULL;
+       tail.end = NULL;
+-      tail_truncation = 0;
++      tail_truncation = false;
+     }
+ 
+   /* 'head' could not take more columns than what has been left in the right
+@@ -1506,12 +1494,12 @@ define_all_fields (OCCURS *occurs)
+ 
+       if (head.end > head.start)
+         {
+-          before_truncation = 0;
++          before_truncation = false;
+           head_truncation = (truncation_string
+                              && head.start > left_context_start);
+         }
+       else
+-        head_truncation = 0;
++        head_truncation = false;
+ 
+       SKIP_WHITE (head.start, head.end);
+     }
+@@ -1522,7 +1510,7 @@ define_all_fields (OCCURS *occurs)
+ 
+       head.start = NULL;
+       head.end = NULL;
+-      head_truncation = 0;
++      head_truncation = false;
+     }
+ 
+   if (auto_reference)
+@@ -1540,8 +1528,8 @@ define_all_fields (OCCURS *occurs)
+       if (occurs->file_index > 0)
+         line_ordinal -= file_line_count[occurs->file_index - 1];
+ 
+-      sprintf (reference.start, "%s:%d", file_name, line_ordinal);
+-      reference.end = reference.start + strlen (reference.start);
++      char *file_end = stpcpy (reference.start, file_name);
++      reference.end = file_end + sprintf (file_end, ":%"PRIdMAX, line_ordinal);
+     }
+   else if (input_reference)
+     {
+@@ -1549,7 +1537,7 @@ define_all_fields (OCCURS *occurs)
+       /* Reference starts at saved position for reference and extends right
+          until some white space is met.  */
+ 
+-      reference.start = keyafter.start + (DELTA) occurs->reference;
++      reference.start = keyafter.start + occurs->reference;
+       reference.end = reference.start;
+       SKIP_NON_WHITE (reference.end, right_context_end);
+     }
+@@ -1753,7 +1741,7 @@ output_one_dumb_line (void)
+ static void
+ generate_all_output (void)
+ {
+-  size_t occurs_index;		/* index of keyword entry being processed */
++  ptrdiff_t occurs_index;	/* index of keyword entry being processed */
+   OCCURS *occurs_cursor;	/* current keyword entry being processed */
+ 
+   /* The following assignments are useful to provide default values in case
+@@ -1762,11 +1750,11 @@ generate_all_output (void)
+ 
+   tail.start = NULL;
+   tail.end = NULL;
+-  tail_truncation = 0;
++  tail_truncation = false;
+ 
+   head.start = NULL;
+   head.end = NULL;
+-  head_truncation = 0;
++  head_truncation = false;
+ 
+   /* Loop over all keyword occurrences.  */
+ 
+@@ -1946,12 +1934,12 @@ main (int argc, char **argv)
+ 
+         case 'g':
+           {
+-            unsigned long int tmp_ulong;
+-            if (xstrtoul (optarg, NULL, 0, &tmp_ulong, NULL) != LONGINT_OK
+-                || ! (0 < tmp_ulong && tmp_ulong <= INT_MAX))
++            intmax_t tmp;
++            if (! (xstrtoimax (optarg, NULL, 0, &tmp, NULL) == LONGINT_OK
++                   && 0 < tmp && tmp <= PTRDIFF_MAX))
+               die (EXIT_FAILURE, 0, _("invalid gap width: %s"),
+                    quote (optarg));
+-            gap_size = tmp_ulong;
++            gap_size = tmp;
+             break;
+           }
+ 
+@@ -1973,12 +1961,12 @@ main (int argc, char **argv)
+ 
+         case 'w':
+           {
+-            unsigned long int tmp_ulong;
+-            if (xstrtoul (optarg, NULL, 0, &tmp_ulong, NULL) != LONGINT_OK
+-                || ! (0 < tmp_ulong && tmp_ulong <= INT_MAX))
++            intmax_t tmp;
++            if (! (xstrtoimax (optarg, NULL, 0, &tmp, NULL) == LONGINT_OK
++                   && 0 < tmp && tmp <= PTRDIFF_MAX))
+               die (EXIT_FAILURE, 0, _("invalid line width: %s"),
+                    quote (optarg));
+-            line_width = tmp_ulong;
++            line_width = tmp;
+             break;
+           }
+ 
+@@ -2045,9 +2033,9 @@ main (int argc, char **argv)
+   else if (gnu_extensions)
+     {
+       number_input_files = argc - optind;
+-      input_file_name = xmalloc (number_input_files * sizeof *input_file_name);
+-      file_line_count = xmalloc (number_input_files * sizeof *file_line_count);
+-      text_buffers    = xmalloc (number_input_files * sizeof *text_buffers);
++      input_file_name = xnmalloc (number_input_files, sizeof *input_file_name);
++      file_line_count = xnmalloc (number_input_files, sizeof *file_line_count);
++      text_buffers    = xnmalloc (number_input_files, sizeof *text_buffers);
+ 
+       for (file_index = 0; file_index < number_input_files; file_index++)
+         {
+-- 
+2.9.5
+

coreutils-8.27-runcon-doc.patch

@@ -0,0 +1,33 @@
+From 76be8a7f9eb717b3d47009eb25d39fe7139a2c2d Mon Sep 17 00:00:00 2001
+From: Sebastian Kisela <skisela@redhat.com>
+Date: Tue, 30 May 2017 09:29:32 +0200
+Subject: [PATCH] doc: mention `setpriv --no-new-privs` feature in runcon info
+
+upstream commit: 6ebaf8195000d6d3590a2eac13f13b158e325452
+---
+ doc/coreutils.texi | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/doc/coreutils.texi b/doc/coreutils.texi
+index 68df075..e16e885 100644
+--- a/doc/coreutils.texi
++++ b/doc/coreutils.texi
+@@ -16583,7 +16583,14 @@ are interpreted as arguments to the command.
+ With neither @var{context} nor @var{command}, print the current
+ security context.
+ 
+-The program accepts the following options.  Also see @ref{Common options}.
++@cindex restricted security context
++@cindex NO_NEW_PRIVS
++Note also the @command{setpriv} command which can be used to set the
++NO_NEW_PRIVS bit using @command{setpriv --no-new-privs runcon ...},
++thus disallowing usage of a security context with more privileges
++than the process would normally have.
++
++@command{runcon} accepts the following options.  Also see @ref{Common options}.
+ 
+ @table @samp
+ 
+-- 
+2.9.4
+

coreutils-8.27-tail-inotify-recreate.patch

@@ -0,0 +1,168 @@
+From ba5fe2d4b8b6a8366f48b1ad1f97fe26c9089b53 Mon Sep 17 00:00:00 2001
+From: Sebastian Kisela <skisela@redhat.com>
+Date: Wed, 5 Apr 2017 09:40:41 +0200
+Subject: [PATCH] tail: revert to polling if a followed directory is replaced
+
+* src/tail.c (tail_forever_inotify): Add the IN_DELETE_SELF flag when
+creating watch for the parent directory.  After the parent directory
+is removed, an event is caught and then we switch from inotify to
+polling mode.  Till now, inotify has always frozen because it waited for
+an event from a watched dir, which has been already deleted and was not
+added again.
+* tests/tail-2/inotify-dir-recreate.sh: Add a test case.
+* tests/local.mk: Reference the new test.
+Fixes http://bugs.gnu.org/26363
+Reported at https://bugzilla.redhat.com/1283760
+
+Upstream-commit: ba5fe2d4b8b6a8366f48b1ad1f97fe26c9089b53
+
+---
+ src/tail.c                           | 22 +++++++++-
+ tests/local.mk                       |  1 +
+ tests/tail-2/inotify-dir-recreate.sh | 82 ++++++++++++++++++++++++++++++++++++
+ 4 files changed, 107 insertions(+), 1 deletion(-)
+ create mode 100755 tests/tail-2/inotify-dir-recreate.sh
+
+diff --git a/src/tail.c b/src/tail.c
+index d1552d4..6328fe0 100644
+--- a/src/tail.c
++++ b/src/tail.c
+@@ -1457,7 +1457,8 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files,
+                   In that case the same watch descriptor is returned.  */
+               f[i].parent_wd = inotify_add_watch (wd, dirlen ? f[i].name : ".",
+                                                   (IN_CREATE | IN_DELETE
+-                                                   | IN_MOVED_TO | IN_ATTRIB));
++                                                   | IN_MOVED_TO | IN_ATTRIB
++                                                   | IN_DELETE_SELF));
+ 
+               f[i].name[dirlen] = prev;
+ 
+@@ -1628,6 +1629,25 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files,
+       ev = void_ev;
+       evbuf_off += sizeof (*ev) + ev->len;
+ 
++      /* If a directory is deleted, IN_DELETE_SELF is emitted
++         with ev->name of length 0.
++         We need to catch it, otherwise it would wait forever,
++         as wd for directory becomes inactive. Revert to polling now.   */
++      if ((ev->mask & IN_DELETE_SELF) && ! ev->len)
++        {
++          for (i = 0; i < n_files; i++)
++            {
++              if (ev->wd == f[i].parent_wd)
++                {
++                  hash_free (wd_to_name);
++                  error (0, 0,
++                      _("directory containing watched file was removed"));
++                  errno = 0;  /* we've already diagnosed enough errno detail. */
++                  return true;
++                }
++            }
++        }
++
+       if (ev->len) /* event on ev->name in watched directory.  */
+         {
+           size_t j;
+diff --git a/tests/local.mk b/tests/local.mk
+index 3fe9ba8..e890c9a 100644
+--- a/tests/local.mk
++++ b/tests/local.mk
+@@ -176,6 +176,7 @@ all_tests =					\
+   tests/tail-2/descriptor-vs-rename.sh		\
+   tests/tail-2/inotify-rotate.sh		\
+   tests/tail-2/inotify-rotate-resources.sh	\
++  tests/tail-2/inotify-dir-recreate.sh		\
+   tests/chmod/no-x.sh				\
+   tests/chgrp/basic.sh				\
+   tests/rm/dangling-symlink.sh			\
+diff --git a/tests/tail-2/inotify-dir-recreate.sh b/tests/tail-2/inotify-dir-recreate.sh
+new file mode 100755
+index 0000000..eaa8422
+--- /dev/null
++++ b/tests/tail-2/inotify-dir-recreate.sh
+@@ -0,0 +1,82 @@
++#!/bin/sh
++# Makes sure, inotify will switch to polling mode if directory
++# of the watched file was removed and recreated.
++# (...instead of getting stuck forever)
++
++# Copyright (C) 2006-2017 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 <http://www.gnu.org/licenses/>.
++
++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
++print_ver_ tail
++
++
++# Terminate any background tail process
++cleanup_() { kill $pid 2>/dev/null && wait $pid; }
++
++cleanup_fail_ ()
++{
++  warn_ $1
++  cleanup_
++  fail=1
++}
++
++# $check_re - string to be found
++# $check_f - file to be searched
++check_tail_output_ ()
++{
++  local delay="$1"
++  grep $check_re $check_f > /dev/null ||
++    { sleep $delay ; return 1; }
++}
++
++grep_timeout_ ()
++{
++  check_re="$1"
++  check_f="$2"
++  retry_delay_ check_tail_output_ .1 5
++}
++
++# Prepare the file to be watched
++mkdir dir && echo 'inotify' > dir/file || framework_failure_
++
++#tail must print content of the file to stdout, verify
++timeout 60 tail -F dir/file &>out & pid=$!
++grep_timeout_ 'inotify' 'out' ||
++{ cleanup_fail_ 'file to be tailed does not exist'; }
++
++# Remove the directory, should get the message about the deletion
++rm -r dir || framework_failure_
++grep_timeout_ 'polling' 'out' ||
++{ cleanup_fail_ 'tail did not switch to polling mode'; }
++
++# Recreate the dir, must get a message about recreation
++mkdir dir && touch dir/file || framework_failure_
++grep_timeout_ 'appeared' 'out' ||
++{ cleanup_fail_ 'previously removed file did not appear'; }
++
++cleanup_
++
++# Expected result for the whole process
++cat <<\EOF > exp || framework_failure_
++inotify
++tail: 'dir/file' has become inaccessible: No such file or directory
++tail: directory containing watched file was removed
++tail: inotify cannot be used, reverting to polling
++tail: 'dir/file' has appeared;  following new file
++EOF
++
++compare exp out || fail=1
++
++Exit $fail
+-- 
+2.9.3
+

coreutils-8.27.tar.xz.sig

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABAgAGBQJYwOwaAAoJEN9v2XEwYDfZQrUP/RdXj/ug35e+u+VD1ts9/b8n
+7JihJmxngEZQAJECNTMbJ7mNj6DhpMY0Jg/Hwg7zJT28T6QDeS1Iuk3Id4uM5eFa
+CgHKAZumntSMTkQdNvnCEFEIqu+L8BtBYGcOaw66wAFNFw3jdJUUs2sOST2r46jR
+N7aY9oARKJuHfgTZ2BI2zL0Q+poXM1O0k/U+BScE6c139zJsbg+1uM9kGVtJWPkM
+EPLFWkbTgjYnt+qEFrDlWL0YFOS42sgR7P1sVfBC1nAu5lwgzPy62OtGv9WCEBhm
+3+PRNZ0KLW8CKp06llG/0bG4QwssWs6p/vPwrRGeAg6pKsRNN1ni27AnDThiPgvz
+YbBLgU+EZj1HuibvYArHXNKY2+O5ZC3nYU6bdAffl3TAtrGFA1ncZXGiFD5UgOQ2
+V9Q38S41FUEwKGtf9tWGCRTxrb4FQ1CDzJglV9vHKetn4mgH/HpEG/q07k4RNW5d
+ikfrS0xFxbqtLjlY3UqvtkrFyVQFY093ozsP7fKsq53JAtEWc3YvXR8UCbliU+gV
+5qug0REBQafe9EAyH+oq0dzD2BZ3KtFcjtKI/2UzAf3idcyygsHgcEPQObqI8BfD
+NscEMjdFY7+Zh5w2shQlyq4xr2aI2nXCX3+AMcS/6Yfg6W6fBvgIjtmXBrQsbWpV
+DBcx50TVDa/ERBX1+FI1
+=skPR
+-----END PGP SIGNATURE-----

coreutils-8.29-CVE-2017-18018.patch

@@ -0,0 +1,124 @@
+From 0aa9b0a92cb61af76b75b57abfd6ea1a7c627367 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Thu, 28 Dec 2017 15:52:42 -0500
+Subject: [PATCH 1/2] doc: clarify chown/chgrp --dereference defaults
+
+* doc/coreutils.texi: the documentation for the --dereference
+  flag of chown/chgrp states that it is the default mode of
+  operation. Document that this is only the case when operating
+  non-recursively.
+
+Upstream-commit: 7597cfa482e42a00a69fb9577ee523762980a9a2
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ doc/coreutils.texi | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/coreutils.texi b/doc/coreutils.texi
+index de1f2eb..de06c0f 100644
+--- a/doc/coreutils.texi
++++ b/doc/coreutils.texi
+@@ -10989,7 +10989,7 @@ chown -h -R --from=OLDUSER NEWUSER /
+ @cindex symbolic links, changing owner
+ @findex lchown
+ Do not act on symbolic links themselves but rather on what they point to.
+-This is the default.
++This is the default when not operating recursively.
+ 
+ @item -h
+ @itemx --no-dereference
+@@ -11119,7 +11119,7 @@ changed.
+ @cindex symbolic links, changing owner
+ @findex lchown
+ Do not act on symbolic links themselves but rather on what they point to.
+-This is the default.
++This is the default when not operating recursively.
+ 
+ @item -h
+ @itemx --no-dereference
+-- 
+2.13.6
+
+
+From 3fb331864c718e065804049001b573ff94810772 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Thu, 4 Jan 2018 11:38:21 -0500
+Subject: [PATCH 2/2] doc: warn about following symlinks recursively in
+ chown/chgrp
+
+In both chown and chgrp (which shares its code with chown), operating
+on symlinks recursively has a window of vulnerability where the
+destination user or group can change the target of the operation.
+Warn about combining the --dereference, --recursive, and -L flags.
+
+* doc/coreutils.texi (warnOptDerefWithRec): Add macro.
+(node chown invocation): Add it to --dereference and -L.
+(node chgrp invocation): Likewise.
+
+See also: CVE-2017-18018
+
+Upstream-commit: bc2fd9796403e03bb757b064d44c22fab92e6842
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ doc/coreutils.texi | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/doc/coreutils.texi b/doc/coreutils.texi
+index de06c0f..24cc85b 100644
+--- a/doc/coreutils.texi
++++ b/doc/coreutils.texi
+@@ -1428,6 +1428,19 @@ a command line argument is a symbolic link to a directory, traverse it.
+ In a recursive traversal, traverse every symbolic link to a directory
+ that is encountered.
+ @end macro
++
++@c Append the following warning to -L where appropriate (e.g. chown).
++@macro warnOptDerefWithRec
++
++Combining this dereferencing option with the @option{--recursive} option
++may create a security risk:
++During the traversal of the directory tree, an attacker may be able to
++introduce a symlink to an arbitrary target; when the tool reaches that,
++the operation will be performed on the target of that symlink,
++possibly allowing the attacker to escalate privileges.
++
++@end macro
++
+ @choptL
+ 
+ @macro choptP
+@@ -10990,6 +11003,7 @@ chown -h -R --from=OLDUSER NEWUSER /
+ @findex lchown
+ Do not act on symbolic links themselves but rather on what they point to.
+ This is the default when not operating recursively.
++@warnOptDerefWithRec
+ 
+ @item -h
+ @itemx --no-dereference
+@@ -11046,6 +11060,7 @@ Recursively change ownership of directories and their contents.
+ @xref{Traversing symlinks}.
+ 
+ @choptL
++@warnOptDerefWithRec
+ @xref{Traversing symlinks}.
+ 
+ @choptP
+@@ -11120,6 +11135,7 @@ changed.
+ @findex lchown
+ Do not act on symbolic links themselves but rather on what they point to.
+ This is the default when not operating recursively.
++@warnOptDerefWithRec
+ 
+ @item -h
+ @itemx --no-dereference
+@@ -11175,6 +11191,7 @@ Recursively change the group ownership of directories and their contents.
+ @xref{Traversing symlinks}.
+ 
+ @choptL
++@warnOptDerefWithRec
+ @xref{Traversing symlinks}.
+ 
+ @choptP
+-- 
+2.13.6
+

coreutils-8.32-DIR_COLORS.patch

@@ -1,100 +0,0 @@
-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
-
----
- DIR_COLORS              |  9 ++++++++-
- DIR_COLORS.lightbgcolor | 21 +++++++++++++++------
- 2 files changed, 23 insertions(+), 7 deletions(-)
-
-diff --git a/DIR_COLORS b/DIR_COLORS
-index b465771..ad42b09 100644
---- a/DIR_COLORS
-+++ b/DIR_COLORS
-@@ -1,3 +1,7 @@
-+# This file goes in the /etc directory, and must be world readable.
-+# You can copy this file to .dir_colors in your $HOME directory to override
-+# the system defaults.
-+
- # Configuration file for dircolors, a utility to help you set the
- # LS_COLORS environment variable used by GNU ls with the --color option.
- 
-@@ -10,6 +14,9 @@
- 
- # Global config options can be specified before TERM or COLORTERM entries
- 
-+# For compatibility, the pattern "^COLOR.*none" is recognized as a way to
-+# disable colorization.  See https://bugzilla.redhat.com/1349579 for details.
-+
- # Below are TERM or COLORTERM entries, which can be glob patterns, which
- # restrict following config to systems with matching environment variables.
- COLORTERM ?*
-@@ -62,7 +69,7 @@ DOOR 01;35	# door
- BLK 40;33;01	# block device driver
- CHR 40;33;01	# character device driver
- ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ...
--MISSING 00      # ... and the files they point to
-+MISSING 01;37;41 # ... and the files they point to
- SETUID 37;41	# file that is setuid (u+s)
- SETGID 30;43	# file that is setgid (g+s)
- CAPABILITY 00	# file with capability (very expensive to lookup)
-diff --git a/DIR_COLORS.lightbgcolor b/DIR_COLORS.lightbgcolor
-index eab6258..1627b63 100644
---- a/DIR_COLORS.lightbgcolor
-+++ b/DIR_COLORS.lightbgcolor
-@@ -1,3 +1,9 @@
-+# Configuration file for the color ls utility - modified for lighter backgrounds
-+
-+# This file goes in the /etc directory, and must be world readable.
-+# You can copy this file to .dir_colors in your $HOME directory to override
-+# the system defaults.
-+
- # Configuration file for dircolors, a utility to help you set the
- # LS_COLORS environment variable used by GNU ls with the --color option.
- 
-@@ -10,6 +16,9 @@
- 
- # Global config options can be specified before TERM or COLORTERM entries
- 
-+# For compatibility, the pattern "^COLOR.*none" is recognized as a way to
-+# disable colorization.  See https://bugzilla.redhat.com/1349579 for details.
-+
- # Below are TERM or COLORTERM entries, which can be glob patterns, which
- # restrict following config to systems with matching environment variables.
- COLORTERM ?*
-@@ -52,17 +61,17 @@ TERM xterm*
- #NORMAL 00	# no color code at all
- #FILE 00	# regular file: use no color at all
- RESET 0		# reset to "normal" color
--DIR 01;34	# directory
--LINK 01;36	# symbolic link.  (If you set this to 'target' instead of a
-+DIR 00;34	# directory
-+LINK 00;36	# symbolic link.  (If you set this to 'target' instead of a
-                 # numerical value, the color is as for the file pointed to.)
- MULTIHARDLINK 00	# regular file with more than one link
- FIFO 40;33	# pipe
--SOCK 01;35	# socket
--DOOR 01;35	# door
-+SOCK 00;35	# socket
-+DOOR 00;35	# door
- BLK 40;33;01	# block device driver
- CHR 40;33;01	# character device driver
- ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ...
--MISSING 00      # ... and the files they point to
-+MISSING 01;37;41 # ... and the files they point to
- SETUID 37;41	# file that is setuid (u+s)
- SETGID 30;43	# file that is setgid (g+s)
- CAPABILITY 00	# file with capability (very expensive to lookup)
-@@ -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:
--EXEC 01;32
-+EXEC 00;32
- 
- # List any file extensions like '.gz' or '.tar' that you would like ls
- # to color below. Put the extension, a space, and the color init string.
--- 
-2.34.1
-

coreutils-8.4-mkdir-modenote.patch

@@ -2,7 +2,7 @@ diff --git a/doc/coreutils.texi b/doc/coreutils.texi
 index 400e135..47e4480 100644
 --- a/doc/coreutils.texi
 +++ b/doc/coreutils.texi
-@@ -10829,6 +10829,8 @@ incorrect.  @xref{Directory Setuid and Setgid}, for how the
+@@ -10074,6 +10074,8 @@ incorrect.  @xref{Directory Setuid and Setgid}, for how the
  set-user-ID and set-group-ID bits of directories are inherited unless
  overridden in this way.
  

coreutils-8.5-dircolors.patch

@@ -0,0 +1,13 @@
+diff -urNp coreutils-8.5-orig/src/dircolors.hin coreutils-8.5/src/dircolors.hin
+--- coreutils-8.5-orig/src/dircolors.hin	2010-04-20 21:52:04.000000000 +0200
++++ coreutils-8.5/src/dircolors.hin	2010-07-22 16:18:41.978036926 +0200
+@@ -127,6 +127,9 @@ EXEC 01;32
+ .deb 01;31
+ .rpm 01;31
+ .jar 01;31
++.war 01;31
++.ear 01;31
++.sar 01;31
+ .rar 01;31
+ .ace 01;31
+ .zoo 01;31

coreutils-colorls.csh

@@ -15,6 +15,11 @@ alias l. 'ls -d .*'
 set COLORS=/etc/DIR_COLORS
 
 if ($?TERM) then
+  if ( -e "/etc/DIR_COLORS.256color" ) then
+    if ( "`/usr/bin/tput colors`" == "256" ) then
+       set COLORS=/etc/DIR_COLORS.256color
+    endif
+  endif
   if ( -e "/etc/DIR_COLORS.$TERM" ) then
      set COLORS="/etc/DIR_COLORS.$TERM"
   endif

coreutils-colorls.sh

@@ -22,6 +22,10 @@ if [ -z "$USER_LS_COLORS" ]; then
   [ -z "$COLORS" ] && [ -e "/etc/DIR_COLORS.$TERM" ] && \
   COLORS="/etc/DIR_COLORS.$TERM"
 
+  [ -z "$COLORS" ] && [ -e "/etc/DIR_COLORS.256color" ] && \
+  [ "x`/usr/bin/tty -s && /usr/bin/tput colors 2>/dev/null`" = "x256" ] && \
+  COLORS="/etc/DIR_COLORS.256color"
+
   [ -z "$COLORS" ] && [ -e "/etc/DIR_COLORS" ] && \
   COLORS="/etc/DIR_COLORS"
 

coreutils-df-direct.patch

@@ -1,20 +1,8 @@
-From 6e36198f10a2f63b89c89ebb5d5c185b20fb3a63 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Mon, 29 Mar 2010 17:20:34 +0000
-Subject: [PATCH] coreutils-df-direct.patch
-
----
- doc/coreutils.texi |  7 ++++++
- src/df.c           | 34 ++++++++++++++++++++++++++--
- tests/df/direct.sh | 55 ++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 94 insertions(+), 2 deletions(-)
- create mode 100755 tests/df/direct.sh
-
 diff --git a/doc/coreutils.texi b/doc/coreutils.texi
-index 5b9a597..6810c15 100644
+index a507280..400e135 100644
 --- a/doc/coreutils.texi
 +++ b/doc/coreutils.texi
-@@ -12074,6 +12074,13 @@ some systems (notably Solaris), doing this yields more up to date results,
+@@ -11303,6 +11303,13 @@ some systems (notably SunOS), doing this yields more up to date results,
  but in general this option makes @command{df} much slower, especially when
  there are many or very busy file systems.
  
@@ -27,12 +15,12 @@ index 5b9a597..6810c15 100644
 +
  @item --total
  @opindex --total
- @cindex grand total of file system size, usage and available space
+ @cindex grand total of disk size, usage and available space
 diff --git a/src/df.c b/src/df.c
-index 48025b9..c8efa5b 100644
+index 8f760db..a7385fd 100644
 --- a/src/df.c
 +++ b/src/df.c
-@@ -125,6 +125,9 @@ static bool print_type;
+@@ -120,6 +120,9 @@ static bool print_type;
  /* If true, print a grand total at the end.  */
  static bool print_grand_total;
  
@@ -42,7 +30,7 @@ index 48025b9..c8efa5b 100644
  /* Grand total data.  */
  static struct fs_usage grand_fsu;
  
-@@ -252,13 +255,15 @@ enum
+@@ -247,13 +250,15 @@ enum
    NO_SYNC_OPTION = CHAR_MAX + 1,
    SYNC_OPTION,
    TOTAL_OPTION,
@@ -59,7 +47,7 @@ index 48025b9..c8efa5b 100644
    {"inodes", no_argument, NULL, 'i'},
    {"human-readable", no_argument, NULL, 'h'},
    {"si", no_argument, NULL, 'H'},
-@@ -583,7 +588,10 @@ get_header (void)
+@@ -509,7 +514,10 @@ get_header (void)
    for (col = 0; col < ncolumns; col++)
      {
        char *cell = NULL;
@@ -71,7 +59,7 @@ index 48025b9..c8efa5b 100644
  
        if (columns[col]->field == SIZE_FIELD
            && (header_mode == DEFAULT_MODE
-@@ -1486,6 +1494,17 @@ get_point (char const *point, const struct stat *statp)
+@@ -1397,6 +1405,19 @@ get_point (const char *point, const struct stat *statp)
  static void
  get_entry (char const *name, struct stat const *statp)
  {
@@ -80,16 +68,18 @@ index 48025b9..c8efa5b 100644
 +      char *resolved = canonicalize_file_name (name);
 +      if (resolved)
 +	{
-+	  get_dev (NULL, resolved, name, NULL, NULL, false, false, NULL, false);
++         char *mp = find_mount_point (name, statp);
++	  get_dev (NULL, mp, resolved, NULL, NULL, false, false, NULL, false);
++         free(mp);
 +	  free (resolved);
 +	  return;
 +	}
 +    }
 +
    if ((S_ISBLK (statp->st_mode) || S_ISCHR (statp->st_mode))
-       && get_device (name))
+       && get_disk (name))
      return;
-@@ -1556,6 +1575,7 @@ or all file systems by default.\n\
+@@ -1467,6 +1488,7 @@ or all file systems by default.\n\
    -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n\
                             '-BM' prints sizes in units of 1,048,576 bytes;\n\
                             see SIZE format below\n\
@@ -97,7 +87,7 @@ index 48025b9..c8efa5b 100644
    -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n\
    -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n\
  "), stdout);
-@@ -1646,6 +1666,9 @@ main (int argc, char **argv)
+@@ -1557,6 +1579,9 @@ main (int argc, char **argv)
                xstrtol_fatal (e, oi, c, long_options, optarg);
            }
            break;
@@ -107,7 +97,7 @@ index 48025b9..c8efa5b 100644
          case 'i':
            if (header_mode == OUTPUT_MODE)
              {
-@@ -1742,6 +1765,13 @@ main (int argc, char **argv)
+@@ -1653,6 +1678,13 @@ main (int argc, char **argv)
          }
      }
  
@@ -122,7 +112,7 @@ index 48025b9..c8efa5b 100644
      {
        if (posix_format)
 diff --git a/tests/df/direct.sh b/tests/df/direct.sh
-new file mode 100755
+new file mode 100644
 index 0000000..8e4cfb8
 --- /dev/null
 +++ b/tests/df/direct.sh
@@ -182,6 +172,3 @@ index 0000000..8e4cfb8
 +compare file_out file_exp || fail=1
 +
 +Exit $fail
--- 
-2.31.1
-

coreutils-getgrouplist.patch

@@ -21,15 +21,7 @@ diff --git a/lib/mgetgroups.c b/lib/mgetgroups.c
 index 76474c2..0a9d221 100644
 --- a/lib/mgetgroups.c
 +++ b/lib/mgetgroups.c
-@@ -31,6 +31,7 @@
- #endif
- 
- #include "getugroups.h"
-+#include "xalloc.h"
- #include "xalloc-oversized.h"
- 
- /* Work around an incompatibility of OS X 10.11: getgrouplist
-@@ -119,9 +120,17 @@ mgetgroups (char const *username, gid_t gid, gid_t **groups)
+@@ -121,9 +121,17 @@ mgetgroups (char const *username, gid_t gid, gid_t **groups)
    /* else no username, so fall through and use getgroups. */
  #endif
  
@@ -50,7 +42,7 @@ index 76474c2..0a9d221 100644
  
    /* If we failed to count groups because there is no supplemental
       group support, then return an array containing just GID.
-@@ -143,10 +152,25 @@ mgetgroups (char const *username, gid_t gid, gid_t **groups)
+@@ -145,10 +153,25 @@ mgetgroups (char const *username, gid_t gid, gid_t **groups)
    if (g == NULL)
      return -1;
  
@@ -84,7 +76,7 @@ diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
 index 62777c7..5180243 100644
 --- a/m4/jm-macros.m4
 +++ b/m4/jm-macros.m4
-@@ -68,6 +68,7 @@ AC_DEFUN([coreutils_MACROS],
+@@ -82,6 +82,7 @@ AC_DEFUN([coreutils_MACROS],
      fchown
      fchmod
      ftruncate

coreutils-i18n-cut-old.patch

@@ -0,0 +1,565 @@
+diff --git a/src/cut.c b/src/cut.c
+index 7ab6be4..022d0ad 100644
+--- a/src/cut.c
++++ b/src/cut.c
+@@ -28,6 +28,11 @@
+ #include <assert.h>
+ #include <getopt.h>
+ #include <sys/types.h>
++
++/* Get mbstate_t, mbrtowc().  */
++#if HAVE_WCHAR_H
++# include <wchar.h>
++#endif
+ #include "system.h"
+ 
+ #include "error.h"
+@@ -38,6 +43,18 @@
+ 
+ #include "set-fields.h"
+ 
++/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC
++   installation; work around this configuration error.        */
++#if !defined MB_LEN_MAX || MB_LEN_MAX < 2
++# undef MB_LEN_MAX
++# define MB_LEN_MAX 16
++#endif
++
++/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t.  */
++#if HAVE_MBRTOWC && defined mbstate_t
++# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0)
++#endif
++
+ /* The official name of this program (e.g., no 'g' prefix).  */
+ #define PROGRAM_NAME "cut"
+ 
+@@ -54,6 +71,52 @@
+     }									\
+   while (0)
+ 
++/* Refill the buffer BUF to get a multibyte character. */
++#define REFILL_BUFFER(BUF, BUFPOS, BUFLEN, STREAM)                        \
++  do                                                                        \
++    {                                                                        \
++      if (BUFLEN < MB_LEN_MAX && !feof (STREAM) && !ferror (STREAM))        \
++        {                                                                \
++          memmove (BUF, BUFPOS, BUFLEN);                                \
++          BUFLEN += fread (BUF + BUFLEN, sizeof(char), BUFSIZ, STREAM); \
++          BUFPOS = BUF;                                                        \
++        }                                                                \
++    }                                                                        \
++  while (0)
++
++/* Get wide character on BUFPOS. BUFPOS is not included after that.
++   If byte sequence is not valid as a character, CONVFAIL is true. Otherwise false. */
++#define GET_NEXT_WC_FROM_BUFFER(WC, BUFPOS, BUFLEN, MBLENGTH, STATE, CONVFAIL) \
++  do                                                                        \
++    {                                                                        \
++      mbstate_t state_bak;                                                \
++                                                                        \
++      if (BUFLEN < 1)                                                        \
++        {                                                                \
++          WC = WEOF;                                                        \
++          break;                                                        \
++        }                                                                \
++                                                                        \
++      /* Get a wide character. */                                        \
++      CONVFAIL = false;                                                        \
++      state_bak = STATE;                                                \
++      MBLENGTH = mbrtowc ((wchar_t *)&WC, BUFPOS, BUFLEN, &STATE);        \
++                                                                        \
++      switch (MBLENGTH)                                                        \
++        {                                                                \
++        case (size_t)-1:                                                \
++        case (size_t)-2:                                                \
++          CONVFAIL = true;                                                        \
++          STATE = state_bak;                                                \
++          /* Fall througn. */                                                \
++                                                                        \
++        case 0:                                                                \
++          MBLENGTH = 1;                                                        \
++          break;                                                        \
++        }                                                                \
++    }                                                                        \
++  while (0)
++
+ 
+ /* Pointer inside RP.  When checking if a byte or field is selected
+    by a finite range, we check if it is between CURRENT_RP.LO
+@@ -61,6 +124,9 @@
+    CURRENT_RP.HI then we make CURRENT_RP to point to the next range pair. */
+ static struct field_range_pair *current_rp;
+ 
++/* Length of the delimiter given as argument to -d.  */
++size_t delimlen;
++
+ /* 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
+   {
+     undefined_mode,
+ 
+-    /* Output characters that are in the given bytes. */
++    /* Output bytes that are at the given positions. */
+     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;
+ 
++/* If nonzero, when in byte mode, don't split multibyte characters.  */
++static int byte_mode_character_aware;
++
++/* If nonzero, the function for single byte locale is work
++   if this program runs on multibyte locale. */
++static int force_singlebyte_mode;
++
+ /* 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;
+ 
+ /* The delimiter character for field mode. */
+ static unsigned char delim;
++#if HAVE_WCHAR_H
++static wchar_t wcdelim;
++#endif
+ 
+ /* The delimiter for each line/record. */
+ static unsigned char line_delim = '\n';
+@@ -164,7 +243,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\
+-  -n                      (ignored)\n\
++  -n                      with -b: don't split multibyte characters\n\
+ "), stdout);
+       fputs (_("\
+       --complement        complement the set of selected bytes, characters\n\
+@@ -280,6 +359,82 @@ cut_bytes (FILE *stream)
+     }
+ }
+ 
++#if HAVE_MBRTOWC
++/* This function is in use for the following case.
++
++   1. Read from the stream STREAM, printing to standard output any selected
++   characters.
++
++   2. Read from stream STREAM, printing to standard output any selected bytes,
++   without splitting multibyte characters.  */
++
++static void
++cut_characters_or_cut_bytes_no_split (FILE *stream)
++{
++  size_t idx;                /* number of bytes or characters in the line so far. */
++  char buf[MB_LEN_MAX + BUFSIZ];  /* For spooling a read byte sequence. */
++  char *bufpos;                /* Next read position of BUF. */
++  size_t buflen;        /* The length of the byte sequence in buf. */
++  wint_t wc;                /* A gotten wide character. */
++  size_t mblength;        /* The byte size of a multibyte character which shows
++                           as same character as WC. */
++  mbstate_t state;        /* State of the stream. */
++  bool convfail = false;  /* true, when conversion failed. Otherwise false. */
++  /* Whether to begin printing delimiters between ranges for the current line.
++     Set after we've begun printing data corresponding to the first range.  */
++  bool print_delimiter = false;
++
++  idx = 0;
++  buflen = 0;
++  bufpos = buf;
++  memset (&state, '\0', sizeof(mbstate_t));
++
++  current_rp = frp;
++
++  while (1)
++    {
++      REFILL_BUFFER (buf, bufpos, buflen, stream);
++
++      GET_NEXT_WC_FROM_BUFFER (wc, bufpos, buflen, mblength, state, convfail);
++      (void) convfail;  /* ignore unused */
++
++      if (wc == WEOF)
++        {
++          if (idx > 0)
++            putchar (line_delim);
++          break;
++        }
++      else if (wc == line_delim)
++        {
++          putchar (line_delim);
++          idx = 0;
++          print_delimiter = false;
++          current_rp = frp;
++        }
++      else
++        {
++          next_item (&idx);
++          if (print_kth (idx))
++            {
++              if (output_delimiter_specified)
++                {
++                  if (print_delimiter && is_range_start_index (idx))
++                    {
++                      fwrite (output_delimiter_string, sizeof (char),
++                              output_delimiter_length, stdout);
++                    }
++                  print_delimiter = true;
++                }
++              fwrite (bufpos, mblength, sizeof(char), stdout);
++            }
++        }
++
++      buflen -= mblength;
++      bufpos += mblength;
++    }
++}
++#endif
++
+ /* Read from stream STREAM, printing to standard output any selected fields.  */
+ 
+ static void
+@@ -425,13 +580,211 @@ cut_fields (FILE *stream)
+     }
+ }
+ 
++#if HAVE_MBRTOWC
++static void
++cut_fields_mb (FILE *stream)
++{
++  int c;
++  size_t field_idx;
++  int found_any_selected_field;
++  int buffer_first_field;
++  int empty_input;
++  char buf[MB_LEN_MAX + BUFSIZ];  /* For spooling a read byte sequence. */
++  char *bufpos;                /* Next read position of BUF. */
++  size_t buflen;        /* The length of the byte sequence in buf. */
++  wint_t wc = 0;        /* A gotten wide character. */
++  size_t mblength;        /* The byte size of a multibyte character which shows
++                           as same character as WC. */
++  mbstate_t state;        /* State of the stream. */
++  bool convfail = false;  /* true, when conversion failed. Otherwise false. */
++
++  current_rp = frp;
++
++  found_any_selected_field = 0;
++  field_idx = 1;
++  bufpos = buf;
++  buflen = 0;
++  memset (&state, '\0', sizeof(mbstate_t));
++
++  c = getc (stream);
++  empty_input = (c == EOF);
++  if (c != EOF)
++  {
++    ungetc (c, stream);
++    wc = 0;
++  }
++  else
++    wc = WEOF;
++
++  /* To support the semantics of the -s flag, we may have to buffer
++     all of the first field to determine whether it is `delimited.'
++     But that is unnecessary if all non-delimited lines must be printed
++     and the first field has been selected, or if non-delimited lines
++     must be suppressed and the first field has *not* been selected.
++     That is because a non-delimited line has exactly one field.  */
++  buffer_first_field = (suppress_non_delimited ^ !print_kth (1));
++
++  while (1)
++    {
++      if (field_idx == 1 && buffer_first_field)
++        {
++          int len = 0;
++
++          while (1)
++            {
++              REFILL_BUFFER (buf, bufpos, buflen, stream);
++
++              GET_NEXT_WC_FROM_BUFFER
++                (wc, bufpos, buflen, mblength, state, convfail);
++
++              if (wc == WEOF)
++                break;
++
++              field_1_buffer = xrealloc (field_1_buffer, len + mblength);
++              memcpy (field_1_buffer + len, bufpos, mblength);
++              len += mblength;
++              buflen -= mblength;
++              bufpos += mblength;
++
++              if (!convfail && (wc == line_delim || wc == wcdelim))
++                break;
++            }
++
++          if (len <= 0 && wc == WEOF)
++            break;
++
++          /* If the first field extends to the end of line (it is not
++             delimited) and we are printing all non-delimited lines,
++             print this one.  */
++          if (convfail || (!convfail && wc != wcdelim))
++            {
++              if (suppress_non_delimited)
++                {
++                  /* Empty.        */
++                }
++              else
++                {
++                  fwrite (field_1_buffer, sizeof (char), len, stdout);
++                  /* Make sure the output line is newline terminated.  */
++                  if (convfail || (!convfail && wc != line_delim))
++                    putchar (line_delim);
++                }
++              continue;
++            }
++
++          if (print_kth (1))
++            {
++              /* Print the field, but not the trailing delimiter.  */
++              fwrite (field_1_buffer, sizeof (char), len - 1, stdout);
++              found_any_selected_field = 1;
++            }
++          next_item (&field_idx);
++        }
++
++      if (wc != WEOF)
++        {
++          if (print_kth (field_idx))
++            {
++              if (found_any_selected_field)
++                {
++                  fwrite (output_delimiter_string, sizeof (char),
++                          output_delimiter_length, stdout);
++                }
++              found_any_selected_field = 1;
++            }
++
++          while (1)
++            {
++              REFILL_BUFFER (buf, bufpos, buflen, stream);
++
++              GET_NEXT_WC_FROM_BUFFER
++                (wc, bufpos, buflen, mblength, state, convfail);
++
++              if (wc == WEOF)
++                break;
++              else if (!convfail && (wc == wcdelim || wc == line_delim))
++                {
++                  buflen -= mblength;
++                  bufpos += mblength;
++                  break;
++                }
++
++              if (print_kth (field_idx))
++                fwrite (bufpos, mblength, sizeof(char), stdout);
++
++              buflen -= mblength;
++              bufpos += mblength;
++            }
++        }
++
++      if ((!convfail || wc == line_delim) && buflen < 1)
++        wc = WEOF;
++
++      if (!convfail && wc == wcdelim)
++        next_item (&field_idx);
++      else if (wc == WEOF || (!convfail && wc == line_delim))
++        {
++          if (found_any_selected_field
++              || (!empty_input && !(suppress_non_delimited && field_idx == 1)))
++            putchar (line_delim);
++          if (wc == WEOF)
++            break;
++          field_idx = 1;
++          current_rp = frp;
++          found_any_selected_field = 0;
++        }
++    }
++}
++#endif
++
+ static void
+ cut_stream (FILE *stream)
+ {
+-  if (operating_mode == byte_mode)
+-    cut_bytes (stream);
++#if HAVE_MBRTOWC
++  if (MB_CUR_MAX > 1 && !force_singlebyte_mode)
++    {
++      switch (operating_mode)
++        {
++        case byte_mode:
++          if (byte_mode_character_aware)
++            cut_characters_or_cut_bytes_no_split (stream);
++          else
++            cut_bytes (stream);
++          break;
++
++        case character_mode:
++          cut_characters_or_cut_bytes_no_split (stream);
++          break;
++
++        case field_mode:
++          if (delimlen == 1)
++            {
++              /* Check if we have utf8 multibyte locale, so we can use this
++                 optimization because of uniqueness of characters, which is
++                 not true for e.g. SJIS */
++              char * loc = setlocale(LC_CTYPE, NULL);
++              if (loc && (strstr (loc, "UTF-8") || strstr (loc, "utf-8") ||
++                  strstr (loc, "UTF8") || strstr (loc, "utf8")))
++                {
++                  cut_fields (stream);
++                  break;
++                }
++            }
++          cut_fields_mb (stream);
++          break;
++
++        default:
++          abort ();
++        }
++    }
+   else
+-    cut_fields (stream);
++#endif
++    {
++      if (operating_mode == field_mode)
++        cut_fields (stream);
++      else
++        cut_bytes (stream);
++    }
+ }
+ 
+ /* Process file FILE to standard output.
+@@ -483,6 +836,7 @@ main (int argc, char **argv)
+   bool ok;
+   bool delim_specified = false;
+   char *spec_list_string IF_LINT ( = NULL);
++  char mbdelim[MB_LEN_MAX + 1];
+ 
+   initialize_main (&argc, &argv);
+   set_program_name (argv[0]);
+@@ -505,7 +859,6 @@ 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"));
+@@ -513,6 +866,14 @@ main (int argc, char **argv)
+           spec_list_string = optarg;
+           break;
+ 
++        case 'c':
++          /* Build the character list. */
++          if (operating_mode != undefined_mode)
++            FATAL_ERROR (_("only one type of list may be specified"));
++          operating_mode = character_mode;
++          spec_list_string = optarg;
++          break;
++
+         case 'f':
+           /* Build the field list. */
+           if (operating_mode != undefined_mode)
+@@ -524,10 +885,38 @@ main (int argc, char **argv)
+         case 'd':
+           /* New delimiter. */
+           /* Interpret -d '' to mean 'use the NUL byte as the delimiter.'  */
+-          if (optarg[0] != '\0' && optarg[1] != '\0')
+-            FATAL_ERROR (_("the delimiter must be a single character"));
+-          delim = optarg[0];
+-          delim_specified = true;
++            {
++#if HAVE_MBRTOWC
++              if(MB_CUR_MAX > 1)
++                {
++                  mbstate_t state;
++
++                  memset (&state, '\0', sizeof(mbstate_t));
++                  delimlen = mbrtowc (&wcdelim, optarg, strnlen(optarg, MB_LEN_MAX), &state);
++
++                  if (delimlen == (size_t)-1 || delimlen == (size_t)-2)
++                    ++force_singlebyte_mode;
++                  else
++                    {
++                      delimlen = (delimlen < 1) ? 1 : delimlen;
++                      if (wcdelim != L'\0' && *(optarg + delimlen) != '\0')
++                        FATAL_ERROR (_("the delimiter must be a single character"));
++                      memcpy (mbdelim, optarg, delimlen);
++                      mbdelim[delimlen] = '\0';
++                      if (delimlen == 1)
++                        delim = *optarg;
++                    }
++                }
++
++              if (MB_CUR_MAX <= 1 || force_singlebyte_mode)
++#endif
++                {
++                  if (optarg[0] != '\0' && optarg[1] != '\0')
++                    FATAL_ERROR (_("the delimiter must be a single character"));
++                  delim = (unsigned char) optarg[0];
++                }
++            delim_specified = true;
++          }
+           break;
+ 
+         case OUTPUT_DELIMITER_OPTION:
+@@ -540,6 +929,7 @@ main (int argc, char **argv)
+           break;
+ 
+         case 'n':
++          byte_mode_character_aware = 1;
+           break;
+ 
+         case 's':
+@@ -579,15 +969,34 @@ main (int argc, char **argv)
+               | (complement ? SETFLD_COMPLEMENT : 0) );
+ 
+   if (!delim_specified)
+-    delim = '\t';
++    {
++      delim = '\t';
++#ifdef HAVE_MBRTOWC
++      wcdelim = L'\t';
++      mbdelim[0] = '\t';
++      mbdelim[1] = '\0';
++      delimlen = 1;
++#endif
++    }
+ 
+   if (output_delimiter_string == NULL)
+     {
+-      static char dummy[2];
+-      dummy[0] = delim;
+-      dummy[1] = '\0';
+-      output_delimiter_string = dummy;
+-      output_delimiter_length = 1;
++#ifdef HAVE_MBRTOWC
++      if (MB_CUR_MAX > 1 && !force_singlebyte_mode)
++        {
++          output_delimiter_string = xstrdup(mbdelim);
++          output_delimiter_length = delimlen;
++        }
++
++      if (MB_CUR_MAX <= 1 || force_singlebyte_mode)
++#endif
++        {
++          static char dummy[2];
++          dummy[0] = delim;
++          dummy[1] = '\0';
++          output_delimiter_string = dummy;
++          output_delimiter_length = 1;
++        }
+     }
+ 
+   if (optind == argc)

coreutils-i18n-cut.patch

@@ -0,0 +1,587 @@
+(sb) lin18nux/lsb compliance - cut - not stable enough, not applied
+
+--- coreutils-8.24/src/cut.c	2015-06-26 19:05:22.000000000 +0200
++++ cut.c	2016-01-15 10:15:04.863804121 +0100
+@@ -28,6 +28,11 @@
+ #include <assert.h>
+ #include <getopt.h>
+ #include <sys/types.h>
++
++#include <mbfile.h>
++#include <mbiter.h>
++#include <string.h>
++
+ #include "system.h"
+ 
+ #include "error.h"
+@@ -61,25 +66,16 @@
+    CURRENT_RP.HI then we make CURRENT_RP to point to the next range pair. */
+ static struct field_range_pair *current_rp;
+ 
+-/* 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
+-   first field must be read into this buffer to determine whether it
+-   is followed by a delimiter or a newline before any of it may be
+-   output.  Otherwise, cut_fields can do the job without using this
+-   buffer.  */
+-static char *field_1_buffer;
+-
+-/* The number of bytes allocated for FIELD_1_BUFFER.  */
+-static size_t field_1_bufsize;
+-
+ enum operating_mode
+   {
+     undefined_mode,
+ 
+-    /* Output characters that are in the given bytes. */
++    /* Output the given bytes. */
+     byte_mode,
+ 
++    /* Output characters that are in the given positions . */
++    char_mode,
++
+     /* Output the given delimiter-separated fields. */
+     field_mode
+   };
+@@ -91,12 +87,16 @@ static enum operating_mode operating_mode;
+    with field mode.  */
+ static bool suppress_non_delimited;
+ 
++/* Unless true, we do not recognize multibyte characters in byte-splitting
++   mode.  */
++static bool no_break_mb_chars;
++
+ /* If true, print all bytes, characters, or fields _except_
+    those that were specified.  */
+ static bool complement;
+ 
+ /* The delimiter character for field mode. */
+-static unsigned char delim;
++static mbf_char_t delim;
+ 
+ /* The delimiter for each line/record. */
+ static unsigned char line_delim = '\n';
+@@ -109,7 +109,7 @@ static size_t output_delimiter_length;
+ 
+ /* The output field separator string.  Defaults to the 1-character
+    string consisting of the input delimiter.  */
+-static char *output_delimiter_string;
++static char const *output_delimiter_string;
+ 
+ /* True if we have ever read standard input. */
+ static bool have_read_stdin;
+@@ -164,7 +164,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\
+-  -n                      (ignored)\n\
++  -n                      with -b, don't split multibyte characters\n\
+ "), stdout);
+       fputs (_("\
+       --complement        complement the set of selected bytes, characters\n\
+@@ -211,6 +211,12 @@ next_item (size_t *item_idx)
+     current_rp++;
+ }
+ 
++static inline void
++next_item_n (size_t *item_idx, size_t n)
++{
++  while (n-- > 0)
++    next_item (item_idx);
++}
+ /* Return nonzero if the K'th field or byte is printable. */
+ 
+ static inline bool
+@@ -219,6 +225,15 @@ print_kth (size_t k)
+   return current_rp->lo <= k;
+ }
+ 
++/* The lo and hi params should be used for the current characters byte position
++ * and byte size, respectively. */
++static inline bool
++rp_intersect (size_t lo, size_t hi)
++{
++  return ((current_rp->lo <= lo && current_rp->hi >= lo)
++	  || (current_rp->lo <= hi && current_rp->hi >= hi));
++}
++
+ /* Return nonzero if K'th byte is the beginning of a range. */
+ 
+ static inline bool
+@@ -281,23 +296,215 @@ cut_bytes (FILE *stream)
+ }
+ 
+ /* Read from stream STREAM, printing to standard output any selected fields.  */
++extern ssize_t
++mb_getndelim2 (mbf_char_t **lineptr, size_t *linesize, size_t nmax,
++	       mbf_char_t delim1, mbf_char_t delim2, mb_file_t *stream)
++{
++/* The maximum value that getndelim2 can return without suffering from
++   overflow problems, either internally (because of pointer
++   subtraction overflow) or due to the API (because of ssize_t).  */
++#define GETNDELIM2_MAXIMUM (PTRDIFF_MAX < SSIZE_MAX ? PTRDIFF_MAX : SSIZE_MAX)
++
++/* Try to add at least this many bytes when extending the buffer.
++   MIN_CHUNK must be no greater than GETNDELIM2_MAXIMUM.  */
++#define MIN_CHUNK 64
++  size_t nchars_avail;          /* Allocated but unused chars in *LINEPTR.  */
++  mbf_char_t *read_pos;               /* Where we're reading into *LINEPTR. */
++  ssize_t chars_stored = -1;
++  mbf_char_t *ptr = *lineptr;
++  size_t size = *linesize;
++  bool found_delimiter;
++
++  if (!ptr)
++    {
++      size = nmax < MIN_CHUNK ? nmax : MIN_CHUNK;
++      ptr = malloc (size * sizeof (mbf_char_t));
++      if (!ptr)
++        return -1;
++    }
++
++  if (size < 0)
++    goto done;
++
++  nchars_avail = size;
++  read_pos = ptr;
++
++  if (nchars_avail == 0 && nmax <= size)
++    goto done;
++
++  /* Normalize delimiters, since memchr2 doesn't handle EOF.  */
++  if (mb_iseof (delim1))
++    mb_copy (&delim1, &delim2);
++  else if (mb_iseof (delim2))
++    mb_copy (&delim2, &delim1);
++
++  flockfile (stream);
++
++  found_delimiter = false;
++  do
++    {
++      /* Here always ptr + size == read_pos + nchars_avail.
++         Also nchars_avail > 0 || size < nmax.  */
++
++      mbf_char_t c IF_LINT (= 0);
++        {
++          mbf_getc (c, *stream);
++          if (mb_iseof (c))
++            {
++              /* Return partial line, if any.  */
++              if (read_pos == ptr)
++                goto unlock_done;
++              else
++                break;
++            }
++          if (mb_equal (c, delim1) || mb_equal (c, delim2))
++            found_delimiter = true;
++        }
++
++      /* We always want at least one byte left in the buffer, since we
++         always (unless we get an error while reading the first byte)
++         NUL-terminate the line buffer.  */
++
++      if (!nchars_avail)
++        {
++          /* Grow size proportionally, not linearly, to avoid O(n^2)
++             running time.  */
++          size_t newsize = size < MIN_CHUNK ? size + MIN_CHUNK : 2 * size;
++          mbf_char_t *newptr;
++
++          /* Respect nmax.  This handles possible integer overflow.  */
++          if (! (size < newsize && newsize <= nmax))
++            newsize = nmax;
++
++          if (GETNDELIM2_MAXIMUM < newsize)
++            {
++              size_t newsizemax = GETNDELIM2_MAXIMUM + 1;
++              if (size == newsizemax)
++                goto unlock_done;
++              newsize = newsizemax;
++            }
++          nchars_avail = newsize - (read_pos - ptr);
++          newptr = realloc (ptr, newsize * sizeof (mbf_char_t));
++          if (!newptr)
++            goto unlock_done;
++          ptr = newptr;
++          size = newsize;
++          read_pos = size - nchars_avail + ptr;
++        }
++
++      /* Here, if size < nmax, nchars_avail >= buffer_len + 1.
++         If size == nmax, nchars_avail > 0.  */
++
++      if (1 < nchars_avail--)
++        {
++          mb_copy(read_pos++, &c);
++        }
++
++    }
++  while (!found_delimiter);
++
++  chars_stored = (read_pos - ptr);
++
++ unlock_done:
++  funlockfile (stream);
++
++ done:
++  *lineptr = ptr;
++  *linesize = size;
++  return chars_stored;
++}
++
++static void
++cut_chars (FILE *stream)
++{
++  size_t char_idx;	/* Number of chars in the line so far. */
++  bool print_delimiter;
++  mbf_char_t c;
++  mb_file_t mbf;
++
++  print_delimiter = false;
++  char_idx = 0;
++  current_rp = frp;
++
++  mbf_init (mbf, stream);
++  while (true)
++    {
++      mbf_getc (c, mbf);
++
++      if (mb_iseq (c, line_delim))
++	{
++	  putc (line_delim, stdout);
++	  char_idx = 0;
++	  print_delimiter = false;
++          current_rp = frp;
++	}
++      else if (mb_iseof (c))
++	{
++	  if (char_idx > 0)
++	    putc (line_delim, stdout);
++	  break;
++	}
++      else
++	{
++	  /* Forward by one byte.  */
++	  next_item (&char_idx);
++
++	  /* Check if the current characters byte range is within
++	   * the argument list.  */
++	  if (rp_intersect (char_idx, char_idx + mb_len (c) - 1))
++	    {
++	      if (output_delimiter_specified)
++		{
++		  if (print_delimiter && is_range_start_index (char_idx))
++		    {
++		      fwrite (output_delimiter_string, sizeof (char),
++			      output_delimiter_length, stdout);
++		    }
++		  print_delimiter = true;
++		}
++	      mb_putc (c, stdout);
++	    }
++
++	  /* Byte mode with multibyte characters uncut (-b -n).  */
++	  if (no_break_mb_chars)
++	    /* Forward by an additional byte_length (c) - 1.  */
++	    next_item_n (&char_idx, mb_len (c) - 1);
++       }
++    }
++}
+ 
+ static void
+ cut_fields (FILE *stream)
+ {
+-  int 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
++     first field must be read into this buffer to determine whether it
++     is followed by a delimiter or a newline before any of it may be
++     output.  Otherwise, cut_fields can do the job without using this
++     buffer.  */
++  mbf_char_t *field_1_buffer = 0;
++  /* The number of bytes allocated for FIELD_1_BUFFER.  */
++  size_t field_1_bufsize;
++
++
++  mbf_char_t c, d;
++  mb_file_t mbf;
+   size_t field_idx = 1;
+   bool found_any_selected_field = false;
+   bool buffer_first_field;
+ 
+   current_rp = frp;
+ 
+-  c = getc (stream);
+-  if (c == EOF)
++  mbf_init (mbf, stream);
++  mbf_getc (c, mbf);
++  if (mb_iseof (c))
+     return;
+ 
+-  ungetc (c, stream);
+-  c = 0;
++  mbf_ungetc (c, mbf);
++  mb_setascii (&c, 0);
++  mb_copy (&d, &delim);
+ 
+   /* To support the semantics of the -s flag, we may have to buffer
+      all of the first field to determine whether it is 'delimited.'
+@@ -312,10 +519,14 @@ cut_fields (FILE *stream)
+       if (field_idx == 1 && buffer_first_field)
+         {
+           ssize_t len;
+-          size_t n_bytes;
++          size_t n_chars;
++	  mbf_char_t nl;
++	  mb_setascii (&nl, line_delim);
++
++          len = mb_getndelim2 (&field_1_buffer, &field_1_bufsize,
++			       GETNLINE_NO_LIMIT, d, nl, &mbf);
++
+ 
+-          len = getndelim2 (&field_1_buffer, &field_1_bufsize, 0,
+-                            GETNLINE_NO_LIMIT, delim, line_delim, stream);
+           if (len < 0)
+             {
+               free (field_1_buffer);
+@@ -325,15 +536,15 @@ cut_fields (FILE *stream)
+               xalloc_die ();
+             }
+ 
+-          n_bytes = len;
+-          assert (n_bytes != 0);
++          n_chars = len;
++          //assert (n_chars != 0);
+ 
+-          c = 0;
++	  mb_setascii (&c, 0);
+ 
+           /* If the first field extends to the end of line (it is not
+              delimited) and we are printing all non-delimited lines,
+              print this one.  */
+-          if (to_uchar (field_1_buffer[n_bytes - 1]) != delim)
++          if (!mb_equal (field_1_buffer[n_chars - 1], d))
+             {
+               if (suppress_non_delimited)
+                 {
+@@ -341,26 +552,30 @@ cut_fields (FILE *stream)
+                 }
+               else
+                 {
+-                  fwrite (field_1_buffer, sizeof (char), n_bytes, stdout);
++		  for (int i = 0; i < n_chars; ++i)
++		    mb_putc (field_1_buffer[i], stdout);
++
+                   /* Make sure the output line is newline terminated.  */
+-                  if (field_1_buffer[n_bytes - 1] != line_delim)
++                  if (!mb_iseq (field_1_buffer[n_chars - 1], line_delim))
+                     putchar (line_delim);
+-                  c = line_delim;
++                  mb_setascii (&c, line_delim);
+                 }
+               continue;
+             }
+           if (print_kth (1))
+             {
+               /* Print the field, but not the trailing delimiter.  */
+-              fwrite (field_1_buffer, sizeof (char), n_bytes - 1, stdout);
++	      for (int i = 0; i < n_chars - 1; ++i)
++		mb_putc (field_1_buffer[i], stdout);
+ 
+               /* With -d$'\n' don't treat the last '\n' as a delimiter.  */
+-              if (delim == line_delim)
++              if (mb_iseq (d, line_delim))
+                 {
+-                  int last_c = getc (stream);
+-                  if (last_c != EOF)
++                  mbf_char_t last_c;
++		  mbf_getc (last_c, mbf);
++                  if (!mb_iseof (last_c))
+                     {
+-                      ungetc (last_c, stream);
++                      mbf_ungetc (last_c, mbf);
+                       found_any_selected_field = true;
+                     }
+                 }
+@@ -370,7 +585,8 @@ cut_fields (FILE *stream)
+           next_item (&field_idx);
+         }
+ 
+-      int prev_c = c;
++      mbf_char_t prev_c;
++      mb_copy (&prev_c, &c);
+ 
+       if (print_kth (field_idx))
+         {
+@@ -381,42 +597,46 @@ cut_fields (FILE *stream)
+             }
+           found_any_selected_field = true;
+ 
+-          while ((c = getc (stream)) != delim && c != line_delim && c != EOF)
++	  mbf_getc (c, mbf);
++          while (!mb_equal (c, d) && !mb_iseq (c, line_delim) && !mb_iseof (c))
+             {
+-              putchar (c);
+-              prev_c = c;
++              mb_putc (c, stdout);
++	      mb_copy (&prev_c, &c);
++	      mbf_getc (c, mbf);
+             }
+         }
+       else
+         {
+-          while ((c = getc (stream)) != delim && c != line_delim && c != EOF)
++	  mbf_getc (c, mbf);
++          while (!mb_equal (c, d) && !mb_iseq (c, line_delim) && !mb_iseof (c))
+             {
+-              prev_c = c;
++	      mb_copy (&prev_c, &c);
++	      mbf_getc (c, mbf);
+             }
+         }
+ 
+       /* With -d$'\n' don't treat the last '\n' as a delimiter.  */
+-      if (delim == line_delim && c == delim)
++      if (mb_iseq (d, line_delim) && mb_equal (c, d))
+         {
+-          int last_c = getc (stream);
+-          if (last_c != EOF)
+-            ungetc (last_c, stream);
++	  mbf_char_t last_c;
++	  mbf_getc (last_c, mbf);
++	  if (!mb_iseof (last_c))
++	    mbf_ungetc (last_c, mbf);
+           else
+-            c = last_c;
++	    mb_copy (&c, &last_c);
+         }
+ 
+-      if (c == delim)
++      if (mb_equal (c, d))
+         next_item (&field_idx);
+-      else if (c == line_delim || c == EOF)
++      else if (mb_iseq (c, line_delim) || mb_iseof (c))
+         {
+           if (found_any_selected_field
+               || !(suppress_non_delimited && field_idx == 1))
+             {
+-              if (c == line_delim || prev_c != line_delim
+-                  || delim == line_delim)
++              if (mb_iseq (c, line_delim) || !mb_iseq (prev_c, line_delim) || mb_iseq (d, line_delim))
+                 putchar (line_delim);
+             }
+-          if (c == EOF)
++          if (mb_iseof (c))
+             break;
+           field_idx = 1;
+           current_rp = frp;
+@@ -429,7 +649,14 @@ static void
+ cut_stream (FILE *stream)
+ {
+   if (operating_mode == byte_mode)
+-    cut_bytes (stream);
++    {
++      if (no_break_mb_chars)
++	cut_chars (stream);
++      else
++	cut_bytes (stream);
++    }
++  else if (operating_mode == char_mode)
++    cut_chars (stream);
+   else
+     cut_fields (stream);
+ }
+@@ -483,6 +710,7 @@ main (int argc, char **argv)
+   bool ok;
+   bool delim_specified = false;
+   char *spec_list_string IF_LINT ( = NULL);
++  mbi_iterator_t iter;
+ 
+   initialize_main (&argc, &argv);
+   set_program_name (argv[0]);
+@@ -496,8 +724,10 @@ main (int argc, char **argv)
+ 
+   /* By default, all non-delimited lines are printed.  */
+   suppress_non_delimited = false;
++  /* Default behaviour for -b, unless -n is also specified.  */
++  no_break_mb_chars = false;
+ 
+-  delim = '\0';
++  mb_setascii (&delim, '\0');
+   have_read_stdin = false;
+ 
+   while ((optc = getopt_long (argc, argv, "b:c:d:f:nsz", longopts, NULL)) != -1)
+@@ -505,7 +735,6 @@ 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"));
+@@ -513,6 +742,14 @@ main (int argc, char **argv)
+           spec_list_string = optarg;
+           break;
+ 
++        case 'c':
++          /* Build the char list. */
++          if (operating_mode != undefined_mode)
++            FATAL_ERROR (_("only one type of list may be specified"));
++          operating_mode = char_mode;
++          spec_list_string = optarg;
++          break;
++
+         case 'f':
+           /* Build the field list. */
+           if (operating_mode != undefined_mode)
+@@ -524,9 +761,17 @@ main (int argc, char **argv)
+         case 'd':
+           /* New delimiter. */
+           /* Interpret -d '' to mean 'use the NUL byte as the delimiter.'  */
+-          if (optarg[0] != '\0' && optarg[1] != '\0')
++	  mbi_init (iter, optarg, strlen (optarg));
++	  if  (!mbi_avail (iter))
++	    mb_setascii (&delim, '\0');
++	  else
++           {
++             mb_copy (&delim, &mbi_cur (iter));
++
++             mbi_advance (iter);
++             if (mbi_avail (iter))
+             FATAL_ERROR (_("the delimiter must be a single character"));
+-          delim = optarg[0];
++           }
+           delim_specified = true;
+           break;
+ 
+@@ -540,6 +785,7 @@ main (int argc, char **argv)
+           break;
+ 
+         case 'n':
++	  no_break_mb_chars = true;
+           break;
+ 
+         case 's':
+@@ -579,15 +825,12 @@ main (int argc, char **argv)
+               | (complement ? SETFLD_COMPLEMENT : 0) );
+ 
+   if (!delim_specified)
+-    delim = '\t';
++    mb_setascii (&delim, '\t');
+ 
+   if (output_delimiter_string == NULL)
+     {
+-      static char dummy[2];
+-      dummy[0] = delim;
+-      dummy[1] = '\0';
+-      output_delimiter_string = dummy;
+-      output_delimiter_length = 1;
++      output_delimiter_string = mb_ptr (delim);
++      output_delimiter_length = mb_len (delim);
+     }
+ 
+   if (optind == argc)

coreutils-i18n-expand-unexpand.patch

@@ -0,0 +1,848 @@
+From e87ab5b991b08092a7e07af82b3ec822a8604151 Mon Sep 17 00:00:00 2001
+From: Ondrej Oprala <ooprala@redhat.com>
+Date: Wed, 5 Aug 2015 09:15:09 +0200
+Subject: [PATCH] expand,unexpand: add multibyte support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* NEWS: Mention the changes.
+* bootstrap.conf: Add mbfile to the list of modules.
+* configure.ac: Properly initialize mbfile.
+* src/expand.c (expand): Iterate over multibyte characters properly.
+* src/unexpand.c (unexpand): Iterate over multibyte characters
+properly.
+* tests/local.mk: Add new tests.
+* tests/{expand,unexpand}/mb.sh: New tests.
+
+Co-authored-by: Pádraig Brady <pbrady@redhat.com>
+---
+ bootstrap.conf       |   1 +
+ configure.ac         |   2 +
+ lib/mbfile.c         |   3 +
+ lib/mbfile.h         | 255 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ m4/mbfile.m4         |  14 +++
+ src/expand.c         |  43 +++++----
+ src/unexpand.c       |  54 +++++++----
+ tests/expand/mb.sh   |  98 ++++++++++++++++++++
+ tests/local.mk       |   2 +
+ tests/unexpand/mb.sh |  97 ++++++++++++++++++++
+ 10 files changed, 535 insertions(+), 34 deletions(-)
+ create mode 100644 lib/mbfile.c
+ create mode 100644 lib/mbfile.h
+ create mode 100644 m4/mbfile.m4
+ create mode 100755 tests/expand/mb.sh
+ create mode 100755 tests/unexpand/mb.sh
+
+diff --git a/bootstrap.conf b/bootstrap.conf
+index 8a0ff31..a1c78b2 100644
+--- a/bootstrap.conf
++++ b/bootstrap.conf
+@@ -152,6 +152,7 @@ gnulib_modules="
+   maintainer-makefile
+   malloc-gnu
+   manywarnings
++  mbfile
+   mbrlen
+   mbrtowc
+   mbsalign
+diff --git a/configure.ac b/configure.ac
+index 1e74b36..24c9725 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -427,6 +427,8 @@ fi
+ # I'm leaving it here for now.  This whole thing needs to be modernized...
+ gl_WINSIZE_IN_PTEM
+ 
++gl_MBFILE
++
+ gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H
+ 
+ if test $gl_cv_sys_tiocgwinsz_needs_termios_h = no && \
+diff --git a/lib/mbfile.c b/lib/mbfile.c
+new file mode 100644
+index 0000000..b0a468e
+--- /dev/null
++++ b/lib/mbfile.c
+@@ -0,0 +1,3 @@
++#include <config.h>
++#define MBFILE_INLINE _GL_EXTERN_INLINE
++#include "mbfile.h"
+diff --git a/lib/mbfile.h b/lib/mbfile.h
+new file mode 100644
+index 0000000..11f1b12
+--- /dev/null
++++ b/lib/mbfile.h
+@@ -0,0 +1,255 @@
++/* Multibyte character I/O: macros for multi-byte encodings.
++   Copyright (C) 2001, 2005, 2009-2015 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 <http://www.gnu.org/licenses/>.  */
++
++/* Written by Mitsuru Chinen <mchinen@yamato.ibm.com>
++   and Bruno Haible <bruno@clisp.org>.  */
++
++/* The macros in this file implement multi-byte character input from a
++   stream.
++
++   mb_file_t
++     is the type for multibyte character input stream, usable for variable
++     declarations.
++
++   mbf_char_t
++     is the type for multibyte character or EOF, usable for variable
++     declarations.
++
++   mbf_init (mbf, stream)
++     initializes the MB_FILE for reading from stream.
++
++   mbf_getc (mbc, mbf)
++     reads the next multibyte character from mbf and stores it in mbc.
++
++   mb_iseof (mbc)
++     returns true if mbc represents the EOF value.
++
++   Here are the function prototypes of the macros.
++
++   extern void          mbf_init (mb_file_t mbf, FILE *stream);
++   extern void          mbf_getc (mbf_char_t mbc, mb_file_t mbf);
++   extern bool          mb_iseof (const mbf_char_t mbc);
++ */
++
++#ifndef _MBFILE_H
++#define _MBFILE_H 1
++
++#include <assert.h>
++#include <stdbool.h>
++#include <stdio.h>
++#include <string.h>
++
++/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
++   <wchar.h>.
++   BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before
++   <wchar.h>.  */
++#include <stdio.h>
++#include <time.h>
++#include <wchar.h>
++
++#include "mbchar.h"
++
++#ifndef _GL_INLINE_HEADER_BEGIN
++ #error "Please include config.h first."
++#endif
++_GL_INLINE_HEADER_BEGIN
++#ifndef MBFILE_INLINE
++# define MBFILE_INLINE _GL_INLINE
++#endif
++
++struct mbfile_multi {
++  FILE *fp;
++  bool eof_seen;
++  bool have_pushback;
++  mbstate_t state;
++  unsigned int bufcount;
++  char buf[MBCHAR_BUF_SIZE];
++  struct mbchar pushback;
++};
++
++MBFILE_INLINE void
++mbfile_multi_getc (struct mbchar *mbc, struct mbfile_multi *mbf)
++{
++  size_t bytes;
++
++  /* If EOF has already been seen, don't use getc.  This matters if
++     mbf->fp is connected to an interactive tty.  */
++  if (mbf->eof_seen)
++    goto eof;
++
++  /* Return character pushed back, if there is one.  */
++  if (mbf->have_pushback)
++    {
++      mb_copy (mbc, &mbf->pushback);
++      mbf->have_pushback = false;
++      return;
++    }
++
++  /* Before using mbrtowc, we need at least one byte.  */
++  if (mbf->bufcount == 0)
++    {
++      int c = getc (mbf->fp);
++      if (c == EOF)
++        {
++          mbf->eof_seen = true;
++          goto eof;
++        }
++      mbf->buf[0] = (unsigned char) c;
++      mbf->bufcount++;
++    }
++
++  /* Handle most ASCII characters quickly, without calling mbrtowc().  */
++  if (mbf->bufcount == 1 && mbsinit (&mbf->state) && is_basic (mbf->buf[0]))
++    {
++      /* These characters are part of the basic character set.  ISO C 99
++         guarantees that their wide character code is identical to their
++         char code.  */
++      mbc->wc = mbc->buf[0] = mbf->buf[0];
++      mbc->wc_valid = true;
++      mbc->ptr = &mbc->buf[0];
++      mbc->bytes = 1;
++      mbf->bufcount = 0;
++      return;
++    }
++
++  /* Use mbrtowc on an increasing number of bytes.  Read only as many bytes
++     from mbf->fp as needed.  This is needed to give reasonable interactive
++     behaviour when mbf->fp is connected to an interactive tty.  */
++  for (;;)
++    {
++      /* We don't know whether the 'mbrtowc' function updates the state when
++         it returns -2, - this is the ISO C 99 and glibc-2.2 behaviour - or
++         not - amended ANSI C, glibc-2.1 and Solaris 2.7 behaviour.  We
++         don't have an autoconf test for this, yet.
++         The new behaviour would allow us to feed the bytes one by one into
++         mbrtowc.  But the old behaviour forces us to feed all bytes since
++         the end of the last character into mbrtowc.  Since we want to retry
++         with more bytes when mbrtowc returns -2, we must backup the state
++         before calling mbrtowc, because implementations with the new
++         behaviour will clobber it.  */
++      mbstate_t backup_state = mbf->state;
++
++      bytes = mbrtowc (&mbc->wc, &mbf->buf[0], mbf->bufcount, &mbf->state);
++
++      if (bytes == (size_t) -1)
++        {
++          /* An invalid multibyte sequence was encountered.  */
++          /* Return a single byte.  */
++          bytes = 1;
++          mbc->wc_valid = false;
++          break;
++        }
++      else if (bytes == (size_t) -2)
++        {
++          /* An incomplete multibyte character.  */
++          mbf->state = backup_state;
++          if (mbf->bufcount == MBCHAR_BUF_SIZE)
++            {
++              /* An overlong incomplete multibyte sequence was encountered.  */
++              /* Return a single byte.  */
++              bytes = 1;
++              mbc->wc_valid = false;
++              break;
++            }
++          else
++            {
++              /* Read one more byte and retry mbrtowc.  */
++              int c = getc (mbf->fp);
++              if (c == EOF)
++                {
++                  /* An incomplete multibyte character at the end.  */
++                  mbf->eof_seen = true;
++                  bytes = mbf->bufcount;
++                  mbc->wc_valid = false;
++                  break;
++                }
++              mbf->buf[mbf->bufcount] = (unsigned char) c;
++              mbf->bufcount++;
++            }
++        }
++      else
++        {
++          if (bytes == 0)
++            {
++              /* A null wide character was encountered.  */
++              bytes = 1;
++              assert (mbf->buf[0] == '\0');
++              assert (mbc->wc == 0);
++            }
++          mbc->wc_valid = true;
++          break;
++        }
++    }
++
++  /* Return the multibyte sequence mbf->buf[0..bytes-1].  */
++  mbc->ptr = &mbc->buf[0];
++  memcpy (&mbc->buf[0], &mbf->buf[0], bytes);
++  mbc->bytes = bytes;
++
++  mbf->bufcount -= bytes;
++  if (mbf->bufcount > 0)
++    {
++      /* It's not worth calling memmove() for so few bytes.  */
++      unsigned int count = mbf->bufcount;
++      char *p = &mbf->buf[0];
++
++      do
++        {
++          *p = *(p + bytes);
++          p++;
++        }
++      while (--count > 0);
++    }
++  return;
++
++eof:
++  /* An mbchar_t with bytes == 0 is used to indicate EOF.  */
++  mbc->ptr = NULL;
++  mbc->bytes = 0;
++  mbc->wc_valid = false;
++  return;
++}
++
++MBFILE_INLINE void
++mbfile_multi_ungetc (const struct mbchar *mbc, struct mbfile_multi *mbf)
++{
++  mb_copy (&mbf->pushback, mbc);
++  mbf->have_pushback = true;
++}
++
++typedef struct mbfile_multi mb_file_t;
++
++typedef mbchar_t mbf_char_t;
++
++#define mbf_init(mbf, stream)                                           \
++  ((mbf).fp = (stream),                                                 \
++   (mbf).eof_seen = false,                                              \
++   (mbf).have_pushback = false,                                         \
++   memset (&(mbf).state, '\0', sizeof (mbstate_t)),                     \
++   (mbf).bufcount = 0)
++
++#define mbf_getc(mbc, mbf) mbfile_multi_getc (&(mbc), &(mbf))
++
++#define mbf_ungetc(mbc, mbf) mbfile_multi_ungetc (&(mbc), &(mbf))
++
++#define mb_iseof(mbc) ((mbc).bytes == 0)
++
++#ifndef _GL_INLINE_HEADER_BEGIN
++ #error "Please include config.h first."
++#endif
++_GL_INLINE_HEADER_BEGIN
++
++#endif /* _MBFILE_H */
+diff --git a/m4/mbfile.m4 b/m4/mbfile.m4
+new file mode 100644
+index 0000000..8589902
+--- /dev/null
++++ b/m4/mbfile.m4
+@@ -0,0 +1,14 @@
++# mbfile.m4 serial 7
++dnl Copyright (C) 2005, 2008-2015 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++dnl autoconf tests required for use of mbfile.h
++dnl From Bruno Haible.
++
++AC_DEFUN([gl_MBFILE],
++[
++  AC_REQUIRE([AC_TYPE_MBSTATE_T])
++  :
++])
+diff --git a/src/expand.c b/src/expand.c
+index 9fa2e10..380e020 100644
+--- a/src/expand.c
++++ b/src/expand.c
+@@ -37,6 +37,9 @@
+ #include <stdio.h>
+ #include <getopt.h>
+ #include <sys/types.h>
++
++#include <mbfile.h>
++
+ #include "system.h"
+ #include "die.h"
+ #include "xstrndup.h"
+@@ -100,19 +103,19 @@ expand (void)
+ {
+   /* Input stream.  */
+   FILE *fp = next_file (NULL);
++  mb_file_t mbf;
++  mbf_char_t c;
+ 
+   if (!fp)
+     return;
+ 
++  mbf_init (mbf, fp);
++
+   while (true)
+     {
+-      /* Input character, or EOF.  */
+-      int c;
+-
+       /* If true, perform translations.  */
+       bool convert = true;
+ 
+-
+       /* The following variables have valid values only when CONVERT
+          is true:  */
+ 
+@@ -122,17 +125,23 @@ expand (void)
+       /* Index in TAB_LIST of next tab stop to examine.  */
+       size_t tab_index = 0;
+ 
+-
+       /* Convert a line of text.  */
+ 
+       do
+         {
+-          while ((c = getc (fp)) < 0 && (fp = next_file (fp)))
+-            continue;
++          do {
++            mbf_getc (c, mbf);
++            if (mb_iseof (c))
++              {
++                mbf_init (mbf, fp = next_file (fp));
++                continue;
++              }
++            }
++          while (false);
+ 
+           if (convert)
+             {
+-              if (c == '\t')
++              if (mb_iseq (c, '\t'))
+                 {
+                   /* Column the next input tab stop is on.  */
+                   uintmax_t next_tab_column;
+@@ -151,32 +160,34 @@ expand (void)
+                     if (putchar (' ') < 0)
+                       die (EXIT_FAILURE, errno, _("write error"));
+ 
+-                  c = ' ';
++                  mb_setascii (&c, ' ');
+                 }
+-              else if (c == '\b')
++              else if (mb_iseq (c, '\b'))
+                 {
+                   /* Go back one column, and force recalculation of the
+                      next tab stop.  */
+                   column -= !!column;
+                   tab_index -= !!tab_index;
+                 }
+-              else
++              /* A leading control character could make us trip over.  */
++              else if (!mb_iscntrl (c))
+                 {
+-                  column++;
++                  column += mb_width (c);
+                   if (!column)
+                     die (EXIT_FAILURE, 0, _("input line is too long"));
+                 }
+ 
+-              convert &= convert_entire_line || !! isblank (c);
++              convert &= convert_entire_line || mb_isblank (c);
+             }
+ 
+-          if (c < 0)
++          if (mb_iseof (c))
+             return;
+ 
+-          if (putchar (c) < 0)
++          mb_putc (c, stdout);
++          if (ferror (stdout))
+             die (EXIT_FAILURE, errno, _("write error"));
+         }
+-      while (c != '\n');
++      while (!mb_iseq (c, '\n'));
+     }
+ }
+ 
+diff --git a/src/unexpand.c b/src/unexpand.c
+index 7801274..569a7ee 100644
+--- a/src/unexpand.c
++++ b/src/unexpand.c
+@@ -38,6 +38,9 @@
+ #include <stdio.h>
+ #include <getopt.h>
+ #include <sys/types.h>
++
++#include <mbfile.h>
++
+ #include "system.h"
+ #include "die.h"
+ #include "xstrndup.h"
+@@ -107,11 +110,12 @@ unexpand (void)
+ {
+   /* Input stream.  */
+   FILE *fp = next_file (NULL);
++  mb_file_t mbf;
+ 
+   /* The array of pending blanks.  In non-POSIX locales, blanks can
+      include characters other than spaces, so the blanks must be
+      stored, not merely counted.  */
+-  char *pending_blank;
++  mbf_char_t *pending_blank;
+ 
+   if (!fp)
+     return;
+@@ -119,12 +123,14 @@ unexpand (void)
+   /* The worst case is a non-blank character, then one blank, then a
+      tab stop, then MAX_COLUMN_WIDTH - 1 blanks, then a non-blank; so
+      allocate MAX_COLUMN_WIDTH bytes to store the blanks.  */
+-  pending_blank = xmalloc (max_column_width);
++  pending_blank = xmalloc (max_column_width * sizeof (mbf_char_t));
++
++  mbf_init (mbf, fp);
+ 
+   while (true)
+     {
+       /* Input character, or EOF.  */
+-      int c;
++      mbf_char_t c;
+ 
+       /* If true, perform translations.  */
+       bool convert = true;
+@@ -158,12 +164,19 @@ unexpand (void)
+ 
+       do
+         {
+-          while ((c = getc (fp)) < 0 && (fp = next_file (fp)))
+-            continue;
++          do {
++            mbf_getc (c, mbf);
++            if (mb_iseof (c))
++              {
++                mbf_init (mbf, fp = next_file (fp));
++                continue;
++              }
++            }
++          while (false);
+ 
+           if (convert)
+             {
+-              bool blank = !! isblank (c);
++              bool blank = mb_isblank (c);
+ 
+               if (blank)
+                 {
+@@ -180,16 +193,16 @@ unexpand (void)
+                       if (next_tab_column < column)
+                         die (EXIT_FAILURE, 0, _("input line is too long"));
+ 
+-                      if (c == '\t')
++                      if (mb_iseq (c, '\t'))
+                         {
+                           column = next_tab_column;
+ 
+                           if (pending)
+-                            pending_blank[0] = '\t';
++                            mb_setascii (&pending_blank[0], '\t');
+                         }
+                       else
+                         {
+-                          column++;
++                          column += mb_width (c);
+ 
+                           if (! (prev_blank && column == next_tab_column))
+                             {
+@@ -197,13 +210,14 @@ unexpand (void)
+                                  will be replaced by tabs.  */
+                               if (column == next_tab_column)
+                                 one_blank_before_tab_stop = true;
+-                              pending_blank[pending++] = c;
++                              mb_copy (&pending_blank[pending++], &c);
+                               prev_blank = true;
+                               continue;
+                             }
+ 
+                           /* Replace the pending blanks by a tab or two.  */
+-                          pending_blank[0] = c = '\t';
++                          mb_setascii (&c, '\t');
++                          mb_setascii (&pending_blank[0], '\t');
+                         }
+ 
+                       /* Discard pending blanks, unless it was a single
+@@ -211,7 +225,7 @@ unexpand (void)
+                       pending = one_blank_before_tab_stop;
+                     }
+                 }
+-              else if (c == '\b')
++              else if (mb_iseq (c, '\b'))
+                 {
+                   /* Go back one column, and force recalculation of the
+                      next tab stop.  */
+@@ -221,7 +235,7 @@ unexpand (void)
+                 }
+               else
+                 {
+-                  column++;
++                  column += mb_width (c);
+                   if (!column)
+                     die (EXIT_FAILURE, 0, _("input line is too long"));
+                 }
+@@ -229,8 +243,11 @@ unexpand (void)
+               if (pending)
+                 {
+                   if (pending > 1 && one_blank_before_tab_stop)
+-                    pending_blank[0] = '\t';
+-                  if (fwrite (pending_blank, 1, pending, stdout) != pending)
++                    mb_setascii (&pending_blank[0], '\t');
++
++                  for (int n = 0; n < pending; ++n)
++                    mb_putc (pending_blank[n], stdout);
++                  if (ferror (stdout))
+                     die (EXIT_FAILURE, errno, _("write error"));
+                   pending = 0;
+                   one_blank_before_tab_stop = false;
+@@ -240,16 +257,17 @@ unexpand (void)
+               convert &= convert_entire_line || blank;
+             }
+ 
+-          if (c < 0)
++          if (mb_iseof (c))
+             {
+               free (pending_blank);
+               return;
+             }
+ 
+-          if (putchar (c) < 0)
++          mb_putc (c, stdout);
++          if (ferror (stdout))
+             die (EXIT_FAILURE, errno, _("write error"));
+         }
+-      while (c != '\n');
++      while (!mb_iseq (c, '\n'));
+     }
+ }
+ 
+diff --git a/tests/expand/mb.sh b/tests/expand/mb.sh
+new file mode 100755
+index 0000000..7971e18
+--- /dev/null
++++ b/tests/expand/mb.sh
+@@ -0,0 +1,98 @@
++#!/bin/sh
++
++# Copyright (C) 2012-2015 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 <http://www.gnu.org/licenses/>.
++
++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
++print_ver_ expand
++
++export LC_ALL=en_US.UTF-8
++
++#input containing multibyte characters
++cat <<\EOF > in || framework_failure_
++1234567812345678123456781
++.       .       .       .
++a	b	c	d
++.       .       .       .
++ä	ö	ü	ß
++.       .       .       .
++EOF
++env printf '   äöü\t.    öüä.   \tä xx\n' >> in || framework_failure_
++
++cat <<\EOF > exp || framework_failure_
++1234567812345678123456781
++.       .       .       .
++a       b       c       d
++.       .       .       .
++ä       ö       ü       ß
++.       .       .       .
++   äöü  .    öüä.       ä xx
++EOF
++
++expand < in > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
++
++#test characters with display widths != 1
++env printf '12345678
++e\t|ascii(1)
++\u00E9\t|composed(1)
++e\u0301\t|decomposed(1)
++\u3000\t|ideo-space(2)
++\uFF0D\t|full-hypen(2)
++' > in || framework_failure_
++
++env printf '12345678
++e       |ascii(1)
++\u00E9       |composed(1)
++e\u0301       |decomposed(1)
++\u3000      |ideo-space(2)
++\uFF0D      |full-hypen(2)
++' > exp || framework_failure_
++
++expand < in > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
++
++#shouldn't fail with "input line too long"
++#when a line starts with a control character
++env printf '\n' > in || framework_failure_
++
++expand < in > out || fail=1
++compare in out > /dev/null 2>&1 || fail=1
++
++#non-Unicode characters interspersed between Unicode ones
++env printf '12345678
++\t\xFF|
++\xFF\t|
++\t\xFFä|
++ä\xFF\t|
++\tä\xFF|
++\xFF\tä|
++äbcdef\xFF\t|
++' > in || framework_failure_
++
++env printf '12345678
++        \xFF|
++\xFF       |
++        \xFFä|
++ä\xFF      |
++        ä\xFF|
++\xFF       ä|
++äbcdef\xFF |
++' > exp || framework_failure_
++
++expand < in > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
++
++exit $fail
+diff --git a/tests/local.mk b/tests/local.mk
+index 192f776..8053397 100644
+--- a/tests/local.mk
++++ b/tests/local.mk
+@@ -544,6 +544,7 @@ all_tests =					\
+   tests/du/threshold.sh				\
+   tests/du/trailing-slash.sh			\
+   tests/du/two-args.sh				\
++  tests/expand/mb.sh				\
+   tests/id/gnu-zero-uids.sh			\
+   tests/id/no-context.sh			\
+   tests/id/context.sh				\
+@@ -684,6 +685,7 @@ all_tests =					\
+   tests/touch/read-only.sh			\
+   tests/touch/relative.sh			\
+   tests/touch/trailing-slash.sh			\
++  tests/unexpand/mb.sh				\
+   $(all_root_tests)
+ 
+ # See tests/factor/create-test.sh.
+diff --git a/tests/unexpand/mb.sh b/tests/unexpand/mb.sh
+new file mode 100755
+index 0000000..60d4c1a
+--- /dev/null
++++ b/tests/unexpand/mb.sh
+@@ -0,0 +1,97 @@
++#!/bin/sh
++
++# Copyright (C) 2012-2015 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 <http://www.gnu.org/licenses/>.
++
++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
++print_ver_ unexpand
++
++export LC_ALL=en_US.UTF-8
++
++#input containing multibyte characters
++cat > in <<\EOF
++1234567812345678123456781
++.       .       .       .
++a       b       c       d
++.       .       .       .
++ä       ö       ü       ß
++.       .       .       .
++   äöü  .    öüä.       ä xx
++EOF
++
++cat > exp <<\EOF
++1234567812345678123456781
++.	.	.	.
++a	b	c	d
++.	.	.	.
++ä	ö	ü	ß
++.	.	.	.
++   äöü	.    öüä.	ä xx
++EOF
++
++unexpand -a < in > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
++
++#test characters with a display width larger than 1
++
++env printf '12345678
++e       |ascii(1)
++\u00E9       |composed(1)
++e\u0301       |decomposed(1)
++\u3000      |ideo-space(2)
++\uFF0D      |full-hypen(2)
++' > in || framework_failure_
++
++env printf '12345678
++e\t|ascii(1)
++\u00E9\t|composed(1)
++e\u0301\t|decomposed(1)
++\u3000\t|ideo-space(2)
++\uFF0D\t|full-hypen(2)
++' > exp || framework_failure_
++
++unexpand -a < in > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
++
++#test input where a blank of width > 1 is not being substituted
++in="$(LC_ALL=en_US.UTF-8 printf ' \u3000  ö       ü       ß')"
++exp=' 　  ö	     ü	     ß'
++
++unexpand -a < in > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
++
++#non-Unicode characters interspersed between Unicode ones
++env printf '12345678
++        \xFF|
++\xFF       |
++        \xFFä|
++ä\xFF      |
++        ä\xFF|
++\xFF       ä|
++äbcdef\xFF |
++' > in || framework_failure_
++
++env printf '12345678
++\t\xFF|
++\xFF\t|
++\t\xFFä|
++ä\xFF\t|
++\tä\xFF|
++\xFF\tä|
++äbcdef\xFF\t|
++' > exp || framework_failure_
++
++unexpand -a < in > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
+-- 
+2.7.4
+

coreutils-i18n-fix-unexpand.patch

@@ -0,0 +1,28 @@
+From 02424bfcd719bbaa695f4e1c3ef17ad91b0d23c0 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Thu, 28 Jan 2016 20:57:22 +0100
+Subject: [PATCH] unexpand: fix blank line handling
+
+  echo '' |./src/unexpand -a
+
+Really?
+---
+ src/unexpand.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/unexpand.c b/src/unexpand.c
+index 569a7ee..3bbbd66 100644
+--- a/src/unexpand.c
++++ b/src/unexpand.c
+@@ -233,7 +233,7 @@ unexpand (void)
+                   next_tab_column = column;
+                   tab_index -= !!tab_index;
+                 }
+-              else
++              else if (!mb_iseq (c, '\n'))
+                 {
+                   column += mb_width (c);
+                   if (!column)
+-- 
+2.7.4
+

coreutils-i18n-fix2-expand-unexpand.patch

@@ -0,0 +1,108 @@
+diff --git a/src/expand.c b/src/expand.c
+index 380e020..310b349 100644
+--- a/src/expand.c
++++ b/src/expand.c
+@@ -129,15 +129,19 @@ expand (void)
+ 
+       do
+         {
+-          do {
++          while (true) {
+             mbf_getc (c, mbf);
+-            if (mb_iseof (c))
++            if ((mb_iseof (c)) && (fp = next_file (fp)))
+               {
+-                mbf_init (mbf, fp = next_file (fp));
++                mbf_init (mbf, fp);
+                 continue;
+               }
++            else
++              {
++                break;
++              }
+             }
+-          while (false);
++
+ 
+           if (convert)
+             {
+diff --git a/src/unexpand.c b/src/unexpand.c
+index 3bbbd66..863a90a 100644
+--- a/src/unexpand.c
++++ b/src/unexpand.c
+@@ -164,15 +164,19 @@ unexpand (void)
+ 
+       do
+         {
+-          do {
++          while (true) {
+             mbf_getc (c, mbf);
+-            if (mb_iseof (c))
++            if ((mb_iseof (c)) && (fp = next_file (fp)))
+               {
+-                mbf_init (mbf, fp = next_file (fp));
++                mbf_init (mbf, fp);
+                 continue;
+               }
++            else
++              {
++                break;
++              }
+             }
+-          while (false);
++
+ 
+           if (convert)
+             {
+diff --git a/tests/expand/mb.sh b/tests/expand/mb.sh
+index 7971e18..031be7a 100755
+--- a/tests/expand/mb.sh
++++ b/tests/expand/mb.sh
+@@ -44,6 +44,20 @@ EOF
+ expand < in > out || fail=1
+ compare exp out > /dev/null 2>&1 || fail=1
+ 
++#multiple files as an input
++cat <<\EOF >> exp || framework_failure_
++1234567812345678123456781
++.       .       .       .
++a       b       c       d
++.       .       .       .
++ä       ö       ü       ß
++.       .       .       .
++   äöü  .    öüä.       ä xx
++EOF
++
++expand ./in ./in > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
++
+ #test characters with display widths != 1
+ env printf '12345678
+ e\t|ascii(1)
+diff --git a/tests/unexpand/mb.sh b/tests/unexpand/mb.sh
+index 60d4c1a..8d75652 100755
+--- a/tests/unexpand/mb.sh
++++ b/tests/unexpand/mb.sh
+@@ -44,6 +44,22 @@ EOF
+ unexpand -a < in > out || fail=1
+ compare exp out > /dev/null 2>&1 || fail=1
+ 
++
++#multiple files as an input
++cat >> exp <<\EOF
++1234567812345678123456781
++.	.	.	.
++a	b	c	d
++.	.	.	.
++ä	ö	ü	ß
++.	.	.	.
++   äöü	.    öüä.	ä xx
++EOF
++
++
++unexpand -a ./in ./in > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
++
+ #test characters with a display width larger than 1
+ 
+ env printf '12345678

coreutils-i18n-fold-newline.patch

@@ -0,0 +1,80 @@
+From ff424639fe863cbd6963add1a79b97290c1606c6 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Fri, 3 Feb 2017 12:26:53 +0100
+Subject: [PATCH] fold.c: preserve new-lines in mutlibyte text
+
+---
+ src/fold.c | 49 ++++++++++++++++++++++++-------------------------
+ 1 file changed, 24 insertions(+), 25 deletions(-)
+
+diff --git a/src/fold.c b/src/fold.c
+index d23edd5..8c232a7 100644
+--- a/src/fold.c
++++ b/src/fold.c
+@@ -342,39 +342,38 @@ fold_multibyte_text (FILE *istream, size_t width, int *saved_errno)
+         }
+ 
+ rescan:
+-      if (operating_mode == byte_mode)                        /* byte mode */
++      if (convfail)
++        increment = 1;
++      else if (wc == L'\n')
++        {
++          /* preserve newline */
++          fwrite (line_out, sizeof(char), offset_out, stdout);
++          START_NEW_LINE;
++          continue;
++        }
++      else if (operating_mode == byte_mode)                  /* byte mode */
+         increment = mblength;
+       else if (operating_mode == character_mode)        /* character mode */
+         increment = 1;
+-      else                                                /* column mode */
++      else                                                 /* column mode */
+         {
+-          if (convfail)
+-            increment = 1;
+-          else
++          switch (wc)
+             {
+-              switch (wc)
+-                {
+-                case L'\n':
+-                  fwrite (line_out, sizeof(char), offset_out, stdout);
+-                  START_NEW_LINE;
+-                  continue;
++            case L'\b':
++              increment = (column > 0) ? -1 : 0;
++              break;
+ 
+-                case L'\b':
+-                  increment = (column > 0) ? -1 : 0;
+-                  break;
++            case L'\r':
++              increment = -1 * column;
++              break;
+ 
+-                case L'\r':
+-                  increment = -1 * column;
+-                  break;
++            case L'\t':
++              increment = 8 - column % 8;
++              break;
+ 
+-                case L'\t':
+-                  increment = 8 - column % 8;
+-                  break;
+-
+-                default:
+-                  increment = wcwidth (wc);
+-                  increment = (increment < 0) ? 0 : increment;
+-                }
++            default:
++              increment = wcwidth (wc);
++              increment = (increment < 0) ? 0 : increment;
+             }
+         }
+ 
+-- 
+2.7.4
+

coreutils-i18n-sort-human.patch

@@ -0,0 +1,35 @@
+From 3976ef5a20369d8b490907ab2cba2d617305a5e0 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 30 May 2016 16:19:20 +0200
+Subject: [PATCH] sort: do not use static array 'blanks' in human_numcompare()
+
+... because the array is not initialized with MB locales.  Note this is
+rather a conservative fix.  I plan to do more cleanup of the i18n patch
+in Fedora to prevent mistakes like this in future updates of coreutils.
+---
+ src/sort.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/src/sort.c b/src/sort.c
+index 9e07ad8..e47b039 100644
+--- a/src/sort.c
++++ b/src/sort.c
+@@ -2304,12 +2304,10 @@ find_unit_order (char const *number)
+        <none/unknown> < K/k < M < G < T < P < E < Z < Y  */
+ 
+ static int
+-human_numcompare (char const *a, char const *b)
++human_numcompare (char *a, char *b)
+ {
+-  while (blanks[to_uchar (*a)])
+-    a++;
+-  while (blanks[to_uchar (*b)])
+-    b++;
++  skipblanks(&a, a + strlen(a));
++  skipblanks(&b, b + strlen(b));
+ 
+   int diff = find_unit_order (a) - find_unit_order (b);
+   return (diff ? diff : strnumcmp (a, b, decimal_point, thousands_sep));
+-- 
+2.5.5
+

coreutils-i18n-un-expand-BOM.patch

@@ -0,0 +1,456 @@
+From 7a7c776a4e228d180e74614fd8c8afcad5d4bdf7 Mon Sep 17 00:00:00 2001
+From: Jakub Martisko <jamartis@redhat.com>
+Date: Thu, 7 Jul 2016 12:53:26 +0200
+Subject: [PATCH] coreutils-i18n-un-expand-BOM.patch
+
+---
+ src/expand-common.c  | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/expand-common.h  |  12 ++++++
+ src/expand.c         |  45 +++++++++++++++++++-
+ src/unexpand.c       |  43 ++++++++++++++++++-
+ tests/expand/mb.sh   |  71 ++++++++++++++++++++++++++++++++
+ tests/unexpand/mb.sh |  59 ++++++++++++++++++++++++++
+ 6 files changed, 342 insertions(+), 2 deletions(-)
+
+diff --git a/src/expand-common.c b/src/expand-common.c
+index 4657e46..97cbb09 100644
+--- a/src/expand-common.c
++++ b/src/expand-common.c
+@@ -18,6 +18,7 @@
+ 
+ #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)
+   return ok;
+ }
+ 
++extern int
++set_utf_locale (void)
++{
++      /*try using some predefined locale */
++      const char* predef_locales[] = {"C.UTF8","en_US.UTF8","en_GB.UTF8"};
++
++      const int predef_locales_count=3;
++      for (int i=0;i<predef_locales_count;i++)
++        {
++          if (setlocale(LC_ALL,predef_locales[i])!=NULL)
++          {
++            break;
++          }
++          else if (i==predef_locales_count-1)
++          {
++            return 1;
++            error (EXIT_FAILURE, errno, _("cannot set UTF-8 locale"));
++          }
++        }
++        return 0;
++}
++
++extern bool
++check_utf_locale(void)
++{
++  char* locale = setlocale (LC_CTYPE , NULL);
++  if (locale == NULL)
++  {
++    return false;
++  }
++  else if (strcasestr(locale, "utf8") == NULL && strcasestr(locale, "utf-8") == NULL)
++  {
++    return false;
++  }
++  return true;
++}
++
++extern bool
++check_bom(FILE* fp, mb_file_t *mbf)
++{
++  int c;
++
++
++  c=fgetc(fp);
++
++  /*test BOM header of the first file */
++  mbf->bufcount=0;
++  if (c == 0xEF)
++  {
++    c=fgetc(fp);
++  }
++  else
++  {
++    if (c != EOF)
++    {
++      ungetc(c,fp);
++    }
++    return false;
++  }
++
++  if (c == 0xBB)
++  {
++    c=fgetc(fp);
++  }
++  else
++  {
++    if ( c!= EOF )
++    {
++      mbf->buf[0]=(unsigned char) 0xEF;
++      mbf->bufcount=1;
++      ungetc(c,fp);
++      return false;
++    }
++    else
++    {
++      ungetc(0xEF,fp);
++      return false;
++    }
++  }
++  if (c == 0xBF)
++  {
++    mbf->bufcount=0;
++    return true;
++  }
++  else
++  {
++    if (c != EOF)
++    {
++      mbf->buf[0]=(unsigned char) 0xEF;
++      mbf->buf[1]=(unsigned char) 0xBB;
++      mbf->bufcount=2;
++      ungetc(c,fp);
++      return false;
++    }
++    else
++    {
++      mbf->buf[0]=(unsigned char) 0xEF;
++      mbf->bufcount=1;
++      ungetc(0xBB,fp);
++      return false;
++    }
++  }
++  return false;
++}
++
++extern void
++print_bom(void)
++{
++  putc (0xEF, stdout);
++  putc (0xBB, stdout);
++  putc (0xBF, stdout);
++}
++
+ /* Add the comma or blank separated list of tab stops STOPS
+    to the list of tab stops.  */
+ extern void
+diff --git a/src/expand-common.h b/src/expand-common.h
+index 8cb2079..763bfda 100644
+--- a/src/expand-common.h
++++ b/src/expand-common.h
+@@ -34,6 +34,18 @@ extern size_t max_column_width;
+ /* The desired exit status.  */
+ extern int exit_status;
+ 
++extern int
++set_utf_locale (void);
++
++extern bool
++check_utf_locale(void);
++
++extern bool
++check_bom(FILE* fp, mb_file_t *mbf);
++
++extern void
++print_bom(void);
++
+ /* Add tab stop TABVAL to the end of 'tab_list'.  */
+ extern void
+ add_tab_stop (uintmax_t tabval);
+diff --git a/src/expand.c b/src/expand.c
+index 310b349..4136824 100644
+--- a/src/expand.c
++++ b/src/expand.c
+@@ -105,11 +105,33 @@ expand (void)
+   FILE *fp = next_file (NULL);
+   mb_file_t mbf;
+   mbf_char_t c;
++  /* True if the starting locale is utf8.  */
++  bool using_utf_locale;
++
++  /* True if the first file contains BOM header.  */
++  bool found_bom;
++  using_utf_locale=check_utf_locale();
+ 
+   if (!fp)
+     return;
+-
+   mbf_init (mbf, fp);
++  found_bom=check_bom(fp,&mbf);
++
++  if (using_utf_locale == false && found_bom == true)
++  {
++    /*try using some predefined locale */
++
++    if (set_utf_locale () != 0)
++    {
++      error (EXIT_FAILURE, errno, _("cannot set UTF-8 locale"));
++    }
++  }
++
++
++  if (found_bom == true)
++  {
++    print_bom();
++  }
+ 
+   while (true)
+     {
+@@ -134,6 +156,27 @@ expand (void)
+             if ((mb_iseof (c)) && (fp = next_file (fp)))
+               {
+                 mbf_init (mbf, fp);
++                if (fp!=NULL)
++                {
++                  if (check_bom(fp,&mbf)==true)
++                  {
++                    /*Not the first file - check BOM header*/
++                    if (using_utf_locale==false && found_bom==false)
++                    {
++                      /*BOM header in subsequent file but not in the first one. */
++                      error (EXIT_FAILURE, errno, _("combination of files with and without BOM header"));
++                    }
++                  }
++                  else
++                  {
++                    if(using_utf_locale==false && found_bom==true)
++                    {
++                      /*First file conatined BOM header - locale was switched to UTF
++                      /*all subsequent files should contain BOM. */
++                      error (EXIT_FAILURE, errno, _("combination of files with and without BOM header"));
++                    }
++                  }
++                }
+                 continue;
+               }
+             else
+diff --git a/src/unexpand.c b/src/unexpand.c
+index 863a90a..5681b58 100644
+--- a/src/unexpand.c
++++ b/src/unexpand.c
+@@ -116,16 +116,36 @@ unexpand (void)
+      include characters other than spaces, so the blanks must be
+      stored, not merely counted.  */
+   mbf_char_t *pending_blank;
++  /* True if the starting locale is utf8.  */
++  bool using_utf_locale;
++
++  /* True if the first file contains BOM header.  */
++  bool found_bom;
++  using_utf_locale=check_utf_locale();
+ 
+   if (!fp)
+     return;
++  mbf_init (mbf, fp);
++  found_bom=check_bom(fp,&mbf);
++
++  if (using_utf_locale == false && found_bom == true)
++  {
++    /*try using some predefined locale */
+ 
++    if (set_utf_locale () != 0)
++    {
++      error (EXIT_FAILURE, errno, _("cannot set UTF-8 locale"));
++    }
++  }
+   /* The worst case is a non-blank character, then one blank, then a
+      tab stop, then MAX_COLUMN_WIDTH - 1 blanks, then a non-blank; so
+      allocate MAX_COLUMN_WIDTH bytes to store the blanks.  */
+   pending_blank = xmalloc (max_column_width * sizeof (mbf_char_t));
+ 
+-  mbf_init (mbf, fp);
++  if (found_bom == true)
++  {
++    print_bom();
++  }
+ 
+   while (true)
+     {
+@@ -169,6 +189,27 @@ unexpand (void)
+             if ((mb_iseof (c)) && (fp = next_file (fp)))
+               {
+                 mbf_init (mbf, fp);
++                if (fp!=NULL)
++                {
++                  if (check_bom(fp,&mbf)==true)
++                  {
++                    /*Not the first file - check BOM header*/
++                    if (using_utf_locale==false && found_bom==false)
++                    {
++                      /*BOM header in subsequent file but not in the first one. */
++                      error (EXIT_FAILURE, errno, _("combination of files with and without BOM header"));
++                    }
++                  }
++                  else
++                  {
++                    if(using_utf_locale==false && found_bom==true)
++                    {
++                      /*First file conatined BOM header - locale was switched to UTF
++                      /*all subsequent files should contain BOM. */
++                      error (EXIT_FAILURE, errno, _("combination of files with and without BOM header"));
++                    }
++                  }
++                }
+                 continue;
+               }
+             else
+diff --git a/tests/expand/mb.sh b/tests/expand/mb.sh
+index 031be7a..1621c84 100755
+--- a/tests/expand/mb.sh
++++ b/tests/expand/mb.sh
+@@ -109,4 +109,75 @@ env printf '12345678
+ expand < in > out || fail=1
+ compare exp out > /dev/null 2>&1 || fail=1
+ 
++
++
++#BOM header test 1
++printf "\xEF\xBB\xBF" > in; cat <<\EOF >> in || framework_failure_
++1234567812345678123456781
++.       .       .       .
++a	b	c	d
++.       .       .       .
++ä	ö	ü	ß
++.       .       .       .
++EOF
++env printf '   äöü\t.    öüä.   \tä xx\n' >> in || framework_failure_
++
++printf "\xEF\xBB\xBF" > exp; cat <<\EOF >> exp || framework_failure_
++1234567812345678123456781
++.       .       .       .
++a       b       c       d
++.       .       .       .
++ä       ö       ü       ß
++.       .       .       .
++   äöü  .    öüä.       ä xx
++EOF
++
++
++expand < in > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
++
++LANG=C expand < in > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
++
++LC_ALL=C expand < in > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
++
++
++printf '\xEF\xBB\xBF' > in1; cat <<\EOF >> in1 || framework_failure_
++1234567812345678123456781
++.       .       .       .
++a	b	c	d
++.       .       .       .
++ä	ö	ü	ß
++.       .       .       .
++EOF
++env printf '   äöü\t.    öüä.   \tä xx\n' >> in1 || framework_failure_
++
++
++printf '\xEF\xBB\xBF' > exp; cat <<\EOF >> exp || framework_failure_
++1234567812345678123456781
++.       .       .       .
++a       b       c       d
++.       .       .       .
++ä       ö       ü       ß
++.       .       .       .
++   äöü  .    öüä.       ä xx
++1234567812345678123456781
++.       .       .       .
++a       b       c       d
++.       .       .       .
++ä       ö       ü       ß
++.       .       .       .
++   äöü  .    öüä.       ä xx
++EOF
++
++expand in1 in1 > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
++
++LANG=C expand in1 in1  > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
++
++LC_ALL=C expand in1 in1 > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
++
+ exit $fail
+diff --git a/tests/unexpand/mb.sh b/tests/unexpand/mb.sh
+index 8d75652..9d4ee3e 100755
+--- a/tests/unexpand/mb.sh
++++ b/tests/unexpand/mb.sh
+@@ -111,3 +111,62 @@ env printf '12345678
+ 
+ unexpand -a < in > out || fail=1
+ compare exp out > /dev/null 2>&1 || fail=1
++
++#BOM header test 1
++printf "\xEF\xBB\xBF" > in; cat <<\EOF >> in || framework_failure_
++1234567812345678123456781
++.       .       .       .
++a       b       c       d
++.       .       .       .
++ä       ö       ü       ß
++.       .       .       .
++   äöü  .    öüä.       ä xx
++EOF
++env printf '   äöü\t.    öüä.   \tä xx\n' >> in || framework_failure_
++
++printf "\xEF\xBB\xBF" > exp; cat <<\EOF >> exp || framework_failure_
++1234567812345678123456781
++.	.	.	.
++a	b	c	d
++.	.	.	.
++ä	ö	ü	ß
++.	.	.	.
++   äöü	.    öüä.	ä xx
++EOF
++
++unexpand < in > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
++
++LANG=C unexpand < in > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
++
++LC_ALL=C unexpand < in > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
++
++
++printf "\xEF\xBB\xBF" > exp; cat <<\EOF >> exp || framework_failure_
++1234567812345678123456781
++.	.	.	.
++a	b	c	d
++.	.	.	.
++ä	ö	ü	ß
++.	.	.	.
++   äöü	.    öüä.	ä xx
++1234567812345678123456781
++.	.	.	.
++a	b	c	d
++.	.	.	.
++ä	ö	ü	ß
++.	.	.	.
++   äöü	.    öüä.	ä xx
++EOF
++
++
++unexpand in in > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
++
++LANG=C unexpand in in > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
++
++LC_ALL=C unexpand in in > out || fail=1
++compare exp out > /dev/null 2>&1 || fail=1
+-- 
+2.9.3
+

coreutils-keyring.gpg

@@ -1,312 +0,0 @@
-Release GPG keyring of coreutils group.
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-ELphkzjc6eM3CaOZ73u4GVXotheeUabUHQ==
-=drvb
------END PGP PUBLIC KEY BLOCK-----

coreutils-provides.inc

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

coreutils-selinux.patch

@@ -1,32 +1,3 @@
-From d70ddb3eb845c494280e7365e2b889242e7e1bb9 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Mon, 4 Oct 2021 08:45:53 +0200
-Subject: [PATCH] coreutils-selinux.patch
-
----
- doc/coreutils.texi |  5 +++++
- man/chcon.x        |  2 +-
- man/runcon.x       |  2 +-
- src/cp.c           | 16 +++++++++++++++-
- src/install.c      | 10 ++++++++--
- 5 files changed, 30 insertions(+), 5 deletions(-)
-
-diff --git a/doc/coreutils.texi b/doc/coreutils.texi
-index 6810c15..19b535c 100644
---- a/doc/coreutils.texi
-+++ b/doc/coreutils.texi
-@@ -8766,6 +8766,11 @@ done
- exit $fail
- @end example
- 
-+@item -c
-+@cindex SELinux security context information, preserving
-+Preserve SELinux security context of the original files if possible.
-+Some file systems don't support storing of SELinux security context.
-+
- @item --copy-contents
- @cindex directories, copying recursively
- @cindex copying directories recursively
 diff --git a/man/chcon.x b/man/chcon.x
 index 8c1ff6f..c84fb96 100644
 --- a/man/chcon.x
@@ -49,20 +20,20 @@ index d2df13e..5c5f5d8 100644
  Run COMMAND with completely-specified CONTEXT, or with current or
  transitioned security context modified by one or more of LEVEL,
 diff --git a/src/cp.c b/src/cp.c
-index c97a675..89fb8ec 100644
+index 1b528c6..25dbb88 100644
 --- a/src/cp.c
 +++ b/src/cp.c
-@@ -191,6 +191,9 @@ Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n\
-                                  additional attributes: context, links, xattr,\
- \n\
+@@ -203,6 +203,9 @@ Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n\
                                   all\n\
-+"), stdout);
-+      fputs (_("\
-+  -c                           deprecated, same as --preserve=context\n\
  "), stdout);
        fputs (_("\
++  -c                           deprecated, same as --preserve=context\n\
++"), stdout);
++      fputs (_("\
        --no-preserve=ATTR_LIST  don't preserve the specified attributes\n\
-@@ -954,7 +957,7 @@ main (int argc, char **argv)
+       --parents                use full source file name under DIRECTORY\n\
+ "), stdout);
+@@ -929,7 +932,7 @@ main (int argc, char **argv)
    selinux_enabled = (0 < is_selinux_enabled ());
    cp_option_init (&x);
  
@@ -71,7 +42,7 @@ index c97a675..89fb8ec 100644
                             long_opts, NULL))
           != -1)
      {
-@@ -1002,6 +1005,17 @@ main (int argc, char **argv)
+@@ -977,6 +980,17 @@ main (int argc, char **argv)
            copy_contents = true;
            break;
  
@@ -89,11 +60,27 @@ index c97a675..89fb8ec 100644
          case 'd':
            x.preserve_links = true;
            x.dereference = DEREF_NEVER;
+diff --git a/doc/coreutils.texi b/doc/coreutils.texi
+index 47e4480..cff2ead 100644
+--- a/doc/coreutils.texi
++++ b/doc/coreutils.texi
+@@ -8083,6 +8083,11 @@ done
+ exit $fail
+ @end example
+ 
++@item -c
++@cindex SELinux security context information, preserving
++Preserve SELinux security context of the original files if possible.
++Some file systems don't support storing of SELinux security context.
++
+ @item --copy-contents
+ @cindex directories, copying recursively
+ @cindex copying directories recursively
 diff --git a/src/install.c b/src/install.c
-index c9456fe..2b1bee9 100644
+index d79d597..437889a 100644
 --- a/src/install.c
 +++ b/src/install.c
-@@ -638,7 +638,7 @@ In the 4th form, create all components of the given DIRECTORY(ies).\n\
+@@ -673,7 +673,7 @@ In the 4th form, create all components of the given DIRECTORY(ies).\n\
    -v, --verbose       print the name of each directory as it is created\n\
  "), stdout);
        fputs (_("\
@@ -102,7 +89,7 @@ index c9456fe..2b1bee9 100644
    -Z                      set SELinux security context of destination\n\
                              file and each created directory to default type\n\
        --context[=CTX]     like -Z, or if CTX is specified then set the\n\
-@@ -790,7 +790,7 @@ main (int argc, char **argv)
+@@ -824,7 +824,7 @@ main (int argc, char **argv)
    dir_arg = false;
    umask (0);
  
@@ -111,7 +98,7 @@ index c9456fe..2b1bee9 100644
                                NULL)) != -1)
      {
        switch (optc)
-@@ -851,6 +851,8 @@ main (int argc, char **argv)
+@@ -885,6 +885,8 @@ main (int argc, char **argv)
            no_target_directory = true;
            break;
  
@@ -120,7 +107,7 @@ index c9456fe..2b1bee9 100644
          case PRESERVE_CONTEXT_OPTION:
            if (! selinux_enabled)
              {
-@@ -858,6 +860,10 @@ main (int argc, char **argv)
+@@ -892,6 +894,10 @@ main (int argc, char **argv)
                               "this kernel is not SELinux-enabled"));
                break;
              }
@@ -131,6 +118,3 @@ index c9456fe..2b1bee9 100644
            x.preserve_security_context = true;
            use_default_selinux_context = false;
            break;
--- 
-2.31.1
-

coreutils.spec

@@ -1,34 +1,54 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
-Version: 9.1
-Release: 4%{?dist}
+Version: 8.27
+Release: 19.1%{?dist}
 License: GPLv3+
+Group:   System Environment/Base
 Url:     https://www.gnu.org/software/coreutils/
 Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
-Source1: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
-# From https://savannah.gnu.org/project/release-gpgkeys.php?group=coreutils&download=1
-# which is linked as project keyring on https://savannah.gnu.org/projects/coreutils
-Source2: coreutils-keyring.gpg
 Source50:   supported_utils
-Source51:   coreutils-provides.inc
 Source105:  coreutils-colorls.sh
 Source106:  coreutils-colorls.csh
 
 # do not make coreutils-single depend on /usr/bin/coreutils
 %global __requires_exclude ^%{_bindir}/coreutils$
 
-# Make simple backups in correct dir; broken in 9.1
-Patch1: gnulib-simple-backup-fix.patch
+# upstream patches
+Patch1:   coreutils-8.27-date-debug-test.patch
+
+# date, touch: fix out-of-bounds write via large TZ variable (CVE-2017-7476)
+Patch2:   coreutils-8.27-CVE-2017-7476.patch
+
+# tail: revert to polling if a followed directory is replaced (#1283760)
+Patch3:   coreutils-8.27-tail-inotify-recreate.patch
+
+# doc: mention `setpriv --no-new-privs` feature in runcon info
+Patch4:   coreutils-8.27-runcon-doc.patch
+
+# ptx: fix a possible crash caused by integer overflow (#1482445)
+Patch5:   coreutils-8.27-ptx-int-overflow.patch
+
+# df: do not call stat() on file system unless it is necessary (#1511951)
+Patch6:   coreutils-8.27-df-stat.patch
+
+# mv -n: do not overwrite the destination, superseded by
+# http://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=v8.29-9-g29baf25aa
+Patch7:   coreutils-8.29-mv-n-noreplace.patch
+
+# doc: warn about following symlinks recursively in chown/chgrp (CVE-2017-18018)
+Patch8:   coreutils-8.29-CVE-2017-18018.patch
+
+# import gnulib's FTS module from coreutils-8.29 (#1544392)
+Patch9:   coreutils-8.27-fts-update.patch
 
 # disable the test-lock gnulib test prone to deadlock
 Patch100: coreutils-8.26-test-lock.patch
 
-# require_selinux_(): use selinuxenabled(8) if available
-Patch105: coreutils-8.26-selinuxenable.patch
-
+#add note about no difference between binary/text mode on Linux - md5sum manpage
+Patch101: coreutils-6.10-manpages.patch
 # downstream changes to default DIR_COLORS
-Patch102: coreutils-8.32-DIR_COLORS.patch
-# to be removed (#548834)
+Patch102: coreutils-8.25-DIR_COLORS.patch
+#do display processor type for uname -p/-i based on uname(2) syscall
 Patch103: coreutils-8.2-uname-processortype.patch
 #df --direct
 Patch104: coreutils-df-direct.patch
@@ -38,9 +58,24 @@ 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
+# (sb) lin18nux/lsb compliance - expand/unexpand
+Patch801: coreutils-i18n-expand-unexpand.patch
+# i18n patch for cut - old version - used
+Patch804: coreutils-i18n-cut-old.patch
+# The unexpand patch above is not correct. Sent to the patch authors
+Patch803: coreutils-i18n-fix-unexpand.patch
+#(un)expand - allow multiple files on input - broken by patch 801
+Patch805: coreutils-i18n-fix2-expand-unexpand.patch
+#(un)expand - test BOM headers
+Patch806: coreutils-i18n-un-expand-BOM.patch
+# make 'sort -h' work for arbitrary column even when using UTF-8 locales
+Patch807: coreutils-i18n-sort-human.patch
+# fold: preserve new-lines in mutlibyte text (#1418505)
+Patch808: coreutils-i18n-fold-newline.patch
 
 #getgrouplist() patch from Ulrich Drepper.
 Patch908: coreutils-getgrouplist.patch
@@ -52,41 +87,75 @@ Patch950: coreutils-selinux.patch
 Conflicts: filesystem < 3
 # To avoid clobbering installs
 Conflicts: coreutils-single
+Provides: /bin/basename
+Provides: /bin/cat
+Provides: /bin/chgrp
+Provides: /bin/chmod
+Provides: /bin/chown
+Provides: /bin/cp
+Provides: /bin/cut
+Provides: /bin/date
+Provides: /bin/dd
+Provides: /bin/df
+Provides: /bin/echo
+Provides: /bin/env
+Provides: /bin/false
+Provides: /bin/ln
+Provides: /bin/ls
+Provides: /bin/mkdir
+Provides: /bin/mknod
+Provides: /bin/mktemp
+Provides: /bin/mv
+Provides: /bin/nice
+Provides: /bin/pwd
+Provides: /bin/readlink
+Provides: /bin/rm
+Provides: /bin/rmdir
+Provides: /bin/sleep
+Provides: /bin/sort
+Provides: /bin/stty
+Provides: /bin/sync
+Provides: /bin/touch
+Provides: /bin/true
+Provides: /bin/uname
 
 BuildRequires: attr
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: gcc
+BuildRequires: bison
 BuildRequires: gettext-devel
 BuildRequires: gmp-devel
-BuildRequires: hostname
 BuildRequires: libacl-devel
 BuildRequires: libattr-devel
 BuildRequires: libcap-devel
 BuildRequires: libselinux-devel
-BuildRequires: libselinux-utils
-BuildRequires: make
 BuildRequires: openssl-devel
 BuildRequires: strace
 BuildRequires: texinfo
 
-# For gpg verification of source tarball
-BuildRequires: gnupg2
-
-# test-only dependencies
-BuildRequires: perl-interpreter
-BuildRequires: perl(FileHandle)
 %if 23 < 0%{?fedora} || 7 < 0%{?rhel}
 # needed by i18n test-cases
 BuildRequires: glibc-langpack-en
-BuildRequires: glibc-langpack-fr
-BuildRequires: glibc-langpack-ko
 %endif
 
 Requires: %{name}-common = %{version}-%{release}
+Requires: ncurses
 
+Provides: bundled(gnulib)
 Provides: coreutils-full = %{version}-%{release}
-%include %{SOURCE51}
+Provides: fileutils = %{version}-%{release}
+Provides: sh-utils = %{version}-%{release}
+Provides: stat = %{version}-%{release}
+Provides: textutils = %{version}-%{release}
+
+#old mktemp package had epoch 3, so we have to use 4 for coreutils
+Provides: mktemp = 4:%{version}-%{release}
+Obsoletes: mktemp < 4:%{version}-%{release}
+
+Obsoletes: fileutils <= 4.1.9
+Obsoletes: sh-utils <= 2.0.12
+Obsoletes: stat <= 3.3
+Obsoletes: textutils <= 2.0.21
 Obsoletes: %{name} < 8.24-100
 
 %description
@@ -97,8 +166,6 @@ the old GNU fileutils, sh-utils, and textutils packages.
 Summary:  coreutils multicall binary
 Suggests: coreutils-common
 Provides: coreutils = %{version}-%{release}
-Provides: coreutils%{?_isa} = %{version}-%{release}
-%include %{SOURCE51}
 # To avoid clobbering installs
 Conflicts: coreutils < 8.24-100
 # Note RPM doesn't support separate buildroots for %files
@@ -114,32 +181,19 @@ packaged as a single multicall binary.
 # yum obsoleting rules explained at:
 # https://bugzilla.redhat.com/show_bug.cgi?id=1107973#c7
 Obsoletes: %{name} < 8.24-100
-
-# info doc refers to "Specifying the Time Zone" from glibc-doc (#959597)
-Suggests: glibc-doc
-
+Requires(preun): /sbin/install-info
+Requires(post): /sbin/install-info
 Summary:  coreutils common optional components
 %description common
 Optional though recommended components,
 including documentation and translations.
 
 %prep
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -N
 
-# will be regenerated in the build directories
-rm -f src/fs.h
-
-# will be further modified by coreutils-8.32-DIR_COLORS.patch
-sed src/dircolors.hin \
-        -e 's| 00;36$| 01;36|' \
-        > DIR_COLORS
-sed src/dircolors.hin \
-        -e 's| 01;31$| 00;31|' \
-        -e 's| 01;35$| 00;35|' \
-        > DIR_COLORS.lightbgcolor
-
-# git add DIR_COLORS{,.lightbgcolor}
+# will be modified by coreutils-8.25-DIR_COLORS.patch
+tee DIR_COLORS{,.256color,.lightbgcolor} <src/dircolors.hin >/dev/null
+# git add DIR_COLORS{,.256color,.lightbgcolor}
 # git commit -m "clone DIR_COLORS before patching"
 
 # apply all patches
@@ -153,33 +207,14 @@ autoreconf -fiv
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fpic"
-
-# disable -flto on ppc64le to make test-float pass (#1789115)
-%ifarch ppc64le
-CFLAGS="$CFLAGS -fno-lto"
-%endif
-
-# Upstream suggests to build with -Dlint for static analyzers:
-# https://lists.gnu.org/archive/html/coreutils/2018-06/msg00110.html
-# ... and even for production binary RPMs:
-# https://lists.gnu.org/archive/html/bug-gnulib/2020-05/msg00130.html
-# There is currently no measurable performance drop or other known downside.
-CFLAGS="$CFLAGS -Dlint"
-
-# make mknod work again in chroot without /proc being mounted (#1811038)
-export ac_cv_func_lchmod="no"
-
-# needed for out-of-tree build
-%global _configure ../configure
-
 %{expand:%%global optflags %{optflags} -D_GNU_SOURCE=1}
 for type in separate single; do
-  mkdir -p $type && \
-  (cd $type || exit $?
+  mkdir $type && \
+  (cd $type && ln -s ../configure || exit 1
   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-libgmp"   # expr/factor machine ints
+    config_single="$config_single --without-gmp"      # expr/factor machine ints
   else
     config_single='--with-openssl'  # faster sha*sum
   fi
@@ -189,11 +224,7 @@ for type in separate single; do
              --enable-no-install-program=kill,uptime \
              --with-tty-group \
              DEFAULT_POSIX2_VERSION=200112 alternative=199209 || :
-  %make_build all V=1
-
-  # make sure that parse-datetime.{c,y} ends up in debuginfo (#1555079)
-  ln -fv ../lib/parse-datetime.{c,y} .
-  )
+  make all %{?_smp_mflags})
 done
 
 # Get the list of supported utilities
@@ -230,7 +261,8 @@ for type in separate single; do
 done
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-install -p -c -m644 DIR_COLORS{,.lightbgcolor} $RPM_BUILD_ROOT%{_sysconfdir}
+install -p -c -m644 DIR_COLORS{,.256color,.lightbgcolor} \
+    $RPM_BUILD_ROOT%{_sysconfdir}
 install -p -c -m644 %SOURCE105 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/colorls.sh
 install -p -c -m644 %SOURCE106 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/colorls.csh
 
@@ -241,6 +273,18 @@ grep LC_TIME %name.lang | cut -d'/' -f1-6 | sed -e 's/) /) %%dir /g' >>%name.lan
 # (sb) Deal with Installed (but unpackaged) file(s) found
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
+%preun common
+if [ $1 = 0 ]; then
+  if [ -f %{_infodir}/%{name}.info.gz ]; then
+    /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
+  fi
+fi
+
+%post common
+if [ -f %{_infodir}/%{name}.info.gz ]; then
+  /sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
+fi
+
 %files -f supported_utils
 %exclude %{_bindir}/*.single
 %dir %{_libexecdir}/coreutils
@@ -265,231 +309,15 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %license COPYING
 
 %changelog
-* Mon Aug 01 2022 Kamil Dudka <kdudka@redhat.com> - 9.1-4
-- prevent unexpand from failing on control characters (#2112870)
+* Thu Jan 25 2018 Kamil Dudka <kdudka@redhat.com> - 8.27-19
+- mv -n: provide more reliable diagnostic messages
 
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Apr 23 2022 Pádraig Brady <P@draigBrady.com> - 9.1-2
-- make simple backups in correct dir; broken in 9.1
-
-* 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)
-
-* Tue Mar 01 2022 Kamil Dudka <kdudka@redhat.com> - 9.0-4
-- make `df --direct` work again (#2058686)
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Oct 04 2021 Kamil Dudka <kdudka@redhat.com> - 9.0-2
-- chmod: fix exit status when ignoring symlinks
-
-* Sun Sep 26 2021 Kamil Dudka <kdudka@redhat.com> - 9.0-1
-- new upstream release 9.0
-
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com>
-- Rebuilt with OpenSSL 3.0.0
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jul 07 2021 Kamil Dudka <kdudka@redhat.com> - 8.32-30
-- df: fix duplicated remote entries due to bind mounts (#1979814)
-
-* Thu Jul 01 2021 Kamil Dudka <kdudka@redhat.com> - 8.32-28
-- tail: fix stack out-of-bounds write with --follow
-
-* Tue Jun 08 2021 Kamil Dudka <kdudka@redhat.com> - 8.32-27
-- mountlist: recognize fuse.portal as dummy file system (#1913358)
-
-* Mon May 17 2021 Kamil Dudka <kdudka@redhat.com> - 8.32-26
-- cp: pick additional copy_file_range()-related fixes from upstream
-
-* Mon May 03 2021 Kamil Dudka <kdudka@redhat.com> - 8.32-24
-- copy: ensure we enforce --reflink=never (#1956080)
-
-* Tue Apr 27 2021 Kamil Dudka <kdudka@redhat.com> - 8.32-23
-- copy: do not refuse to copy a swap file
-
-* Fri Apr 09 2021 Kamil Dudka <kdudka@redhat.com> - 8.32-22
-- weaken the dependency on glibc-doc to reduce minimal installations
-- drop the last use of ncurses no longer needed (#1830318)
-- utimens: fix confusing arg type in internal func
-
-* Fri Mar 26 2021 Kamil Dudka <kdudka@redhat.com> - 8.32-21
-- hostname,ln: fix memory leaks detected by Coverity
-
-* Wed Mar 24 2021 Kamil Dudka <kdudka@redhat.com> - 8.32-20
-- cp: use copy_file_range if available
-
-* Thu Feb 18 2021 Kamil Dudka <kdudka@redhat.com> - 8.32-19
-- stat: add support for the exfat file system (#1921427)
-
-* Wed Feb 03 2021 Kamil Dudka <kdudka@redhat.com> - 8.32-18
-- make coreutils-common recommend glibc-doc for info doc refs (#959597)
-
-* Tue Feb 02 2021 Kamil Dudka <kdudka@redhat.com> - 8.32-17
-- ls: fix crash printing SELinux context for unstatable files (#1921249)
-- split: fix --number=K/N to output correct part of file (#1921246)
-- expr: fix invalid read with unmatched \(...\) (#1919775)
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Dec 08 2020 Kamil Dudka <kdudka@redhat.com> - 8.32-15
-- rm: do not skip files upon failure to remove an empty dir (#1905481)
-
-* Tue Nov 03 2020 Kamil Dudka <kdudka@redhat.com> - 8.32-14
-- df,stat,tail: recognize more file system types
-
-* Wed Oct 14 2020 Kamil Dudka <kdudka@redhat.com> - 8.32-13
-- make the %%build section idempotent
-
-* Mon Aug 17 2020 Kamil Dudka <kdudka@redhat.com> - 8.32-12
-- do not install /etc/DIR_COLORS.256color (#1830318)
-
-* Thu Jul 30 2020 Kamil Dudka <kdudka@redhat.com> - 8.32-11
-- cp: default to --reflink=auto (#1861108)
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 24 2020 Kamil Dudka <kdudka@redhat.com> - 8.32-9
-- disable -flto on ppc64le to make test-float pass (#1789115)
-
-* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 8.32-8
-- Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Fri Jun 26 2020 James Cassell <cyberpear@fedoraproject.org> - 8.32-7
-- move ncurses to -common package since it's needed for colorls.sh
-- make ncurses optional
-
-* Fri May 15 2020 Kamil Dudka <kdudka@redhat.com> - 8.32-6
-- compile with -Dlint to enable optional initialization and cleanup code
-
-* Thu Apr 23 2020 Kamil Dudka <kdudka@redhat.com> - 8.32-5
-- du: simplify leaf optimization for XFS (#1823247)
-
-* Fri Apr 17 2020 Tom Stellard <tstellar@redhat.com> - 8.32-4
-- Fix missing inline function definition
-
-* Wed Mar 11 2020 Kamil Dudka <kdudka@redhat.com> - 8.32-3
-- uniq: remove collation handling as required by newer POSIX
-
-* Mon Mar 09 2020 Kamil Dudka <kdudka@redhat.com> - 8.32-2
-- make mknod work again in chroot without /proc being mounted (#1811038)
-- ls: restore 8.31 behavior on removed directories
-
-* Thu Mar 05 2020 Kamil Dudka <kdudka@redhat.com> - 8.32-1
-- new upstream release 8.32
-
-* Tue Feb 11 2020 Kamil Dudka <kdudka@redhat.com> - 8.31-10
-- make upstream test-suite work with root privileges (#1800597)
-
-* Wed Feb 05 2020 Kamil Dudka <kdudka@redhat.com> - 8.31-9
-- use upstream fix the cp/proc-short-read test
-
-* Thu Jan 30 2020 Kamil Dudka <kdudka@redhat.com> - 8.31-8
-- skip a test that relies on /proc/kallsyms having immutable content
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 17 2019 Kamil Dudka <kdudka@redhat.com> - 8.31-6
-- temporarily disable the use of statx (#1760300)
-
-* Fri Oct 11 2019 Kamil Dudka <kdudka@redhat.com> - 8.31-5
-- use statx instead of stat when available (#1760300)
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jul 16 2019 Kamil Dudka <kdudka@redhat.com> - 8.31-3
-- disable flashing in ls colors for broken symbolic links (#1728986)
-
-* Mon Mar 18 2019 Kamil Dudka <kdudka@redhat.com> - 8.31-2
-- fix formatting of sha512sum(1) man page (#1688740)
-
-* Mon Mar 11 2019 Kamil Dudka <kdudka@redhat.com> - 8.31-1
-- new upstream release 8.31
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Nov 07 2018 Kamil Dudka <kdudka@redhat.com> - 8.30-8
-- sync: fix open() fallback bug
-- fix implicit declaration warning in coreutils-getgrouplist.patch
-
-* Sat Nov 03 2018 Kevin Fenzi <kevin@scrye.com> - 8.30-7
-- Also remove Requires pre/post used by info scriptlets.
-
-* Sat Nov 03 2018 Kevin Fenzi <kevin@scrye.com> - 8.30-6
-- Remove no longer needed info scriptlets
-
-* Thu Oct 11 2018 Kamil Dudka <kdudka@redhat.com> - 8.30-5
-- fix heap-based buffer overflow in vasnprintf() (CVE-2018-17942)
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8.30-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jul 10 2018 Kamil Dudka <kdudka@redhat.com> - 8.30-3
-- rename gnulib's renameat2 to renameatu to avoid clash with glibc (#1598518)
-
-* Wed Jul 04 2018 Kamil Dudka <kdudka@redhat.com> - 8.30-2
-- sync i18n patches with Suse (patch by Bernhard Voelker)
-
-* Mon Jul 02 2018 Kamil Dudka <kdudka@redhat.com> - 8.30-1
-- new upstream release 8.30
-
-* Wed May 30 2018 Kamil Dudka <kdudka@redhat.com> - 8.29-12
-- add provides to coreutils-single to make it a drop-in replacement
-
-* Mon May 28 2018 Kamil Dudka <kdudka@redhat.com> - 8.29-11
-- ls: increase the allowed abmon width from 5 to 12 (#1577872)
-- date, ls: pick strftime fixes from glibc to improve locale support (#1577872)
-
-* Fri Apr 20 2018 Kamil Dudka <kdudka@redhat.com> - 8.29-10
-- fix crash caused by mistakenly enabled leaf optimization (#1558249)
-
-* Fri Mar 23 2018 Kamil Dudka <kdudka@redhat.com> - 8.29-9
-- make it possible to install the latest available Adobe Reader RPM for Linux
-
-* Mon Mar 19 2018 Kamil Dudka <kdudka@redhat.com> - 8.29-8
-- drop BR for bison, which is not used during the build
-
-* Fri Mar 16 2018 Kamil Dudka <kdudka@redhat.com> - 8.29-7
-- make sure that parse-datetime.{c,y} ends up in debuginfo (#1555079)
-
-* Tue Mar 06 2018 Kamil Dudka <kdudka@redhat.com> - 8.29-6
-- fix build failure with glibc-2.28
-
-* Mon Feb 26 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 8.29-5
-- Remove /bin/* Provides
-
-* Mon Feb 19 2018 Kamil Dudka <kdudka@redhat.com> - 8.29-4
-- add explicit BR for the gcc compiler
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8.29-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Jan 23 2018 Kamil Dudka <kdudka@redhat.com> - 8.29-2
+* Tue Jan 23 2018 Kamil Dudka <kdudka@redhat.com> - 8.27-18
 - doc: warn about following symlinks recursively in chown/chgrp (CVE-2017-18018)
 - mv -n: do not overwrite the destination
 
-* Tue Jan 02 2018 Kamil Dudka <kdudka@redhat.com> - 8.29-1
-- new upstream release 8.29
-
-* Tue Nov 07 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 8.28-2
-- Remove very old Provides (mktemp, sh-utils, textwrap, fileutils, stat)
-
-* Mon Sep 04 2017 Kamil Dudka <kdudka@redhat.com> - 8.28-1
-- new upstream release 8.28
+* Fri Nov 10 2017 Kamil Dudka <kdudka@redhat.com> - 8.27-17
+- df: do not call stat() on file system unless it is necessary (#1511951)
 
 * Tue Aug 22 2017 Ville Skyttä <ville.skytta@iki.fi> - 8.27-16
 - Own the %%{_libexecdir}/coreutils dir

gnulib-simple-backup-fix.patch

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

sources

@@ -1,2 +1 @@
-SHA512 (coreutils-9.1.tar.xz.sig) = 9f0766531afd4faa3e2c337730f61db55605cf06729e9c61f644594883732c2e0b1ddb0005b492be309c53e6f45b8ff875398163a48699d52517ea49e9bdbc91
-SHA512 (coreutils-9.1.tar.xz) = a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa
+SHA512 (coreutils-8.27.tar.xz) = abf3280aaa54e9bd5851df0eda2af1de1017ca174633e52d1e592455d46ea0e99812dda46d2f320e979553cef271485d8818c595bba6ed31264511a511c93679

supported_utils

@@ -1,7 +1,6 @@
 %{_bindir}/arch
 %{_bindir}/b2sum
 %{_bindir}/basename
-%{_bindir}/basenc
 %{_bindir}/cat
 %{_bindir}/chgrp
 %{_bindir}/chmod

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

@@ -1,63 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/coreutils/readlink-cannot-handle-recursive-symlink s
-#   Description: Test for readlink cannot handle recursive symlinks
-#   Author: Jan Scotka <jscotka@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2010 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/coreutils/readlink-cannot-handle-recursive-symlinks
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Jan Scotka <jscotka@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Test for readlink cannot handle recursive symlinks" >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
-	@echo "RunFor:          coreutils" >> $(METADATA)
-	@echo "Requires:        coreutils" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-
-	rhts-lint $(METADATA)

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

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

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

@@ -1,60 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/coreutils/readlink-cannot-handle-recursive-symlinks
-#   Description: Test for readlink cannot handle recursive symlinks
-#   Author: Jan Scotka <jscotka@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2010 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include rhts environment
-. /usr/bin/rhts-environment.sh
-. /usr/lib/beakerlib/beakerlib.sh
-
-PACKAGE="coreutils"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
-        rlRun "pushd $TmpDir"
-        rlRun "mkdir link" 0 "Creating test directory"
-        rlRun "cd link" 0 "cd to this dir"
-        rlRun "ln -s ../link link" 0 "creating symlink to ../link -> link"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlLog "Test of readlink up to 20 iteration"
-        export TMPVAR="link"
-        for foo in `seq 20`
-          do echo $TMPVAR
-            rlRun "readlink -v -f $TMPVAR" 0 "readlink of $TMPVAR"
-            TMPVAR="$TMPVAR/link"
-        done
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd

tests/test-basics

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

tests/test_basics.yml

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

tests/tests.yml

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

upstream-key.gpg

@@ -0,0 +1,123 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+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
+Ke4=
+=zRdO
+-----END PGP PUBLIC KEY BLOCK-----