From b5f92004485e03004e5830205af0d1873f84f482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Fri, 9 Sep 2011 13:16:47 +0200 Subject: [PATCH] new upstream release 8.13, drop libs subpackage, temporarily disable multibyte checks in misc/cut test --- .gitignore | 1 + coreutils-6.10-configuration.patch | 43 ++-- coreutils-7.4-sttytcsadrain.patch | 10 +- coreutils-acl-extended-file-nofollow.patch | 74 ------- coreutils-cpZ-deprecate.patch | 1 - coreutils-df-direct.patch | 2 +- coreutils-i18n.patch | 217 +++++++++++---------- coreutils-selinux.patch | 158 +++++++-------- coreutils.spec | 51 ++--- sources | 2 +- 10 files changed, 243 insertions(+), 316 deletions(-) delete mode 100644 coreutils-acl-extended-file-nofollow.patch diff --git a/.gitignore b/.gitignore index 298ae80..c560e51 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /coreutils-8.10.tar.xz /coreutils-8.11.tar.xz /coreutils-8.12.tar.xz +/coreutils-8.13.tar.xz diff --git a/coreutils-6.10-configuration.patch b/coreutils-6.10-configuration.patch index 4f52076..8dd43f8 100644 --- a/coreutils-6.10-configuration.patch +++ b/coreutils-6.10-configuration.patch @@ -1,7 +1,7 @@ -diff -urNp coreutils-8.4-orig/gnulib-tests/gnulib.mk coreutils-8.4/gnulib-tests/gnulib.mk ---- coreutils-8.4-orig/gnulib-tests/gnulib.mk 2010-01-13 22:01:30.000000000 +0100 -+++ coreutils-8.4/gnulib-tests/gnulib.mk 2010-01-14 10:28:17.000000000 +0100 -@@ -256,9 +256,9 @@ EXTRA_DIST += nap.h test-chown.h test-ch +diff -urNp coreutils-8.13-orig/gnulib-tests/gnulib.mk coreutils-8.13/gnulib-tests/gnulib.mk +--- coreutils-8.13-orig/gnulib-tests/gnulib.mk 2011-09-08 17:09:08.000000000 +0200 ++++ coreutils-8.13/gnulib-tests/gnulib.mk 2011-09-09 10:14:18.714689661 +0200 +@@ -235,9 +235,9 @@ EXTRA_DIST += nap.h test-chown.h test-ch ## begin gnulib module cloexec-tests @@ -14,7 +14,7 @@ diff -urNp coreutils-8.4-orig/gnulib-tests/gnulib.mk coreutils-8.4/gnulib-tests/ ## end gnulib module cloexec-tests -@@ -332,9 +332,9 @@ EXTRA_DIST += test-dirname.c +@@ -321,9 +321,9 @@ EXTRA_DIST += test-dirname.c ## begin gnulib module dup2-tests @@ -27,7 +27,7 @@ diff -urNp coreutils-8.4-orig/gnulib-tests/gnulib.mk coreutils-8.4/gnulib-tests/ ## end gnulib module dup2-tests -@@ -376,9 +376,9 @@ EXTRA_DIST += test-exclude.c test-exclud +@@ -373,9 +373,9 @@ EXTRA_DIST += test-fadvise.c ## begin gnulib module fchdir-tests @@ -40,7 +40,7 @@ diff -urNp coreutils-8.4-orig/gnulib-tests/gnulib.mk coreutils-8.4/gnulib-tests/ ## end gnulib module fchdir-tests -@@ -855,10 +855,10 @@ EXTRA_DIST += $(top_srcdir)/build-aux/li +@@ -918,10 +918,10 @@ EXTRA_DIST += test-link.h test-link.c si ## begin gnulib module linkat-tests @@ -55,7 +55,7 @@ diff -urNp coreutils-8.4-orig/gnulib-tests/gnulib.mk coreutils-8.4/gnulib-tests/ ## end gnulib module linkat-tests -@@ -1532,9 +1532,9 @@ EXTRA_DIST += test-uname.c signature.h m +@@ -1891,9 +1891,9 @@ EXTRA_DIST += test-uname.c signature.h m ## begin gnulib module unistd-safer-tests @@ -68,26 +68,25 @@ diff -urNp coreutils-8.4-orig/gnulib-tests/gnulib.mk coreutils-8.4/gnulib-tests/ ## end gnulib module unistd-safer-tests -@@ -1644,10 +1644,10 @@ EXTRA_DIST += test-usleep.c signature.h +@@ -1997,10 +1997,10 @@ EXTRA_DIST += test-usleep.c signature.h ## begin gnulib module utimens-tests -TESTS += test-utimens -check_PROGRAMS += test-utimens --test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@ +-test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) -EXTRA_DIST += nap.h test-futimens.h test-lutimens.h test-utimens.h test-utimens-common.h test-utimens.c macros.h +#TESTS += test-utimens +#check_PROGRAMS += test-utimens -+#test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@ ++#test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) +#EXTRA_DIST += nap.h test-futimens.h test-lutimens.h test-utimens.h test-utimens-common.h test-utimens.c macros.h ## end gnulib module utimens-tests - -diff -urNp coreutils-8.4-orig/tests/Makefile.am coreutils-8.4/tests/Makefile.am ---- coreutils-8.4-orig/tests/Makefile.am 2010-01-03 18:06:20.000000000 +0100 -+++ coreutils-8.4/tests/Makefile.am 2010-01-14 10:28:17.000000000 +0100 -@@ -79,7 +79,6 @@ TESTS = \ +diff -urNp coreutils-8.13-orig/tests/Makefile.am coreutils-8.13/tests/Makefile.am +--- coreutils-8.13-orig/tests/Makefile.am 2011-09-02 14:08:40.000000000 +0200 ++++ coreutils-8.13/tests/Makefile.am 2011-09-09 10:12:56.364814725 +0200 +@@ -86,7 +86,6 @@ TESTS = \ rm/ext3-perf \ rm/cycle \ cp/link-heap \ @@ -95,15 +94,15 @@ diff -urNp coreutils-8.4-orig/tests/Makefile.am coreutils-8.4/tests/Makefile.am tail-2/inotify-hash-abuse2 \ tail-2/F-vs-missing \ tail-2/F-vs-rename \ -diff -urNp coreutils-8.4-orig/tests/touch/no-dereference coreutils-8.4/tests/touch/no-dereference ---- coreutils-8.4-orig/tests/touch/no-dereference 2010-01-12 15:36:17.000000000 +0100 -+++ coreutils-8.4/tests/touch/no-dereference 2010-01-14 10:28:17.000000000 +0100 -@@ -46,6 +46,8 @@ test -f nowhere && fail=1 +diff -urNp coreutils-8.13-orig/tests/touch/no-dereference coreutils-8.13/tests/touch/no-dereference +--- coreutils-8.13-orig/tests/touch/no-dereference 2011-08-08 09:42:16.000000000 +0200 ++++ coreutils-8.13/tests/touch/no-dereference 2011-09-09 10:15:21.167060702 +0200 +@@ -42,6 +42,8 @@ test -f nowhere && fail=1 grep '^#define HAVE_UTIMENSAT 1' "$CONFIG_HEADER" > /dev/null || grep '^#define HAVE_LUTIMES 1' "$CONFIG_HEADER" > /dev/null || - skip_test_ 'this system lacks the utimensat function' + skip_ 'this system lacks the utimensat function' +grep '^#define HAVE_WORKINGKOJI 1' "$CONFIG_HEADER" > /dev/null || -+ skip_test_ 'rest of the test disabled due to koji lack of utimensat function' ++ skip_ 'rest of the test disabled due to koji lack of utimensat function' # Changing time of dangling symlink is okay. # Skip the test if this fails, but the error text corresponds to diff --git a/coreutils-7.4-sttytcsadrain.patch b/coreutils-7.4-sttytcsadrain.patch index caf8387..fe83798 100644 --- a/coreutils-7.4-sttytcsadrain.patch +++ b/coreutils-7.4-sttytcsadrain.patch @@ -1,9 +1,9 @@ -diff -urNp coreutils-7.4-orig/src/stty.c coreutils-7.4/src/stty.c ---- coreutils-7.4-orig/src/stty.c 2009-04-24 14:41:19.000000000 +0200 -+++ coreutils-7.4/src/stty.c 2009-06-11 10:15:41.000000000 +0200 -@@ -1001,7 +1001,7 @@ main (int argc, char **argv) +diff -urNp coreutils-8.13-orig/src/stty.c coreutils-8.13/src/stty.c +--- coreutils-8.13-orig/src/stty.c 2011-07-28 12:38:27.000000000 +0200 ++++ coreutils-8.13/src/stty.c 2011-09-09 10:18:57.526687209 +0200 +@@ -1005,7 +1005,7 @@ main (int argc, char **argv) spurious difference in an uninitialized portion of the structure. */ - DECLARE_ZEROED_AGGREGATE (struct termios, new_mode); + struct termios new_mode = { 0, }; - if (tcsetattr (STDIN_FILENO, TCSADRAIN, &mode)) + if (tcsetattr (STDIN_FILENO, TCSANOW, &mode)) diff --git a/coreutils-acl-extended-file-nofollow.patch b/coreutils-acl-extended-file-nofollow.patch deleted file mode 100644 index ad72293..0000000 --- a/coreutils-acl-extended-file-nofollow.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 95f7c57ff4090a5dee062044d2c7b99879077808 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka redhat.com> -Date: Fri, 22 Jul 2011 14:48:42 +0200 -Subject: [PATCH] file-has-acl: use acl_extended_file_nofollow if available - -* lib/acl-internal.h (HAVE_ACL_EXTENDED_FILE): New macro. -(acl_extended_file): New macro. -* lib/file-has-acl.c (file_has_acl): Use acl_extended_file_nofollow. -* m4/acl.m4 (gl_FUNC_ACL): Check for acl_extended_file_nofollow. -This addresses http://bugzilla.redhat.com/692823. ---- - lib/acl-internal.h | 6 ++++++ - lib/file-has-acl.c | 10 +++++++++- - m4/acl.m4 | 2 +- - 3 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/lib/acl-internal.h b/lib/acl-internal.h -index b3160a7..b509666 100644 ---- a/lib/acl-internal.h -+++ b/lib/acl-internal.h -@@ -133,6 +133,12 @@ rpl_acl_set_fd (int fd, acl_t acl) - # endif - - /* Linux-specific */ -+# ifndef HAVE_ACL_EXTENDED_FILE_NOFOLLOW -+# define HAVE_ACL_EXTENDED_FILE_NOFOLLOW false -+# define acl_extended_file_nofollow(name) (-1) -+# endif -+ -+/* Linux-specific */ - # ifndef HAVE_ACL_FROM_MODE - # define HAVE_ACL_FROM_MODE false - # define acl_from_mode(mode) (NULL) -diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c -index 3d4d5c1..2ee6ba2 100644 ---- a/lib/file-has-acl.c -+++ b/lib/file-has-acl.c -@@ -366,12 +366,20 @@ file_has_acl (char const *name, struct stat const *sb) - /* Linux, FreeBSD, MacOS X, IRIX, Tru64 */ - int ret; - -- if (HAVE_ACL_EXTENDED_FILE) /* Linux */ -+ if (HAVE_ACL_EXTENDED_FILE || HAVE_ACL_EXTENDED_FILE_NOFOLLOW) /* Linux */ - { -+# if HAVE_ACL_EXTENDED_FILE_NOFOLLOW -+ /* acl_extended_file_nofollow() uses lgetxattr() in order to prevent -+ unnecessary mounts, but it returns the same result as we already -+ know that NAME is not a symbolic link at this point (modulo the -+ TOCTTOU race condition). */ -+ ret = acl_extended_file_nofollow (name); -+# else - /* On Linux, acl_extended_file is an optimized function: It only - makes two calls to getxattr(), one for ACL_TYPE_ACCESS, one for - ACL_TYPE_DEFAULT. */ - ret = acl_extended_file (name); -+# endif - } - else /* FreeBSD, MacOS X, IRIX, Tru64 */ - { -diff --git a/m4/acl.m4 b/m4/acl.m4 -index d6a448a..ecf0384 100644 ---- a/m4/acl.m4 -+++ b/m4/acl.m4 -@@ -33,7 +33,7 @@ AC_DEFUN([gl_FUNC_ACL], - AC_CHECK_FUNCS( - [acl_get_file acl_get_fd acl_set_file acl_set_fd \ - acl_free acl_from_mode acl_from_text \ -- acl_delete_def_file acl_extended_file \ -+ acl_delete_def_file acl_extended_file acl_extended_file_nofollow \ - acl_delete_fd_np acl_delete_file_np \ - acl_copy_ext_native acl_create_entry_np \ - acl_to_short_text acl_free_text]) --- -1.7.6.586.g302e6 diff --git a/coreutils-cpZ-deprecate.patch b/coreutils-cpZ-deprecate.patch index fce7b8c..713b7c5 100644 --- a/coreutils-cpZ-deprecate.patch +++ b/coreutils-cpZ-deprecate.patch @@ -10,7 +10,6 @@ diff -urNp coreutils-8.12-orig/src/copy.c coreutils-8.12/src/copy.c { bool all_errors = (!x->data_copy_required || x->require_preserve_context); -Binary files coreutils-8.12-orig/src/.copy.c.swp and coreutils-8.12/src/.copy.c.swp differ diff -urNp coreutils-8.12-orig/src/cp.c coreutils-8.12/src/cp.c --- coreutils-8.12-orig/src/cp.c 2011-08-11 16:05:15.435486976 +0200 +++ coreutils-8.12/src/cp.c 2011-08-11 16:16:56.408644526 +0200 diff --git a/coreutils-df-direct.patch b/coreutils-df-direct.patch index 025323d..2139809 100644 --- a/coreutils-df-direct.patch +++ b/coreutils-df-direct.patch @@ -133,7 +133,7 @@ diff -urNp coreutils-8.11-orig/tests/df/direct coreutils-8.11/tests/df/direct +. "${srcdir=.}/init.sh"; path_prepend_ ../src +print_ver_ df + -+df || skip_test_ "df fails" ++df || skip_ "df fails" + +DIR=`pwd` || framework_failure +FILE="$DIR/file" diff --git a/coreutils-i18n.patch b/coreutils-i18n.patch index 6e10f37..e8803ae 100644 --- a/coreutils-i18n.patch +++ b/coreutils-i18n.patch @@ -1,6 +1,6 @@ -diff -urNp coreutils-8.10-orig/lib/linebuffer.h coreutils-8.10/lib/linebuffer.h ---- coreutils-8.10-orig/lib/linebuffer.h 2011-01-06 09:47:56.000000000 +0100 -+++ coreutils-8.10/lib/linebuffer.h 2011-02-04 20:13:23.985464731 +0100 +diff -urNp coreutils-8.13-orig/lib/linebuffer.h coreutils-8.13/lib/linebuffer.h +--- coreutils-8.13-orig/lib/linebuffer.h 2011-04-24 19:21:45.000000000 +0200 ++++ coreutils-8.13/lib/linebuffer.h 2011-09-09 10:23:14.163704760 +0200 @@ -21,6 +21,11 @@ # include @@ -23,9 +23,9 @@ diff -urNp coreutils-8.10-orig/lib/linebuffer.h coreutils-8.10/lib/linebuffer.h }; /* Initialize linebuffer LINEBUFFER for use. */ -diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c ---- coreutils-8.10-orig/src/cut.c 2011-01-31 13:40:38.000000000 +0100 -+++ coreutils-8.10/src/cut.c 2011-02-04 20:13:23.988464025 +0100 +diff -urNp coreutils-8.13-orig/src/cut.c coreutils-8.13/src/cut.c +--- coreutils-8.13-orig/src/cut.c 2011-07-28 12:38:27.000000000 +0200 ++++ coreutils-8.13/src/cut.c 2011-09-09 10:23:14.165701039 +0200 @@ -28,6 +28,11 @@ #include #include @@ -226,7 +226,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c } max_range_endpoint = 0; -@@ -580,6 +662,63 @@ cut_bytes (FILE *stream) +@@ -582,6 +664,63 @@ cut_bytes (FILE *stream) } } @@ -290,7 +290,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c /* Read from stream STREAM, printing to standard output any selected fields. */ static void -@@ -702,13 +841,192 @@ cut_fields (FILE *stream) +@@ -704,13 +843,192 @@ cut_fields (FILE *stream) } } @@ -486,7 +486,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c } /* Process file FILE to standard output. -@@ -760,6 +1078,8 @@ main (int argc, char **argv) +@@ -762,6 +1080,8 @@ main (int argc, char **argv) bool ok; bool delim_specified = false; char *spec_list_string IF_LINT ( = NULL); @@ -495,7 +495,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c initialize_main (&argc, &argv); set_program_name (argv[0]); -@@ -782,7 +1102,6 @@ main (int argc, char **argv) +@@ -784,7 +1104,6 @@ main (int argc, char **argv) switch (optc) { case 'b': @@ -503,7 +503,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c /* Build the byte list. */ if (operating_mode != undefined_mode) FATAL_ERROR (_("only one type of list may be specified")); -@@ -790,6 +1109,14 @@ main (int argc, char **argv) +@@ -792,6 +1111,14 @@ main (int argc, char **argv) spec_list_string = optarg; break; @@ -518,7 +518,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c case 'f': /* Build the field list. */ if (operating_mode != undefined_mode) -@@ -801,10 +1128,35 @@ main (int argc, char **argv) +@@ -803,10 +1130,35 @@ main (int argc, char **argv) case 'd': /* New delimiter. */ /* Interpret -d '' to mean `use the NUL byte as the delimiter.' */ @@ -558,7 +558,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c break; case OUTPUT_DELIMITER_OPTION: -@@ -817,6 +1169,7 @@ main (int argc, char **argv) +@@ -819,6 +1171,7 @@ main (int argc, char **argv) break; case 'n': @@ -566,7 +566,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c break; case 's': -@@ -839,7 +1192,7 @@ main (int argc, char **argv) +@@ -841,7 +1194,7 @@ main (int argc, char **argv) if (operating_mode == undefined_mode) FATAL_ERROR (_("you must specify a list of bytes, characters, or fields")); @@ -575,7 +575,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c FATAL_ERROR (_("an input delimiter may be specified only\ when operating on fields")); -@@ -866,15 +1219,34 @@ main (int argc, char **argv) +@@ -868,15 +1221,34 @@ main (int argc, char **argv) } if (!delim_specified) @@ -616,9 +616,9 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c } if (optind == argc) -diff -urNp coreutils-8.10-orig/src/expand.c coreutils-8.10/src/expand.c ---- coreutils-8.10-orig/src/expand.c 2011-01-31 13:40:38.000000000 +0100 -+++ coreutils-8.10/src/expand.c 2011-02-04 20:13:23.990463571 +0100 +diff -urNp coreutils-8.13-orig/src/expand.c coreutils-8.13/src/expand.c +--- coreutils-8.13-orig/src/expand.c 2011-07-28 12:38:27.000000000 +0200 ++++ coreutils-8.13/src/expand.c 2011-09-09 10:23:14.167583399 +0200 @@ -38,12 +38,29 @@ #include #include @@ -806,9 +806,9 @@ diff -urNp coreutils-8.10-orig/src/expand.c coreutils-8.10/src/expand.c if (have_read_stdin && fclose (stdin) != 0) error (EXIT_FAILURE, errno, "-"); -diff -urNp coreutils-8.10-orig/src/fold.c coreutils-8.10/src/fold.c ---- coreutils-8.10-orig/src/fold.c 2011-01-31 13:40:38.000000000 +0100 -+++ coreutils-8.10/src/fold.c 2011-02-04 20:13:23.992463115 +0100 +diff -urNp coreutils-8.13-orig/src/fold.c coreutils-8.13/src/fold.c +--- coreutils-8.13-orig/src/fold.c 2011-07-28 12:38:27.000000000 +0200 ++++ coreutils-8.13/src/fold.c 2011-09-09 10:23:14.169583741 +0200 @@ -22,12 +22,34 @@ #include #include @@ -1179,7 +1179,7 @@ diff -urNp coreutils-8.10-orig/src/fold.c coreutils-8.10/src/fold.c if (ferror (istream)) { error (0, saved_errno, "%s", filename); -@@ -254,7 +502,8 @@ main (int argc, char **argv) +@@ -254,7 +501,8 @@ main (int argc, char **argv) atexit (close_stdout); @@ -1189,7 +1189,7 @@ diff -urNp coreutils-8.10-orig/src/fold.c coreutils-8.10/src/fold.c while ((optc = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1) { -@@ -263,7 +512,15 @@ main (int argc, char **argv) +@@ -263,7 +511,15 @@ main (int argc, char **argv) switch (optc) { case 'b': /* Count bytes rather than columns. */ @@ -1206,9 +1206,9 @@ diff -urNp coreutils-8.10-orig/src/fold.c coreutils-8.10/src/fold.c break; case 's': /* Break at word boundaries. */ -diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c ---- coreutils-8.10-orig/src/join.c 2011-01-31 13:40:38.000000000 +0100 -+++ coreutils-8.10/src/join.c 2011-02-04 20:20:15.985114387 +0100 +diff -urNp coreutils-8.13-orig/src/join.c coreutils-8.13/src/join.c +--- coreutils-8.13-orig/src/join.c 2011-08-08 10:16:09.000000000 +0200 ++++ coreutils-8.13/src/join.c 2011-09-09 10:23:14.172687087 +0200 @@ -22,18 +22,32 @@ #include #include @@ -1243,7 +1243,7 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "join" -@@ -129,10 +143,12 @@ static struct outlist outlist_head; +@@ -135,10 +149,12 @@ static struct outlist outlist_head; /* Last element in `outlist', where a new element can be added. */ static struct outlist *outlist_end = &outlist_head; @@ -1260,7 +1260,7 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c /* If nonzero, check that the input is correctly ordered. */ static enum -@@ -257,13 +273,14 @@ xfields (struct line *line) +@@ -263,13 +279,14 @@ xfields (struct line *line) if (ptr == lim) return; @@ -1278,7 +1278,7 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c { /* Skip leading blanks before the first field. */ while (isblank (to_uchar (*ptr))) -@@ -287,6 +304,148 @@ xfields (struct line *line) +@@ -293,6 +310,148 @@ xfields (struct line *line) extract_field (line, ptr, lim - ptr); } @@ -1427,7 +1427,7 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c static void freeline (struct line *line) { -@@ -308,56 +467,115 @@ keycmp (struct line const *line1, struct +@@ -314,56 +473,115 @@ keycmp (struct line const *line1, struct size_t jf_1, size_t jf_2) { /* Start of field to compare in each file. */ @@ -1566,9 +1566,9 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c } /* Check that successive input lines PREV and CURRENT from input file -@@ -438,6 +656,11 @@ get_line (FILE *fp, struct line **linep, - return false; +@@ -455,6 +673,11 @@ get_line (FILE *fp, struct line **linep, } + ++line_no[which - 1]; +#if HAVE_MBRTOWC + if (MB_CUR_MAX > 1) @@ -1578,7 +1578,7 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c xfields (line); if (prevline[which - 1]) -@@ -537,21 +760,28 @@ prfield (size_t n, struct line const *li +@@ -554,21 +777,28 @@ prfield (size_t n, struct line const *li /* Output all the fields in line, other than the join field. */ @@ -1610,7 +1610,7 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c prfield (i, line); } } -@@ -562,7 +792,6 @@ static void +@@ -579,7 +809,6 @@ static void prjoin (struct line const *line1, struct line const *line2) { const struct outlist *outlist; @@ -1618,7 +1618,7 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c size_t field; struct line const *line; -@@ -596,7 +825,7 @@ prjoin (struct line const *line1, struct +@@ -613,7 +842,7 @@ prjoin (struct line const *line1, struct o = o->next; if (o == NULL) break; @@ -1627,7 +1627,7 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c } putchar ('\n'); } -@@ -1075,21 +1304,46 @@ main (int argc, char **argv) +@@ -1091,21 +1320,46 @@ main (int argc, char **argv) case 't': { @@ -1683,9 +1683,9 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c break; case NOCHECK_ORDER_OPTION: -diff -urNp coreutils-8.10-orig/src/pr.c coreutils-8.10/src/pr.c ---- coreutils-8.10-orig/src/pr.c 2011-01-31 13:40:38.000000000 +0100 -+++ coreutils-8.10/src/pr.c 2011-02-04 20:13:24.002460897 +0100 +diff -urNp coreutils-8.13-orig/src/pr.c coreutils-8.13/src/pr.c +--- coreutils-8.13-orig/src/pr.c 2011-08-30 23:01:40.000000000 +0200 ++++ coreutils-8.13/src/pr.c 2011-09-09 10:23:14.177658905 +0200 @@ -312,6 +312,32 @@ #include @@ -2408,9 +2408,9 @@ diff -urNp coreutils-8.10-orig/src/pr.c coreutils-8.10/src/pr.c /* We've just printed some files and need to clean up things before looking for more options and printing the next batch of files. -diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c ---- coreutils-8.10-orig/src/sort.c 2011-02-03 11:24:35.000000000 +0100 -+++ coreutils-8.10/src/sort.c 2011-02-04 20:15:44.160384535 +0100 +diff -urNp coreutils-8.13-orig/src/sort.c coreutils-8.13/src/sort.c +--- coreutils-8.13-orig/src/sort.c 2011-07-29 10:12:25.000000000 +0200 ++++ coreutils-8.13/src/sort.c 2011-09-09 10:23:14.183686800 +0200 @@ -22,11 +22,20 @@ #include @@ -2432,7 +2432,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c #include "system.h" #include "argmatch.h" #include "error.h" -@@ -163,12 +172,34 @@ static int thousands_sep; +@@ -167,12 +176,34 @@ static int thousands_sep; /* Nonzero if the corresponding locales are hard. */ static bool hard_LC_COLLATE; @@ -2468,7 +2468,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c /* The kind of blanks for '-b' to skip in various options. */ enum blanktype { bl_start, bl_end, bl_both }; -@@ -335,13 +366,11 @@ static bool reverse; +@@ -343,13 +374,11 @@ static bool reverse; they were read if all keys compare equal. */ static bool stable; @@ -2485,7 +2485,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c /* Flag to remove consecutive duplicate lines from the output. Only the last of a sequence of equal lines will be output. */ -@@ -775,6 +804,46 @@ reap_all (void) +@@ -783,6 +812,46 @@ reap_all (void) reap (-1); } @@ -2532,7 +2532,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c /* Clean up any remaining temporary files. */ static void -@@ -1207,7 +1276,7 @@ zaptemp (char const *name) +@@ -1215,7 +1284,7 @@ zaptemp (char const *name) free (node); } @@ -2541,7 +2541,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c static int struct_month_cmp (void const *m1, void const *m2) -@@ -1222,7 +1291,7 @@ struct_month_cmp (void const *m1, void c +@@ -1230,7 +1299,7 @@ struct_month_cmp (void const *m1, void c /* Initialize the character class tables. */ static void @@ -2550,7 +2550,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c { size_t i; -@@ -1234,7 +1303,7 @@ inittables (void) +@@ -1242,7 +1311,7 @@ inittables (void) fold_toupper[i] = toupper (i); } @@ -2559,7 +2559,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c /* If we're not in the "C" locale, read different names for months. */ if (hard_LC_TIME) { -@@ -1316,6 +1385,84 @@ specify_nmerge (int oi, char c, char con +@@ -1324,6 +1393,84 @@ specify_nmerge (int oi, char c, char con xstrtol_fatal (e, oi, c, long_options, s); } @@ -2644,7 +2644,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c /* Specify the amount of main memory to use when sorting. */ static void specify_sort_size (int oi, char c, char const *s) -@@ -1544,7 +1691,7 @@ buffer_linelim (struct buffer const *buf +@@ -1552,7 +1699,7 @@ buffer_linelim (struct buffer const *buf by KEY in LINE. */ static char * @@ -2653,7 +2653,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c { char *ptr = line->text, *lim = ptr + line->length - 1; size_t sword = key->sword; -@@ -1553,10 +1700,10 @@ begfield (struct line const *line, struc +@@ -1561,10 +1708,10 @@ begfield (struct line const *line, struc /* The leading field separator itself is included in a field when -t is absent. */ @@ -2666,7 +2666,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c ++ptr; if (ptr < lim) ++ptr; -@@ -1582,11 +1729,70 @@ begfield (struct line const *line, struc +@@ -1590,11 +1737,70 @@ begfield (struct line const *line, struc return ptr; } @@ -2738,7 +2738,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c { char *ptr = line->text, *lim = ptr + line->length - 1; size_t eword = key->eword, echar = key->echar; -@@ -1601,10 +1807,10 @@ limfield (struct line const *line, struc +@@ -1609,10 +1815,10 @@ limfield (struct line const *line, struc `beginning' is the first character following the delimiting TAB. Otherwise, leave PTR pointing at the first `blank' character after the preceding field. */ @@ -2751,7 +2751,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c ++ptr; if (ptr < lim && (eword || echar)) ++ptr; -@@ -1650,10 +1856,10 @@ limfield (struct line const *line, struc +@@ -1658,10 +1864,10 @@ limfield (struct line const *line, struc */ /* Make LIM point to the end of (one byte past) the current field. */ @@ -2764,7 +2764,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c if (newlim) lim = newlim; } -@@ -1684,6 +1890,130 @@ limfield (struct line const *line, struc +@@ -1692,6 +1898,130 @@ limfield (struct line const *line, struc return ptr; } @@ -2895,7 +2895,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c /* Fill BUF reading from FP, moving buf->left bytes from the end of buf->buf to the beginning first. If EOF is reached and the file wasn't terminated by a newline, supply one. Set up BUF's line -@@ -1770,8 +2100,22 @@ fillbuf (struct buffer *buf, FILE *fp, c +@@ -1778,8 +2108,22 @@ fillbuf (struct buffer *buf, FILE *fp, c else { if (key->skipsblanks) @@ -2920,7 +2920,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c line->keybeg = line_start; } } -@@ -1892,7 +2236,7 @@ human_numcompare (char const *a, char co +@@ -1900,7 +2244,7 @@ human_numcompare (char const *a, char co hideously fast. */ static int @@ -2929,7 +2929,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c { while (blanks[to_uchar (*a)]) a++; -@@ -1902,6 +2246,25 @@ numcompare (char const *a, char const *b +@@ -1910,6 +2254,25 @@ numcompare (char const *a, char const *b return strnumcmp (a, b, decimal_point, thousands_sep); } @@ -2955,7 +2955,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c static int general_numcompare (char const *sa, char const *sb) { -@@ -1934,7 +2297,7 @@ general_numcompare (char const *sa, char +@@ -1942,7 +2305,7 @@ general_numcompare (char const *sa, char Return 0 if the name in S is not recognized. */ static int @@ -2964,7 +2964,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c { size_t lo = 0; size_t hi = MONTHS_PER_YEAR; -@@ -2209,15 +2572,14 @@ debug_key (struct line const *line, stru +@@ -2217,15 +2580,14 @@ debug_key (struct line const *line, stru char saved = *lim; *lim = '\0'; @@ -2982,7 +2982,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c else if (key->general_numeric) ignore_value (strtold (beg, &tighter_lim)); else if (key->numeric || key->human_numeric) -@@ -2361,7 +2723,7 @@ key_warnings (struct keyfield const *gke +@@ -2369,7 +2731,7 @@ key_warnings (struct keyfield const *gke bool maybe_space_aligned = !hard_LC_COLLATE && default_key_compare (key) && !(key->schar || key->echar); bool line_offset = key->eword == 0 && key->echar != 0; /* -k1.x,1.y */ @@ -2991,7 +2991,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c && ((!key->skipsblanks && !(implicit_skip || maybe_space_aligned)) || (!key->skipsblanks && key->schar) || (!key->skipeblanks && key->echar))) -@@ -2419,11 +2781,83 @@ key_warnings (struct keyfield const *gke +@@ -2427,11 +2789,83 @@ key_warnings (struct keyfield const *gke error (0, 0, _("option `-r' only applies to last-resort comparison")); } @@ -3076,7 +3076,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c { struct keyfield *key = keylist; -@@ -2508,7 +2942,7 @@ keycompare (struct line const *a, struct +@@ -2516,7 +2950,7 @@ keycompare (struct line const *a, struct else if (key->human_numeric) diff = human_numcompare (ta, tb); else if (key->month) @@ -3085,7 +3085,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c else if (key->random) diff = compare_random (ta, tlena, tb, tlenb); else if (key->version) -@@ -2624,6 +3058,179 @@ keycompare (struct line const *a, struct +@@ -2632,6 +3066,179 @@ keycompare (struct line const *a, struct return key->reverse ? -diff : diff; } @@ -3265,7 +3265,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c /* Compare two lines A and B, returning negative, zero, or positive depending on whether A compares less than, equal to, or greater than B. */ -@@ -4087,7 +4694,7 @@ main (int argc, char **argv) +@@ -4095,7 +4702,7 @@ main (int argc, char **argv) initialize_exit_failure (SORT_FAILURE); hard_LC_COLLATE = hard_locale (LC_COLLATE); @@ -3274,7 +3274,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c hard_LC_TIME = hard_locale (LC_TIME); #endif -@@ -4108,6 +4715,29 @@ main (int argc, char **argv) +@@ -4116,6 +4723,29 @@ main (int argc, char **argv) thousands_sep = -1; } @@ -3304,7 +3304,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c have_read_stdin = false; inittables (); -@@ -4378,13 +5008,34 @@ main (int argc, char **argv) +@@ -4386,13 +5016,34 @@ main (int argc, char **argv) case 't': { @@ -3343,7 +3343,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c else { /* Provoke with `sort -txx'. Complain about -@@ -4395,9 +5046,12 @@ main (int argc, char **argv) +@@ -4403,9 +5054,12 @@ main (int argc, char **argv) quote (optarg)); } } @@ -3358,9 +3358,9 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c } break; -diff -urNp coreutils-8.10-orig/src/unexpand.c coreutils-8.10/src/unexpand.c ---- coreutils-8.10-orig/src/unexpand.c 2011-01-31 13:40:38.000000000 +0100 -+++ coreutils-8.10/src/unexpand.c 2011-02-04 20:13:24.015458014 +0100 +diff -urNp coreutils-8.13-orig/src/unexpand.c coreutils-8.13/src/unexpand.c +--- coreutils-8.13-orig/src/unexpand.c 2011-07-28 12:38:27.000000000 +0200 ++++ coreutils-8.13/src/unexpand.c 2011-09-09 10:23:14.185647633 +0200 @@ -39,12 +39,29 @@ #include #include @@ -3614,9 +3614,9 @@ diff -urNp coreutils-8.10-orig/src/unexpand.c coreutils-8.10/src/unexpand.c if (have_read_stdin && fclose (stdin) != 0) error (EXIT_FAILURE, errno, "-"); -diff -urNp coreutils-8.10-orig/src/uniq.c coreutils-8.10/src/uniq.c ---- coreutils-8.10-orig/src/uniq.c 2011-01-31 13:40:38.000000000 +0100 -+++ coreutils-8.10/src/uniq.c 2011-02-04 20:13:24.018457349 +0100 +diff -urNp coreutils-8.13-orig/src/uniq.c coreutils-8.13/src/uniq.c +--- coreutils-8.13-orig/src/uniq.c 2011-07-28 12:38:27.000000000 +0200 ++++ coreutils-8.13/src/uniq.c 2011-09-09 10:24:19.631560964 +0200 @@ -21,6 +21,16 @@ #include #include @@ -3669,7 +3669,7 @@ diff -urNp coreutils-8.10-orig/src/uniq.c coreutils-8.10/src/uniq.c @@ -207,7 +233,7 @@ size_opt (char const *opt, char const *m return a pointer to the beginning of the line's field to be compared. */ - static char * + static char * _GL_ATTRIBUTE_PURE -find_field (struct linebuffer const *line) +find_field_uni (struct linebuffer *line) { @@ -3952,7 +3952,7 @@ diff -urNp coreutils-8.10-orig/src/uniq.c coreutils-8.10/src/uniq.c match = !different (thisfield, prevfield, thislen, prevlen); match_count += match; -@@ -383,6 +612,9 @@ check_file (const char *infile, const ch +@@ -383,6 +611,9 @@ check_file (const char *infile, const ch SWAP_LINES (prevline, thisline); prevfield = thisfield; prevlen = thislen; @@ -3962,7 +3962,7 @@ diff -urNp coreutils-8.10-orig/src/uniq.c coreutils-8.10/src/uniq.c if (!match) match_count = 0; } -@@ -428,6 +660,19 @@ main (int argc, char **argv) +@@ -428,6 +659,19 @@ main (int argc, char **argv) atexit (close_stdout); @@ -3982,10 +3982,10 @@ diff -urNp coreutils-8.10-orig/src/uniq.c coreutils-8.10/src/uniq.c skip_chars = 0; skip_fields = 0; check_chars = SIZE_MAX; -diff -urNp coreutils-8.10-orig/tests/Makefile.am coreutils-8.10/tests/Makefile.am ---- coreutils-8.10-orig/tests/Makefile.am 2011-02-04 20:12:58.236173903 +0100 -+++ coreutils-8.10/tests/Makefile.am 2011-02-04 20:13:24.020456905 +0100 -@@ -235,6 +235,7 @@ TESTS = \ +diff -urNp coreutils-8.13-orig/tests/Makefile.am coreutils-8.13/tests/Makefile.am +--- coreutils-8.13-orig/tests/Makefile.am 2011-09-09 10:22:43.352561668 +0200 ++++ coreutils-8.13/tests/Makefile.am 2011-09-09 10:23:14.189688942 +0200 +@@ -238,6 +238,7 @@ TESTS = \ misc/sort-debug-keys \ misc/sort-debug-warn \ misc/sort-files0-from \ @@ -3993,7 +3993,7 @@ diff -urNp coreutils-8.10-orig/tests/Makefile.am coreutils-8.10/tests/Makefile.a misc/sort-float \ misc/sort-merge \ misc/sort-merge-fdlimit \ -@@ -505,6 +506,10 @@ TESTS = \ +@@ -518,6 +519,10 @@ TESTS = \ $(root_tests) pr_data = \ @@ -4004,10 +4004,21 @@ diff -urNp coreutils-8.10-orig/tests/Makefile.am coreutils-8.10/tests/Makefile.a pr/0F \ pr/0FF \ pr/0FFnt \ -diff -urNp coreutils-8.10-orig/tests/misc/cut coreutils-8.10/tests/misc/cut ---- coreutils-8.10-orig/tests/misc/cut 2011-01-31 13:40:38.000000000 +0100 -+++ coreutils-8.10/tests/misc/cut 2011-02-04 20:13:24.021456684 +0100 -@@ -26,7 +26,7 @@ use strict; +diff -urNp coreutils-8.13-orig/tests/misc/cut coreutils-8.13/tests/misc/cut +--- coreutils-8.13-orig/tests/misc/cut 2011-09-02 14:08:40.000000000 +0200 ++++ coreutils-8.13/tests/misc/cut 2011-09-09 10:23:14.190686793 +0200 +@@ -23,14 +23,15 @@ my $mb_locale = $ENV{LOCALE_FR_UTF8}; + # Turn off localization of executable's output. + @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +-my $mb_locale = $ENV{LOCALE_FR_UTF8}; +-! defined $mb_locale || $mb_locale eq 'none' +- and $mb_locale = 'C'; ++#my $mb_locale = $ENV{LOCALE_FR_UTF8}; ++#! defined $mb_locale || $mb_locale eq 'none' ++# and $mb_locale = 'C'; ++my $mb_locale = 'C'; + my $prog = 'cut'; my $try = "Try \`$prog --help' for more information.\n"; my $from_1 = "$prog: fields and positions are numbered from 1\n$try"; @@ -4016,7 +4027,7 @@ diff -urNp coreutils-8.10-orig/tests/misc/cut coreutils-8.10/tests/misc/cut my $no_endpoint = "$prog: invalid range with no endpoint: -\n$try"; my @Tests = -@@ -143,7 +143,7 @@ my @Tests = +@@ -147,7 +147,7 @@ my @Tests = # None of the following invalid ranges provoked an error up to coreutils-6.9. ['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1}, @@ -4025,41 +4036,41 @@ diff -urNp coreutils-8.10-orig/tests/misc/cut coreutils-8.10/tests/misc/cut ['inval2', qw(-f -), {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], ['inval3', '-f', '4,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], ['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, -diff -urNp coreutils-8.10-orig/tests/misc/mb1.I coreutils-8.10/tests/misc/mb1.I ---- coreutils-8.10-orig/tests/misc/mb1.I 1970-01-01 01:00:00.000000000 +0100 -+++ coreutils-8.10/tests/misc/mb1.I 2011-02-04 20:13:24.022456462 +0100 +diff -urNp coreutils-8.13-orig/tests/misc/mb1.I coreutils-8.13/tests/misc/mb1.I +--- coreutils-8.13-orig/tests/misc/mb1.I 1970-01-01 01:00:00.000000000 +0100 ++++ coreutils-8.13/tests/misc/mb1.I 2011-09-09 10:23:14.191687037 +0200 @@ -0,0 +1,4 @@ +Apple＠10 +Banana＠5 +Citrus＠20 +Cherry＠30 -diff -urNp coreutils-8.10-orig/tests/misc/mb1.X coreutils-8.10/tests/misc/mb1.X ---- coreutils-8.10-orig/tests/misc/mb1.X 1970-01-01 01:00:00.000000000 +0100 -+++ coreutils-8.10/tests/misc/mb1.X 2011-02-04 20:13:24.023456240 +0100 +diff -urNp coreutils-8.13-orig/tests/misc/mb1.X coreutils-8.13/tests/misc/mb1.X +--- coreutils-8.13-orig/tests/misc/mb1.X 1970-01-01 01:00:00.000000000 +0100 ++++ coreutils-8.13/tests/misc/mb1.X 2011-09-09 10:23:14.192581910 +0200 @@ -0,0 +1,4 @@ +Banana＠5 +Apple＠10 +Citrus＠20 +Cherry＠30 -diff -urNp coreutils-8.10-orig/tests/misc/mb2.I coreutils-8.10/tests/misc/mb2.I ---- coreutils-8.10-orig/tests/misc/mb2.I 1970-01-01 01:00:00.000000000 +0100 -+++ coreutils-8.10/tests/misc/mb2.I 2011-02-04 20:13:24.024456019 +0100 +diff -urNp coreutils-8.13-orig/tests/misc/mb2.I coreutils-8.13/tests/misc/mb2.I +--- coreutils-8.13-orig/tests/misc/mb2.I 1970-01-01 01:00:00.000000000 +0100 ++++ coreutils-8.13/tests/misc/mb2.I 2011-09-09 10:23:14.192581910 +0200 @@ -0,0 +1,4 @@ +Apple＠ＡＡ10＠＠20 +Banana＠ＡＡ5＠＠30 +Citrus＠ＡＡ20＠＠5 +Cherry＠ＡＡ30＠＠10 -diff -urNp coreutils-8.10-orig/tests/misc/mb2.X coreutils-8.10/tests/misc/mb2.X ---- coreutils-8.10-orig/tests/misc/mb2.X 1970-01-01 01:00:00.000000000 +0100 -+++ coreutils-8.10/tests/misc/mb2.X 2011-02-04 20:13:24.024456019 +0100 +diff -urNp coreutils-8.13-orig/tests/misc/mb2.X coreutils-8.13/tests/misc/mb2.X +--- coreutils-8.13-orig/tests/misc/mb2.X 1970-01-01 01:00:00.000000000 +0100 ++++ coreutils-8.13/tests/misc/mb2.X 2011-09-09 10:23:14.193687456 +0200 @@ -0,0 +1,4 @@ +Citrus＠ＡＡ20＠＠5 +Cherry＠ＡＡ30＠＠10 +Apple＠ＡＡ10＠＠20 +Banana＠ＡＡ5＠＠30 -diff -urNp coreutils-8.10-orig/tests/misc/sort-mb-tests coreutils-8.10/tests/misc/sort-mb-tests ---- coreutils-8.10-orig/tests/misc/sort-mb-tests 1970-01-01 01:00:00.000000000 +0100 -+++ coreutils-8.10/tests/misc/sort-mb-tests 2011-02-04 20:13:24.025455797 +0100 +diff -urNp coreutils-8.13-orig/tests/misc/sort-mb-tests coreutils-8.13/tests/misc/sort-mb-tests +--- coreutils-8.13-orig/tests/misc/sort-mb-tests 1970-01-01 01:00:00.000000000 +0100 ++++ coreutils-8.13/tests/misc/sort-mb-tests 2011-09-09 10:23:14.194687565 +0200 @@ -0,0 +1,58 @@ +#! /bin/sh +case $# in @@ -4079,7 +4090,7 @@ diff -urNp coreutils-8.10-orig/tests/misc/sort-mb-tests coreutils-8.10/tests/mis +$xx -t ＠ -k2 -n misc/mb1.I > misc/mb1.O +code=$? +if test $code != 0; then -+ $echo "Test mb1 failed: $xx return code $code differs from expected value 0" 1>&2 ++ $echo "Test mb1 failed: $xx return code $code differs from expected value 0" + errors=`expr $errors + 1` +else + cmp misc/mb1.O $srcdir/misc/mb1.X > /dev/null 2>&1 diff --git a/coreutils-selinux.patch b/coreutils-selinux.patch index 0c6c51e..7ebce30 100644 --- a/coreutils-selinux.patch +++ b/coreutils-selinux.patch @@ -1,7 +1,7 @@ -diff -urNp coreutils-8.11-orig/configure.ac coreutils-8.11/configure.ac ---- coreutils-8.11-orig/configure.ac 2011-04-14 11:05:27.511308852 +0200 -+++ coreutils-8.11/configure.ac 2011-04-14 11:06:05.481433832 +0200 -@@ -132,6 +132,13 @@ if test "$gl_gcc_warnings" = yes; then +diff -urNp coreutils-8.13-orig/configure.ac coreutils-8.13/configure.ac +--- coreutils-8.13-orig/configure.ac 2011-09-09 10:29:52.584690353 +0200 ++++ coreutils-8.13/configure.ac 2011-09-09 10:30:39.524564991 +0200 +@@ -141,6 +141,13 @@ if test "$gl_gcc_warnings" = yes; then AC_SUBST([GNULIB_TEST_WARN_CFLAGS]) fi @@ -15,18 +15,18 @@ diff -urNp coreutils-8.11-orig/configure.ac coreutils-8.11/configure.ac AC_FUNC_FORK AC_ARG_ENABLE(pam, AS_HELP_STRING([--disable-pam], -diff -urNp coreutils-8.11-orig/man/chcon.x coreutils-8.11/man/chcon.x ---- coreutils-8.11-orig/man/chcon.x 2009-09-01 13:01:16.000000000 +0200 -+++ coreutils-8.11/man/chcon.x 2011-04-14 11:06:05.482433878 +0200 +diff -urNp coreutils-8.13-orig/man/chcon.x coreutils-8.13/man/chcon.x +--- coreutils-8.13-orig/man/chcon.x 2009-09-01 13:01:16.000000000 +0200 ++++ coreutils-8.13/man/chcon.x 2011-09-09 10:30:39.524564991 +0200 @@ -1,4 +1,4 @@ [NAME] -chcon \- change file security context +chcon \- change file SELinux security context [DESCRIPTION] .\" Add any additional description here -diff -urNp coreutils-8.11-orig/man/runcon.x coreutils-8.11/man/runcon.x ---- coreutils-8.11-orig/man/runcon.x 2009-09-01 13:01:16.000000000 +0200 -+++ coreutils-8.11/man/runcon.x 2011-04-14 11:06:05.483445779 +0200 +diff -urNp coreutils-8.13-orig/man/runcon.x coreutils-8.13/man/runcon.x +--- coreutils-8.13-orig/man/runcon.x 2009-09-01 13:01:16.000000000 +0200 ++++ coreutils-8.13/man/runcon.x 2011-09-09 10:30:39.544686472 +0200 @@ -1,5 +1,5 @@ [NAME] -runcon \- run command with specified security context @@ -34,9 +34,9 @@ diff -urNp coreutils-8.11-orig/man/runcon.x coreutils-8.11/man/runcon.x [DESCRIPTION] Run COMMAND with completely-specified CONTEXT, or with current or transitioned security context modified by one or more of LEVEL, -diff -urNp coreutils-8.11-orig/src/chcon.c coreutils-8.11/src/chcon.c ---- coreutils-8.11-orig/src/chcon.c 2011-02-19 18:17:03.000000000 +0100 -+++ coreutils-8.11/src/chcon.c 2011-04-14 11:06:05.489434075 +0200 +diff -urNp coreutils-8.13-orig/src/chcon.c coreutils-8.13/src/chcon.c +--- coreutils-8.13-orig/src/chcon.c 2011-07-28 12:38:27.000000000 +0200 ++++ coreutils-8.13/src/chcon.c 2011-09-09 10:30:39.562561252 +0200 @@ -356,7 +356,7 @@ Usage: %s [OPTION]... CONTEXT FILE...\n\ "), program_name, program_name, program_name); @@ -46,10 +46,10 @@ diff -urNp coreutils-8.11-orig/src/chcon.c coreutils-8.11/src/chcon.c With --reference, change the security context of each FILE to that of RFILE.\n\ \n\ -h, --no-dereference affect symbolic links instead of any referenced file\n\ -diff -urNp coreutils-8.11-orig/src/copy.c coreutils-8.11/src/copy.c ---- coreutils-8.11-orig/src/copy.c 2011-04-12 12:07:43.000000000 +0200 -+++ coreutils-8.11/src/copy.c 2011-04-14 11:06:05.485433752 +0200 -@@ -2179,6 +2179,8 @@ copy_internal (char const *src_name, cha +diff -urNp coreutils-8.13-orig/src/copy.c coreutils-8.13/src/copy.c +--- coreutils-8.13-orig/src/copy.c 2011-07-28 12:38:27.000000000 +0200 ++++ coreutils-8.13/src/copy.c 2011-09-09 10:30:39.564562214 +0200 +@@ -2244,6 +2244,8 @@ copy_internal (char const *src_name, cha { /* Here, we are crossing a file system boundary and cp's -x option is in effect: so don't copy the contents of this directory. */ @@ -58,9 +58,9 @@ diff -urNp coreutils-8.11-orig/src/copy.c coreutils-8.11/src/copy.c } else { -diff -urNp coreutils-8.11-orig/src/copy.h coreutils-8.11/src/copy.h ---- coreutils-8.11-orig/src/copy.h 2011-02-19 18:17:03.000000000 +0100 -+++ coreutils-8.11/src/copy.h 2011-04-14 11:06:05.487340225 +0200 +diff -urNp coreutils-8.13-orig/src/copy.h coreutils-8.13/src/copy.h +--- coreutils-8.13-orig/src/copy.h 2011-07-28 12:38:27.000000000 +0200 ++++ coreutils-8.13/src/copy.h 2011-09-09 10:30:39.565563712 +0200 @@ -158,6 +158,9 @@ struct cp_options bool preserve_mode; bool preserve_timestamps; @@ -71,9 +71,9 @@ diff -urNp coreutils-8.11-orig/src/copy.h coreutils-8.11/src/copy.h /* Enabled for mv, and for cp by the --preserve=links option. If true, attempt to preserve in the destination files any logical hard links between the source files. If used with cp's -diff -urNp coreutils-8.11-orig/src/cp.c coreutils-8.11/src/cp.c ---- coreutils-8.11-orig/src/cp.c 2011-02-19 18:17:03.000000000 +0100 -+++ coreutils-8.11/src/cp.c 2011-04-14 11:06:05.488433894 +0200 +diff -urNp coreutils-8.13-orig/src/cp.c coreutils-8.13/src/cp.c +--- coreutils-8.13-orig/src/cp.c 2011-07-28 12:38:27.000000000 +0200 ++++ coreutils-8.13/src/cp.c 2011-09-09 10:30:39.566562062 +0200 @@ -141,6 +141,7 @@ static struct option const long_opts[] = {"target-directory", required_argument, NULL, 't'}, {"update", no_argument, NULL, 'u'}, @@ -162,9 +162,9 @@ diff -urNp coreutils-8.11-orig/src/cp.c coreutils-8.11/src/cp.c case 'S': make_backups = true; backup_suffix_string = optarg; -diff -urNp coreutils-8.11-orig/src/id.c coreutils-8.11/src/id.c ---- coreutils-8.11-orig/src/id.c 2011-02-19 18:17:03.000000000 +0100 -+++ coreutils-8.11/src/id.c 2011-04-14 11:06:05.490435340 +0200 +diff -urNp coreutils-8.13-orig/src/id.c coreutils-8.13/src/id.c +--- coreutils-8.13-orig/src/id.c 2011-07-28 12:38:27.000000000 +0200 ++++ coreutils-8.13/src/id.c 2011-09-09 10:30:39.567562153 +0200 @@ -107,7 +107,7 @@ int main (int argc, char **argv) { @@ -174,9 +174,9 @@ diff -urNp coreutils-8.11-orig/src/id.c coreutils-8.11/src/id.c /* If true, output the list of all group IDs. -G */ bool just_group_list = false; -diff -urNp coreutils-8.11-orig/src/install.c coreutils-8.11/src/install.c ---- coreutils-8.11-orig/src/install.c 2011-04-12 12:07:43.000000000 +0200 -+++ coreutils-8.11/src/install.c 2011-04-14 11:07:58.333433706 +0200 +diff -urNp coreutils-8.13-orig/src/install.c coreutils-8.13/src/install.c +--- coreutils-8.13-orig/src/install.c 2011-07-28 12:38:27.000000000 +0200 ++++ coreutils-8.13/src/install.c 2011-09-09 10:30:39.569562422 +0200 @@ -261,6 +261,7 @@ cp_option_init (struct cp_options *x) x->data_copy_required = true; x->require_preserve = false; @@ -230,10 +230,10 @@ diff -urNp coreutils-8.11-orig/src/install.c coreutils-8.11/src/install.c use_default_selinux_context = false; break; case_GETOPT_HELP_CHAR; -diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c ---- coreutils-8.11-orig/src/ls.c 2011-04-12 12:07:43.000000000 +0200 -+++ coreutils-8.11/src/ls.c 2011-04-14 11:06:05.498436329 +0200 -@@ -159,7 +159,8 @@ enum filetype +diff -urNp coreutils-8.13-orig/src/ls.c coreutils-8.13/src/ls.c +--- coreutils-8.13-orig/src/ls.c 2011-07-28 12:38:27.000000000 +0200 ++++ coreutils-8.13/src/ls.c 2011-09-09 10:30:39.575562845 +0200 +@@ -166,7 +166,8 @@ enum filetype symbolic_link, sock, whiteout, @@ -243,7 +243,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c }; /* Display letters and indicators for each filetype. -@@ -276,6 +277,7 @@ static void queue_directory (char const +@@ -283,6 +284,7 @@ static void queue_directory (char const static void sort_files (void); static void parse_ls_color (void); void usage (int status); @@ -251,7 +251,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c /* Initial size of hash table. Most hierarchies are likely to be shallower than this. */ -@@ -345,7 +347,7 @@ static struct pending *pending_dirs; +@@ -352,7 +354,7 @@ static struct pending *pending_dirs; static struct timespec current_time; @@ -260,7 +260,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c static char UNKNOWN_SECURITY_CONTEXT[] = "?"; /* Whether any of the files has an ACL. This affects the width of the -@@ -385,7 +387,9 @@ enum format +@@ -392,7 +394,9 @@ enum format one_per_line, /* -1 */ many_per_line, /* -C */ horizontal, /* -x */ @@ -271,7 +271,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c }; static enum format format; -@@ -787,6 +791,9 @@ enum +@@ -794,6 +798,9 @@ enum SHOW_CONTROL_CHARS_OPTION, SI_OPTION, SORT_OPTION, @@ -281,7 +281,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c TIME_OPTION, TIME_STYLE_OPTION }; -@@ -832,7 +839,9 @@ static struct option const long_options[ +@@ -839,7 +846,9 @@ static struct option const long_options[ {"time-style", required_argument, NULL, TIME_STYLE_OPTION}, {"color", optional_argument, NULL, COLOR_OPTION}, {"block-size", required_argument, NULL, BLOCK_SIZE_OPTION}, @@ -292,7 +292,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c {"author", no_argument, NULL, AUTHOR_OPTION}, {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, -@@ -842,12 +851,12 @@ static struct option const long_options[ +@@ -849,12 +858,12 @@ static struct option const long_options[ static char const *const format_args[] = { "verbose", "long", "commas", "horizontal", "across", @@ -307,7 +307,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c }; ARGMATCH_VERIFY (format_args, format_types); -@@ -1289,7 +1298,8 @@ main (int argc, char **argv) +@@ -1296,7 +1305,8 @@ main (int argc, char **argv) /* Avoid following symbolic links when possible. */ if (is_colored (C_ORPHAN) || (is_colored (C_EXEC) && color_symlink_as_referent) @@ -317,7 +317,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c check_symlink_color = true; /* If the standard output is a controlling terminal, watch out -@@ -1336,7 +1346,7 @@ main (int argc, char **argv) +@@ -1343,7 +1353,7 @@ main (int argc, char **argv) if (dereference == DEREF_UNDEFINED) dereference = ((immediate_dirs || indicator_style == classify @@ -326,7 +326,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c ? DEREF_NEVER : DEREF_COMMAND_LINE_SYMLINK_TO_DIR); -@@ -1356,7 +1366,7 @@ main (int argc, char **argv) +@@ -1363,7 +1373,7 @@ main (int argc, char **argv) format_needs_stat = sort_type == sort_time || sort_type == sort_size || format == long_format @@ -335,7 +335,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c || print_block_size; format_needs_type = (! format_needs_stat && (recursive -@@ -1387,7 +1397,7 @@ main (int argc, char **argv) +@@ -1394,7 +1404,7 @@ main (int argc, char **argv) } else do @@ -344,7 +344,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c while (i < argc); if (cwd_n_used) -@@ -1558,7 +1568,7 @@ decode_switches (int argc, char **argv) +@@ -1565,7 +1575,7 @@ decode_switches (int argc, char **argv) ignore_mode = IGNORE_DEFAULT; ignore_patterns = NULL; hide_patterns = NULL; @@ -353,7 +353,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c /* FIXME: put this in a function. */ { -@@ -1940,13 +1950,27 @@ decode_switches (int argc, char **argv) +@@ -1947,13 +1957,27 @@ decode_switches (int argc, char **argv) break; case 'Z': @@ -382,7 +382,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c default: usage (LS_FAILURE); } -@@ -2691,8 +2715,10 @@ clear_files (void) +@@ -2714,8 +2738,10 @@ clear_files (void) struct fileinfo *f = sorted_file[i]; free (f->name); free (f->linkname); @@ -395,7 +395,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c } cwd_n_used = 0; -@@ -2734,6 +2760,7 @@ gobble_file (char const *name, enum file +@@ -2757,6 +2783,7 @@ gobble_file (char const *name, enum file memset (f, '\0', sizeof *f); f->stat.st_ino = inode; f->filetype = type; @@ -403,7 +403,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c if (command_line_arg || format_needs_stat -@@ -2843,7 +2870,7 @@ gobble_file (char const *name, enum file +@@ -2869,7 +2896,7 @@ gobble_file (char const *name, enum file && print_with_color && is_colored (C_CAP)) f->has_capability = has_capability (absolute_name); @@ -412,7 +412,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c { bool have_selinux = false; bool have_acl = false; -@@ -2866,7 +2893,7 @@ gobble_file (char const *name, enum file +@@ -2892,7 +2919,7 @@ gobble_file (char const *name, enum file err = 0; } @@ -421,7 +421,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c { int n = file_has_acl (absolute_name, &f->stat); err = (n < 0); -@@ -2885,7 +2912,8 @@ gobble_file (char const *name, enum file +@@ -2911,7 +2938,8 @@ gobble_file (char const *name, enum file } if (S_ISLNK (f->stat.st_mode) @@ -431,7 +431,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c { char *linkname; struct stat linkstats; -@@ -2905,6 +2933,7 @@ gobble_file (char const *name, enum file +@@ -2931,6 +2959,7 @@ gobble_file (char const *name, enum file command line are automatically traced if not being listed as files. */ if (!command_line_arg || format == long_format @@ -439,7 +439,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c || !S_ISDIR (linkstats.st_mode)) { /* Get the linked-to file's mode for the filetype indicator -@@ -2944,7 +2973,7 @@ gobble_file (char const *name, enum file +@@ -2970,7 +2999,7 @@ gobble_file (char const *name, enum file block_size_width = len; } @@ -448,7 +448,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c { if (print_owner) { -@@ -3445,6 +3474,13 @@ print_current_files (void) +@@ -3471,6 +3500,13 @@ print_current_files (void) print_long_format (sorted_file[i]); DIRED_PUTCHAR ('\n'); } @@ -462,7 +462,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c break; } } -@@ -3607,6 +3643,67 @@ format_inode (char *buf, size_t buflen, +@@ -3633,6 +3669,67 @@ format_inode (char *buf, size_t buflen, : (char *) "?"); } @@ -530,7 +530,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c /* Print information about F in long format. */ static void print_long_format (const struct fileinfo *f) -@@ -3698,9 +3795,15 @@ print_long_format (const struct fileinfo +@@ -3724,9 +3821,15 @@ print_long_format (const struct fileinfo The latter is wrong when nlink_width is zero. */ p += strlen (p); @@ -547,7 +547,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c { DIRED_FPUTS (buf, stdout, p - buf); -@@ -3713,9 +3816,6 @@ print_long_format (const struct fileinfo +@@ -3739,9 +3842,6 @@ print_long_format (const struct fileinfo if (print_author) format_user (f->stat.st_author, author_width, f->stat_ok); @@ -557,7 +557,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c p = buf; } -@@ -4060,9 +4160,6 @@ print_file_name_and_frills (const struct +@@ -4086,9 +4186,6 @@ print_file_name_and_frills (const struct : human_readable (ST_NBLOCKS (f->stat), buf, human_output_opts, ST_NBLOCKSIZE, output_block_size)); @@ -567,7 +567,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c size_t width = print_name_with_quoting (f, false, NULL, start_col); if (indicator_style != none) -@@ -4266,9 +4363,6 @@ length_of_file_name_and_frills (const st +@@ -4292,9 +4389,6 @@ length_of_file_name_and_frills (const st output_block_size)) : block_size_width); @@ -577,7 +577,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c quote_name (NULL, f->name, filename_quoting_options, &name_width); len += name_width; -@@ -4707,9 +4801,16 @@ Mandatory arguments to long options are +@@ -4733,9 +4827,16 @@ Mandatory arguments to long options are -w, --width=COLS assume screen width instead of current value\n\ -x list entries by lines instead of by columns\n\ -X sort alphabetically by entry extension\n\ @@ -595,9 +595,9 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); emit_size_note (); -diff -urNp coreutils-8.11-orig/src/mkdir.c coreutils-8.11/src/mkdir.c ---- coreutils-8.11-orig/src/mkdir.c 2011-02-19 18:17:03.000000000 +0100 -+++ coreutils-8.11/src/mkdir.c 2011-04-14 11:06:05.499460276 +0200 +diff -urNp coreutils-8.13-orig/src/mkdir.c coreutils-8.13/src/mkdir.c +--- coreutils-8.13-orig/src/mkdir.c 2011-07-28 12:38:27.000000000 +0200 ++++ coreutils-8.13/src/mkdir.c 2011-09-09 10:30:39.576564256 +0200 @@ -38,6 +38,7 @@ static struct option const longopts[] = { @@ -606,9 +606,9 @@ diff -urNp coreutils-8.11-orig/src/mkdir.c coreutils-8.11/src/mkdir.c {"mode", required_argument, NULL, 'm'}, {"parents", no_argument, NULL, 'p'}, {"verbose", no_argument, NULL, 'v'}, -diff -urNp coreutils-8.11-orig/src/mknod.c coreutils-8.11/src/mknod.c ---- coreutils-8.11-orig/src/mknod.c 2011-02-19 18:17:03.000000000 +0100 -+++ coreutils-8.11/src/mknod.c 2011-04-14 11:06:05.500309648 +0200 +diff -urNp coreutils-8.13-orig/src/mknod.c coreutils-8.13/src/mknod.c +--- coreutils-8.13-orig/src/mknod.c 2011-07-28 12:38:27.000000000 +0200 ++++ coreutils-8.13/src/mknod.c 2011-09-09 10:30:39.577563177 +0200 @@ -35,7 +35,7 @@ static struct option const longopts[] = @@ -618,9 +618,9 @@ diff -urNp coreutils-8.11-orig/src/mknod.c coreutils-8.11/src/mknod.c {"mode", required_argument, NULL, 'm'}, {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, -diff -urNp coreutils-8.11-orig/src/mv.c coreutils-8.11/src/mv.c ---- coreutils-8.11-orig/src/mv.c 2011-02-19 18:17:03.000000000 +0100 -+++ coreutils-8.11/src/mv.c 2011-04-14 11:06:05.501309664 +0200 +diff -urNp coreutils-8.13-orig/src/mv.c coreutils-8.13/src/mv.c +--- coreutils-8.13-orig/src/mv.c 2011-07-28 12:38:27.000000000 +0200 ++++ coreutils-8.13/src/mv.c 2011-09-09 10:30:39.578562234 +0200 @@ -118,6 +118,7 @@ cp_option_init (struct cp_options *x) x->preserve_mode = true; x->preserve_timestamps = true; @@ -629,9 +629,9 @@ diff -urNp coreutils-8.11-orig/src/mv.c coreutils-8.11/src/mv.c x->reduce_diagnostics = false; x->data_copy_required = true; x->require_preserve = false; /* FIXME: maybe make this an option */ -diff -urNp coreutils-8.11-orig/src/runcon.c coreutils-8.11/src/runcon.c ---- coreutils-8.11-orig/src/runcon.c 2011-02-19 18:17:03.000000000 +0100 -+++ coreutils-8.11/src/runcon.c 2011-04-14 11:06:05.502310854 +0200 +diff -urNp coreutils-8.13-orig/src/runcon.c coreutils-8.13/src/runcon.c +--- coreutils-8.13-orig/src/runcon.c 2011-07-28 12:38:27.000000000 +0200 ++++ coreutils-8.13/src/runcon.c 2011-09-09 10:30:39.579564283 +0200 @@ -86,7 +86,7 @@ Usage: %s CONTEXT COMMAND [args]\n\ or: %s [ -c ] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n\ "), program_name, program_name); @@ -641,10 +641,10 @@ diff -urNp coreutils-8.11-orig/src/runcon.c coreutils-8.11/src/runcon.c With neither CONTEXT nor COMMAND, print the current security context.\n\ \n\ CONTEXT Complete security context\n\ -diff -urNp coreutils-8.11-orig/tests/init.cfg coreutils-8.11/tests/init.cfg ---- coreutils-8.11-orig/tests/init.cfg 2011-04-12 12:07:43.000000000 +0200 -+++ coreutils-8.11/tests/init.cfg 2011-04-14 11:06:05.503308646 +0200 -@@ -231,8 +231,8 @@ require_selinux_() +diff -urNp coreutils-8.13-orig/tests/init.cfg coreutils-8.13/tests/init.cfg +--- coreutils-8.13-orig/tests/init.cfg 2011-09-07 18:00:55.000000000 +0200 ++++ coreutils-8.13/tests/init.cfg 2011-09-09 10:32:17.031688699 +0200 +@@ -253,8 +253,8 @@ require_selinux_() # Independent of whether SELinux is enabled system-wide, # the current file system may lack SELinux support. @@ -652,12 +652,12 @@ diff -urNp coreutils-8.11-orig/tests/init.cfg coreutils-8.11/tests/init.cfg - '? .'|'unlabeled .') + case `ls -Zd . | cut -f4 -d" "` in + '?'|'unlabeled') - skip_test_ "this system (or maybe just" \ + skip_ "this system (or maybe just" \ "the current file system) lacks SELinux support" ;; -diff -urNp coreutils-8.11-orig/tests/misc/selinux coreutils-8.11/tests/misc/selinux ---- coreutils-8.11-orig/tests/misc/selinux 2011-01-31 13:40:38.000000000 +0100 -+++ coreutils-8.11/tests/misc/selinux 2011-04-14 11:06:05.504353757 +0200 +diff -urNp coreutils-8.13-orig/tests/misc/selinux coreutils-8.13/tests/misc/selinux +--- coreutils-8.13-orig/tests/misc/selinux 2011-08-08 09:42:16.000000000 +0200 ++++ coreutils-8.13/tests/misc/selinux 2011-09-09 10:30:39.586563144 +0200 @@ -37,7 +37,7 @@ chcon $ctx f d p || # inspect that context with both ls -Z and stat. diff --git a/coreutils.spec b/coreutils.spec index 3d5c6a1..9fc1d6a 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,7 +1,7 @@ Summary: A set of basic GNU tools commonly used in shell scripts Name: coreutils -Version: 8.12 -Release: 6%{?dist} +Version: 8.13 +Release: 1%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -32,8 +32,6 @@ Patch103: coreutils-8.2-uname-processortype.patch Patch104: coreutils-df-direct.patch #add note about mkdir --mode behaviour into info documentation(#610559) Patch107: coreutils-8.4-mkdir-modenote.patch -#use acl_extended_file_nofollow if available (#692823) -Patch108: coreutils-acl-extended-file-nofollow.patch # sh-utils #add info about TZ envvar to date manpage @@ -87,7 +85,6 @@ Requires(post): grep %{?!nopam:Requires: pam } Requires: ncurses Requires: gmp -Requires: %{name}-libs = %{version}-%{release} Provides: fileutils = %{version}-%{release} Provides: sh-utils = %{version}-%{release} @@ -105,14 +102,6 @@ Obsoletes: textutils <= 2.0.21 These are the GNU core utilities. This package is the combination of the old GNU fileutils, sh-utils, and textutils packages. -%package libs -Summary: Libraries for %{name} -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} - -%description libs -Libraries for coreutils package. - %prep %setup -q @@ -125,7 +114,6 @@ Libraries for coreutils package. %patch103 -p1 -b .sysinfo %patch104 -p1 -b .dfdirect %patch107 -p1 -b .mkdirmode -%patch108 -p1 -b .nofollow # sh-utils %patch703 -p1 -b .dateman @@ -199,11 +187,11 @@ fi bzip2 -9f ChangeLog # let be compatible with old fileutils, sh-utils and textutils packages : -mkdir -p $RPM_BUILD_ROOT{/bin,%_bindir,%_sbindir,/sbin} -%{?!nopam:mkdir -p $RPM_BUILD_ROOT%_sysconfdir/pam.d} +mkdir -p $RPM_BUILD_ROOT{/bin,%{_bindir},%{_sbindir},/sbin} +%{?!nopam:mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d} for f in arch basename cat chgrp chmod chown cp cut date dd df echo env false link ln ls mkdir mknod mktemp mv nice pwd readlink rm rmdir sleep sort stty sync touch true uname unlink do - mv $RPM_BUILD_ROOT{%_bindir,/bin}/$f + mv $RPM_BUILD_ROOT{%{_bindir},/bin}/$f done # chroot was in /usr/sbin : @@ -226,13 +214,13 @@ rm -rf $RPM_BUILD_ROOT/usr/bin/runuser || : # These come from util-linux and/or procps. for i in hostname uptime kill ; do - rm $RPM_BUILD_ROOT{%_bindir/$i,%_mandir/man1/$i.1} + rm $RPM_BUILD_ROOT{%{_bindir}/$i,%{_mandir}/man1/$i.1} done -%{?!nopam:install -p -m 644 %SOURCE200 $RPM_BUILD_ROOT%_sysconfdir/pam.d/su} -%{?!nopam:install -p -m 644 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/pam.d/su-l} -%{?!nopam:install -p -m 644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/pam.d/runuser} -%{?!nopam:install -p -m 644 %SOURCE203 $RPM_BUILD_ROOT%_sysconfdir/pam.d/runuser-l} +%{?!nopam:install -p -m 644 %SOURCE200 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/su} +%{?!nopam:install -p -m 644 %SOURCE202 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/su-l} +%{?!nopam:install -p -m 644 %SOURCE201 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/runuser} +%{?!nopam:install -p -m 644 %SOURCE203 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/runuser-l} # Compress ChangeLogs from before the fileutils/textutils/etc merge bzip2 -f9 old/*/C* @@ -324,17 +312,20 @@ fi /bin/true /bin/uname /bin/unlink -%_bindir/* -%_infodir/coreutils* -%_mandir/man*/* -%_sbindir/chroot +%{_bindir}/* +%{_infodir}/coreutils* +%{_libexecdir}/coreutils* +%{_mandir}/man*/* +%{_sbindir}/chroot %{?!norunuser:/sbin/runuser} -%files libs -%defattr(-, root, root, -) -%{_libdir}/coreutils - %changelog +* Fri Sep 09 2011 Ondrej Vasik - 8.13-1 +- new upstream release 8.13 +- temporarily disable recently added multibyte checks in + misc/cut test +- drop coreutils-libs subpackage, no longer needed + * Tue Aug 23 2011 Ondrej Vasik - 8.12-6 - su: fix shell suspend in tcsh (#597928) diff --git a/sources b/sources index 6a12672..0c0c179 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0f7d43c2d2e24314b43a6c6267e25b90 coreutils-8.12.tar.xz +8e1675c6c336ff55557c698706a63d6c coreutils-8.13.tar.xz