fix cut test failure on aarch64 rawhide

Resolves: rhbz#2424302

.cvsignore

@@ -1 +0,0 @@
-coreutils-6.10.tar.lzma

.gitignore

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

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: coreutils
-# $Id$
-NAME := coreutils
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

STAGE1-coreutils

@@ -0,0 +1,7 @@
+srpm coreutils
+mcd $BUILDDIR/$1
+(cd $SRC/${1}-*/ ; autoreconf -vif)
+$SRC/${1}-*/configure $TCONFIGARGS --disable-pam
+notparallel
+make $J man1_MANS= V=1
+make $J man1_MANS= install DESTDIR=${ROOTFS}

coreutils-4.5.3-langinfo.patch

@@ -1,18 +0,0 @@
---- coreutils-5.92/src/date.c.langinfo	2005-09-16 09:06:57.000000000 +0100
-+++ coreutils-5.92/src/date.c	2005-10-24 18:09:16.000000000 +0100
-@@ -451,14 +451,7 @@
-       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-4.5.3-sysinfo.patch

@@ -1,72 +0,0 @@
---- coreutils-5.97/src/uname.c.sysinfo	2005-09-15 20:57:04.000000000 +0100
-+++ coreutils-5.97/src/uname.c	2006-08-24 17:15:56.000000000 +0100
-@@ -263,7 +263,7 @@
- int
- main (int argc, char **argv)
- {
--  static char const unknown[] = "unknown";
-+  static char unknown[] = "unknown";
- 
-   /* Mask indicating which elements to print. */
-   unsigned int toprint = 0;
-@@ -306,13 +306,35 @@
- 
-   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
-+      {
-+	struct utsname u;
-+	uname(&u);
-+	element = u.machine;
-+#ifdef linux
-+	if(!strcmp(element, "i686")) { /* Check for Athlon */
-+		char cinfo[1024];
-+		FILE *f=fopen("/proc/cpuinfo", "r");
-+		if(f) {
-+			while(fgets(cinfo, 1024, f)) {
-+				if(!strncmp(cinfo, "vendor_id", 9)) {
-+					if(strstr(cinfo, "AuthenticAMD"))
-+						element="athlon";
-+					break;
-+				}
-+			}
-+			fclose(f);
-+		}
-+	}
-+#endif
-+      }
- #endif
- #ifdef UNAME_PROCESSOR
-       if (element == unknown)
-@@ -348,7 +370,7 @@
- 
-   if (toprint & PRINT_HARDWARE_PLATFORM)
-     {
--      char const *element = unknown;
-+      char *element = unknown;
- #if HAVE_SYSINFO && defined SI_PLATFORM
-       {
- 	static char hardware_platform[257];
-@@ -356,6 +378,14 @@
- 			  hardware_platform, sizeof hardware_platform))
- 	  element = hardware_platform;
-       }
-+#else
-+      {
-+	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
-       if (element == unknown)

coreutils-5.2.1-runuser.patch

@@ -1,385 +0,0 @@
---- coreutils-6.10/tests/misc/help-version.runuser	
-+++ coreutils-6.10/tests/misc/help-version	
-@@ -168,6 +168,7 @@
- seq_args=10
- sleep_args=0
- su_args=--version
-+runuser_args=--version
- 
- # I'd rather not run sync, since it spins up disks that I've
- # deliberately caused to spin down (but not unmounted).
---- coreutils-6.10/README.runuser	
-+++ coreutils-6.10/README	
-@@ -11,8 +11,8 @@
-   factor false fmt fold groups head hostid hostname id install join kill
-   link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup
-   od paste pathchk pinky pr printenv printf ptx pwd readlink rm rmdir
--  runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf
--  sleep sort split stat stty su sum sync tac tail tee test touch tr true
-+  runcon runuser seq sha1sum sha224sum sha256sum sha384sum sha512sum shred
-+  shuf sleep sort split stat stty su sum sync tac tail tee test touch tr true
-   tsort tty uname unexpand uniq unlink uptime users vdir wc who whoami yes
-
- See the file NEWS for a list of major changes in the current release.
---- coreutils-6.7/src/su.c.runuser	2007-01-09 17:27:56.000000000 +0000
-+++ coreutils-6.7/src/su.c	2007-01-09 17:30:12.000000000 +0000
-@@ -110,9 +110,15 @@
- #include "error.h"
- 
- /* The official name of this program (e.g., no `g' prefix).  */
-+#ifndef RUNUSER
- #define PROGRAM_NAME "su"
-+#else
-+#define PROGRAM_NAME "runuser"
-+#endif
- 
-+#ifndef AUTHORS
- #define AUTHORS "David MacKenzie"
-+#endif
- 
- #if HAVE_PATHS_H
- # include <paths.h>
-@@ -150,6 +156,10 @@
- #ifndef USE_PAM
- char *crypt ();
- #endif
-+#ifndef CHECKPASSWD
-+#define CHECKPASSWD 1
-+#endif
-+
- char *getusershell ();
- void endusershell ();
- void setusershell ();
-@@ -157,7 +167,11 @@
- extern char **environ;
- 
- static void run_shell (char const *, char const *, char **, size_t,
--	const struct passwd *)
-+	const struct passwd *
-+#ifdef RUNUSER
-+		       , gid_t *groups, int num_groups
-+#endif
-+	)
- #ifdef USE_PAM
- 	;
- #else
-@@ -187,6 +201,10 @@
-   {"login", no_argument, NULL, 'l'},
-   {"preserve-environment", no_argument, NULL, 'p'},
-   {"shell", required_argument, NULL, 's'},
-+#ifdef RUNUSER
-+  {"group", required_argument, NULL, 'g'},
-+  {"supp-group", required_argument, NULL, 'G'},
-+#endif
-   {GETOPT_HELP_OPTION_DECL},
-   {GETOPT_VERSION_OPTION_DECL},
-   {NULL, 0, NULL, 0}
-@@ -288,10 +306,12 @@
-   retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh);
-   PAM_BAIL_P;
- 
-+#ifndef RUNUSER
-   if (getuid() != 0 && !isatty(0)) {
- 	fprintf(stderr, "standard in must be a tty\n");
- 	exit(1);
-   }
-+#endif
- 
-   caller = getpwuid(getuid());
-   if(caller != NULL && caller->pw_name != NULL) {
-@@ -308,6 +328,11 @@
-     retval = pam_set_item(pamh, PAM_TTY, tty_name);
-     PAM_BAIL_P;
-   }
-+#ifdef RUNUSER
-+  if (getuid() != geteuid())
-+    /* safety net: deny operation if we are suid by accident */
-+    error(EXIT_FAILURE, 1, "runuser may not be setuid");
-+#else
-   retval = pam_authenticate(pamh, 0);
-   PAM_BAIL_P;
-   retval = pam_acct_mgmt(pamh, 0);
-@@ -317,6 +342,7 @@
-     PAM_BAIL_P;
-   }
-   PAM_BAIL_P;
-+#endif
-   /* must be authenticated if this point was reached */
-   return 1;
- #else /* !USE_PAM */
-@@ -398,11 +424,22 @@
- /* Become the user and group(s) specified by PW.  */
- 
- static void
--change_identity (const struct passwd *pw)
-+change_identity (const struct passwd *pw
-+#ifdef RUNUSER
-+		 , gid_t *groups, int num_groups
-+#endif
-+	)
- {
- #ifdef HAVE_INITGROUPS
-+  int rc = 0;
-   errno = 0;
--  if (initgroups (pw->pw_name, pw->pw_gid) == -1) {
-+#ifdef RUNUSER
-+  if (num_groups)
-+    rc = setgroups(num_groups, groups);
-+  else
-+#endif
-+    rc = initgroups(pw->pw_name, pw->pw_gid);
-+  if (rc == -1) {
- #ifdef USE_PAM
-     pam_close_session(pamh, 0);
-     pam_end(pamh, PAM_ABORT);
-@@ -449,7 +486,11 @@
- 
- static void
- run_shell (char const *shell, char const *command, char **additional_args,
--	   size_t n_additional_args, const struct passwd *pw)
-+	   size_t n_additional_args, const struct passwd *pw
-+#ifdef RUNUSER
-+	   , gid_t *groups, int num_groups
-+#endif
-+	)
- {
-   size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1;
-   char const **args = xnmalloc (n_args, sizeof *args);
-@@ -480,7 +521,11 @@
- 
-   child = fork();
-   if (child == 0) {  /* child shell */
--  change_identity (pw);
-+  change_identity (pw
-+#ifdef RUNUSER
-+		   , groups, num_groups
-+#endif
-+	  );
-   pam_end(pamh, 0);
-   if (!same_session)
-     setsid ();
-@@ -657,6 +702,12 @@
-   char *shell = NULL;
-   struct passwd *pw;
-   struct passwd pw_copy;
-+#ifdef RUNUSER
-+  struct group *gr;
-+  gid_t groups[NGROUPS_MAX];
-+  int num_supp_groups = 0;
-+  int use_gid = 0;
-+#endif
- 
-   initialize_main (&argc, &argv);
-   program_name = argv[0];
-@@ -671,7 +722,11 @@
-   simulate_login = false;
-   change_environment = true;
- 
--  while ((optc = getopt_long (argc, argv, "c:flmps:", longopts, NULL)) != -1)
-+  while ((optc = getopt_long (argc, argv, "c:flmps:"
-+#ifdef RUNUSER
-+			      "g:G:"
-+#endif
-+			      , longopts, NULL)) != -1)
-     {
-       switch (optc)
- 	{
-@@ -701,6 +756,28 @@
- 	  shell = optarg;
- 	  break;
- 
-+#ifdef RUNUSER
-+	case 'g':
-+	  gr = getgrnam(optarg);
-+	  if (!gr)
-+	    error (EXIT_FAILURE, 0, _("group %s does not exist"), optarg);
-+	  use_gid = 1;
-+	  groups[0] = gr->gr_gid;
-+	  break;
-+
-+	case 'G':
-+	  num_supp_groups++;
-+	  if (num_supp_groups >= NGROUPS_MAX)
-+	    error (EXIT_FAILURE, 0,
-+		   _("Can't specify more than %d supplemental groups"),
-+		   NGROUPS_MAX - 1);
-+	  gr = getgrnam(optarg);
-+	  if (!gr)
-+	    error (EXIT_FAILURE, 0, _("group %s does not exist"), optarg);
-+	  groups[num_supp_groups] = gr->gr_gid;
-+	  break;
-+#endif
-+
- 	case_GETOPT_HELP_CHAR;
- 
- 	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
-@@ -739,7 +816,20 @@
- 			  : DEFAULT_SHELL);
-   endpwent ();
- 
--  if (!correct_password (pw))
-+#ifdef RUNUSER
-+  if (num_supp_groups && !use_gid)
-+  {
-+    pw->pw_gid = groups[1];
-+    memmove (groups, groups + 1, sizeof(gid_t) * num_supp_groups);
-+  }
-+  else if (use_gid)
-+  {
-+    pw->pw_gid = groups[0];
-+    num_supp_groups++;
-+  }
-+#endif
-+
-+  if (CHECKPASSWD && !correct_password (pw))
-     {
- #ifdef SYSLOG_FAILURE
-       log_su (pw, false);
-@@ -771,8 +861,16 @@
-   modify_environment (pw, shell);
- 
- #ifndef USE_PAM
--  change_identity (pw);
-+  change_identity (pw
-+#ifdef RUNUSER
-+		   , groups, num_supp_groups
-+#endif
-+		   );
- #endif
- 
--  run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw);
-+  run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw
-+#ifdef RUNUSER
-+	     , groups, num_supp_groups
-+#endif
-+	     );
- }
---- coreutils-6.10/src/Makefile.am.runuser	
-+++ coreutils-6.10/src/Makefile.am	
-@@ -38,7 +38,7 @@
-   shuf sort split sum tac tail tr tsort unexpand uniq wc \
-   basename date dirname echo env expr factor false \
-   id kill logname pathchk printenv printf pwd \
--  runcon seq sleep tee \
-+  runcon runuser seq sleep tee \
-   test true tty whoami yes \
-   base64
-
-@@ -112,6 +112,10 @@
- mv_LDADD += $(LIB_ACL)
- ginstall_LDADD += $(LIB_ACL)
- 
-+runuser_SOURCES = su.c
-+runuser_CFLAGS = -DRUNUSER -DAUTHORS="\"David MacKenzie, Dan Walsh\""
-+runuser_LDADD = $(LDADD) $(LIB_CRYPT) @LIB_PAM@
-+
- $(PROGRAMS): ../lib/libcoreutils.a
- 
- SUFFIXES = .sh
-@@ -126,7 +130,7 @@
- 	chmod +x $@-t
- 	mv $@-t $@
- 
--all-local: su$(EXEEXT)
-+all-local: su$(EXEEXT) runuser
- 
- installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'`
- 
---- coreutils-6.10/AUTHORS.runuser
-+++ coreutils-6.10/AUTHORS	
-@@ -60,6 +60,7 @@
- readlink: Dmitry V. Levin
- rm: Paul Rubin, David MacKenzie, Richard Stallman, Jim Meyering
- rmdir: David MacKenzie
-+runuser: David MacKenzie, Dan Walsh
- runcon: Russell Coker
- seq: Ulrich Drepper
- sha1sum: Ulrich Drepper, Scott Miller, David Madore
---- coreutils-6.10/man/Makefile.am.runuser
-+++ coreutils-6.10/man/Makefile.am
-@@ -92,6 +92,7 @@
- rm.1:		$(common_dep)	$(srcdir)/rm.x		../src/rm.c
- rmdir.1:	$(common_dep)	$(srcdir)/rmdir.x	../src/rmdir.c
- runcon.1:	$(common_dep)	$(srcdir)/runcon.x	../src/runcon.c
-+runuser.1:	$(common_dep)	$(srcdir)/runuser.x	../src/su.c
- seq.1:		$(common_dep)	$(srcdir)/seq.x		../src/seq.c
- sha1sum.1:	$(common_dep)	$(srcdir)/sha1sum.x	../src/md5sum.c
- sha224sum.1:	$(common_dep)	$(srcdir)/sha224sum.x	../src/md5sum.c
---- /dev/null	2007-01-09 09:38:07.860075128 +0000
-+++ coreutils-6.7/man/runuser.x	2007-01-09 17:27:56.000000000 +0000
-@@ -0,0 +1,4 @@
-+[NAME]
-+runuser \- run a shell with substitute user and group IDs
-+[DESCRIPTION]
-+.\" Add any additional description here
---- /dev/null	2007-01-09 09:38:07.860075128 +0000
-+++ coreutils-6.10/man/runuser.1	2007-01-09 17:27:56.000000000 +0000
-@@ -0,0 +1,68 @@
-+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-+.TH RUNUSER "1" "September 2004" "runuser (coreutils) 5.2.1" "User Commands"
-+.SH NAME
-+runuser \- run a shell with substitute user and group IDs, similar to su, but will not run PAM hooks
-+.SH SYNOPSIS
-+.B runuser
-+[\fIOPTION\fR]... [\fI-\fR] [\fIUSER \fR[\fIARG\fR]...]
-+.SH DESCRIPTION
-+.\" Add any additional description here
-+.PP
-+Change the effective user id and group id to that of USER.  No PAM hooks
-+are run, and there will be no password prompt.  This command is useful
-+when run as the root user.  If run as a non-root user without privilege
-+to set user ID, the command will fail.
-+.TP
-+-, \fB\-l\fR, \fB\-\-login\fR
-+make the shell a login shell, uses runuser-l PAM file instead of default one.
-+.TP
-+\fB\-c\fR, \fB\-\-command\fR=\fICOMMAND\fR
-+pass a single COMMAND to the shell with \fB\-c\fR
-+.TP
-+\fB\-f\fR, \fB\-\-fast\fR
-+pass \fB\-f\fR to the shell (for csh or tcsh)
-+.TP
-+\fB\-g\fR, \fB\-\-group\fR=\fIGROUP\fR
-+specify the primary group
-+.TP
-+\fB\-G\fR, \fB\-\-supp-group\fR=\fIGROUP\fR
-+specify a supplemental group
-+.TP
-+\fB\-m\fR, \fB\-\-preserve\-environment\fR
-+do not reset environment variables
-+.TP
-+\fB\-p\fR
-+same as \fB\-m\fR
-+.TP
-+\fB\-s\fR, \fB\-\-shell\fR=\fISHELL\fR
-+run SHELL if /etc/shells allows it
-+.TP
-+\fB\-\-help\fR
-+display this help and exit
-+.TP
-+\fB\-\-version\fR
-+output version information and exit
-+.PP
-+A mere - implies \fB\-l\fR.   If USER not given, assume root.
-+.SH AUTHOR
-+Written by David MacKenzie, Dan Walsh.
-+.SH "REPORTING BUGS"
-+Report bugs to <bug-coreutils@gnu.org>.
-+.SH COPYRIGHT
-+Copyright \(co 2004 Free Software Foundation, Inc.
-+.br
-+This is free software; see the source for copying conditions.  There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+.SH "SEE ALSO"
-+Since this command is trimmed down version of su use you can use the su manual.
-+The full documentation for
-+.B su
-+is maintained as a Texinfo manual.  If the
-+.B info
-+and
-+.B su
-+programs are properly installed at your site, the command
-+.IP
-+.B info coreutils su
-+.PP
-+should give you access to the complete manual.

coreutils-6.10-configuration.patch

@@ -1,118 +0,0 @@
-diff -urp coreutils-6.10-orig/src/Makefile.am coreutils-6.10/src/Makefile.am
---- coreutils-6.10-orig/src/Makefile.am	2008-01-11 11:34:22.000000000 +0100
-+++ coreutils-6.10/src/Makefile.am	2008-01-23 14:52:26.000000000 +0100
-@@ -170,7 +170,7 @@ install_su =						\
-     echo " chown root $(installed_su)";			\
-     chown root $(installed_su);				\
-     echo " chmod $(setuid_root_mode) $(installed_su)";	\
--    chmod $(setuid_root_mode) $(installed_su)		\
-+    chmod $(setuid_root_mode) $(installed_su);		\
-   else							\
-     :;							\
-   fi
-diff -urp coreutils-6.10-orig/gnulib-tests/test-getaddrinfo.c coreutils-6.10/gnulib-tests/test-getaddrinfo.c
---- coreutils-6.10-orig/gnulib-tests/test-getaddrinfo.c	2007-11-17 07:59:42.000000000 +0100
-+++ coreutils-6.10/gnulib-tests/test-getaddrinfo.c	2008-01-25 19:19:43.000000000 +0100
-@@ -61,6 +61,10 @@ int simple (char *host, char *service)
-       if (res == EAI_SERVICE)
- 	return 0;
- 
-+      /* Do not fail this test for temporary name resolution errors. */
-+      if (res == EAI_AGAIN)
-+         return 0;
-+
-       return 1;
-     }
-
-diff -urNp coreutils-6.10-orig/tests/misc/chcon coreutils-6.10/tests/misc/chcon
---- coreutils-6.10-orig/tests/misc/chcon	2008-01-05 23:59:11.000000000 +0100
-+++ coreutils-6.10/tests/misc/chcon	2008-03-26 13:19:37.000000000 +0100
-@@ -21,9 +21,15 @@ u1=root
- r1=object_r
- t1=tmp_t
- ctx=$u1:$r1:$t1
--chcon $ctx f || fail=1
-+chcon $ctx f 2>outerror || fail=1
- stat --printf='f|%C\n' f > out || fail=1
- 
-+cat <<\EOF > experror || fail=1
-+chcon: failed to change context of `f' to `root:object_r:tmp_t': Invalid argument
-+EOF
-+
-+compare outerror experror >/dev/null && skip_test_ "Missing mcstransd, skipping the test"
-+
- # Use --reference.
- chcon --ref=f g || fail=1
- stat --printf='g|%C\n' g >> out || fail=1
-@@ -38,8 +38,9 @@ stat --printf='g|%C\n' g >> out || fail=
- u2=user_u
- r2=object_r
- t2=file_t
--l2=SystemLow-SystemHigh
--for i in --user=$u2 --role=$r2 --type=$t2 --range=$l2; do
-+#do not set range here, it will fail in enforcing mode, requires permissive
-+#l2=SystemLow-SystemHigh 
-+for i in --user=$u2 --role=$r2 --type=$t2; do
-   chcon $i f || fail=1
-   stat --printf="f|$i|"'%C\n' f >> out || fail=1
- done
-@@ -56,12 +57,24 @@ g|$ctx
- f|--user=$u2|$u2:$r1:$t1
- f|--role=$r2|$u2:$r2:$t1
- f|--type=$t2|$u2:$r2:$t2
--f|--range=$l2|$u2:$r2:$t2:$l2
--f|-uroot|root:object_r:file_t:SystemLow-SystemHigh
--f|-robject_r|root:object_r:file_t:SystemLow-SystemHigh
--f|-ttmp_t|root:object_r:tmp_t:SystemLow-SystemHigh
-+f|-uroot|root:object_r:file_t
-+f|-robject_r|root:object_r:file_t
-+f|-ttmp_t|root:object_r:tmp_t
- EOF
- 
- compare out exp || fail=1
- 
-+SELINUX_MODE=$(getenforce)
-+if [ $SELINUX_MODE == "Permissive" ]; then
-+#check running range for Permisive mode
-+l2=SystemLow-SystemHigh
-+chcon --range=$l2 f || fail
-+stat --printf="f|--range=$l2|"'%C\n' f >> permout || fail=1
-+cat <<EOF > permexp || fail=1
-+f|--range=$l2|root:object_r:tmp_t:SystemLow-SystemHigh
-+EOF
-+
-+compare permout permexp || fail=1
-+fi
-+
- (exit $fail); exit $fail
-diff -urNp coreutils-6.10-orig/tests/misc/factor coreutils-6.10/tests/misc/factor
---- coreutils-6.10-orig/tests/misc/factor	2007-12-13 00:14:28.000000000 +0100
-+++ coreutils-6.10/tests/misc/factor	2008-03-28 13:49:34.000000000 +0100
-@@ -71,6 +71,7 @@ my @Tests =
-      ['x', '4294966896', {OUT => '2 2 2 2 3 3 3 11 607 1489'}],
-      ['y', '4294966998', {OUT => '2 3 7 3917 26107'}],
-      ['z', '-1',
-+      {ERR_SUBST => q!s/'1'/1/!}, # map newer glibc diagnostic to expected.
-       {ERR => "$prog: invalid option -- 1\n"
-        . "Try `$prog --help' for more information.\n"},
-       {EXIT => 1}],
-diff -urNp coreutils-6.10-orig/tests/cp/cp-a-selinux coreutils-6.10/tests/cp/cp-a-selinux
---- coreutils-6.10-orig/tests/cp/cp-a-selinux	2008-01-05 23:59:11.000000000 +0100
-+++ coreutils-6.10/tests/cp/cp-a-selinux	2008-03-26 13:52:24.000000000 +0100
-@@ -27,6 +27,16 @@ PRIV_CHECK_ARG=require-root . $srcdir/..
- . $srcdir/../test-lib.sh
- require_selinux_
- 
-+#check for missing mcstrans(d)
-+touch f || fail=1
-+chcon root:object_r:tmp_t f 2>outerror || fail=1
-+
-+cat <<\EOF > experror || fail=1
-+chcon: failed to change context of `f' to `root:object_r:tmp_t': Invalid argument
-+EOF
-+
-+compare outerror experror && skip_test_ "Missing mcstransd, skipping the test"
-+
- cwd=`pwd`
- cleanup_() { cd /; umount "$cwd/mnt"; }
- 

coreutils-6.10-lonebackslash.patch

@@ -1,91 +0,0 @@
-diff -urNp coreutils-6.10-orig/src/paste.c coreutils-6.10/src/paste.c
---- coreutils-6.10-orig/src/paste.c	2007-11-25 14:23:31.000000000 +0100
-+++ coreutils-6.10/src/paste.c	2008-03-27 14:47:02.000000000 +0100
-@@ -42,6 +42,7 @@
- #include <sys/types.h>
- #include "system.h"
- #include "error.h"
-+#include "quotearg.h"
- 
- /* The official name of this program (e.g., no `g' prefix).  */
- #define PROGRAM_NAME "paste"
-@@ -79,12 +80,17 @@ static struct option const longopts[] =
- /* Set globals delims and delim_end.  Copy STRPTR to DELIMS, converting
-    backslash representations of special characters in STRPTR to their actual
-    values. The set of possible backslash characters has been expanded beyond
--   that recognized by the Unix version.  */
-+   that recognized by the Unix version.
-+   Return 0 upon success.
-+   If the string ends in an odd number of backslashes, ignore the
-+   final backslash and return nonzero.  */   
- 
--static void
-+static int
- collapse_escapes (char const *strptr)
- {
-   char *strout = xstrdup (strptr);
-+  bool backslash_at_end = false;
-+
-   delims = strout;
- 
-   while (*strptr)
-@@ -123,6 +129,15 @@ collapse_escapes (char const *strptr)
- 	      *strout++ = '\v';
- 	      break;
- 
-+	    case '\\':
-+	      *strout++ = '\\';
-+	      break;
-+
-+	    case '\0':
-+	      backslash_at_end = true;
-+	      goto done;
-+
-+
- 	    default:
- 	      *strout++ = *strptr;
- 	      break;
-@@ -130,7 +145,11 @@ collapse_escapes (char const *strptr)
- 	  strptr++;
- 	}
-     }
-+
-+	done:;
-+
-   delim_end = strout;
-+  return backslash_at_end ? 1 : 0;
- }
- 
- /* Report a write error and exit.  */
-@@ -481,7 +500,15 @@ main (int argc, char **argv)
-   if (optind == argc)
-     argv[argc++] = "-";
- 
--  collapse_escapes (delim_arg);
-+  if (collapse_escapes (delim_arg))
-+    {
-+      /* Don't use the default quoting style, because that would double the
-+	 number of displayed backslashes, making the diagnostic look bogus.  */
-+      set_quoting_style (NULL, escape_quoting_style);
-+      error (EXIT_FAILURE, 0,
-+	     _("delimiter list ends with an unescaped backslash: %s"),
-+	     quotearg_colon (delim_arg));
-+    }
- 
-   if (!serial_merge)
-     ok = paste_parallel (argc - optind, &argv[optind]);
-diff -urNp coreutils-6.10-orig/src/ptx.c coreutils-6.10/src/ptx.c
---- coreutils-6.10-orig/src/ptx.c	2007-11-25 14:23:31.000000000 +0100
-+++ coreutils-6.10/src/ptx.c	2008-03-27 14:53:24.000000000 +0100
-@@ -387,6 +387,11 @@ copy_unescaped_string (const char *strin
- 	    string++;
- 	    break;
- 
-+	    case '\0':		/* lone backslash at end of string */
-+	      /* ignore it */
-+	      break;
-+
-+
- 	  default:
- 	    *cursor++ = '\\';
- 	    *cursor++ = *string++;

coreutils-6.10-longoptions.patch

@@ -1,13 +0,0 @@
-diff -urp coreutils-6.10-orig/lib/long-options.c coreutils-6.10/lib/long-options.c
---- coreutils-6.10-orig/lib/long-options.c	2007-10-17 15:47:26.000000000 +0200
-+++ coreutils-6.10/lib/long-options.c	2008-01-31 14:28:01.000000000 +0100
-@@ -57,8 +57,7 @@ parse_long_options (int argc,
-   /* Don't print an error message for unrecognized options.  */
-   opterr = 0;
- 
--  if (argc == 2
--      && (c = getopt_long (argc, argv, "+", long_options, NULL)) != -1)
-+  while ((c = getopt_long (argc, argv, "+", long_options, NULL)) != -1)
-     {
-       switch (c)
- 	{

coreutils-6.10-manpages.patch

@@ -1,35 +0,0 @@
-diff -urp coreutils-6.10-orig/man/md5sum.1 coreutils-6.10/man/md5sum.1
---- coreutils-6.10-orig/man/md5sum.1	2008-01-28 14:33:16.000000000 +0100
-+++ coreutils-6.10/man/md5sum.1	2008-01-28 14:54:29.000000000 +0100
-@@ -19,6 +19,8 @@ read MD5 sums from the FILEs and check t
- .TP
- \fB\-t\fR, \fB\-\-text\fR
- read in text mode (default)
-+.br
-+\fBNote:\fR There is no difference between binary and text mode option on GNU system.
- .SS "The following two options are useful only when verifying checksums:"
- .TP
- \fB\-\-status\fR
-diff -urp coreutils-6.10-orig/man/sort.1 coreutils-6.10/man/sort.1
---- coreutils-6.10-orig/man/sort.1	2008-01-28 14:33:17.000000000 +0100
-+++ coreutils-6.10/man/sort.1	2008-01-28 16:02:28.000000000 +0100
-@@ -56,7 +56,7 @@ compress temporaries with PROG;
- decompress them with PROG \fB\-d\fR
- .TP
- \fB\-k\fR, \fB\-\-key\fR=\fIPOS1[\fR,POS2]
--start a key at POS1, end it at POS2 (origin 1)
-+start a key at POS1, end it at POS2 (origin 1) - when no POS2 is specified, end of line is used
- .TP
- \fB\-m\fR, \fB\-\-merge\fR
- merge already sorted files; do not sort
-@@ -103,8 +103,8 @@ With no FILE, or when FILE is \-, read s
- .PP
- *** WARNING ***
- The locale specified by the environment affects sort order.
--Set LC_ALL=C to get the traditional sort order that uses
--native byte values.
-+Set LC_ALL=C (by "export LC_ALL=C") to get the traditional 
-+sort order that uses native byte values.
- .SH AUTHOR
- Written by Mike Haertel and Paul Eggert.
- .SH "REPORTING BUGS"

coreutils-6.10-md5sha1sum.patch

@@ -1,55 +0,0 @@
-diff -urNp coreutils-6.10-orig/src/md5sum.c coreutils-6.10/src/md5sum.c
---- coreutils-6.10-orig/src/md5sum.c	2007-11-25 14:23:31.000000000 +0100
-+++ coreutils-6.10/src/md5sum.c	2008-04-15 21:04:09.000000000 +0200
-@@ -205,6 +205,9 @@ bsd_split_3 (char *s, size_t s_len, unsi
- {
-   size_t i;
- 
-+	if (s_len ==0)
-+		return false;
-+
-   *file_name = s;
- 
-   /* Find end of filename. The BSD 'md5' and 'sha1' commands do not escape
-diff -urNp coreutils-6.10-orig/src/md5sum.c coreutils-6.10/src/md5sum.c
---- coreutils-6.10-orig/src/md5sum.c	2008-04-18 17:40:03.000000000 +0200
-+++ coreutils-6.10/src/md5sum.c	2008-04-18 17:48:05.000000000 +0200
-@@ -346,6 +346,8 @@ split_3 (char *s, size_t s_len,
- static bool
- hex_digits (unsigned char const *s)
- {
-+  if (!*s)
-+    return false;
-   while (*s)
-     {
-       if (!isxdigit (*s))
-diff -urNp coreutils-6.10-orig/tests/misc/sha1sum coreutils-6.10/tests/misc/sha1sum
---- coreutils-6.10-orig/tests/misc/sha1sum	2007-12-13 00:14:28.000000000 +0100
-+++ coreutils-6.10/tests/misc/sha1sum	2008-04-15 21:05:43.000000000 +0200
-@@ -29,7 +29,7 @@ exec $PERL -w -I$srcdir/.. -MCoreutils -M"CuTmpdir qw($me)" -- - <<\EOF
- require 5.003;
- use strict;
- 
--(my $program_name = $0) =~ s|.*/||;
-+my $prog = 'sha1sum';
- 
- # Turn off localisation of executable's ouput.
- @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
-@@ -72,6 +72,8 @@ my @Tests =
-      ['check-bsd3', '--check', '--status',
- 			{IN=> {'f.sha1' => "SHA1 (f) = $sha_degenerate\n"}},
- 			{AUX=> {f=> 'bar'}}, {EXIT=> 1}],
-+     ['bsd-segv', '--check', {IN=> {'z' => "SHA1 ("}}, {EXIT=> 1},
-+      {ERR=> "$prog: z: no properly formatted SHA1 checksum lines found\n"}],
-     );
- 
- # Insert the `--text' argument for each test.
-@@ -86,7 +88,6 @@ foreach $t (@Tests)
- my $save_temps = $ENV{DEBUG};
- my $verbose = $ENV{VERBOSE};
- 
--my $prog = 'sha1sum';
--my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
-+my $fail = run_tests ($prog, $prog, \@Tests, $save_temps, $verbose);
- exit $fail;
- EOF

coreutils-6.10-mkscontextsegfault.patch

@@ -1,97 +0,0 @@
-diff -urNp coreutils-6.10-orig/src/mkdir.c coreutils-6.10/src/mkdir.c
---- coreutils-6.10-orig/src/mkdir.c	2008-03-27 14:42:40.000000000 +0100
-+++ coreutils-6.10/src/mkdir.c	2008-03-27 14:51:48.000000000 +0100
-@@ -211,7 +211,7 @@ main (int argc, char **argv)
-   if (scontext && setfscreatecon (scontext) < 0)
-     error (EXIT_FAILURE, errno,
- 	   _("failed to set default file creation context to %s"),
--	   quote (optarg));
-+	   quote (scontext));
- 
-   if (options.make_ancestor_function || specified_mode)
-     {
-diff -urNp coreutils-6.10-orig/src/mkfifo.c coreutils-6.10/src/mkfifo.c
---- coreutils-6.10-orig/src/mkfifo.c	2008-03-29 17:53:27.000000000 +0100
-+++ coreutils-6.10/src/mkfifo.c	2008-03-29 17:55:44.000000000 +0100
-@@ -1,5 +1,5 @@
- /* mkfifo -- make fifo's (named pipes)
--   Copyright (C) 90, 91, 1995-2007 Free Software Foundation, Inc.
-+   Copyright (C) 90, 91, 1995-2008 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
-@@ -123,7 +123,7 @@ main (int argc, char **argv)
-   if (scontext && setfscreatecon (scontext) < 0)
-     error (EXIT_FAILURE, errno,
- 	   _("failed to set default file creation context to %s"),
--	   quote (optarg));
-+	   quote (scontext));
- 
-   newmode = (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
-   if (specified_mode)
-diff -urNp coreutils-6.10-orig/src/mknod.c coreutils-6.10/src/mknod.c
---- coreutils-6.10-orig/src/mknod.c	2008-03-29 17:53:27.000000000 +0100
-+++ coreutils-6.10/src/mknod.c	2008-03-29 17:55:36.000000000 +0100
-@@ -175,7 +175,7 @@ main (int argc, char **argv)
-   if (scontext && setfscreatecon (scontext) < 0)
-     error (EXIT_FAILURE, errno,
- 	   _("failed to set default file creation context to %s"),
--	   quote (optarg));
-+	   quote (scontext));
- 
-   /* Only check the first character, to allow mnemonic usage like
-      `mknod /dev/rst0 character 18 0'. */
-diff -urNp coreutils-6.10-orig/tests/mkdir/selinux coreutils-6.10/tests/mkdir/selinux
---- coreutils-6.10-orig/tests/mkdir/selinux	1970-01-01 01:00:00.000000000 +0100
-+++ coreutils-6.10/tests/mkdir/selinux	2008-03-29 17:58:25.000000000 +0100
-@@ -0,0 +1,50 @@
-+#!/bin/sh
-+# ensure that an invalid context doesn't cause a segfault
-+
-+# Copyright (C) 2008 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/>.
-+
-+if test "$VERBOSE" = yes; then
-+  set -x
-+  mkdir --version
-+  mkfifo --version
-+  mknod --version
-+fi
-+
-+. $srcdir/../envvar-check
-+. $srcdir/../lang-default
-+. $srcdir/../test-lib.sh
-+
-+c=invalid-selinux-context
-+fail=0
-+msg="failed to set default file creation context to \`$c':"
-+
-+# Test each of mkdir, mknod, mkfifo with "-Z invalid-context".
-+
-+for cmd_w_arg in 'mkdir dir' 'mknod b p' 'mkfifo f'; do
-+  $cmd_w_arg -Z $c 2> out && fail=1
-+  set $cmd_w_arg; cmd=$1
-+  echo "$cmd: $msg" > exp || fail=1
-+
-+  # Some systems fail with ENOTSUP, or EINVAL, or even ENOENT.
-+  sed					\
-+    -e 's/ Invalid argument$//'		\
-+    -e 's/ Operation not supported$//'	\
-+    -e 's/ No such file or directory$//' out > k || fail=1
-+  mv k out || fail=1
-+  compare out exp || fail=1
-+done
-+
-+(exit $fail); exit $fail

coreutils-6.10-verbose.patch

@@ -1,227 +0,0 @@
-diff --git a/doc/coreutils.texi b/doc/coreutils.texi
-index df6792d..e3a0d50 100644
---- a/doc/coreutils.texi
-+++ b/doc/coreutils.texi
-@@ -2838,7 +2838,7 @@ Use digits in suffixes rather than lower-case letters.
-
- @itemx --verbose
- @opindex --verbose
--Write a diagnostic to standard error just before each output file is opened.
-+Write a diagnostic just before each output file is opened.
-
- @end table
-
-@@ -8190,7 +8190,7 @@ If a file has multiple links, only the named links will be removed.
- @itemx --verbose
- @opindex -v
- @opindex --verbose
--Display status updates as sterilization proceeds.
-+Display to standard error status updates as sterilization proceeds. 
- 
- @item -x
- @itemx --exact
-diff --git a/src/install.c b/src/install.c
-index db08751..6925c55 100644
---- a/src/install.c
-+++ b/src/install.c
-@@ -1,5 +1,5 @@
- /* install - copy files and set attributes
--   Copyright (C) 89, 90, 91, 1995-2007 Free Software Foundation, Inc.
-+   Copyright (C) 89, 90, 91, 1995-2008 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
-@@ -160,6 +160,19 @@ static struct option const long_options[] =
-   {NULL, 0, NULL, 0}
- };
- 
-+/* Verbose formatted output of variable count of arguments.  */
-+static void
-+verbose_output (FILE *fp, char const *fmt, ...)
-+{
-+  va_list ap;
-+  fputs (program_name, fp);
-+  fputs (": ", fp);
-+  va_start (ap, fmt);
-+  vfprintf (fp, fmt, ap);
-+  va_end (ap);
-+  fputc ('\n', fp);
-+}
-+
- static void
- cp_option_init (struct cp_options *x)
- {
-@@ -762,7 +775,7 @@ announce_mkdir (char const *dir, void *options)
- {
-   struct cp_options const *x = options;
-   if (x->verbose)
--    error (0, 0, _("creating directory %s"), quote (dir));
-+    verbose_output (stdout,_("creating directory %s"),  quote (dir));
- }
- 
- /* Make ancestor directory DIR, whose last file name component is
-diff --git a/src/rmdir.c b/src/rmdir.c
-index bb1a0c8..1f17f6a 100644
---- a/src/rmdir.c
-+++ b/src/rmdir.c
-@@ -1,6 +1,6 @@
- /* rmdir -- remove directories
- 
--   Copyright (C) 90, 91, 1995-2002, 2004, 2005, 2006, 2007 Free Software
-+   Copyright (C) 90, 91, 1995-2002, 2004-2008 Free Software
-    Foundation, Inc.
- 
-    This program is free software: you can redistribute it and/or modify
-@@ -72,6 +72,19 @@ static struct option const longopts[] =
-   {NULL, 0, NULL, 0}
- };
- 
-+/* Verbose formatted output of variable count of arguments.  */
-+static void
-+verbose_output (FILE *fp, char const *fmt, ...)
-+{
-+  va_list ap;
-+  fputs (program_name, fp);
-+  fputs (": ", fp);
-+  va_start (ap, fmt);
-+  vfprintf (fp, fmt, ap);
-+  va_end (ap);
-+  fputc ('\n', fp);
-+}
-+
- /* Return true if ERROR_NUMBER is one of the values associated
-    with a failed rmdir due to non-empty target directory.  */
- static bool
-@@ -134,7 +147,7 @@ remove_parents (char *dir)
- 
-       /* Give a diagnostic for each attempted removal if --verbose.  */
-       if (verbose)
--	error (0, 0, _("removing directory, %s"), quote (dir));
-+	verbose_output (stdout,_("removing directory, %s"), quote (dir));
- 
-       ok = (rmdir (dir) == 0);
- 
-@@ -233,7 +246,7 @@ main (int argc, char **argv)
- 
-       /* Give a diagnostic for each attempted removal if --verbose.  */
-       if (verbose)
--	error (0, 0, _("removing directory, %s"), dir);
-+	verbose_output(stdout, _("removing directory, %s"), dir);
- 
-       if (rmdir (dir) != 0)
- 	{
-diff --git a/src/mkdir.c b/src/mkdir.c
-index 0704077..3781065 100644
---- a/src/mkdir.c
-+++ b/src/mkdir.c
-@@ -1,5 +1,5 @@
- /* mkdir -- make directories
--   Copyright (C) 90, 1995-2002, 2004-2007 Free Software Foundation, Inc.
-+   Copyright (C) 90, 1995-2002, 2004-2008 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
-@@ -79,6 +79,19 @@ Mandatory arguments to long options are mandatory for short options too.\n\
-   exit (status);
- }
-
-+/* Verbose formatted output of variable count of arguments.  */
-+static void
-+verbose_output (FILE *fp, char const *fmt, ...)
-+{
-+  va_list ap;
-+  fputs (program_name, fp);
-+  fputs (": ", fp);
-+  va_start (ap, fmt);
-+  vfprintf (fp, fmt, ap);
-+  va_end (ap);
-+  fputc ('\n', fp);
-+}
-+
- /* Options passed to subsidiary functions.  */
- struct mkdir_options
- {
-@@ -105,7 +118,7 @@ announce_mkdir (char const *dir, void *options)
- {
-   struct mkdir_options const *o = options;
-   if (o->created_directory_format)
--    error (0, 0, o->created_directory_format, quote (dir));
-+    verbose_output (stdout, o->created_directory_format, quote (dir));
- }
-
- /* Make ancestor directory DIR, whose last component is COMPONENT,
-diff --git a/src/split.c b/src/split.c
-index 5807a1c..f84d40e 100644
---- a/src/split.c
-+++ b/src/split.c
-@@ -1,5 +1,5 @@
- /* split.c -- split a file into pieces.
--   Copyright (C) 1988, 1991, 1995-2007 Free Software Foundation, Inc.
-+   Copyright (C) 1988, 1991, 1995-2008 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
-@@ -122,8 +122,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
-   -l, --lines=NUMBER      put NUMBER lines per output file\n\
- "), DEFAULT_SUFFIX_LENGTH);
-       fputs (_("\
--      --verbose           print a diagnostic to standard error just\n\
--                            before each output file is opened\n\
-+      --verbose           print a diagnostic just before each\n\
-+                            output file is opened\n\
- "), stdout);
-       fputs (HELP_OPTION_DESCRIPTION, stdout);
-       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-@@ -208,7 +208,7 @@ cwrite (bool new_file_flag, const char *bp, size_t bytes)
-
-       next_file_name ();
-       if (verbose)
--	fprintf (stderr, _("creating file %s\n"), quote (outfile));
-+	fprintf (stdout, _("creating file %s\n"), quote (outfile));
-       output_desc = open (outfile,
- 			  O_WRONLY | O_CREAT | O_TRUNC | O_BINARY,
- 			  (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP
-diff --git a/tests/misc/split-a b/tests/misc/split-a
-index 794115f..a8eed38 100755
---- a/tests/misc/split-a
-+++ b/tests/misc/split-a
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # Show that split -a works.
-
--# Copyright (C) 2002-2007 Free Software Foundation, Inc.
-+# Copyright (C) 2002-2008 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
-@@ -39,7 +39,7 @@ test -f xaz && fail=1
- rm -f x*
-
- # With a longer suffix, it must succeed.
--split --verbose -b 1 -a 2 in 2> err || fail=1
-+split --verbose -b 1 -a 2 in > err || fail=1
- test -f xaa || fail=1
- test -f xaz || fail=1
- test -f xba || fail=1
-diff --git a/tests/mkdir/p-v b/tests/mkdir/p-v
-index 2c84b41..569e9b0 100755
---- a/tests/mkdir/p-v
-+++ b/tests/mkdir/p-v
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # Test mkdir -pv.
-
--# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
-+# Copyright (C) 2006-2008 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
-@@ -24,7 +24,7 @@ fi
- . $srcdir/../lang-default
- . $srcdir/../test-lib.sh
-
--mkdir -pv foo/a/b/c/d 2>out || exit
-+mkdir -pv foo/a/b/c/d >out || exit
-
- diff - out <<\EOF
- mkdir: created directory `foo'

coreutils-6.7.tar.bz2.sig

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQBFeKRc/dLerNMzy6ERAiEJAJ435eWCOpfJkoCKoSpnh8Fwwb9XugCgnQ5H
-SYg6l7M/jyvUdsFM1yS4RKk=
-=GOOc
------END PGP SIGNATURE-----

coreutils-6.9.tar.bz2.sig

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQBGAvc3/dLerNMzy6ERAnyfAKC4MPj62hCSRYNu0ysD9SahdQvZIACgsNl/
-CzQjwTNo5FUiiNm0FxtL5Ow=
-=gl3O
------END PGP SIGNATURE-----

coreutils-8.26-selinuxenable.patch

@@ -0,0 +1,26 @@
+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.26-test-lock.patch

@@ -0,0 +1,29 @@
+From 0d04ee8ddedb2bf33d64f148f246a3b7ec4fef21 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 23 Jan 2017 12:35:41 +0100
+Subject: [PATCH] test-lock: disable the rwlock test
+
+It hangs indefinitely if the system rwlock implementation does not
+prevent writer starvation (and glibc does not implement it).
+
+Bug: http://www.mail-archive.com/bug-gnulib@gnu.org/msg33017.html
+---
+ gnulib-tests/test-lock.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gnulib-tests/test-lock.c b/gnulib-tests/test-lock.c
+index aa6de27..5af0a6c 100644
+--- a/gnulib-tests/test-lock.c
++++ b/gnulib-tests/test-lock.c
+@@ -42,7 +42,7 @@
+    Uncomment some of these, to verify that all tests crash if no locking
+    is enabled.  */
+ #define DO_TEST_LOCK 1
+-#define DO_TEST_RWLOCK 1
++#define DO_TEST_RWLOCK 0
+ #define DO_TEST_RECURSIVE_LOCK 1
+ #define DO_TEST_ONCE 1
+ 
+-- 
+2.7.4
+

coreutils-8.32-DIR_COLORS.patch

@@ -0,0 +1,100 @@
+From bca11e30e8a6281a8cbddc9fb196dd86ab09c955 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Fri, 17 Jun 2016 16:58:18 +0200
+Subject: [PATCH] downstream changes to default DIR_COLORS
+
+---
+ DIR_COLORS              |  9 ++++++++-
+ DIR_COLORS.lightbgcolor | 21 +++++++++++++++------
+ 2 files changed, 23 insertions(+), 7 deletions(-)
+
+diff --git a/DIR_COLORS b/DIR_COLORS
+index 540f6cd..b4785b6 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 override the system defaults by making a copy of this file
++# as ~/.dir_colors
++
+ # Configuration file for dircolors, a utility to help you set the
+ # LS_COLORS environment variable used by GNU ls with the --color option.
+ 
+@@ -11,6 +15,9 @@
+ 
+ # Global config options can be specified before TERM or COLORTERM entries
+ 
++# For compatibility, the pattern "^COLOR.*none" is recognized as a way to
++# disable colorization.  See https://bugzilla.redhat.com/1349579 for details.
++
+ # ===================================================================
+ # Terminal filters
+ # ===================================================================
+@@ -70,7 +77,7 @@ DOOR 01;35	# door
+ BLK 40;33;01	# block device driver
+ CHR 40;33;01	# character device driver
+ ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ...
+-MISSING 00      # ... and the files they point to
++MISSING 01;37;41 # ... and the files they point to
+ SETUID 37;41	# regular file that is setuid (u+s)
+ SETGID 30;43	# regular file that is setgid (g+s)
+ CAPABILITY 00	# regular file with capability (very expensive to lookup)
+diff --git a/DIR_COLORS.lightbgcolor b/DIR_COLORS.lightbgcolor
+index e3b0ec3..39a0a4c 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 override the system defaults by making a copy of this file
++# as ~/.dir_colors
++
+ # Configuration file for dircolors, a utility to help you set the
+ # LS_COLORS environment variable used by GNU ls with the --color option.
+ 
+@@ -11,6 +17,9 @@
+ 
+ # Global config options can be specified before TERM or COLORTERM entries
+ 
++# For compatibility, the pattern "^COLOR.*none" is recognized as a way to
++# disable colorization.  See https://bugzilla.redhat.com/1349579 for details.
++
+ # ===================================================================
+ # Terminal filters
+ # ===================================================================
+@@ -60,17 +69,17 @@ TERM xterm*
+ #NORMAL 00	# no color code at all
+ #FILE 00	# regular file: use no color at all
+ RESET 0		# reset to "normal" color
+-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	# regular file that is setuid (u+s)
+ SETGID 30;43	# regular file that is setgid (g+s)
+ CAPABILITY 00	# regular file with capability (very expensive to lookup)
+@@ -79,7 +88,7 @@ OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
+ STICKY 37;44	# dir with the sticky bit set (+t) and not other-writable
+ 
+ # This is for regular files with execute permission:
+-EXEC 01;32
++EXEC 00;32
+ 
+ # ===================================================================
+ # File extension attributes
+-- 
+2.49.0
+

coreutils-9.9-fix-cut-test-aarch64.patch

@@ -0,0 +1,28 @@
+From 95044cb5eaea83d02f768feb5ab79fcf5e6ad782 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Mon, 22 Dec 2025 17:12:48 +0000
+Subject: [PATCH] tests: avoid false failure due to ulimit on aarch64
+
+* tests/cut/cut-huge-range.sh: Add an extra 1MiB headroom,
+which was seen with aarch64.
+Reported at https://bugzilla.redhat.com/2424302
+
+Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
+Upstream-commit: 95044cb5eaea83d02f768feb5ab79fcf5e6ad782
+---
+ tests/cut/cut-huge-range.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/cut/cut-huge-range.sh b/tests/cut/cut-huge-range.sh
+index 4bd1b129d8..98d7e8f0b9 100755
+--- a/tests/cut/cut-huge-range.sh
++++ b/tests/cut/cut-huge-range.sh
+@@ -22,6 +22,7 @@ getlimits_
+ 
+ vm=$(get_min_ulimit_v_ returns_ 0 cut -b1 /dev/null) \
+   || skip_ 'shell lacks ulimit, or ASAN enabled'
++vm=$(($vm+1000))  # https://bugzilla.redhat.com/2424302
+ 
+ # Ensure we can cut up to our sentinel value.
+ # Don't use expr to subtract one,
+

coreutils-9.9-gnulib-c23.patch

@@ -0,0 +1,169 @@
+From 891761bca1aa78336e5b18c121075b6e4696c5d4 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sun, 23 Nov 2025 00:50:40 -0800
+Subject: [PATCH] Port to C23 qualifier-generic fns like strchr
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This ports Gnulib to strict C23 platforms that reject code
+like ‘char *q = strchr (P, 'x');’ when P is a pointer to const,
+because in C23 strchr is a qualifier-generic function so
+strchr (P, 'x') returns char const *.
+This patch does not attempt to do the following two things,
+which might be useful in the future:
+1. When compiling on non-C23 platforms, check user code for
+portability to platforms that define qualifier-generic functions.
+2. Port Gnulib to platforms that have qualifier-generic functions
+not listed in the C23 standard, e.g., strchrnul.  I don’t know
+of any such platforms.
+* lib/mbschr.c (mbschr):
+* lib/memchr2.c (memchr2):
+Port to C23, where functions like strchr are qualifier-generic.
+* lib/c++defs.h (_GL_FUNCDECL_SYS_NAME): New macro.
+* lib/c++defs.h (_GL_FUNCDECL_SYS):
+* lib/stdlib.in.h (bsearch):
+Use it, to prevent C23 names like strchr from acting like macros.
+* lib/string.in.h (memchr, strchr, strpbrk, strrchr):
+Do not #undef when GNULIB_POSIXCHECK is defined, as this could
+cause conforming C23 code to fail to conform.  It’s not clear why
+_GL_WARN_ON_USE_CXX; perhaps it was needed but isn’t any more?
+But for now, limit the removal of #undef to these four functions
+where #undeffing is clearly undesirable in C23.
+* lib/wchar.in.h (wmemchr): Parenthesize function name in decl,
+to prevent it from acting like a macro.
+
+Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
+Upstream-commit: df17f4f37ed3ca373d23ad42eae51122bdb96626
+---
+ lib/c++defs.h   | 12 +++++++++++-
+ lib/mbschr.c    |  2 +-
+ lib/memchr2.c   |  2 +-
+ lib/stdlib.in.h |  6 +++---
+ lib/string.in.h |  4 ----
+ lib/wchar.in.h  |  2 +-
+ 6 files changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/lib/c++defs.h b/lib/c++defs.h
+index b77979a..7384457 100644
+--- a/lib/c++defs.h
++++ b/lib/c++defs.h
+@@ -127,6 +127,16 @@
+ #define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
+   _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
+ 
++/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to
++   parenthsized func otherwise.  Parenthesization is needed in C23 if
++   the function is like strchr and so is a qualifier-generic macro
++   that expands to something more complicated.  */
++#ifdef __cplusplus
++# define _GL_FUNCDECL_SYS_NAME(func) func
++#else
++# define _GL_FUNCDECL_SYS_NAME(func) (func)
++#endif
++
+ /* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
+    declares the system function, named func, with the given prototype,
+    consisting of return type, parameters, and attributes.
+@@ -139,7 +149,7 @@
+      _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
+  */
+ #define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
+-  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters
++  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype _GL_FUNCDECL_SYS_NAME (func) parameters
+ 
+ /* _GL_CXXALIAS_RPL (func, rettype, parameters);
+    declares a C++ alias called GNULIB_NAMESPACE::func
+diff --git a/lib/mbschr.c b/lib/mbschr.c
+index c9e14b5..6582134 100644
+--- a/lib/mbschr.c
++++ b/lib/mbschr.c
+@@ -65,5 +65,5 @@ mbschr (const char *string, int c)
+       return NULL;
+     }
+   else
+-    return strchr (string, c);
++    return (char *) strchr (string, c);
+ }
+diff --git a/lib/memchr2.c b/lib/memchr2.c
+index 7493823..d7724ae 100644
+--- a/lib/memchr2.c
++++ b/lib/memchr2.c
+@@ -55,7 +55,7 @@ memchr2 (void const *s, int c1_in, int c2_in, size_t n)
+   c2 = (unsigned char) c2_in;
+ 
+   if (c1 == c2)
+-    return memchr (s, c1, n);
++    return (void *) memchr (s, c1, n);
+ 
+   /* Handle the first few bytes by reading one byte at a time.
+      Do this until VOID_PTR is aligned on a longword boundary.  */
+diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
+index bef0aaa..fd0e1e0 100644
+--- a/lib/stdlib.in.h
++++ b/lib/stdlib.in.h
+@@ -224,9 +224,9 @@ _GL_INLINE_HEADER_BEGIN
+ 
+ /* Declarations for ISO C N3322.  */
+ #if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__
+-_GL_EXTERN_C void *bsearch (const void *__key,
+-                            const void *__base, size_t __nmemb, size_t __size,
+-                            int (*__compare) (const void *, const void *))
++_GL_EXTERN_C void *_GL_FUNCDECL_SYS_NAME (bsearch)
++  (const void *__key, const void *__base, size_t __nmemb, size_t __size,
++   int (*__compare) (const void *, const void *))
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3) _GL_ARG_NONNULL ((5));
+ _GL_EXTERN_C void qsort (void *__base, size_t __nmemb, size_t __size,
+                          int (*__compare) (const void *, const void *))
+diff --git a/lib/string.in.h b/lib/string.in.h
+index fdcdd21..8b56acf 100644
+--- a/lib/string.in.h
++++ b/lib/string.in.h
+@@ -409,7 +409,6 @@ _GL_CXXALIASWARN1 (memchr, void const *,
+ _GL_CXXALIASWARN (memchr);
+ # endif
+ #elif defined GNULIB_POSIXCHECK
+-# undef memchr
+ /* Assume memchr is always declared.  */
+ _GL_WARN_ON_USE (memchr, "memchr has platform-specific bugs - "
+                  "use gnulib module memchr for portability" );
+@@ -674,7 +673,6 @@ _GL_WARN_ON_USE (stpncpy, "stpncpy is unportable - "
+ #if defined GNULIB_POSIXCHECK
+ /* strchr() does not work with multibyte strings if the locale encoding is
+    GB18030 and the character to be searched is a digit.  */
+-# undef strchr
+ /* Assume strchr is always declared.  */
+ _GL_WARN_ON_USE_CXX (strchr,
+                      const char *, char *, (const char *, int),
+@@ -981,7 +979,6 @@ _GL_CXXALIASWARN (strpbrk);
+    Even in this simple case, it does not work with multibyte strings if the
+    locale encoding is GB18030 and one of the characters to be searched is a
+    digit.  */
+-#  undef strpbrk
+ _GL_WARN_ON_USE_CXX (strpbrk,
+                      const char *, char *, (const char *, const char *),
+                      "strpbrk cannot work correctly on character strings "
+@@ -1011,7 +1008,6 @@ _GL_WARN_ON_USE (strspn, "strspn cannot work correctly on character strings "
+ #if defined GNULIB_POSIXCHECK
+ /* strrchr() does not work with multibyte strings if the locale encoding is
+    GB18030 and the character to be searched is a digit.  */
+-# undef strrchr
+ /* Assume strrchr is always declared.  */
+ _GL_WARN_ON_USE_CXX (strrchr,
+                      const char *, char *, (const char *, int),
+diff --git a/lib/wchar.in.h b/lib/wchar.in.h
+index ab602a2..6be4515 100644
+--- a/lib/wchar.in.h
++++ b/lib/wchar.in.h
+@@ -301,7 +301,7 @@ _GL_EXTERN_C int wcsncmp (const wchar_t *__s1, const wchar_t *__s2, size_t __n)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+ # ifndef __cplusplus
+-_GL_EXTERN_C wchar_t *wmemchr (const wchar_t *__s, wchar_t __wc, size_t __n)
++_GL_EXTERN_C wchar_t *(wmemchr) (const wchar_t *__s, wchar_t __wc, size_t __n)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
+ # endif
+ _GL_EXTERN_C wchar_t *wmemset (wchar_t *__s, wchar_t __wc, size_t __n)
+-- 
+2.52.0
+

coreutils-DIR_COLORS

@@ -1,183 +0,0 @@
-# Configuration file for the color 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.
-
-# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not
-# pipes. 'all' adds color characters to all output. 'none' shuts colorization
-# off.
-COLOR tty
-
-# Extra command line options for ls go here.
-# Basically these ones are:
-#  -F = show '/' for dirs, '*' for executables, etc.
-#  -T 0 = don't trust tab spacing when formatting ls output.
-OPTIONS -F -T 0
-
-# Below, there should be one TERM entry for each termtype that is colorizable
-TERM Eterm
-TERM ansi
-TERM color-xterm
-TERM con132x25
-TERM con132x30
-TERM con132x43
-TERM con132x60
-TERM con80x25
-TERM con80x28
-TERM con80x30
-TERM con80x43
-TERM con80x50
-TERM con80x60
-TERM cons25
-TERM console
-TERM cygwin
-TERM dtterm
-TERM eterm-color
-TERM gnome
-TERM konsole
-TERM kterm
-TERM linux
-TERM linux-c
-TERM mach-color
-TERM mlterm
-TERM putty
-TERM rxvt
-TERM rxvt-cygwin
-TERM rxvt-cygwin-native
-TERM rxvt-unicode
-TERM screen
-TERM screen-256color
-TERM screen-bce
-TERM screen-w
-TERM screen.linux
-TERM vt100
-TERM xterm
-TERM xterm-16color
-TERM xterm-256color
-TERM xterm-88color
-TERM xterm-color
-TERM xterm-debian
-
-# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output)
-EIGHTBIT 1
-
-# 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:
-# Attribute codes: 
-# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
-# Text color codes:
-# 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
-NORMAL 00	# global default, although everything should be something.
-FILE 00 	# normal file
-DIR 01;34 	# directory
-LINK 01;36 	# symbolic link (If you set this to 'target' instead of a
-		# numerical value, the color is as for the file pointed to.)
-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 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)
-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
-
-
-# This is for files with execute permission:
-EXEC 01;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.
-# (and any comments you want to add after a '#')
-# executables (bright green)
-.cmd 01;32 
-.exe 01;32
-.com 01;32
-.btm 01;32
-.bat 01;32
-.sh  01;32
-.csh 01;32
- # archives or compressed (bright red)
-.tar 01;31 
-.tgz 01;31
-.svgz 01;31
-.arj 01;31
-.taz 01;31
-.lzh 01;31
-.lzma 01;31
-.zip 01;31
-.z   01;31
-.Z   01;31
-.dz  01;31
-.gz  01;31
-.bz2 01;31
-.tbz2 01;31
-.bz  01;31
-.tz  01;31
-.deb 01;31
-.rpm 01;31
-.jar 01;31
-.rar 01;31
-.ace 01;31
-.zoo 01;31
-.cpio 01;31
-.7z  01;31
-.rz  01;31
-# image formats (magenta)
-.jpg 01;35 
-.jpeg 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
-.mng 01;35
-.pcx 01;35
-.mov 01;35
-.mpg 01;35
-.mpeg 01;35
-.m2v 01;35
-.mkv 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
-.gl 01;35
-.dl 01;35
-.xcf 01;35
-.xwd 01;35
-.yuv 01;35
-.svg 01;35
-# audio formats (cyan)
-.aac 00;36
-.au 00;36
-.flac 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

coreutils-DIR_COLORS.256color

@@ -1,161 +0,0 @@
-# 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.
-# In the case that you are not satisfied with supplied colors, please
-# submit your color configuration or attach your file with colors readable
-# on ALL color background schemas (white,gray,black) to RedHat Bugzilla
-# ticket on https://bugzilla.redhat.com/show_bug.cgi?id=429121 . TIA.
-# Please just keep ls color conventions from 8 color scheme.
-
-# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not
-# pipes. 'all' adds color characters to all output. 'none' shuts colorization
-# off.
-COLOR tty
-
-# Extra command line options for ls go here.
-# Basically these ones are:
-#  -F = show '/' for dirs, '*' for executables, etc.
-#  -T 0 = don't trust tab spacing when formatting ls output.
-OPTIONS -F -T 0
-
-# Below, there should be one TERM entry for each termtype that is colorizable
-TERM putty-256color
-TERM rxvt-256color
-TERM screen-256color
-TERM xterm-256color
-TERM gnome-256color
-
-# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output)
-EIGHTBIT 1
-
-# 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:
-# Attribute codes: 
-# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
-# Text color(8 colors mode) codes:
-# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
-# Background color(8 colors mode) 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	# global default, although everything should be something.
-FILE 00 	# normal file
-DIR 01;38;5;27 	# directory
-LINK 01;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.)
-FIFO 40;38;5;11	# pipe
-SOCK 01;38;5;13	# socket
-DOOR 01;38;5;5	# door
-BLK 01;48;5;232;38;5;11	# block device driver
-CHR 01;48;5;232;38;5;3 	# character device driver
-ORPHAN 01;48;5;232;38;5;9  # symlink to nonexistent file, or non-stat'able file
-MISSING 01;05;48;5;232;38;5;15 # ... 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)
-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;38;5;34
-
-# 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.
-# (and any comments you want to add after a '#')
-# executables (bright green)
-.cmd 01;38;5;34
-.exe 01;38;5;34
-.com 01;38;5;34
-.btm 01;38;5;34
-.bat 01;38;5;34
-.sh  01;38;5;34
-.csh 01;38;5;34
- # archives or compressed (bright red)
-.tar 01;38;5;9 
-.tgz 01;38;5;9
-.svgz 01;38;5;9
-.arj 01;38;5;9
-.taz 01;38;5;9
-.lzh 01;38;5;9
-.lzma 01;38;5;9
-.zip 01;38;5;9
-.z   01;38;5;9
-.Z   01;38;5;9
-.dz  01;38;5;9
-.gz  01;38;5;9
-.bz2 01;38;5;9
-.tbz2 01;38;5;9
-.bz  01;38;5;9
-.tz  01;38;5;9
-.deb 01;38;5;9
-.rpm 01;38;5;9
-.jar 01;38;5;9
-.rar 01;38;5;9
-.ace 01;38;5;9
-.zoo 01;38;5;9
-.cpio 01;38;5;9
-.7z  01;38;5;9
-.rz  01;38;5;9
-# image formats (magenta)
-.jpg 01;38;5;13 
-.jpeg 01;38;5;13
-.gif 01;38;5;13
-.bmp 01;38;5;13
-.pbm 01;38;5;13
-.pgm 01;38;5;13
-.ppm 01;38;5;13
-.tga 01;38;5;13
-.xbm 01;38;5;13
-.xpm 01;38;5;13
-.tif 01;38;5;13
-.tiff 01;38;5;13
-.png 01;38;5;13
-.mng 01;38;5;13
-.pcx 01;38;5;13
-.mov 01;38;5;13
-.mpg 01;38;5;13
-.mpeg 01;38;5;13
-.m2v 01;38;5;13
-.mkv 01;38;5;13
-.ogm 01;38;5;13
-.mp4 01;38;5;13
-.m4v 01;38;5;13
-.mp4v 01;38;5;13
-.vob 01;38;5;13
-.qt  01;38;5;13
-.nuv 01;38;5;13
-.wmv 01;38;5;13
-.asf 01;38;5;13
-.rm  01;38;5;13
-.rmvb 01;38;5;13
-.flc 01;38;5;13
-.avi 01;38;5;13
-.fli 01;38;5;13
-.gl 01;38;5;13
-.dl 01;38;5;13
-.xcf 01;38;5;13
-.xwd 01;38;5;13
-.yuv 01;38;5;13
-.svg 01;38;5;13
-# audio formats (cyan)
-.aac 00;38;5;45
-.au 00;38;5;45
-.flac 00;38;5;45
-.mid 00;38;5;45
-.midi 00;38;5;45
-.mka 00;38;5;45
-.mp3 00;38;5;45
-.mpc 00;38;5;45
-.ogg 00;38;5;45
-.ra 00;38;5;45
-.wav 00;38;5;45

coreutils-DIR_COLORS.xterm

@@ -1,164 +0,0 @@
-# Configuration file for the color 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.
-
-# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not
-# pipes. 'all' adds color characters to all output. 'none' shuts colorization
-# off.
-COLOR tty
-
-# Extra command line options for ls go here.
-# Basically these ones are:
-#  -F = show '/' for dirs, '*' for executables, etc.
-#  -T 0 = don't trust tab spacing when formatting ls output.
-OPTIONS -F -T 0
-
-# Below, there should be one TERM entry for each termtype that is colorizable
-TERM linux
-TERM console
-TERM con132x25
-TERM con132x30
-TERM con132x43
-TERM con132x60
-TERM con80x25
-TERM con80x28
-TERM con80x30
-TERM con80x43
-TERM con80x50
-TERM con80x60
-TERM cons25
-TERM xterm
-TERM xterm-16color
-TERM xterm-88color
-TERM xterm-256color
-TERM rxvt
-TERM rxvt-unicode
-TERM xterm-color
-TERM color-xterm
-TERM vt100
-TERM dtterm
-TERM color_xterm
-
-# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output)
-EIGHTBIT 1
-
-# 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:
-# Attribute codes: 
-# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
-# Text color codes:
-# 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
-NORMAL 00	# global default, although everything should be something.
-FILE 00 	# normal file
-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.)
-FIFO 40;33	# pipe
-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 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)
-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
-
-
-# This is for files with execute permission:
-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.
-# (and any comments you want to add after a '#')
-.cmd 00;32 # executables (green)
-.exe 00;32
-.com 00;32
-.btm 00;32
-.bat 00;32
-.sh  00;32
-.csh 00;32
- # archives or compressed (red)
-.tar 00;31 
-.tgz 00;31
-.svgz 00;31
-.arj 00;31
-.taz 00;31
-.lzh 00;31
-.lzma 00;31
-.zip 00;31
-.z   00;31
-.Z   00;31
-.dz  00;31
-.gz  00;31
-.bz2 00;31
-.tbz2 00;31
-.bz  00;31
-.tz  00;31
-.deb 00;31
-.rpm 00;31
-.jar 00;31
-.rar 00;31
-.ace 00;31
-.zoo 00;31
-.cpio 00;31
-.7z  00;31
-.rz  00;31
-# image formats (magenta)
-.jpg 00;35 
-.jpeg 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
-.mng 00;35
-.pcx 00;35
-.mov 00;35
-.mpg 00;35
-.mpeg 00;35
-.m2v 00;35
-.mkv 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
-.gl 00;35
-.dl 00;35
-.xcf 00;35
-.xwd 00;35
-.yuv 00;35
-.svg 00;35
-# audio formats (cyan)
-.aac 00;36
-.au 00;36
-.flac 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

coreutils-chgrp.patch

@@ -1,14 +0,0 @@
---- coreutils-5.92/tests/group-names.chgrp	2005-10-28 09:20:12.000000000 +0100
-+++ coreutils-5.92/tests/group-names	2005-10-28 09:55:27.000000000 +0100
-@@ -18,3 +18,11 @@
-      (exit 77); exit 77
-      ;;
- esac
-+
-+set `id -Gn`
-+if echo "$2" | grep -q '[^0-9]'
-+then
-+  exit 0
-+else
-+  (exit 77); exit 77
-+fi

coreutils-colorls.csh

@@ -1,8 +1,10 @@
-#! /bin/csh -f
+# skip everything for non-interactive shells
+if (! $?prompt) exit
+
 # color-ls initialization
 if ( $?USER_LS_COLORS ) then
   if ( "$USER_LS_COLORS" != "" ) then
-     #when USER_LS_COLORS defined do not override user 
+     #when USER_LS_COLORS defined do not override user
      #specified LS_COLORS and use them
      goto finish
   endif
@@ -11,34 +13,49 @@ endif
 alias ll 'ls -l'
 alias l. 'ls -d .*'
 set COLORS=/etc/DIR_COLORS
+
 if ($?TERM) then
-  if ( -e "/etc/DIR_COLORS.$TERM" ) then 
+  if ( -e "/etc/DIR_COLORS.$TERM" ) then
      set COLORS="/etc/DIR_COLORS.$TERM"
   endif
 endif
-if ( -e "/etc/DIR_COLORS.256color" ) then
-  if ( "`tput colors`" == "256" ) then
-     set COLORS=/etc/DIR_COLORS.256color
-  endif 
-endif
 if ( -f ~/.dircolors ) set COLORS=~/.dircolors
 if ( -f ~/.dir_colors ) set COLORS=~/.dir_colors
 if ($?TERM) then
   if ( -f ~/.dircolors."$TERM" ) set COLORS=~/.dircolors."$TERM"
   if ( -f ~/.dir_colors."$TERM" ) set COLORS=~/.dir_colors."$TERM"
 endif
+set INCLUDE="`/usr/bin/cat "$COLORS" | /usr/bin/grep '^INCLUDE' | /usr/bin/cut -d ' ' -f2-`"
 
 if ( ! -e "$COLORS" ) exit
 
-eval `dircolors -c $COLORS`
+set _tmp="`/usr/bin/mktemp .colorlsXXX -q --tmpdir=/tmp`"
+#if mktemp fails, exit when include was active, otherwise use $COLORS file
+if ( "$_tmp" == '' ) then
+  if ( "$INCLUDE" == '' ) then
+    eval "`/usr/bin/dircolors -c $COLORS`"
+  endif
+  goto cleanup
+endif
+
+if ( "$INCLUDE" != '' ) /usr/bin/cat "$INCLUDE" >> $_tmp
+/usr/bin/grep -v '^INCLUDE' "$COLORS" >> $_tmp
+
+eval "`/usr/bin/dircolors -c $_tmp`"
+
+/usr/bin/rm -f $_tmp
 
 if ( "$LS_COLORS" == '' ) exit
-set color_none=`sed -n '/^COLOR.*none/Ip' < $COLORS`
-if ( "$color_none" != '' ) then 
+cleanup:
+set color_none=`/usr/bin/sed -n '/^COLOR.*none/Ip' < $COLORS`
+if ( "$color_none" != '' ) then
    unset color_none
    exit
 endif
 unset color_none
+unset _tmp
+unset INCLUDE
+unset COLORS
 
 finish:
 alias ll 'ls -l --color=auto'

coreutils-colorls.sh

@@ -1,40 +1,53 @@
 # color-ls initialization
 
+# Skip all for noninteractive shells.
+[ ! -t 0 ] && return
+
 #when USER_LS_COLORS defined do not override user LS_COLORS, but use them.
 if [ -z "$USER_LS_COLORS" ]; then
-  
+
   alias ll='ls -l' 2>/dev/null
   alias l.='ls -d .*' 2>/dev/null
 
-
-  # Skip the rest for noninteractive shells.
-  [ -z "$PS1" ] && return
-
+  INCLUDE=
   COLORS=
 
   for colors in "$HOME/.dir_colors.$TERM" "$HOME/.dircolors.$TERM" \
       "$HOME/.dir_colors" "$HOME/.dircolors"; do
-    [ -e "$colors" ] && COLORS="$colors" && break
+    [ -e "$colors" ] && COLORS="$colors" && \
+    INCLUDE="`/usr/bin/cat "$COLORS" | /usr/bin/grep '^INCLUDE' | /usr/bin/cut -d ' ' -f2-`" && \
+    break
   done
 
-  [ -z "$COLORS" ] && [ -e "/etc/DIR_COLORS.256color" ] && \
-      [ "x`tput colors 2>/dev/null`" = "x256" ] && \
-      COLORS="/etc/DIR_COLORS.256color"
+  [ -z "$COLORS" ] && [ -e "/etc/DIR_COLORS.$TERM" ] && \
+  COLORS="/etc/DIR_COLORS.$TERM"
 
-  if [ -z "$COLORS" ]; then
-    for colors in "/etc/DIR_COLORS.$TERM" "/etc/DIR_COLORS" ; do
-      [ -e "$colors" ] && COLORS="$colors" && break
-    done
-  fi
+  [ -z "$COLORS" ] && [ -e "/etc/DIR_COLORS" ] && \
+  COLORS="/etc/DIR_COLORS"
 
   # Existence of $COLORS already checked above.
   [ -n "$COLORS" ] || return
 
-  eval `dircolors --sh "$COLORS" 2>/dev/null`
+  if [ -e "$INCLUDE" ];
+  then
+    TMP="`/usr/bin/mktemp .colorlsXXX -q --tmpdir=/tmp`"
+    [ -z "$TMP" ] && return
+
+    /usr/bin/cat "$INCLUDE" >> $TMP
+    /usr/bin/grep -v '^INCLUDE' "$COLORS" >> $TMP
+
+    eval "`/usr/bin/dircolors --sh $TMP 2>/dev/null`"
+    /usr/bin/rm -f $TMP
+  else
+    eval "`/usr/bin/dircolors --sh $COLORS 2>/dev/null`"
+  fi
+
   [ -z "$LS_COLORS" ] && return
-  egrep -qi "^COLOR.*none" $COLORS >/dev/null 2>/dev/null && return
+  /usr/bin/grep -qi "^COLOR.*none" $COLORS >/dev/null 2>/dev/null && return
 fi
 
+unset TMP COLORS INCLUDE
+
 alias ll='ls -l --color=auto' 2>/dev/null
 alias l.='ls -d .* --color=auto' 2>/dev/null
 alias ls='ls --color=auto' 2>/dev/null

coreutils-dddoubleclose.patch

@@ -1,45 +0,0 @@
-diff -urNp coreutils-6.10-orig/src/dd.c coreutils-6.10/src/dd.c
---- coreutils-6.10-orig/src/dd.c	2007-12-06 14:22:42.000000000 +0100
-+++ coreutils-6.10/src/dd.c	2008-03-11 12:48:12.000000000 +0100
-@@ -391,6 +391,25 @@ static char const ebcdic_to_ascii[] =
-   '\070', '\071', '\372', '\373', '\374', '\375', '\376', '\377'
- };
- 
-+/* True if we need to close the standard output *stream*.  */
-+static bool close_stdout_required = true;
-+
-+/* The only reason to close the standard output *stream* is if
-+   parse_long_options fails (as it does for --help or --version).
-+   In any other case, dd uses only the STDOUT_FILENO file descriptor,
-+   and the "cleanup" function calls "close (STDOUT_FILENO)".
-+   Closing the file descriptor and then letting the usual atexit-run
-+   close_stdout function call "fclose (stdout)" would result in a
-+   harmless failure of the close syscall (with errno EBADF).
-+   This function serves solely to avoid the unnecessary close_stdout
-+   call, once parse_long_options has succeeded.  */
-+static void
-+maybe_close_stdout (void)
-+{
-+  if (close_stdout_required)
-+    close_stdout ();
-+}
-+
- void
- usage (int status)
- {
-@@ -1639,12 +1658,14 @@ main (int argc, char **argv)
-   textdomain (PACKAGE);
- 
-   /* Arrange to close stdout if parse_long_options exits.  */
--  atexit (close_stdout);
-+  atexit (maybe_close_stdout);
- 
-   page_size = getpagesize ();
- 
-   parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
- 		      usage, AUTHORS, (char const *) NULL);
-+  close_stdout_required = false;
-+
-   if (getopt_long (argc, argv, "", NULL, NULL) != -1)
-     usage (EXIT_FAILURE);
- 

coreutils-df-direct.patch

@@ -0,0 +1,187 @@
+From 91be1a584108a6a3d96f64382bbf206c4213b3db Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 29 Mar 2010 17:20:34 +0000
+Subject: [PATCH] coreutils-df-direct.patch
+
+---
+ 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 b420606..0ccb368 100644
+--- a/doc/coreutils.texi
++++ b/doc/coreutils.texi
+@@ -12597,6 +12597,13 @@ some systems (notably Solaris), doing this yields more up to date results,
+ but in general this option makes @command{df} much slower, especially when
+ there are many or very busy file systems.
+ 
++@item --direct
++@opindex --direct
++@cindex direct statfs for a file
++Do not resolve mount point and show statistics directly for a file. It can be
++especially useful for NFS mount points if there is a boundary between two
++storage policies behind the mount point.
++
+ @item --total
+ @opindex --total
+ @cindex grand total of file system size, usage and available space
+diff --git a/src/df.c b/src/df.c
+index 75e638c..ef9f0a7 100644
+--- a/src/df.c
++++ b/src/df.c
+@@ -121,6 +121,9 @@ static bool print_type;
+ /* If true, print a grand total at the end.  */
+ static bool print_grand_total;
+ 
++/* If true, show statistics for a file instead of mount point.  */
++static bool direct_statfs;
++
+ /* Grand total data.  */
+ static struct fs_usage grand_fsu;
+ 
+@@ -248,13 +251,15 @@ enum
+   NO_SYNC_OPTION = CHAR_MAX + 1,
+   SYNC_OPTION,
+   TOTAL_OPTION,
+-  OUTPUT_OPTION
++  OUTPUT_OPTION,
++  DIRECT_OPTION
+ };
+ 
+ static struct option const long_options[] =
+ {
+   {"all", no_argument, nullptr, 'a'},
+   {"block-size", required_argument, nullptr, 'B'},
++  {"direct", no_argument, nullptr, DIRECT_OPTION},
+   {"inodes", no_argument, nullptr, 'i'},
+   {"human-readable", no_argument, nullptr, 'h'},
+   {"si", no_argument, nullptr, 'H'},
+@@ -571,7 +576,10 @@ get_header (void)
+   for (idx_t col = 0; col < ncolumns; col++)
+     {
+       char *cell;
+-      char const *header = _(columns[col]->caption);
++      char const *header = (columns[col]->field == TARGET_FIELD
++                            && direct_statfs)?
++                            _("File") :
++                            _(columns[col]->caption);
+ 
+       if (columns[col]->field == SIZE_FIELD
+           && (header_mode == DEFAULT_MODE
+@@ -1446,6 +1454,17 @@ get_point (char const *point, const struct stat *statp)
+ static void
+ get_entry (char const *name, struct stat const *statp)
+ {
++  if (direct_statfs)
++    {
++      char *resolved = canonicalize_file_name (name);
++      if (resolved)
++        {
++          get_dev (NULL, resolved, name, NULL, NULL, false, false, NULL, false);
++          free (resolved);
++          return;
++        }
++    }
++
+   if ((S_ISBLK (statp->st_mode) || S_ISCHR (statp->st_mode))
+       && get_device (name))
+     return;
+@@ -1516,6 +1535,7 @@ or all file systems by default.\n\
+   -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n\
+                            '-BM' prints sizes in units of 1,048,576 bytes;\n\
+                            see SIZE format below\n\
++      --direct          show statistics for a file instead of mount point\n\
+   -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);
+@@ -1610,6 +1630,9 @@ main (int argc, char **argv)
+               xstrtol_fatal (e, oi, c, long_options, optarg);
+           }
+           break;
++        case DIRECT_OPTION:
++          direct_statfs = true;
++          break;
+         case 'i':
+           if (header_mode == OUTPUT_MODE)
+             {
+@@ -1706,6 +1729,13 @@ main (int argc, char **argv)
+         }
+     }
+ 
++  if (direct_statfs && show_local_fs)
++    {
++      error (0, 0, _("options --direct and --local (-l) are mutually "
++                     "exclusive"));
++      usage (EXIT_FAILURE);
++    }
++
+   if (human_output_opts == -1)
+     {
+       if (posix_format)
+diff --git a/tests/df/direct.sh b/tests/df/direct.sh
+new file mode 100755
+index 0000000..8e4cfb8
+--- /dev/null
++++ b/tests/df/direct.sh
+@@ -0,0 +1,55 @@
++#!/bin/sh
++# Ensure "df --direct" works as documented
++
++# Copyright (C) 2010 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=.}/init.sh"; path_prepend_ ../src
++print_ver_ df
++
++df || skip_ "df fails"
++
++DIR=`pwd` || framework_failure
++FILE="$DIR/file"
++touch "$FILE" || framework_failure
++echo "$FILE" > file_exp || framework_failure
++echo "Mounted on" > header_mounted_exp || framework_failure
++echo "File" > header_file_exp || framework_failure
++
++fail=0
++
++df --portability "$FILE" > df_out || fail=1
++df --portability --direct "$FILE" > df_direct_out || fail=1
++df --portability --direct --local "$FILE" > /dev/null 2>&1 && fail=1
++
++# check df header
++$AWK '{ if (NR==1) print $6 " " $7; }' df_out > header_mounted_out \
++  || framework_failure
++$AWK '{ if (NR==1) print $6; }' df_direct_out > header_file_out \
++  || framework_failure
++compare header_mounted_out header_mounted_exp || fail=1
++compare header_file_out header_file_exp || fail=1
++
++# check df output (without --direct)
++$AWK '{ if (NR==2) print $6; }' df_out > file_out \
++  || framework_failure
++compare file_out file_exp && fail=1
++
++# check df output (with --direct)
++$AWK '{ if (NR==2) print $6; }' df_direct_out > file_out \
++  || framework_failure
++compare file_out file_exp || fail=1
++
++Exit $fail
+-- 
+2.52.0
+

coreutils-getfacl-exit-code.patch

@@ -1,23 +0,0 @@
---- coreutils-6.8+/tests/cp/acl.getfacl-exit-code	2007-03-01 16:48:29.000000000 +0000
-+++ coreutils-6.8+/tests/cp/acl	2007-03-01 16:49:35.000000000 +0000
-@@ -70,16 +70,16 @@
- # copy a file without preserving permissions
- cp a/file b/ || fail=1
- 
--acl2=`cd b && getfacl file` || framework_failure
-+acl2=`cd b && getfacl file`
- test "$acl1" = "$acl2" || fail=1
- rm a/file || framework_failure
- 
- # copy a file, preserving permissions
- touch a/file || framework_failure
--setfacl -m user:bin:rw a/file || framework_failure
--acl1=`cd a && getfacl file` || framework_failure
-+setfacl -m user:bin:rw a/file
-+acl1=`cd a && getfacl file`
- cp -p a/file b/ || fail=1
--acl2=`cd b && getfacl file` || framework_failure
-+acl2=`cd b && getfacl file`
- test "$acl1" = "$acl2" || fail=1
- 
- exit $fail

coreutils-getgrouplist.patch

@@ -1,82 +0,0 @@
-diff -urp coreutils-6.10-orig/lib/getugroups.c coreutils-6.10/lib/getugroups.c
---- coreutils-6.10-orig/lib/getugroups.c	2007-10-17 15:47:25.000000000 +0200
-+++ coreutils-6.10/lib/getugroups.c	2008-01-24 16:37:04.000000000 +0100
-@@ -19,6 +19,9 @@
- 
- #include <config.h>
- 
-+/* We do not need this code if getgrouplist(3) is available.  */
-+#ifndef HAVE_GETGROUPLIST
-+
- #include "getugroups.h"
- 
- #include <stdio.h> /* grp.h on alpha OSF1 V2.0 uses "FILE *". */
-@@ -114,3 +117,4 @@ getugroups (int maxcount, GETGROUPS_T *g
- 
-   return count;
- }
-+#endif	/* have getgrouplist */
-diff -urp coreutils-6.10-orig/lib/mgetgroups.c coreutils-6.10/lib/mgetgroups.c
---- coreutils-6.10-orig/lib/mgetgroups.c	2007-11-25 14:23:31.000000000 +0100
-+++ coreutils-6.10/lib/mgetgroups.c	2008-01-24 16:41:15.000000000 +0100
-@@ -43,9 +43,17 @@ mgetgroups (const char *username, gid_t 
-   int ng;
-   GETGROUPS_T *g;
- 
--  max_n_groups = (username
--		  ? getugroups (0, NULL, username, gid)
--		  : getgroups (0, NULL));
-+    if (!username)
-+      max_n_groups = getgroups(0, NULL);
-+  else 
-+   {
-+#ifdef HAVE_GETGROUPLIST
-+      max_n_groups = 0;
-+      getgrouplist (username, gid, NULL, &max_n_groups);
-+#else
-+      max_n_groups = getugroups (0, NULL, username, gid);
-+#endif
-+   }
- 
-   /* If we failed to count groups with NULL for a buffer,
-      try again with a non-NULL one, just in case.  */
-@@ -62,9 +70,25 @@ mgetgroups (const char *username, gid_t 
-   if (g == NULL)
-     return -1;
- 
--  ng = (username
--	? getugroups (max_n_groups, g, username, gid)
--	: getgroups (max_n_groups, g));
-+  if (!username)
-+    ng = getgroups (max_n_groups, g);
-+  else
-+    {
-+#ifdef HAVE_GETGROUPLIST
-+	  int e;
-+	  ng = max_n_groups;
-+	  while ((e = getgrouplist (username, gid, g, &ng)) == -1
-+		 && ng > max_n_groups)
-+	    {
-+	      max_n_groups = ng;
-+	      g = xrealloc (g, max_n_groups * sizeof (GETGROUPS_T));
-+	    }
-+	  if (e == -1)
-+	    ng = -1;
-+#else
-+	  ng = getugroups (max_n_groups, g, username, gid);
-+#endif
-+    }
- 
-   if (ng < 0)
-     {
-diff -urp coreutils-6.10-orig/m4/jm-macros.m4 coreutils-6.10/m4/jm-macros.m4
---- coreutils-6.10-orig/m4/jm-macros.m4	2007-11-25 14:23:31.000000000 +0100
-+++ coreutils-6.10/m4/jm-macros.m4	2008-01-24 16:42:00.000000000 +0100
-@@ -52,6 +52,7 @@ AC_DEFUN([coreutils_MACROS],
-     fchown \
-     fchmod \
-     ftruncate \
-+    getgrouplist \
-     iswspace \
-     mkfifo \
-     mbrlen \

coreutils-keyring.gpg

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

coreutils-mvatomic.patch

@@ -1,103 +0,0 @@
- src/copy.c           |    5 +++--
- tests/mv/Makefile.am |    4 ++--
- tests/mv/atomic2     |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 55 insertions(+), 4 deletions(-)
- create mode 100755 tests/mv/atomic2
-
-diff --git a/src/copy.c b/src/copy.c
-index fd31b5c..208a674 100644
---- a/src/copy.c
-+++ b/src/copy.c
-@@ -1339,10 +1339,11 @@ copy_internal (char const *src_name, char const *dst_name,
-	      new_dst = true;
-	    }
-	  else if (! S_ISDIR (dst_sb.st_mode)
-+		   /* Never unlink dst_name when in move mode.  */
-+		   && ! x->move_mode
-		   && (x->unlink_dest_before_opening
-		       || (x->preserve_links && 1 < dst_sb.st_nlink)
--		       || (!x->move_mode
--			   && x->dereference == DEREF_NEVER
-+			   || (x->dereference == DEREF_NEVER
-			   && S_ISLNK (src_sb.st_mode))
-		       ))
-	    {
-diff --git a/tests/mv/Makefile.am b/tests/mv/Makefile.am
-index c121911..92ec68e 100644
---- a/tests/mv/Makefile.am
-+++ b/tests/mv/Makefile.am
-@@ -1,7 +1,6 @@
- # Make coreutils tests for "mv".                       -*-Makefile-*-
-
--# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
--# Free Software Foundation, Inc.
-+# Copyright (C) 1998-2008 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
-@@ -17,6 +16,7 @@
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
- TESTS = \
-+  atomic2 \
-   sticky-to-xpart \
-   hard-verbose \
-   backup-dir \
-diff --git a/tests/mv/atomic2 b/tests/mv/atomic2
-new file mode 100755
-index 0000000..d1029aa
---- /dev/null
-+++ b/tests/mv/atomic2
-@@ -0,0 +1,50 @@
-+#!/bin/sh
-+# ensure that mv doesn't first unlink a multi-hard-linked destination
-+
-+# Copyright (C) 2008 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/>.
-+
-+if test "$VERBOSE" = yes; then
-+  set -x
-+  mv --version
-+fi
-+
-+. $srcdir/../strace
-+. $srcdir/../test-lib.sh
-+
-+# Before the fix, mv would unnecessarily unlink the destination symlink:
-+#   $ rm -f a b b2; touch a b; ln b b2; strace -e unlink /p/bin/mv a b
-+#   unlink("b")                             = 0
-+#
-+# With the fix, it doesn't call unlink:
-+#   $ rm -f a b b2; touch a b; ln b b2; strace -e unlink ./mv a b
-+#   $
-+
-+touch a b || framework_failure
-+ln b b2 || framework_failure
-+
-+fail=0
-+
-+strace -qe unlink mv a b > out 2>&1 || fail=1
-+$EGREP 'unlink.*"b"' out && fail=1
-+
-+# Ensure that the source, "a", is gone.
-+ls -dl a > /dev/null 2>&1 && fail=1
-+
-+# Ensure that the destination, "b", has link count 1.
-+n_links=`stat --printf=%h b` || fail=1
-+test "$n_links" = 1 || fail=1
-+
-+(exit $fail); exit $fail
---
-1.5.5.rc0.7.g57e83

coreutils-overflow.patch

@@ -1,11 +0,0 @@
---- coreutils-5.2.1/src/who.c.overflow	2005-05-25 09:59:06.000000000 +0100
-+++ coreutils-5.2.1/src/who.c	2005-05-25 10:00:31.000000000 +0100
-@@ -75,7 +75,7 @@
- # define UT_TYPE_NEW_TIME(U) false
- #endif
- 
--#define IDLESTR_LEN 6
-+#define IDLESTR_LEN 10
- 
- #if HAVE_STRUCT_XTMP_UT_PID
- # define PIDSTR_DECL_AND_INIT(Var, Utmp_ent) \

coreutils-pam.patch

@@ -1,413 +0,0 @@
---- coreutils-6.7/src/Makefile.am.pam	2006-11-24 21:28:10.000000000 +0000
-+++ coreutils-6.7/src/Makefile.am	2007-01-09 17:00:01.000000000 +0000
-@@ -103,7 +103,7 @@
- # If necessary, add -lm to resolve use of pow in lib/strtod.c.
- uptime_LDADD = $(LDADD) $(POW_LIB) $(GETLOADAVG_LIBS)
- 
--su_LDADD = $(LDADD) $(LIB_CRYPT)
-+su_LDADD = $(LDADD) $(LIB_CRYPT) @LIB_PAM@
- 
- dir_LDADD += $(LIB_ACL)
- ls_LDADD += $(LIB_ACL)
---- coreutils-6.7/src/su.c.pam	2007-01-09 17:00:01.000000000 +0000
-+++ coreutils-6.7/src/su.c	2007-01-09 17:16:43.000000000 +0000
-@@ -38,6 +38,16 @@
-    restricts who can su to UID 0 accounts.  RMS considers that to
-    be fascist.
- 
-+#ifdef USE_PAM
-+
-+   Actually, with PAM, su has nothing to do with whether or not a
-+   wheel group is enforced by su.  RMS tries to restrict your access
-+   to a su which implements the wheel group, but PAM considers that
-+   to be fascist, and gives the user/sysadmin the opportunity to
-+   enforce a wheel group by proper editing of /etc/pam.conf
-+
-+#endif
-+
-    Compile-time options:
-    -DSYSLOG_SUCCESS	Log successful su's (by default, to root) with syslog.
-    -DSYSLOG_FAILURE	Log failed su's (by default, to root) with syslog.
-@@ -59,6 +69,15 @@
-    prototype (returning `int') in <unistd.h>.  */
- #define getusershell _getusershell_sys_proto_
- 
-+#ifdef USE_PAM
-+# include <signal.h>
-+# include <sys/wait.h>
-+# include <sys/fsuid.h>
-+# include <unistd.h>
-+# include <security/pam_appl.h>
-+# include <security/pam_misc.h>
-+#endif /* USE_PAM */
-+
- #include "system.h"
- #include "getpass.h"
- 
-@@ -128,15 +147,22 @@
- /* The user to become if none is specified.  */
- #define DEFAULT_USER "root"
- 
-+#ifndef USE_PAM
- char *crypt ();
-+#endif
- char *getusershell ();
- void endusershell ();
- void setusershell ();
- 
- extern char **environ;
- 
--static void run_shell (char const *, char const *, char **, size_t)
-+static void run_shell (char const *, char const *, char **, size_t,
-+	const struct passwd *)
-+#ifdef USE_PAM
-+	;
-+#else
-      ATTRIBUTE_NORETURN;
-+#endif
- 
- /* The name this program was run with.  */
- char *program_name;
-@@ -225,7 +251,26 @@
- }
- #endif
- 
-+#ifdef USE_PAM
-+static pam_handle_t *pamh = NULL;
-+static int retval;
-+static struct pam_conv conv = {
-+  misc_conv,
-+  NULL
-+};
-+
-+#define PAM_BAIL_P if (retval) { \
-+  pam_end(pamh, PAM_SUCCESS); \
-+  return 0; \
-+}
-+#define PAM_BAIL_P_VOID if (retval) {		\
-+  pam_end(pamh, PAM_SUCCESS);			\
-+return;						\
-+}
-+#endif
-+
- /* Ask the user for a password.
-+   If PAM is in use, let PAM ask for the password if necessary.
-    Return true if the user gives the correct password for entry PW,
-    false if not.  Return true without asking for a password if run by UID 0
-    or if PW has an empty password.  */
-@@ -233,6 +278,44 @@
- static bool
- correct_password (const struct passwd *pw)
- {
-+#ifdef USE_PAM
-+  struct passwd *caller;
-+  char *tty_name, *ttyn;
-+  retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh);
-+  PAM_BAIL_P;
-+
-+  if (getuid() != 0 && !isatty(0)) {
-+	fprintf(stderr, "standard in must be a tty\n");
-+	exit(1);
-+  }
-+
-+  caller = getpwuid(getuid());
-+  if(caller != NULL && caller->pw_name != NULL) {
-+	  retval = pam_set_item(pamh, PAM_RUSER, caller->pw_name);
-+	  PAM_BAIL_P;
-+  }
-+
-+  ttyn = ttyname(0);
-+  if (ttyn) {
-+    if (strncmp(ttyn, "/dev/", 5) == 0)
-+       tty_name = ttyn+5;
-+    else
-+       tty_name = ttyn;
-+    retval = pam_set_item(pamh, PAM_TTY, tty_name);
-+    PAM_BAIL_P;
-+  }
-+  retval = pam_authenticate(pamh, 0);
-+  PAM_BAIL_P;
-+  retval = pam_acct_mgmt(pamh, 0);
-+  if (retval == PAM_NEW_AUTHTOK_REQD) {
-+    /* password has expired.  Offer option to change it. */
-+    retval = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK);
-+    PAM_BAIL_P;
-+  }
-+  PAM_BAIL_P;
-+  /* must be authenticated if this point was reached */
-+  return 1;
-+#else /* !USE_PAM */
-   char *unencrypted, *encrypted, *correct;
- #if HAVE_GETSPNAM && HAVE_STRUCT_SPWD_SP_PWDP
-   /* Shadow passwd stuff for SVR3 and maybe other systems.  */
-@@ -257,6 +340,7 @@
-   encrypted = crypt (unencrypted, correct);
-   memset (unencrypted, 0, strlen (unencrypted));
-   return STREQ (encrypted, correct);
-+#endif /* !USE_PAM */
- }
- 
- /* Update `environ' for the new shell based on PW, with SHELL being
-@@ -270,12 +354,18 @@
-       /* Leave TERM unchanged.  Set HOME, SHELL, USER, LOGNAME, PATH.
-          Unset all other environment variables.  */
-       char const *term = getenv ("TERM");
-+      char const *display = getenv ("DISPLAY");
-+      char const *xauthority = getenv ("XAUTHORITY");
-       if (term)
- 	term = xstrdup (term);
-       environ = xmalloc ((6 + !!term) * sizeof (char *));
-       environ[0] = NULL;
-       if (term)
- 	xsetenv ("TERM", term);
-+      if (display)
-+	xsetenv ("DISPLAY", display);
-+      if (xauthority)
-+	xsetenv ("XAUTHORITY", xauthority);
-       xsetenv ("HOME", pw->pw_dir);
-       xsetenv ("SHELL", shell);
-       xsetenv ("USER", pw->pw_name);
-@@ -308,8 +398,13 @@
- {
- #ifdef HAVE_INITGROUPS
-   errno = 0;
--  if (initgroups (pw->pw_name, pw->pw_gid) == -1)
-+  if (initgroups (pw->pw_name, pw->pw_gid) == -1) {
-+#ifdef USE_PAM
-+    pam_close_session(pamh, 0);
-+    pam_end(pamh, PAM_ABORT);
-+#endif
-     error (EXIT_FAILURE, errno, _("cannot set groups"));
-+  }
-   endgrent ();
- #endif
-   if (setgid (pw->pw_gid))
-@@ -318,6 +413,31 @@
-     error (EXIT_FAILURE, errno, _("cannot set user id"));
- }
- 
-+#ifdef USE_PAM
-+static int caught=0;
-+/* Signal handler for parent process later */
-+static void su_catch_sig(int sig)
-+{
-+  ++caught;
-+}
-+
-+int
-+pam_copyenv (pam_handle_t *pamh)
-+{
-+  char **env;
-+
-+  env = pam_getenvlist(pamh);
-+  if(env) {
-+    while(*env) {
-+	if (putenv (*env))
-+	  xalloc_die ();
-+	env++;
-+    }
-+  }
-+  return(0);
-+}
-+#endif
-+
- /* Run SHELL, or DEFAULT_SHELL if SHELL is empty.
-    If COMMAND is nonzero, pass it to the shell with the -c option.
-    Pass ADDITIONAL_ARGS to the shell as more arguments; there
-@@ -325,17 +445,49 @@
- 
- static void
- run_shell (char const *shell, char const *command, char **additional_args,
--	   size_t n_additional_args)
-+	   size_t n_additional_args, const struct passwd *pw)
- {
-   size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1;
-   char const **args = xnmalloc (n_args, sizeof *args);
-   size_t argno = 1;
-+#ifdef USE_PAM
-+  int child;
-+  sigset_t ourset;
-+  int status;
-+
-+  retval = pam_open_session(pamh,0);
-+  if (retval != PAM_SUCCESS) {
-+    fprintf (stderr, "could not open session\n");
-+    exit (1);
-+  }
-+
-+/* do this at the last possible moment, because environment variables may
-+   be passed even in the session phase
-+*/
-+  if(pam_copyenv(pamh) != PAM_SUCCESS)
-+     fprintf (stderr, "error copying PAM environment\n");
-+  
-+  /* Credentials should be set in the parent */ 
-+  if (pam_setcred(pamh, PAM_ESTABLISH_CRED) != PAM_SUCCESS) {
-+    pam_close_session(pamh, 0);
-+    fprintf(stderr, "could not set PAM credentials\n");
-+    exit(1);
-+  }
-+
-+  child = fork();
-+  if (child == 0) {  /* child shell */
-+  change_identity (pw);
-+  pam_end(pamh, 0);
-+#endif
- 
-   if (simulate_login)
-     {
-       char *arg0;
-       char *shell_basename;
- 
-+      if(chdir(pw->pw_dir))
-+	      error(0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
-+
-       shell_basename = last_component (shell);
-       arg0 = xmalloc (strlen (shell_basename) + 2);
-       arg0[0] = '-';
-@@ -360,6 +512,66 @@
-     error (0, errno, "%s", shell);
-     exit (exit_status);
-   }
-+#ifdef USE_PAM
-+  } else if (child == -1) {
-+      fprintf(stderr, "can not fork user shell: %s", strerror(errno));
-+      pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT);
-+      pam_close_session(pamh, 0);
-+      pam_end(pamh, PAM_ABORT);
-+      exit(1);
-+  }
-+  /* parent only */
-+  sigfillset(&ourset);
-+  if (sigprocmask(SIG_BLOCK, &ourset, NULL)) {
-+    fprintf(stderr, "%s: signal malfunction\n", PROGRAM_NAME);
-+    caught = 1;
-+  }
-+  if (!caught) {
-+    struct sigaction action;
-+    action.sa_handler = su_catch_sig;
-+    sigemptyset(&action.sa_mask);
-+    action.sa_flags = 0;
-+    sigemptyset(&ourset);
-+    if (sigaddset(&ourset, SIGTERM)
-+        || sigaddset(&ourset, SIGALRM)
-+        || sigaction(SIGTERM, &action, NULL)
-+        || sigprocmask(SIG_UNBLOCK, &ourset, NULL)) {
-+      fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
-+      caught = 1;
-+    }
-+  }
-+  if (!caught) {
-+    do {
-+      int pid;
-+
-+      pid = waitpid(-1, &status, WUNTRACED);
-+
-+      if (WIFSTOPPED(status)) {
-+          kill(getpid(), SIGSTOP);
-+          /* once we get here, we must have resumed */
-+          kill(pid, SIGCONT);
-+      }
-+    } while (WIFSTOPPED(status));
-+  }
-+
-+  if (caught) {
-+    fprintf(stderr, "\nSession terminated, killing shell...");
-+    kill (child, SIGTERM);
-+  }
-+  /* Not checking retval on this because we need to call close session */
-+  pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT);
-+  retval = pam_close_session(pamh, 0);
-+  PAM_BAIL_P_VOID;
-+  retval = pam_end(pamh, PAM_SUCCESS);
-+  PAM_BAIL_P_VOID;
-+  if (caught) {
-+    sleep(2);
-+    kill(child, SIGKILL);
-+    fprintf(stderr, " ...killed.\n");
-+    exit(-1);
-+  }
-+  exit (WEXITSTATUS(status));
-+#endif /* USE_PAM */
- }
- 
- /* Return true if SHELL is a restricted shell (one not returned by
-@@ -527,9 +739,9 @@
-   shell = xstrdup (shell ? shell : pw->pw_shell);
-   modify_environment (pw, shell);
- 
-+#ifndef USE_PAM
-   change_identity (pw);
--  if (simulate_login && chdir (pw->pw_dir) != 0)
--    error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
-+#endif
- 
--  run_shell (shell, command, argv + optind, MAX (0, argc - optind));
-+  run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw);
- }
---- coreutils-6.7/doc/coreutils.texi.pam	2006-10-27 15:30:48.000000000 +0100
-+++ coreutils-6.7/doc/coreutils.texi	2007-01-09 17:00:01.000000000 +0000
-@@ -13395,8 +13395,11 @@
- @findex syslog
- @command{su} can optionally be compiled to use @code{syslog} to report
- failed, and optionally successful, @command{su} attempts.  (If the system
--supports @code{syslog}.)  However, GNU @command{su} does not check if the
--user is a member of the @code{wheel} group; see below.
-+supports @code{syslog}.)
-+
-+This version of @command{su} has support for using PAM for
-+authentication.  You can edit @file{/etc/pam.d/su} to customize its
-+behaviour.
- 
- The program accepts the following options.  Also see @ref{Common options}.
- 
-@@ -13477,33 +13480,6 @@
- the exit status of the subshell otherwise
- @end display
- 
--@cindex wheel group, not supported
--@cindex group wheel, not supported
--@cindex fascism
--@subsection Why GNU @command{su} does not support the @samp{wheel} group
--
--(This section is by Richard Stallman.)
--
--@cindex Twenex
--@cindex MIT AI lab
--Sometimes a few of the users try to hold total power over all the
--rest.  For example, in 1984, a few users at the MIT AI lab decided to
--seize power by changing the operator password on the Twenex system and
--keeping it secret from everyone else.  (I was able to thwart this coup
--and give power back to the users by patching the kernel, but I
--wouldn't know how to do that in Unix.)
--
--However, occasionally the rulers do tell someone.  Under the usual
--@command{su} mechanism, once someone learns the root password who
--sympathizes with the ordinary users, he or she can tell the rest.  The
--``wheel group'' feature would make this impossible, and thus cement the
--power of the rulers.
--
--I'm on the side of the masses, not that of the rulers.  If you are
--used to supporting the bosses and sysadmins in whatever they do, you
--might find this idea strange at first.
--
--
- @node Process control
- @chapter Process control
- 
---- coreutils-6.7/configure.ac.pam	2006-12-07 21:30:24.000000000 +0000
-+++ coreutils-6.7/configure.ac	2007-01-09 17:18:04.000000000 +0000
-@@ -44,6 +44,13 @@
- gl_INIT
- coreutils_MACROS
- 
-+dnl Give the chance to enable PAM
-+AC_ARG_ENABLE(pam, dnl
-+[  --enable-pam              Enable use of the PAM libraries],
-+[AC_DEFINE(USE_PAM, 1, [Define if you want to use PAM])
-+LIB_PAM="-ldl -lpam -lpam_misc"
-+AC_SUBST(LIB_PAM)])
-+
- AC_FUNC_FORK
-
- optional_bin_progs=

coreutils-python3.patch

@@ -0,0 +1,65 @@
+From 8927d505ecb5334f09c48ef98ef1f464f581d0f7 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Tue, 2 Apr 2024 14:11:26 +0100
+Subject: [PATCH] coreutils-python3.patch
+
+---
+ init.cfg                              | 4 ++--
+ tests/d_type-check                    | 2 +-
+ tests/du/move-dir-while-traversing.sh | 6 +++---
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/init.cfg b/init.cfg
+index ac05f7b..26d9516 100644
+--- a/init.cfg
++++ b/init.cfg
+@@ -601,10 +601,10 @@ seek_data_capable_()
+ # Skip the current test if "." lacks d_type support.
+ require_dirent_d_type_()
+ {
+-  python < /dev/null \
++  python3 < /dev/null \
+     || skip_ python missing: assuming no d_type support
+ 
+-  python "$abs_srcdir"/tests/d_type-check \
++  python3 "$abs_srcdir"/tests/d_type-check \
+     || skip_ requires d_type support
+ }
+ 
+diff --git a/tests/d_type-check b/tests/d_type-check
+index 1a2f76f..42d3924 100644
+--- a/tests/d_type-check
++++ b/tests/d_type-check
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # Exit 0 if "." and "./tempfile" have useful d_type information, else 1.
+ # Intended to exit 0 only on Linux/GNU systems.
+ import os
+diff --git a/tests/du/move-dir-while-traversing.sh b/tests/du/move-dir-while-traversing.sh
+index adf482b..cf9214a 100755
+--- a/tests/du/move-dir-while-traversing.sh
++++ b/tests/du/move-dir-while-traversing.sh
+@@ -21,8 +21,8 @@ print_ver_ du
+ require_trap_signame_
+ 
+ # We use a python-inotify script, so...
+-python -m pyinotify -h > /dev/null \
+-  || skip_ 'python inotify package not installed'
++python3 -m pyinotify -h > /dev/null \
++  || skip_ 'python3 inotify package not installed'
+ 
+ # Move a directory "up" while du is processing its sub-directories.
+ # While du is processing a hierarchy .../B/C/D/... this script
+@@ -33,7 +33,7 @@ python -m pyinotify -h > /dev/null \
+ # rename syscall before du finishes processing the subtree under D/.
+ 
+ cat <<'EOF' > inotify-watch-for-dir-access.py
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ import pyinotify as pn
+ import os,sys
+ 
+-- 
+2.51.0
+

coreutils-runuser-l.pamd

@@ -1,4 +0,0 @@
-#%PAM-1.0
-auth		include		runuser
-session		optional	pam_keyinit.so force revoke
-session		include		runuser

coreutils-runuser.pamd

@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-session		optional	pam_keyinit.so revoke
-session		required	pam_limits.so
-session		required	pam_unix.so

coreutils-selinuxmanpages.patch

@@ -1,70 +0,0 @@
-diff -urNp coreutils-6.10-orig/man/cp.1 coreutils-6.10/man/cp.1
---- coreutils-6.10-orig/man/cp.1	2008-04-07 14:46:37.000000000 +0200
-+++ coreutils-6.10/man/cp.1	2008-04-07 15:34:17.000000000 +0200
-@@ -19,7 +19,7 @@ Copy SOURCE to DEST, or multiple SOURCE(
- Mandatory arguments to long options are mandatory for short options too.
- .TP
- \fB\-a\fR, \fB\-\-archive\fR
--same as \fB\-dpR\fR
-+same as \fB\-cdpR\fR
- .TP
- \fB\-\-backup\fR[=\fICONTROL\fR]
- make a backup of each existing destination file
-@@ -55,6 +55,9 @@ never follow symbolic links in SOURCE
- \fB\-p\fR
- same as \fB\-\-preserve\fR=\fImode\fR,ownership,timestamps
- .TP
-+\fB\-c\fR
-+same as \fB\-\-preserve\fR=context\fR
-+.TP
- \fB\-\-preserve\fR[=\fIATTR_LIST\fR]
- preserve the specified attributes (default:
- mode,ownership,timestamps), if possible
-diff -urNp coreutils-6.10-orig/doc/coreutils.info coreutils-6.10/doc/coreutils.info
---- coreutils-6.10-orig/doc/coreutils.info	2008-04-07 17:52:11.000000000 +0200
-+++ coreutils-6.10/doc/coreutils.info	2008-04-07 18:03:27.000000000 +0200
-@@ -5642,7 +5642,7 @@ options::.
-      Preserve as much as possible of the structure and attributes of the
-      original files in the copy (but do not attempt to preserve internal
-      directory structure; i.e., `ls -U' may list the entries in a copied
--     directory in a different order).  Equivalent to `-dpR'.
-+     directory in a different order).  Equivalent to `-cdpR'.
- 
- `-b'
- `--backup[=METHOD]'
-@@ -5660,6 +5660,11 @@ options::.
-             cp --backup --force -- "$i" "$i"
-           done
- 
-+`-c'
-+     Preserve SELinux security context of the original files if possible.
-+     Note: Some file systems don't support storing of SELinux security 
-+           context.
-+
- `--copy-contents'
-      If copying recursively, copy the contents of any special files
-      (e.g., FIFOs and device files) as if they were regular files.
-diff -urNp coreutils-6.10-orig/doc/coreutils.texi coreutils-6.10/doc/coreutils.texi
---- coreutils-6.10-orig/doc/coreutils.texi	2008-04-07 17:52:11.000000000 +0200
-+++ coreutils-6.10/doc/coreutils.texi	2008-04-07 18:01:43.000000000 +0200
-@@ -6957,7 +6957,7 @@ Preserve as much as possible of the stru
- original files in the copy (but do not attempt to preserve internal
- directory structure; i.e., @samp{ls -U} may list the entries in a copied
- directory in a different order).
--Equivalent to @option{-dpR}.
-+Equivalent to @option{-cdpR}.
- 
- @item -b
- @itemx @w{@kbd{--backup}[=@var{method}]}
-@@ -6981,6 +6981,11 @@ for i; do
- done
- @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

coreutils-setsid.patch

@@ -1,96 +0,0 @@
---- coreutils-6.7/src/su.c.setsid	2007-01-09 17:26:26.000000000 +0000
-+++ coreutils-6.7/src/su.c	2007-01-09 17:26:57.000000000 +0000
-@@ -176,9 +176,13 @@
- /* If true, change some environment vars to indicate the user su'd to.  */
- static bool change_environment;
- 
-+/* If true, then don't call setsid() with a command. */
-+int same_session = 0;
-+
- static struct option const longopts[] =
- {
-   {"command", required_argument, NULL, 'c'},
-+  {"session-command", required_argument, NULL, 'C'},
-   {"fast", no_argument, NULL, 'f'},
-   {"login", no_argument, NULL, 'l'},
-   {"preserve-environment", no_argument, NULL, 'p'},
-@@ -478,6 +482,8 @@
-   if (child == 0) {  /* child shell */
-   change_identity (pw);
-   pam_end(pamh, 0);
-+  if (!same_session)
-+    setsid ();
- #endif
- 
-   if (simulate_login)
-@@ -532,13 +538,27 @@
-     sigemptyset(&action.sa_mask);
-     action.sa_flags = 0;
-     sigemptyset(&ourset);
--    if (sigaddset(&ourset, SIGTERM)
--        || sigaddset(&ourset, SIGALRM)
--        || sigaction(SIGTERM, &action, NULL)
--        || sigprocmask(SIG_UNBLOCK, &ourset, NULL)) {
-+    if (!same_session)
-+      {
-+	if (sigaddset(&ourset, SIGINT) || sigaddset(&ourset, SIGQUIT))
-+	  {
-+	    fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
-+	    caught = 1;
-+	  }
-+      }
-+    if (!caught && (sigaddset(&ourset, SIGTERM)
-+		    || sigaddset(&ourset, SIGALRM)
-+		    || sigaction(SIGTERM, &action, NULL)
-+		    || sigprocmask(SIG_UNBLOCK, &ourset, NULL))) {
-       fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
-       caught = 1;
-     }
-+    if (!caught && !same_session && (sigaction(SIGINT, &action, NULL)
-+				     || sigaction(SIGQUIT, &action, NULL)))
-+      {
-+	fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
-+	caught = 1;
-+      }
-   }
-   if (!caught) {
-     do {
-@@ -609,6 +629,8 @@
- \n\
-   -, -l, --login               make the shell a login shell\n\
-   -c, --command=COMMAND        pass a single COMMAND to the shell with -c\n\
-+  --session-command=COMMAND    pass a single COMMAND to the shell with -c\n\
-+                               and do not create a new session\n\
-   -f, --fast                   pass -f to the shell (for csh or tcsh)\n\
-   -m, --preserve-environment   do not reset environment variables\n\
-   -p                           same as -m\n\
-@@ -631,6 +653,7 @@
-   int optc;
-   const char *new_user = DEFAULT_USER;
-   char *command = NULL;
-+  int request_same_session = 0;
-   char *shell = NULL;
-   struct passwd *pw;
-   struct passwd pw_copy;
-@@ -656,6 +679,11 @@
- 	  command = optarg;
- 	  break;
- 
-+	case 'C':
-+	  command = optarg;
-+	  request_same_session = 1;
-+	  break;
-+
- 	case 'f':
- 	  fast_startup = true;
- 	  break;
-@@ -725,6 +753,9 @@
-     }
- #endif
- 
-+  if (request_same_session || !command || !pw->pw_uid)
-+    same_session = 1;
-+
-   if (!shell && !change_environment)
-     shell = getenv ("SHELL");
-   if (shell && getuid () != 0 && restricted_shell (pw->pw_shell))

coreutils-split-pam.patch

@@ -1,57 +0,0 @@
-diff -uNrp -x '*~' coreutils-5.97-orig/src/su.c coreutils-5.97/src/su.c
---- coreutils-5.97-orig/src/su.c	2006-07-13 12:14:40.000000000 +0100
-+++ coreutils-5.97/src/su.c	2006-07-13 12:24:33.000000000 +0100
-@@ -131,11 +131,15 @@
- 
- #include "error.h"
- 
--/* The official name of this program (e.g., no `g' prefix).  */
-+/* The official name of this program (e.g., no `g' prefix).
-+ * - Add a "-l" to the name passed to PAM if this is a login simulation
-+ */
- #ifndef RUNUSER
- #define PROGRAM_NAME "su"
-+#define PROGRAM_NAME_L "su-l"
- #else
- #define PROGRAM_NAME "runuser"
-+#define PROGRAM_NAME_L "runuser-l"
- #endif
- 
- #ifndef AUTHORS
-@@ -310,7 +314,8 @@ correct_password (const struct passwd *p
- #ifdef USE_PAM
-   struct passwd *caller;
-   char *tty_name, *ttyn;
--  retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh);
-+  retval = pam_start(simulate_login ? PROGRAM_NAME_L : PROGRAM_NAME,
-+		     pw->pw_name, &conv, &pamh);
-   PAM_BAIL_P;
- 
- #ifndef RUNUSER
-diff -urp coreutils-6.10-orig/doc/coreutils.info coreutils-6.10/doc/coreutils.info
---- coreutils-6.10-orig/doc/coreutils.info	2008-01-22 00:32:44.000000000 +0100
-+++ coreutils-6.10/doc/coreutils.info	2008-01-24 17:17:04.000000000 +0100
-@@ -11006,7 +11006,8 @@ options::.
-      set, even for the super-user, as described above), and set `PATH'
-      to a compiled-in default value.  Change to USER's home directory.
-      Prepend `-' to the shell's name, intended to make it read its
--     login startup file(s).
-+     login startup file(s). When this option is given, /etc/pam.d/su-l
-+     PAM file is used instead of the default one.
- 
- `-m'
- `-p'
-diff -urp coreutils-6.10-orig/doc/coreutils.texi coreutils-6.10/doc/coreutils.texi
---- coreutils-6.10-orig/doc/coreutils.texi	2008-01-24 16:50:57.000000000 +0100
-+++ coreutils-6.10/doc/coreutils.texi	2008-01-24 17:12:58.000000000 +0100
-@@ -13670,7 +13670,9 @@ the exit status of @var{command} otherwi
- 
- @command{su} allows one user to temporarily become another user.  It runs a
- command (often an interactive shell) with the real and effective user
--ID, group ID, and supplemental groups of a given @var{user}.  Synopsis:
-+ID, group ID, and supplemental groups of a given @var{user}. When the -l
-+option is given, the su-l PAM file is used instead of the default su PAM file.
-+Synopsis:
- 
- @example
- su [@var{option}]@dots{} [@var{user} [@var{arg}]@dots{}]

coreutils-su-l.pamd

@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		include		su
-account		include		su
-password	include		su
-session		optional	pam_keyinit.so force revoke
-session		include		su

coreutils-su.pamd

@@ -1,12 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-# Uncomment the following line to implicitly trust users in the "wheel" group.
-#auth		sufficient	pam_wheel.so trust use_uid
-# Uncomment the following line to require a user to be in the "wheel" group.
-#auth		required	pam_wheel.so use_uid
-auth		include		system-auth
-account		sufficient	pam_succeed_if.so uid = 0 use_uid quiet
-account		include		system-auth
-password	include		system-auth
-session		include		system-auth
-session		optional	pam_xauth.so

sh-utils-1.16-paths.patch

@@ -1,18 +0,0 @@
---- sh-utils-1.16/src/su.c.badpaths	Mon Apr 14 14:26:55 1997
-+++ sh-utils-1.16/src/su.c	Sun Aug 17 14:11:31 EDT 2003
-@@ -147,6 +147,15 @@
- #define DEFAULT_ROOT_LOGIN_PATH "/usr/ucb:/bin:/usr/bin:/etc"
- #endif
- 
-+/* The default paths which get set are both bogus and oddly influenced
-+   by <paths.h> and -D on the commands line. Just to be clear, we'll set
-+   these explicitly. -ewt */
-+#undef DEFAULT_LOGIN_PATH
-+#undef DEFAULT_ROOT_LOGIN_PATH
-+#define DEFAULT_LOGIN_PATH "/usr/local/bin:/bin:/usr/bin"
-+#define DEFAULT_ROOT_LOGIN_PATH \
-+    "/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
-+
- /* The shell to run if none is given in the user's passwd entry.  */
- #define DEFAULT_SHELL "/bin/sh"
- 

sh-utils-2.0.11-dateman.patch

@@ -1,14 +0,0 @@
---- coreutils-5.92/man/date.1.dateman	2005-10-22 19:14:46.000000000 +0100
-+++ coreutils-5.92/man/date.1	2005-10-24 17:57:38.000000000 +0100
-@@ -188,6 +188,11 @@
- then an optional modifier, which is either
- E to use the locale's alternate representations if available, or
- O to use the locale's alternate numeric symbols if available.
-+.SH ENVIRONMENT
-+.TP
-+TZ
-+Specifies the timezone, unless overridden by command line parameters.
-+If neither is specified, the setting from /etc/localtime is used.
- .SH AUTHOR
- Written by David MacKenzie.
- .SH "REPORTING BUGS"

sources

@@ -1 +1,2 @@
-23582a4e8b21e837cfbafbc3834a8a4b  coreutils-6.10.tar.lzma
+SHA512 (coreutils-9.9.tar.xz.sig) = 0a3dfdfa6b4234e2e1d42142269f959bdf3cf8f6605a50270a27eff84dd22588f182121f7dd3eeb04be45f5109d02690215065b3d3b43882874d0e165a1435d0
+SHA512 (coreutils-9.9.tar.xz) = e7b0e59f7732d2c098ea4934014f470248bd5c4764210e9200a698010a8e3b95bbb26e543f0cd73ed5a4b8e1f8cda932c73f39954d68175e4deaa47526610c65

supported_utils

@@ -0,0 +1,105 @@
+%{_bindir}/arch
+%{_bindir}/b2sum
+%{_bindir}/basename
+%{_bindir}/basenc
+%{_bindir}/cat
+%{_bindir}/chgrp
+%{_bindir}/chmod
+%{_bindir}/chown
+%{_bindir}/cp
+%{_bindir}/cut
+%{_bindir}/date
+%{_bindir}/dd
+%{_bindir}/df
+%{_bindir}/echo
+%{_bindir}/env
+%{_bindir}/false
+%{_bindir}/link
+%{_bindir}/ln
+%{_bindir}/ls
+%{_bindir}/mkdir
+%{_bindir}/mknod
+%{_bindir}/mv
+%{_bindir}/nice
+%{_bindir}/pwd
+%{_bindir}/readlink
+%{_bindir}/rm
+%{_bindir}/rmdir
+%{_bindir}/sleep
+%{_bindir}/sort
+%{_bindir}/stty
+%{_bindir}/sync
+%{_bindir}/mktemp
+%{_bindir}/touch
+%{_bindir}/true
+%{_bindir}/uname
+%{_bindir}/unlink
+%{_bindir}/[
+%{_bindir}/base32
+%{_bindir}/base64
+%{_bindir}/chcon
+%{_bindir}/cksum
+%{_bindir}/comm
+%{_bindir}/csplit
+%{_bindir}/dir
+%{_bindir}/dircolors
+%{_bindir}/dirname
+%{_bindir}/du
+%{_bindir}/expand
+%{_bindir}/expr
+%{_bindir}/factor
+%{_bindir}/fmt
+%{_bindir}/fold
+%{_bindir}/groups
+%{_bindir}/head
+%{_bindir}/hostid
+%{_bindir}/id
+%{_bindir}/install
+%{_bindir}/join
+%{_bindir}/logname
+%{_bindir}/md5sum
+%{_bindir}/mkfifo
+%{_bindir}/nl
+%{_bindir}/nohup
+%{_bindir}/nproc
+%{_bindir}/numfmt
+%{_bindir}/od
+%{_bindir}/paste
+%{_bindir}/pathchk
+%{_bindir}/pinky
+%{_bindir}/pr
+%{_bindir}/printenv
+%{_bindir}/printf
+%{_bindir}/ptx
+%{_bindir}/realpath
+%{_bindir}/runcon
+%{_bindir}/seq
+%{_bindir}/sha1sum
+%{_bindir}/sha224sum
+%{_bindir}/sha256sum
+%{_bindir}/sha384sum
+%{_bindir}/sha512sum
+%{_bindir}/shred
+%{_bindir}/shuf
+%{_bindir}/split
+%{_bindir}/stat
+%{_bindir}/stdbuf
+%{_bindir}/sum
+%{_bindir}/tac
+%{_bindir}/tail
+%{_bindir}/tee
+%{_bindir}/test
+%{_bindir}/timeout
+%{_bindir}/tr
+%{_bindir}/truncate
+%{_bindir}/tsort
+%{_bindir}/tty
+%{_bindir}/unexpand
+%{_bindir}/uniq
+%{_bindir}/users
+%{_bindir}/vdir
+%{_bindir}/wc
+%{_bindir}/who
+%{_bindir}/whoami
+%{_bindir}/yes
+%{_sbindir}/chroot

upstream-key.gpg

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