rpms/coreutils
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

automatic version update by autodist [release 8.27-1mamba;Mon Apr 24 2017]

Browse Source
This commit is contained in:
Automatic Build System 2024-01-05 21:31:11 +01:00
parent afce8c2839
commit 636adb5eaa
2 changed files with 149 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

263
coreutils-8.26-i18n-1.patch → coreutils-8.27-i18n-1.patch
View File

@ -1,14 +1,14 @@
Submitted by: DJ Lucas (dj_AT_linuxfromscratch_DOT_org) Submitted by: DJ Lucas (dj_AT_linuxfromscratch_DOT_org)
Date: 2016-12-03 Date: 2017-03-12
Initial Package Version: 8.26 Initial Package Version: 8.27
Upstream Status: Rejected Upstream Status: Rejected
Origin: Based on Suse's i18n patches at Origin: Based on Fedora's i18n patches at
https://build.opensuse.org/package/show/Base:System/coreutils/ http://pkgs.fedoraproject.org/cgit/rpms/coreutils.git/tree/
Description: Fixes i18n issues with various Coreutils programs Description: Fixes i18n issues with various Coreutils programs
diff -Naurp coreutils-8.26-orig/bootstrap.conf coreutils-8.26/bootstrap.conf diff -Naurp coreutils-8.27-orig/bootstrap.conf coreutils-8.27/bootstrap.conf
--- coreutils-8.26-orig/bootstrap.conf 2016-11-06 16:15:29.000000000 -0600 --- coreutils-8.27-orig/bootstrap.conf 2017-03-07 23:34:06.000000000 -0600
+++ coreutils-8.26/bootstrap.conf 2016-12-02 19:15:23.514391986 -0600 +++ coreutils-8.27/bootstrap.conf 2017-03-11 23:47:38.068058445 -0600
@@ -152,6 +152,7 @@ gnulib_modules=" @@ -152,6 +152,7 @@ gnulib_modules="
maintainer-makefile maintainer-makefile
malloc-gnu malloc-gnu
@ -17,10 +17,10 @@ diff -Naurp coreutils-8.26-orig/bootstrap.conf coreutils-8.26/bootstrap.conf
mbrlen mbrlen
mbrtowc mbrtowc
mbsalign mbsalign
diff -Naurp coreutils-8.26-orig/configure.ac coreutils-8.26/configure.ac diff -Naurp coreutils-8.27-orig/configure.ac coreutils-8.27/configure.ac
--- coreutils-8.26-orig/configure.ac 2016-11-29 12:03:45.000000000 -0600 --- coreutils-8.27-orig/configure.ac 2017-02-26 08:52:29.000000000 -0600
+++ coreutils-8.26/configure.ac 2016-12-02 19:15:23.515391902 -0600 +++ coreutils-8.27/configure.ac 2017-03-11 23:47:38.068058445 -0600
@@ -427,6 +427,8 @@ fi @@ -429,6 +429,8 @@ fi
# I'm leaving it here for now. This whole thing needs to be modernized... # I'm leaving it here for now. This whole thing needs to be modernized...
gl_WINSIZE_IN_PTEM gl_WINSIZE_IN_PTEM
@ -29,9 +29,9 @@ diff -Naurp coreutils-8.26-orig/configure.ac coreutils-8.26/configure.ac
gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H
if test $gl_cv_sys_tiocgwinsz_needs_termios_h = no && \ if test $gl_cv_sys_tiocgwinsz_needs_termios_h = no && \
diff -Naurp coreutils-8.26-orig/lib/linebuffer.h coreutils-8.26/lib/linebuffer.h diff -Naurp coreutils-8.27-orig/lib/linebuffer.h coreutils-8.27/lib/linebuffer.h
--- coreutils-8.26-orig/lib/linebuffer.h 2016-07-15 14:47:39.000000000 -0500 --- coreutils-8.27-orig/lib/linebuffer.h 2017-01-01 16:35:38.000000000 -0600
+++ coreutils-8.26/lib/linebuffer.h 2016-12-02 19:15:23.515391902 -0600 +++ coreutils-8.27/lib/linebuffer.h 2017-03-11 23:47:13.089286391 -0600
@@ -21,6 +21,11 @@ @@ -21,6 +21,11 @@
# include <stdio.h> # include <stdio.h>
@ -54,19 +54,19 @@ diff -Naurp coreutils-8.26-orig/lib/linebuffer.h coreutils-8.26/lib/linebuffer.h
}; };
/* Initialize linebuffer LINEBUFFER for use. */ /* Initialize linebuffer LINEBUFFER for use. */
diff -Naurp coreutils-8.26-orig/lib/mbfile.c coreutils-8.26/lib/mbfile.c diff -Naurp coreutils-8.27-orig/lib/mbfile.c coreutils-8.27/lib/mbfile.c
--- coreutils-8.26-orig/lib/mbfile.c 1969-12-31 18:00:00.000000000 -0600 --- coreutils-8.27-orig/lib/mbfile.c 1969-12-31 18:00:00.000000000 -0600
+++ coreutils-8.26/lib/mbfile.c 2016-12-02 19:15:23.515391902 -0600 +++ coreutils-8.27/lib/mbfile.c 2017-03-11 23:47:38.069058397 -0600
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
+#include <config.h> +#include <config.h>
+#define MBFILE_INLINE _GL_EXTERN_INLINE +#define MBFILE_INLINE _GL_EXTERN_INLINE
+#include "mbfile.h" +#include "mbfile.h"
diff -Naurp coreutils-8.26-orig/lib/mbfile.h coreutils-8.26/lib/mbfile.h diff -Naurp coreutils-8.27-orig/lib/mbfile.h coreutils-8.27/lib/mbfile.h
--- coreutils-8.26-orig/lib/mbfile.h 1969-12-31 18:00:00.000000000 -0600 --- coreutils-8.27-orig/lib/mbfile.h 1969-12-31 18:00:00.000000000 -0600
+++ coreutils-8.26/lib/mbfile.h 2016-12-02 19:15:23.516391818 -0600 +++ coreutils-8.27/lib/mbfile.h 2017-03-11 23:47:38.069058397 -0600
@@ -0,0 +1,255 @@ @@ -0,0 +1,255 @@
+/* Multibyte character I/O: macros for multi-byte encodings. +/* Multibyte character I/O: macros for multi-byte encodings.
+ Copyright (C) 2001, 2005, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001, 2005, 2009-2017 Free Software Foundation, Inc.
+ +
+ This program is free software: you can redistribute it and/or modify + 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 + it under the terms of the GNU General Public License as published by
@ -320,12 +320,12 @@ diff -Naurp coreutils-8.26-orig/lib/mbfile.h coreutils-8.26/lib/mbfile.h
+_GL_INLINE_HEADER_BEGIN +_GL_INLINE_HEADER_BEGIN
+ +
+#endif /* _MBFILE_H */ +#endif /* _MBFILE_H */
diff -Naurp coreutils-8.26-orig/m4/mbfile.m4 coreutils-8.26/m4/mbfile.m4 diff -Naurp coreutils-8.27-orig/m4/mbfile.m4 coreutils-8.27/m4/mbfile.m4
--- coreutils-8.26-orig/m4/mbfile.m4 1969-12-31 18:00:00.000000000 -0600 --- coreutils-8.27-orig/m4/mbfile.m4 1969-12-31 18:00:00.000000000 -0600
+++ coreutils-8.26/m4/mbfile.m4 2016-12-02 19:15:23.516391818 -0600 +++ coreutils-8.27/m4/mbfile.m4 2017-03-11 23:47:38.070058349 -0600
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
+# mbfile.m4 serial 7 +# mbfile.m4 serial 7
+dnl Copyright (C) 2005, 2008-2015 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2008-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation +dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it, +dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved. +dnl with or without modifications, as long as this notice is preserved.
@ -338,9 +338,9 @@ diff -Naurp coreutils-8.26-orig/m4/mbfile.m4 coreutils-8.26/m4/mbfile.m4
+ AC_REQUIRE([AC_TYPE_MBSTATE_T]) + AC_REQUIRE([AC_TYPE_MBSTATE_T])
+ : + :
+]) +])
diff -Naurp coreutils-8.26-orig/src/cut.c coreutils-8.26/src/cut.c diff -Naurp coreutils-8.27-orig/src/cut.c coreutils-8.27/src/cut.c
--- coreutils-8.26-orig/src/cut.c 2016-10-15 16:00:55.000000000 -0500 --- coreutils-8.27-orig/src/cut.c 2017-01-01 16:34:24.000000000 -0600
+++ coreutils-8.26/src/cut.c 2016-12-02 19:15:23.517391733 -0600 +++ coreutils-8.27/src/cut.c 2017-03-11 23:47:59.526048471 -0600
@@ -28,6 +28,11 @@ @@ -28,6 +28,11 @@
#include <assert.h> #include <assert.h>
#include <getopt.h> #include <getopt.h>
@ -902,9 +902,9 @@ diff -Naurp coreutils-8.26-orig/src/cut.c coreutils-8.26/src/cut.c
} }
if (optind == argc) if (optind == argc)
diff -Naurp coreutils-8.26-orig/src/expand.c coreutils-8.26/src/expand.c diff -Naurp coreutils-8.27-orig/src/expand.c coreutils-8.27/src/expand.c
--- coreutils-8.26-orig/src/expand.c 2016-11-06 16:15:30.000000000 -0600 --- coreutils-8.27-orig/src/expand.c 2017-02-26 15:42:25.000000000 -0600
+++ coreutils-8.26/src/expand.c 2016-12-02 19:15:23.518391649 -0600 +++ coreutils-8.27/src/expand.c 2017-03-11 23:49:06.758133530 -0600
@@ -37,6 +37,9 @@ @@ -37,6 +37,9 @@
#include <stdio.h> #include <stdio.h>
#include <getopt.h> #include <getopt.h>
@ -1057,9 +1057,9 @@ diff -Naurp coreutils-8.26-orig/src/expand.c coreutils-8.26/src/expand.c
} }
} }
diff -Naurp coreutils-8.26-orig/src/expand-common.c coreutils-8.26/src/expand-common.c diff -Naurp coreutils-8.27-orig/src/expand-common.c coreutils-8.27/src/expand-common.c
--- coreutils-8.26-orig/src/expand-common.c 2016-11-06 16:15:30.000000000 -0600 --- coreutils-8.27-orig/src/expand-common.c 2017-03-01 11:22:55.000000000 -0600
+++ coreutils-8.26/src/expand-common.c 2016-12-02 19:15:23.518391649 -0600 +++ coreutils-8.27/src/expand-common.c 2017-03-11 23:49:06.757133570 -0600
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
#include <stdio.h> #include <stdio.h>
@ -1068,8 +1068,8 @@ diff -Naurp coreutils-8.26-orig/src/expand-common.c coreutils-8.26/src/expand-co
#include "system.h" #include "system.h"
#include "die.h" #include "die.h"
#include "error.h" #include "error.h"
@@ -85,6 +86,119 @@ add_tab_stop (uintmax_t tabval) @@ -105,6 +106,119 @@ set_extend_size (uintmax_t tabval)
} return ok;
} }
+extern int +extern int
@ -1188,9 +1188,9 @@ diff -Naurp coreutils-8.26-orig/src/expand-common.c coreutils-8.26/src/expand-co
/* Add the comma or blank separated list of tab stops STOPS /* Add the comma or blank separated list of tab stops STOPS
to the list of tab stops. */ to the list of tab stops. */
extern void extern void
diff -Naurp coreutils-8.26-orig/src/expand-common.h coreutils-8.26/src/expand-common.h diff -Naurp coreutils-8.27-orig/src/expand-common.h coreutils-8.27/src/expand-common.h
--- coreutils-8.26-orig/src/expand-common.h 2016-11-06 16:15:30.000000000 -0600 --- coreutils-8.27-orig/src/expand-common.h 2017-01-01 16:34:24.000000000 -0600
+++ coreutils-8.26/src/expand-common.h 2016-12-02 19:15:23.518391649 -0600 +++ coreutils-8.27/src/expand-common.h 2017-03-11 23:49:06.758133530 -0600
@@ -34,6 +34,18 @@ extern size_t max_column_width; @@ -34,6 +34,18 @@ extern size_t max_column_width;
/* The desired exit status. */ /* The desired exit status. */
extern int exit_status; extern int exit_status;
@ -1210,9 +1210,9 @@ diff -Naurp coreutils-8.26-orig/src/expand-common.h coreutils-8.26/src/expand-co
/* Add tab stop TABVAL to the end of 'tab_list'. */ /* Add tab stop TABVAL to the end of 'tab_list'. */
extern void extern void
add_tab_stop (uintmax_t tabval); add_tab_stop (uintmax_t tabval);
diff -Naurp coreutils-8.26-orig/src/fold.c coreutils-8.26/src/fold.c diff -Naurp coreutils-8.27-orig/src/fold.c coreutils-8.27/src/fold.c
--- coreutils-8.26-orig/src/fold.c 2016-11-06 16:15:30.000000000 -0600 --- coreutils-8.27-orig/src/fold.c 2017-01-01 16:34:24.000000000 -0600
+++ coreutils-8.26/src/fold.c 2016-12-02 19:15:23.519391564 -0600 +++ coreutils-8.27/src/fold.c 2017-03-11 23:49:30.982169404 -0600
@@ -22,12 +22,34 @@ @@ -22,12 +22,34 @@
#include <getopt.h> #include <getopt.h>
#include <sys/types.h> #include <sys/types.h>
@ -1360,16 +1360,16 @@ diff -Naurp coreutils-8.26-orig/src/fold.c coreutils-8.26/src/fold.c
/* Look for the last blank. */ /* Look for the last blank. */
while (logical_end) while (logical_end)
{ {
@@ -215,11 +252,221 @@ fold_file (char const *filename, size_t @@ -215,11 +252,220 @@ fold_file (char const *filename, size_t
line_out[offset_out++] = c; line_out[offset_out++] = c;
} }
- saved_errno = errno; - saved_errno = errno;
+ *saved_errno = errno; + *saved_errno = errno;
+
if (offset_out) + if (offset_out)
fwrite (line_out, sizeof (char), (size_t) offset_out, stdout); + fwrite (line_out, sizeof (char), (size_t) offset_out, stdout);
+
+} +}
+ +
+#if HAVE_MBRTOWC +#if HAVE_MBRTOWC
@ -1455,23 +1455,23 @@ diff -Naurp coreutils-8.26-orig/src/fold.c coreutils-8.26/src/fold.c
+ } + }
+ +
+rescan: +rescan:
+ if (operating_mode == byte_mode) /* byte mode */ + if (convfail)
+ increment = 1;
+ else if (wc == L'\n')
+ {
+ /* preserve newline */
+ fwrite (line_out, sizeof(char), offset_out, stdout);
+ START_NEW_LINE;
+ continue;
+ }
+ else if (operating_mode == byte_mode) /* byte mode */
+ increment = mblength; + increment = mblength;
+ else if (operating_mode == character_mode) /* character mode */ + else if (operating_mode == character_mode) /* character mode */
+ increment = 1; + increment = 1;
+ else /* column mode */ + else /* column mode */
+ { + {
+ if (convfail)
+ increment = 1;
+ else
+ {
+ switch (wc) + switch (wc)
+ { + {
+ case L'\n':
+ fwrite (line_out, sizeof(char), offset_out, stdout);
+ START_NEW_LINE;
+ continue;
+
+ case L'\b': + case L'\b':
+ increment = (column > 0) ? -1 : 0; + increment = (column > 0) ? -1 : 0;
+ break; + break;
@ -1489,7 +1489,6 @@ diff -Naurp coreutils-8.26-orig/src/fold.c coreutils-8.26/src/fold.c
+ increment = (increment < 0) ? 0 : increment; + increment = (increment < 0) ? 0 : increment;
+ } + }
+ } + }
+ }
+ +
+ if (column + increment > width && break_spaces && last_blank_pos) + if (column + increment > width && break_spaces && last_blank_pos)
+ { + {
@ -1541,10 +1540,10 @@ diff -Naurp coreutils-8.26-orig/src/fold.c coreutils-8.26/src/fold.c
+ } + }
+ +
+ *saved_errno = errno; + *saved_errno = errno;
+
+ if (offset_out) if (offset_out)
+ fwrite (line_out, sizeof (char), (size_t) offset_out, stdout); fwrite (line_out, sizeof (char), (size_t) offset_out, stdout);
+
+} +}
+#endif +#endif
+ +
@ -1583,7 +1582,7 @@ diff -Naurp coreutils-8.26-orig/src/fold.c coreutils-8.26/src/fold.c
if (ferror (istream)) if (ferror (istream))
{ {
error (0, saved_errno, "%s", quotef (filename)); error (0, saved_errno, "%s", quotef (filename));
@@ -252,7 +499,8 @@ main (int argc, char **argv) @@ -252,7 +498,8 @@ main (int argc, char **argv)
atexit (close_stdout); atexit (close_stdout);
@ -1593,7 +1592,7 @@ diff -Naurp coreutils-8.26-orig/src/fold.c coreutils-8.26/src/fold.c
while ((optc = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1) while ((optc = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1)
{ {
@@ -261,7 +509,15 @@ main (int argc, char **argv) @@ -261,7 +508,15 @@ main (int argc, char **argv)
switch (optc) switch (optc)
{ {
case 'b': /* Count bytes rather than columns. */ case 'b': /* Count bytes rather than columns. */
@ -1610,9 +1609,9 @@ diff -Naurp coreutils-8.26-orig/src/fold.c coreutils-8.26/src/fold.c
break; break;
case 's': /* Break at word boundaries. */ case 's': /* Break at word boundaries. */
diff -Naurp coreutils-8.26-orig/src/join.c coreutils-8.26/src/join.c diff -Naurp coreutils-8.27-orig/src/join.c coreutils-8.27/src/join.c
--- coreutils-8.26-orig/src/join.c 2016-11-06 16:15:30.000000000 -0600 --- coreutils-8.27-orig/src/join.c 2017-01-01 16:34:24.000000000 -0600
+++ coreutils-8.26/src/join.c 2016-12-02 19:15:23.520391480 -0600 +++ coreutils-8.27/src/join.c 2017-03-11 23:47:13.091286290 -0600
@@ -22,19 +22,33 @@ @@ -22,19 +22,33 @@
#include <sys/types.h> #include <sys/types.h>
#include <getopt.h> #include <getopt.h>
@ -2102,9 +2101,9 @@ diff -Naurp coreutils-8.26-orig/src/join.c coreutils-8.26/src/join.c
} }
break; break;
diff -Naurp coreutils-8.26-orig/src/pr.c coreutils-8.26/src/pr.c diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c
--- coreutils-8.26-orig/src/pr.c 2016-11-25 07:40:49.000000000 -0600 --- coreutils-8.27-orig/src/pr.c 2017-01-01 16:34:24.000000000 -0600
+++ coreutils-8.26/src/pr.c 2016-12-02 19:15:23.522391311 -0600 +++ coreutils-8.27/src/pr.c 2017-03-11 23:47:13.094286139 -0600
@@ -311,6 +311,24 @@ @@ -311,6 +311,24 @@
#include <getopt.h> #include <getopt.h>
@ -2867,9 +2866,9 @@ diff -Naurp coreutils-8.26-orig/src/pr.c coreutils-8.26/src/pr.c
/* We've just printed some files and need to clean up things before /* We've just printed some files and need to clean up things before
looking for more options and printing the next batch of files. looking for more options and printing the next batch of files.
diff -Naurp coreutils-8.26-orig/src/sort.c coreutils-8.26/src/sort.c diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c
--- coreutils-8.26-orig/src/sort.c 2016-11-06 16:15:30.000000000 -0600 --- coreutils-8.27-orig/src/sort.c 2017-01-01 16:34:24.000000000 -0600
+++ coreutils-8.26/src/sort.c 2016-12-02 19:15:23.525391058 -0600 +++ coreutils-8.27/src/sort.c 2017-03-11 23:49:22.416505389 -0600
@@ -29,6 +29,14 @@ @@ -29,6 +29,14 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <signal.h> #include <signal.h>
@ -3897,9 +3896,9 @@ diff -Naurp coreutils-8.26-orig/src/sort.c coreutils-8.26/src/sort.c
if (have_read_stdin && fclose (stdin) == EOF) if (have_read_stdin && fclose (stdin) == EOF)
sort_die (_("close failed"), "-"); sort_die (_("close failed"), "-");
diff -Naurp coreutils-8.26-orig/src/unexpand.c coreutils-8.26/src/unexpand.c diff -Naurp coreutils-8.27-orig/src/unexpand.c coreutils-8.27/src/unexpand.c
--- coreutils-8.26-orig/src/unexpand.c 2016-11-06 16:15:30.000000000 -0600 --- coreutils-8.27-orig/src/unexpand.c 2017-01-01 16:34:24.000000000 -0600
+++ coreutils-8.26/src/unexpand.c 2016-12-02 19:15:23.525391058 -0600 +++ coreutils-8.27/src/unexpand.c 2017-03-11 23:49:06.758133530 -0600
@@ -38,6 +38,9 @@ @@ -38,6 +38,9 @@
#include <stdio.h> #include <stdio.h>
#include <getopt.h> #include <getopt.h>
@ -4102,9 +4101,9 @@ diff -Naurp coreutils-8.26-orig/src/unexpand.c coreutils-8.26/src/unexpand.c
} }
} }
diff -Naurp coreutils-8.26-orig/src/uniq.c coreutils-8.26/src/uniq.c diff -Naurp coreutils-8.27-orig/src/uniq.c coreutils-8.27/src/uniq.c
--- coreutils-8.26-orig/src/uniq.c 2016-11-06 16:15:30.000000000 -0600 --- coreutils-8.27-orig/src/uniq.c 2017-01-01 16:34:24.000000000 -0600
+++ coreutils-8.26/src/uniq.c 2016-12-02 19:15:23.526390974 -0600 +++ coreutils-8.27/src/uniq.c 2017-03-11 23:47:13.098285938 -0600
@@ -21,6 +21,17 @@ @@ -21,6 +21,17 @@
#include <getopt.h> #include <getopt.h>
#include <sys/types.h> #include <sys/types.h>
@ -4490,13 +4489,13 @@ diff -Naurp coreutils-8.26-orig/src/uniq.c coreutils-8.26/src/uniq.c
skip_chars = 0; skip_chars = 0;
skip_fields = 0; skip_fields = 0;
check_chars = SIZE_MAX; check_chars = SIZE_MAX;
diff -Naurp coreutils-8.26-orig/tests/expand/mb.sh coreutils-8.26/tests/expand/mb.sh diff -Naurp coreutils-8.27-orig/tests/expand/mb.sh coreutils-8.27/tests/expand/mb.sh
--- coreutils-8.26-orig/tests/expand/mb.sh 1969-12-31 18:00:00.000000000 -0600 --- coreutils-8.27-orig/tests/expand/mb.sh 1969-12-31 18:00:00.000000000 -0600
+++ coreutils-8.26/tests/expand/mb.sh 2016-12-02 19:15:23.526390974 -0600 +++ coreutils-8.27/tests/expand/mb.sh 2017-03-11 23:49:06.759133489 -0600
@@ -0,0 +1,183 @@ @@ -0,0 +1,183 @@
+#!/bin/sh +#!/bin/sh
+ +
+# Copyright (C) 2012-2015 Free Software Foundation, Inc. +# Copyright (C) 2012-2017 Free Software Foundation, Inc.
+ +
+# This program is free software: you can redistribute it and/or modify +# 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 +# it under the terms of the GNU General Public License as published by
@ -4677,9 +4676,9 @@ diff -Naurp coreutils-8.26-orig/tests/expand/mb.sh coreutils-8.26/tests/expand/m
+compare exp out > /dev/null 2>&1 || fail=1 +compare exp out > /dev/null 2>&1 || fail=1
+ +
+exit $fail +exit $fail
diff -Naurp coreutils-8.26-orig/tests/i18n/sort.sh coreutils-8.26/tests/i18n/sort.sh diff -Naurp coreutils-8.27-orig/tests/i18n/sort.sh coreutils-8.27/tests/i18n/sort.sh
--- coreutils-8.26-orig/tests/i18n/sort.sh 1969-12-31 18:00:00.000000000 -0600 --- coreutils-8.27-orig/tests/i18n/sort.sh 1969-12-31 18:00:00.000000000 -0600
+++ coreutils-8.26/tests/i18n/sort.sh 2016-12-02 19:15:23.527390889 -0600 +++ coreutils-8.27/tests/i18n/sort.sh 2017-03-11 23:47:13.100285838 -0600
@@ -0,0 +1,29 @@ @@ -0,0 +1,29 @@
+#!/bin/sh +#!/bin/sh
+# Verify sort's multi-byte support. +# Verify sort's multi-byte support.
@ -4710,10 +4709,10 @@ diff -Naurp coreutils-8.26-orig/tests/i18n/sort.sh coreutils-8.26/tests/i18n/sor
+ +
+ +
+Exit $fail +Exit $fail
diff -Naurp coreutils-8.26-orig/tests/local.mk coreutils-8.26/tests/local.mk diff -Naurp coreutils-8.27-orig/tests/local.mk coreutils-8.27/tests/local.mk
--- coreutils-8.26-orig/tests/local.mk 2016-11-22 14:04:32.000000000 -0600 --- coreutils-8.27-orig/tests/local.mk 2017-02-28 22:25:37.000000000 -0600
+++ coreutils-8.26/tests/local.mk 2016-12-02 19:15:23.527390889 -0600 +++ coreutils-8.27/tests/local.mk 2017-03-11 23:47:38.072058253 -0600
@@ -350,6 +350,8 @@ all_tests = \ @@ -352,6 +352,8 @@ all_tests = \
tests/misc/sort-discrim.sh \ tests/misc/sort-discrim.sh \
tests/misc/sort-files0-from.pl \ tests/misc/sort-files0-from.pl \
tests/misc/sort-float.sh \ tests/misc/sort-float.sh \
@ -4722,7 +4721,7 @@ diff -Naurp coreutils-8.26-orig/tests/local.mk coreutils-8.26/tests/local.mk
tests/misc/sort-h-thousands-sep.sh \ tests/misc/sort-h-thousands-sep.sh \
tests/misc/sort-merge.pl \ tests/misc/sort-merge.pl \
tests/misc/sort-merge-fdlimit.sh \ tests/misc/sort-merge-fdlimit.sh \
@@ -542,6 +544,7 @@ all_tests = \ @@ -544,6 +546,7 @@ all_tests = \
tests/du/threshold.sh \ tests/du/threshold.sh \
tests/du/trailing-slash.sh \ tests/du/trailing-slash.sh \
tests/du/two-args.sh \ tests/du/two-args.sh \
@ -4730,7 +4729,7 @@ diff -Naurp coreutils-8.26-orig/tests/local.mk coreutils-8.26/tests/local.mk
tests/id/gnu-zero-uids.sh \ tests/id/gnu-zero-uids.sh \
tests/id/no-context.sh \ tests/id/no-context.sh \
tests/id/context.sh \ tests/id/context.sh \
@@ -682,6 +685,7 @@ all_tests = \ @@ -684,6 +687,7 @@ all_tests = \
tests/touch/read-only.sh \ tests/touch/read-only.sh \
tests/touch/relative.sh \ tests/touch/relative.sh \
tests/touch/trailing-slash.sh \ tests/touch/trailing-slash.sh \
@ -4738,9 +4737,9 @@ diff -Naurp coreutils-8.26-orig/tests/local.mk coreutils-8.26/tests/local.mk
$(all_root_tests) $(all_root_tests)
# See tests/factor/create-test.sh. # See tests/factor/create-test.sh.
diff -Naurp coreutils-8.26-orig/tests/misc/cut.pl coreutils-8.26/tests/misc/cut.pl diff -Naurp coreutils-8.27-orig/tests/misc/cut.pl coreutils-8.27/tests/misc/cut.pl
--- coreutils-8.26-orig/tests/misc/cut.pl 2016-03-16 07:21:24.000000000 -0500 --- coreutils-8.27-orig/tests/misc/cut.pl 2017-01-01 16:34:24.000000000 -0600
+++ coreutils-8.26/tests/misc/cut.pl 2016-12-02 19:15:23.527390889 -0600 +++ coreutils-8.27/tests/misc/cut.pl 2017-03-11 23:47:13.100285838 -0600
@@ -23,9 +23,11 @@ use strict; @@ -23,9 +23,11 @@ use strict;
# Turn off localization of executable's output. # Turn off localization of executable's output.
@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
@ -4763,9 +4762,9 @@ diff -Naurp coreutils-8.26-orig/tests/misc/cut.pl coreutils-8.26/tests/misc/cut.
push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}];
} }
push @Tests, @new; push @Tests, @new;
diff -Naurp coreutils-8.26-orig/tests/misc/expand.pl coreutils-8.26/tests/misc/expand.pl diff -Naurp coreutils-8.27-orig/tests/misc/expand.pl coreutils-8.27/tests/misc/expand.pl
--- coreutils-8.26-orig/tests/misc/expand.pl 2016-11-06 16:15:30.000000000 -0600 --- coreutils-8.27-orig/tests/misc/expand.pl 2017-03-01 11:16:46.000000000 -0600
+++ coreutils-8.26/tests/misc/expand.pl 2016-12-02 19:15:23.528390805 -0600 +++ coreutils-8.27/tests/misc/expand.pl 2017-03-11 23:47:13.101285788 -0600
@@ -27,6 +27,15 @@ my $prog = 'expand'; @@ -27,6 +27,15 @@ my $prog = 'expand';
# Turn off localization of executable's output. # Turn off localization of executable's output.
@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
@ -4782,8 +4781,8 @@ diff -Naurp coreutils-8.26-orig/tests/misc/expand.pl coreutils-8.26/tests/misc/e
my @Tests = my @Tests =
( (
['t1', '--tabs=3', {IN=>"a\tb"}, {OUT=>"a b"}], ['t1', '--tabs=3', {IN=>"a\tb"}, {OUT=>"a b"}],
@@ -140,6 +149,8 @@ my @Tests = @@ -152,6 +161,8 @@ my @Tests =
['trail9', '--tab=1,2 -t/5',{IN=>"\ta\tb\tc"}, {OUT=>" a b c"}],
# Test errors # Test errors
+ # FIXME: The following tests contain ‘quoting’ specific to LC_MESSAGES + # FIXME: The following tests contain ‘quoting’ specific to LC_MESSAGES
@ -4791,8 +4790,8 @@ diff -Naurp coreutils-8.26-orig/tests/misc/expand.pl coreutils-8.26/tests/misc/e
['e1', '--tabs="a"', {IN=>''}, {OUT=>''}, {EXIT=>1}, ['e1', '--tabs="a"', {IN=>''}, {OUT=>''}, {EXIT=>1},
{ERR => "$prog: tab size contains invalid character(s): 'a'\n"}], {ERR => "$prog: tab size contains invalid character(s): 'a'\n"}],
['e2', "-t $UINTMAX_OFLOW", {IN=>''}, {OUT=>''}, {EXIT=>1}, ['e2', "-t $UINTMAX_OFLOW", {IN=>''}, {OUT=>''}, {EXIT=>1},
@@ -150,6 +161,37 @@ my @Tests = @@ -168,6 +179,37 @@ my @Tests =
{ERR => "$prog: tab sizes must be ascending\n"}], {ERR => "$prog: '/' specifier not at start of number: '/'\n"}],
); );
+if ($mb_locale ne 'C') +if ($mb_locale ne 'C')
@ -4829,9 +4828,9 @@ diff -Naurp coreutils-8.26-orig/tests/misc/expand.pl coreutils-8.26/tests/misc/e
my $save_temps = $ENV{DEBUG}; my $save_temps = $ENV{DEBUG};
my $verbose = $ENV{VERBOSE}; my $verbose = $ENV{VERBOSE};
diff -Naurp coreutils-8.26-orig/tests/misc/fold.pl coreutils-8.26/tests/misc/fold.pl diff -Naurp coreutils-8.27-orig/tests/misc/fold.pl coreutils-8.27/tests/misc/fold.pl
--- coreutils-8.26-orig/tests/misc/fold.pl 2016-03-16 07:21:24.000000000 -0500 --- coreutils-8.27-orig/tests/misc/fold.pl 2017-01-01 16:34:24.000000000 -0600
+++ coreutils-8.26/tests/misc/fold.pl 2016-12-02 19:15:23.528390805 -0600 +++ coreutils-8.27/tests/misc/fold.pl 2017-03-11 23:47:13.101285788 -0600
@@ -20,9 +20,18 @@ use strict; @@ -20,9 +20,18 @@ use strict;
(my $program_name = $0) =~ s|.*/||; (my $program_name = $0) =~ s|.*/||;
@ -4901,9 +4900,9 @@ diff -Naurp coreutils-8.26-orig/tests/misc/fold.pl coreutils-8.26/tests/misc/fol
-my $prog = 'fold'; -my $prog = 'fold';
my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
exit $fail; exit $fail;
diff -Naurp coreutils-8.26-orig/tests/misc/join.pl coreutils-8.26/tests/misc/join.pl diff -Naurp coreutils-8.27-orig/tests/misc/join.pl coreutils-8.27/tests/misc/join.pl
--- coreutils-8.26-orig/tests/misc/join.pl 2016-03-16 07:21:24.000000000 -0500 --- coreutils-8.27-orig/tests/misc/join.pl 2017-01-01 16:34:24.000000000 -0600
+++ coreutils-8.26/tests/misc/join.pl 2016-12-02 19:15:23.528390805 -0600 +++ coreutils-8.27/tests/misc/join.pl 2017-03-11 23:47:13.102285737 -0600
@@ -25,6 +25,15 @@ my $limits = getlimits (); @@ -25,6 +25,15 @@ my $limits = getlimits ();
my $prog = 'join'; my $prog = 'join';
@ -4970,9 +4969,9 @@ diff -Naurp coreutils-8.26-orig/tests/misc/join.pl coreutils-8.26/tests/misc/joi
my $save_temps = $ENV{DEBUG}; my $save_temps = $ENV{DEBUG};
my $verbose = $ENV{VERBOSE}; my $verbose = $ENV{VERBOSE};
diff -Naurp coreutils-8.26-orig/tests/misc/sort-mb-tests.sh coreutils-8.26/tests/misc/sort-mb-tests.sh diff -Naurp coreutils-8.27-orig/tests/misc/sort-mb-tests.sh coreutils-8.27/tests/misc/sort-mb-tests.sh
--- coreutils-8.26-orig/tests/misc/sort-mb-tests.sh 1969-12-31 18:00:00.000000000 -0600 --- coreutils-8.27-orig/tests/misc/sort-mb-tests.sh 1969-12-31 18:00:00.000000000 -0600
+++ coreutils-8.26/tests/misc/sort-mb-tests.sh 2016-12-02 19:15:23.528390805 -0600 +++ coreutils-8.27/tests/misc/sort-mb-tests.sh 2017-03-11 23:47:13.102285737 -0600
@@ -0,0 +1,45 @@ @@ -0,0 +1,45 @@
+#!/bin/sh +#!/bin/sh
+# Verify sort's multi-byte support. +# Verify sort's multi-byte support.
@ -5019,9 +5018,9 @@ diff -Naurp coreutils-8.26-orig/tests/misc/sort-mb-tests.sh coreutils-8.26/tests
+compare exp out || { fail=1; cat out; } +compare exp out || { fail=1; cat out; }
+ +
+Exit $fail +Exit $fail
diff -Naurp coreutils-8.26-orig/tests/misc/sort-merge.pl coreutils-8.26/tests/misc/sort-merge.pl diff -Naurp coreutils-8.27-orig/tests/misc/sort-merge.pl coreutils-8.27/tests/misc/sort-merge.pl
--- coreutils-8.26-orig/tests/misc/sort-merge.pl 2016-03-16 07:21:24.000000000 -0500 --- coreutils-8.27-orig/tests/misc/sort-merge.pl 2017-01-01 16:34:24.000000000 -0600
+++ coreutils-8.26/tests/misc/sort-merge.pl 2016-12-02 19:15:23.529390720 -0600 +++ coreutils-8.27/tests/misc/sort-merge.pl 2017-03-11 23:47:13.102285737 -0600
@@ -26,6 +26,15 @@ my $prog = 'sort'; @@ -26,6 +26,15 @@ my $prog = 'sort';
# Turn off localization of executable's output. # Turn off localization of executable's output.
@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
@ -5078,9 +5077,9 @@ diff -Naurp coreutils-8.26-orig/tests/misc/sort-merge.pl coreutils-8.26/tests/mi
my $save_temps = $ENV{DEBUG}; my $save_temps = $ENV{DEBUG};
my $verbose = $ENV{VERBOSE}; my $verbose = $ENV{VERBOSE};
diff -Naurp coreutils-8.26-orig/tests/misc/sort.pl coreutils-8.26/tests/misc/sort.pl diff -Naurp coreutils-8.27-orig/tests/misc/sort.pl coreutils-8.27/tests/misc/sort.pl
--- coreutils-8.26-orig/tests/misc/sort.pl 2016-03-16 07:21:24.000000000 -0500 --- coreutils-8.27-orig/tests/misc/sort.pl 2017-01-21 08:53:43.000000000 -0600
+++ coreutils-8.26/tests/misc/sort.pl 2016-12-02 19:15:23.529390720 -0600 +++ coreutils-8.27/tests/misc/sort.pl 2017-03-11 23:47:13.103285687 -0600
@@ -24,10 +24,15 @@ my $prog = 'sort'; @@ -24,10 +24,15 @@ my $prog = 'sort';
# Turn off localization of executable's output. # Turn off localization of executable's output.
@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
@ -5098,7 +5097,7 @@ diff -Naurp coreutils-8.26-orig/tests/misc/sort.pl coreutils-8.26/tests/misc/sor
# Since each test is run with a file name and with redirected stdin, # Since each test is run with a file name and with redirected stdin,
# the name in the diagnostic is either the file name or "-". # the name in the diagnostic is either the file name or "-".
# Normalize each diagnostic to use '-'. # Normalize each diagnostic to use '-'.
@@ -424,6 +429,38 @@ foreach my $t (@Tests) @@ -423,6 +428,38 @@ foreach my $t (@Tests)
} }
} }
@ -5137,7 +5136,7 @@ diff -Naurp coreutils-8.26-orig/tests/misc/sort.pl coreutils-8.26/tests/misc/sor
@Tests = triple_test \@Tests; @Tests = triple_test \@Tests;
# Remember that triple_test creates from each test with exactly one "IN" # Remember that triple_test creates from each test with exactly one "IN"
@@ -433,6 +470,7 @@ foreach my $t (@Tests) @@ -432,6 +469,7 @@ foreach my $t (@Tests)
# Remove the IN_PIPE version of the "output-is-input" test above. # Remove the IN_PIPE version of the "output-is-input" test above.
# The others aren't susceptible because they have three inputs each. # The others aren't susceptible because they have three inputs each.
@Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests; @Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests;
@ -5145,9 +5144,9 @@ diff -Naurp coreutils-8.26-orig/tests/misc/sort.pl coreutils-8.26/tests/misc/sor
my $save_temps = $ENV{DEBUG}; my $save_temps = $ENV{DEBUG};
my $verbose = $ENV{VERBOSE}; my $verbose = $ENV{VERBOSE};
diff -Naurp coreutils-8.26-orig/tests/misc/unexpand.pl coreutils-8.26/tests/misc/unexpand.pl diff -Naurp coreutils-8.27-orig/tests/misc/unexpand.pl coreutils-8.27/tests/misc/unexpand.pl
--- coreutils-8.26-orig/tests/misc/unexpand.pl 2016-11-06 16:15:30.000000000 -0600 --- coreutils-8.27-orig/tests/misc/unexpand.pl 2017-01-01 16:34:24.000000000 -0600
+++ coreutils-8.26/tests/misc/unexpand.pl 2016-12-02 19:15:23.530390636 -0600 +++ coreutils-8.27/tests/misc/unexpand.pl 2017-03-11 23:47:13.103285687 -0600
@@ -27,6 +27,14 @@ my $limits = getlimits (); @@ -27,6 +27,14 @@ my $limits = getlimits ();
my $prog = 'unexpand'; my $prog = 'unexpand';
@ -5201,9 +5200,9 @@ diff -Naurp coreutils-8.26-orig/tests/misc/unexpand.pl coreutils-8.26/tests/misc
my $save_temps = $ENV{DEBUG}; my $save_temps = $ENV{DEBUG};
my $verbose = $ENV{VERBOSE}; my $verbose = $ENV{VERBOSE};
diff -Naurp coreutils-8.26-orig/tests/misc/uniq.pl coreutils-8.26/tests/misc/uniq.pl diff -Naurp coreutils-8.27-orig/tests/misc/uniq.pl coreutils-8.27/tests/misc/uniq.pl
--- coreutils-8.26-orig/tests/misc/uniq.pl 2016-03-16 07:21:24.000000000 -0500 --- coreutils-8.27-orig/tests/misc/uniq.pl 2017-01-01 16:34:24.000000000 -0600
+++ coreutils-8.26/tests/misc/uniq.pl 2016-12-02 19:15:23.530390636 -0600 +++ coreutils-8.27/tests/misc/uniq.pl 2017-03-11 23:47:13.103285687 -0600
@@ -23,9 +23,17 @@ my $limits = getlimits (); @@ -23,9 +23,17 @@ my $limits = getlimits ();
my $prog = 'uniq'; my $prog = 'uniq';
my $try = "Try '$prog --help' for more information.\n"; my $try = "Try '$prog --help' for more information.\n";
@ -5276,9 +5275,9 @@ diff -Naurp coreutils-8.26-orig/tests/misc/uniq.pl coreutils-8.26/tests/misc/uni
@Tests = add_z_variants \@Tests; @Tests = add_z_variants \@Tests;
@Tests = triple_test \@Tests; @Tests = triple_test \@Tests;
diff -Naurp coreutils-8.26-orig/tests/pr/pr-tests.pl coreutils-8.26/tests/pr/pr-tests.pl diff -Naurp coreutils-8.27-orig/tests/pr/pr-tests.pl coreutils-8.27/tests/pr/pr-tests.pl
--- coreutils-8.26-orig/tests/pr/pr-tests.pl 2016-11-25 08:01:44.000000000 -0600 --- coreutils-8.27-orig/tests/pr/pr-tests.pl 2017-01-01 16:34:24.000000000 -0600
+++ coreutils-8.26/tests/pr/pr-tests.pl 2016-12-02 19:15:23.530390636 -0600 +++ coreutils-8.27/tests/pr/pr-tests.pl 2017-03-11 23:47:13.103285687 -0600
@@ -24,6 +24,15 @@ use strict; @@ -24,6 +24,15 @@ use strict;
my $prog = 'pr'; my $prog = 'pr';
my $normalize_strerror = "s/': .*/'/"; my $normalize_strerror = "s/': .*/'/";
@ -5344,13 +5343,13 @@ diff -Naurp coreutils-8.26-orig/tests/pr/pr-tests.pl coreutils-8.26/tests/pr/pr-
my $save_temps = $ENV{DEBUG}; my $save_temps = $ENV{DEBUG};
my $verbose = $ENV{VERBOSE}; my $verbose = $ENV{VERBOSE};
diff -Naurp coreutils-8.26-orig/tests/unexpand/mb.sh coreutils-8.26/tests/unexpand/mb.sh diff -Naurp coreutils-8.27-orig/tests/unexpand/mb.sh coreutils-8.27/tests/unexpand/mb.sh
--- coreutils-8.26-orig/tests/unexpand/mb.sh 1969-12-31 18:00:00.000000000 -0600 --- coreutils-8.27-orig/tests/unexpand/mb.sh 1969-12-31 18:00:00.000000000 -0600
+++ coreutils-8.26/tests/unexpand/mb.sh 2016-12-02 19:15:23.531390552 -0600 +++ coreutils-8.27/tests/unexpand/mb.sh 2017-03-11 23:49:06.759133489 -0600
@@ -0,0 +1,172 @@ @@ -0,0 +1,172 @@
+#!/bin/sh +#!/bin/sh
+ +
+# Copyright (C) 2012-2015 Free Software Foundation, Inc. +# Copyright (C) 2012-2017 Free Software Foundation, Inc.
+ +
+# This program is free software: you can redistribute it and/or modify +# 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 +# it under the terms of the GNU General Public License as published by

5
coreutils.spec
View File

@ -1,6 +1,6 @@
%define i18npatch_version %version %define i18npatch_version %version
Name: coreutils Name: coreutils
Version: 8.26 Version: 8.27
Release: 1mamba Release: 1mamba
Summary: A GNU set of tools commonly used in shell scripts Summary: A GNU set of tools commonly used in shell scripts
Group: System/Tools Group: System/Tools
@ -188,6 +188,9 @@ exit 0
#%doc THANKS THANKS-to-translators THANKStt.in #%doc THANKS THANKS-to-translators THANKStt.in
%changelog %changelog
* Mon Apr 24 2017 Automatic Build System <autodist@mambasoft.it> 8.27-1mamba
- automatic version update by autodist
* Sat Dec 10 2016 Automatic Build System <autodist@mambasoft.it> 8.26-1mamba * Sat Dec 10 2016 Automatic Build System <autodist@mambasoft.it> 8.26-1mamba
- automatic version update by autodist - automatic version update by autodist