Hello community, here is the log from the commit of package coreutils for openSUSE:Factory checked in at 2017-03-21 22:42:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/coreutils (Old) and /work/SRC/openSUSE:Factory/.coreutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "coreutils" Tue Mar 21 22:42:03 2017 rev:122 rq:478478 version:8.27 Changes: -------- --- /work/SRC/openSUSE:Factory/coreutils/coreutils-testsuite.changes 2016-12-05 16:28:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.coreutils.new/coreutils-testsuite.changes 2017-03-21 22:42:08.105661732 +0100 @@ -1,0 +2,21 @@ +Fri Mar 10 09:42:51 UTC 2017 - m...@bernhard-voelker.de + +- Update to 8.27 + (for details see included NEWS file) +- Refresh patches: + * coreutils-build-timeout-as-pie.patch + * coreutils-disable_tests.patch + * coreutils-getaddrinfo.patch + * coreutils-i18n.patch + * coreutils-ocfs2_reflinks.patch + * coreutils-remove_hostname_documentation.patch + * coreutils-remove_kill_documentation.patch + * coreutils-skip-gnulib-test-tls.patch + * coreutils-tests-shorten-extreme-factor-tests.patch + * coreutils-testsuite.spec +- coreutils.keyring: Update (now ascii-armored) by + 'osc service localrun download_files'. +- coreutils-tests-port-to-timezone-2017a.patch: Add patch to + workaround a FP test failure with newer timezone-2017a. + +------------------------------------------------------------------- coreutils.changes: same change Old: ---- coreutils-8.26.tar.xz coreutils-8.26.tar.xz.sig New: ---- coreutils-8.27.tar.xz coreutils-8.27.tar.xz.sig coreutils-tests-port-to-timezone-2017a.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ coreutils-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.M3LqOr/_old 2017-03-21 22:42:09.593451537 +0100 +++ /var/tmp/diff_new_pack.M3LqOr/_new 2017-03-21 22:42:09.597450972 +0100 @@ -1,7 +1,7 @@ # # spec file for package coreutils-testsuite # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ License: GPL-3.0+ Group: System/Base Url: http://www.gnu.org/software/coreutils/ -Version: 8.26 +Version: 8.27 Release: 0 ################################################################# @@ -129,6 +129,10 @@ Patch500: coreutils-disable_tests.patch Patch501: coreutils-test_without_valgrind.patch +# Upstream patch on top of coreutils-8.27. +# Avoid a FP of tests/misc/date-debug.sh with newer timezone-2017a. +Patch700: coreutils-tests-port-to-timezone-2017a.patch + # ================================================ %description These are the GNU core utilities. This package is the union of @@ -171,6 +175,8 @@ %patch500 %patch501 +%patch700 + #???## We need to statically link to gmp, otherwise we have a build loop #???#sed -i s,'$(LIB_GMP)',%%{_libdir}/libgmp.a,g Makefile.in ++++++ coreutils.spec ++++++ --- /var/tmp/diff_new_pack.M3LqOr/_old 2017-03-21 22:42:09.621447581 +0100 +++ /var/tmp/diff_new_pack.M3LqOr/_new 2017-03-21 22:42:09.625447016 +0100 @@ -1,7 +1,7 @@ # # spec file for package coreutils # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ License: GPL-3.0+ Group: System/Base Url: http://www.gnu.org/software/coreutils/ -Version: 8.26 +Version: 8.27 Release: 0 ################################################################# @@ -129,6 +129,10 @@ Patch500: coreutils-disable_tests.patch Patch501: coreutils-test_without_valgrind.patch +# Upstream patch on top of coreutils-8.27. +# Avoid a FP of tests/misc/date-debug.sh with newer timezone-2017a. +Patch700: coreutils-tests-port-to-timezone-2017a.patch + # ================================================ %description These are the GNU core utilities. This package is the union of @@ -171,6 +175,8 @@ %patch500 %patch501 +%patch700 + #???## We need to statically link to gmp, otherwise we have a build loop #???#sed -i s,'$(LIB_GMP)',%%{_libdir}/libgmp.a,g Makefile.in ++++++ coreutils-8.26.tar.xz -> coreutils-8.27.tar.xz ++++++ ++++ 219171 lines of diff (skipped) ++++++ coreutils-build-timeout-as-pie.patch ++++++ --- /var/tmp/diff_new_pack.M3LqOr/_old 2017-03-21 22:42:12.465045837 +0100 +++ /var/tmp/diff_new_pack.M3LqOr/_new 2017-03-21 22:42:12.465045837 +0100 @@ -27,7 +27,7 @@ # The list of all programs (separated in different variables to express # the how and when they should be installed) is defined in this makefile -@@ -278,6 +278,9 @@ src_factor_LDADD += $(LIB_GMP) +@@ -280,6 +280,9 @@ src_factor_LDADD += $(LIB_GMP) # for getloadavg src_uptime_LDADD += $(GETLOADAVG_LIBS) ++++++ coreutils-disable_tests.patch ++++++ --- /var/tmp/diff_new_pack.M3LqOr/_old 2017-03-21 22:42:12.477044142 +0100 +++ /var/tmp/diff_new_pack.M3LqOr/_new 2017-03-21 22:42:12.481043577 +0100 @@ -1,23 +1,25 @@ --- - gnulib-tests/gnulib.mk | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + gnulib-tests/gnulib.mk | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) Index: gnulib-tests/gnulib.mk =================================================================== --- gnulib-tests/gnulib.mk.orig +++ gnulib-tests/gnulib.mk -@@ -899,11 +899,11 @@ EXTRA_DIST += test-getloadavg.c signatur +@@ -893,12 +893,12 @@ EXTRA_DIST += test-getloadavg.c signatur ## end gnulib module getloadavg-tests ## begin gnulib module getlogin-tests - -TESTS += test-getlogin -check_PROGRAMS += test-getlogin +-test_getlogin_LDADD = $(LDADD) $(LIB_GETLOGIN) -EXTRA_DIST += test-getlogin.c signature.h macros.h - +# +#TESTS += test-getlogin +#check_PROGRAMS += test-getlogin ++#test_getlogin_LDADD = $(LDADD) $(LIB_GETLOGIN) +#EXTRA_DIST += test-getlogin.c signature.h macros.h +# ## end gnulib module getlogin-tests ++++++ coreutils-getaddrinfo.patch ++++++ --- /var/tmp/diff_new_pack.M3LqOr/_old 2017-03-21 22:42:12.501040752 +0100 +++ /var/tmp/diff_new_pack.M3LqOr/_new 2017-03-21 22:42:12.505040187 +0100 @@ -6,7 +6,7 @@ =================================================================== --- gnulib-tests/test-getaddrinfo.c.orig +++ gnulib-tests/test-getaddrinfo.c -@@ -86,11 +86,7 @@ simple (char const *host, char const *se +@@ -91,11 +91,7 @@ simple (char const *host, char const *se the test merely because someone is down the country on their in-law's farm. */ if (res == EAI_AGAIN) ++++++ coreutils-i18n.patch ++++++ --- /var/tmp/diff_new_pack.M3LqOr/_old 2017-03-21 22:42:12.517038492 +0100 +++ /var/tmp/diff_new_pack.M3LqOr/_new 2017-03-21 22:42:12.521037927 +0100 @@ -7,7 +7,7 @@ src/cut.c | 441 ++++++++++++++++++++++++- src/expand-common.c | 114 ++++++ src/expand-common.h | 12 - src/expand.c | 92 ++++- + src/expand.c | 90 ++++- src/fold.c | 308 ++++++++++++++++- src/join.c | 359 +++++++++++++++++--- src/pr.c | 443 ++++++++++++++++++++++--- @@ -28,7 +28,7 @@ tests/misc/uniq.pl | 55 +++ tests/pr/pr-tests.pl | 49 ++ tests/unexpand/mb.sh | 172 +++++++++ - 30 files changed, 3778 insertions(+), 219 deletions(-) + 30 files changed, 3777 insertions(+), 218 deletions(-) create mode 100644 lib/mbfile.c create mode 100644 lib/mbfile.h create mode 100644 m4/mbfile.m4 @@ -53,7 +53,7 @@ =================================================================== --- configure.ac.orig +++ configure.ac -@@ -427,6 +427,8 @@ fi +@@ -429,6 +429,8 @@ fi # I'm leaving it here for now. This whole thing needs to be modernized... gl_WINSIZE_IN_PTEM @@ -952,8 +952,8 @@ #include "system.h" #include "die.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 @@ -1113,7 +1113,6 @@ { /* Input stream. */ FILE *fp = next_file (NULL); -- + mb_file_t mbf; + mbf_char_t c; + /* True if the starting locale is utf8. */ @@ -1122,7 +1121,7 @@ + /* True if the first file contains BOM header. */ + bool found_bom; + using_utf_locale=check_utf_locale(); -+ + if (!fp) return; + mbf_init (mbf, fp); @@ -1141,12 +1140,12 @@ + } + } + -+ + + if (found_bom == true) + { + print_bom(); + } - ++ + while (true) + { /* If true, perform translations. */ @@ -2006,8 +2005,8 @@ - diff = memcmp (beg1, beg2, MIN (len1, len2)); + copy[0] = beg[0]; + copy[1] = beg[1]; -+ } -+ + } + + if (hard_LC_COLLATE) + { + diff = xmemcoll ((char *) copy[0], len[0], (char *) copy[1], len[1]); @@ -2017,14 +2016,14 @@ + free (copy[i]); + + return diff; - } ++ } + diff = memcmp (copy[0], copy[1], MIN (len[0], len[1])); + + if (mallocd) + for (i = 0; i < 2; i++) + free (copy[i]); + - ++ if (diff) return diff; - return len1 < len2 ? -1 : len1 != len2; @@ -4307,7 +4306,7 @@ if (check_chars < oldlen) oldlen = check_chars; if (check_chars < newlen) -@@ -295,15 +401,104 @@ different (char *old, char *new, size_t +@@ -295,14 +401,103 @@ different (char *old, char *new, size_t if (ignore_case) { @@ -4339,8 +4338,8 @@ + + return xmemcoll (copy_old, oldlen, copy_new, newlen); + - } - ++} ++ +#if HAVE_MBRTOWC +static int +different_multi (const char *old, const char *new, size_t oldlen, size_t newlen, mbstate_t oldstate, mbstate_t newstate) @@ -4411,12 +4410,11 @@ + free (copy[1]); + return rc; + -+} + } +#endif -+ + /* Output the line in linebuffer LINE to standard output provided that the switches say it should be output. - MATCH is true if the line matches the previous line. @@ -367,19 +562,38 @@ check_file (const char *infile, const ch char *prevfield IF_LINT ( = NULL); size_t prevlen IF_LINT ( = 0); @@ -4765,7 +4763,7 @@ =================================================================== --- tests/local.mk.orig +++ tests/local.mk -@@ -350,6 +350,8 @@ all_tests = \ +@@ -352,6 +352,8 @@ all_tests = \ tests/misc/sort-discrim.sh \ tests/misc/sort-files0-from.pl \ tests/misc/sort-float.sh \ @@ -4774,7 +4772,7 @@ tests/misc/sort-h-thousands-sep.sh \ tests/misc/sort-merge.pl \ tests/misc/sort-merge-fdlimit.sh \ -@@ -542,6 +544,7 @@ all_tests = \ +@@ -544,6 +546,7 @@ all_tests = \ tests/du/threshold.sh \ tests/du/trailing-slash.sh \ tests/du/two-args.sh \ @@ -4782,7 +4780,7 @@ tests/id/gnu-zero-uids.sh \ tests/id/no-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/relative.sh \ tests/touch/trailing-slash.sh \ @@ -4836,8 +4834,8 @@ my @Tests = ( ['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 + # FIXME: The following tests contain ‘quoting’ specific to LC_MESSAGES @@ -4845,8 +4843,8 @@ ['e1', '--tabs="a"', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR => "$prog: tab size contains invalid character(s): 'a'\n"}], ['e2', "-t $UINTMAX_OFLOW", {IN=>''}, {OUT=>''}, {EXIT=>1}, -@@ -150,6 +161,37 @@ my @Tests = - {ERR => "$prog: tab sizes must be ascending\n"}], +@@ -168,6 +179,37 @@ my @Tests = + {ERR => "$prog: '/' specifier not at start of number: '/'\n"}], ); +if ($mb_locale ne 'C') @@ -5157,7 +5155,7 @@ # Since each test is run with a file name and with redirected stdin, # the name in the diagnostic is either the file name or "-". # Normalize each diagnostic to use '-'. -@@ -424,6 +429,38 @@ foreach my $t (@Tests) +@@ -423,6 +428,38 @@ foreach my $t (@Tests) } } @@ -5196,7 +5194,7 @@ @Tests = triple_test \@Tests; # 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. # The others aren't susceptible because they have three inputs each. @Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests; ++++++ coreutils-ocfs2_reflinks.patch ++++++ --- /var/tmp/diff_new_pack.M3LqOr/_old 2017-03-21 22:42:12.541035102 +0100 +++ /var/tmp/diff_new_pack.M3LqOr/_new 2017-03-21 22:42:12.541035102 +0100 @@ -18,7 +18,7 @@ =================================================================== --- src/copy.c.orig +++ src/copy.c -@@ -324,6 +324,47 @@ sparse_copy (int src_fd, int dest_fd, ch +@@ -327,6 +327,47 @@ sparse_copy (int src_fd, int dest_fd, ch return true; } @@ -66,7 +66,7 @@ /* Perform the O(1) btrfs clone operation, if possible. Upon success, return 0. Otherwise, return -1 and set errno. */ static inline int -@@ -1054,6 +1095,45 @@ copy_reg (char const *src_name, char con +@@ -1057,6 +1098,45 @@ copy_reg (char const *src_name, char con goto close_src_desc; } @@ -112,7 +112,7 @@ /* The semantics of the following open calls are mandated by the specs for both cp and mv. */ if (! *new_dst) -@@ -1197,7 +1277,7 @@ copy_reg (char const *src_name, char con +@@ -1200,7 +1280,7 @@ copy_reg (char const *src_name, char con } /* --attributes-only overrides --reflink. */ ++++++ coreutils-remove_hostname_documentation.patch ++++++ --- /var/tmp/diff_new_pack.M3LqOr/_old 2017-03-21 22:42:12.553033406 +0100 +++ /var/tmp/diff_new_pack.M3LqOr/_new 2017-03-21 22:42:12.553033406 +0100 @@ -23,7 +23,7 @@ * SELinux context:: chcon runcon * Modified command invocation:: chroot env nice nohup stdbuf timeout * Process control:: kill -@@ -423,7 +422,6 @@ System context +@@ -424,7 +423,6 @@ System context * date invocation:: Print or set system date and time * nproc invocation:: Print the number of processors * uname invocation:: Print system information @@ -31,7 +31,7 @@ * hostid invocation:: Print numeric host identifier * uptime invocation:: Print system uptime and load -@@ -15073,7 +15071,6 @@ information. +@@ -15422,7 +15420,6 @@ information. * arch invocation:: Print machine hardware name. * nproc invocation:: Print the number of processors. * uname invocation:: Print system information. @@ -39,7 +39,7 @@ * hostid invocation:: Print numeric host identifier. * uptime invocation:: Print system uptime and load. @end menu -@@ -15912,15 +15909,6 @@ Note this is non-portable (even across G +@@ -16266,15 +16263,6 @@ Note this is non-portable (even across G Print the machine hardware name (sometimes called the hardware class or hardware type). @@ -55,7 +55,7 @@ @item -p @itemx --processor @opindex -p -@@ -15974,34 +15962,6 @@ Print the kernel version. +@@ -16328,34 +16316,6 @@ Print the kernel version. @exitstatus ++++++ coreutils-remove_kill_documentation.patch ++++++ --- /var/tmp/diff_new_pack.M3LqOr/_old 2017-03-21 22:42:12.565031711 +0100 +++ /var/tmp/diff_new_pack.M3LqOr/_new 2017-03-21 22:42:12.565031711 +0100 @@ -22,7 +22,7 @@ * Delaying:: sleep * Numeric operations:: factor numfmt seq * File permissions:: Access modes -@@ -450,10 +448,6 @@ Modified command invocation +@@ -451,10 +449,6 @@ Modified command invocation * stdbuf invocation:: Run a command with modified I/O buffering * timeout invocation:: Run a command with a time limit @@ -33,7 +33,7 @@ Delaying * sleep invocation:: Delay for a specified time -@@ -16896,90 +16890,6 @@ the exit status of @var{command} otherwi +@@ -17250,90 +17244,6 @@ the exit status of @var{command} otherwi @end display ++++++ coreutils-skip-gnulib-test-tls.patch ++++++ --- /var/tmp/diff_new_pack.M3LqOr/_old 2017-03-21 22:42:12.573030581 +0100 +++ /var/tmp/diff_new_pack.M3LqOr/_new 2017-03-21 22:42:12.577030016 +0100 @@ -21,7 +21,7 @@ =================================================================== --- gnulib-tests/gnulib.mk.orig +++ gnulib-tests/gnulib.mk -@@ -2243,9 +2243,10 @@ EXTRA_DIST += test-timespec.c macros.h +@@ -2239,9 +2239,10 @@ EXTRA_DIST += test-timespec.c macros.h ## begin gnulib module tls-tests ++++++ coreutils-tests-port-to-timezone-2017a.patch ++++++ Upstream patch on top of coreutils-8.27. Avoid a FP of tests/misc/date-debug.sh with newer timezone-2017a. Upstream patch: http://git.sv.gnu.org/cgit/coreutils.git/commit/?id=612086660b >From 612086660bab9bf981894da146550e9101224b17 Mon Sep 17 00:00:00 2001 From: Paul Eggert <egg...@cs.ucla.edu> Date: Thu, 9 Mar 2017 23:59:05 -0800 Subject: [PATCH] tests: port to tzdb-2017a Problem reported by Bernhard Voelker in: http://lists.gnu.org/archive/html/coreutils/2017-03/msg00026.html * tests/misc/date-debug.sh: Port test to tzdb 2017a, and future-proof the America/Belize test. --- tests/misc/date-debug.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) Index: tests/misc/date-debug.sh =================================================================== --- tests/misc/date-debug.sh.orig +++ tests/misc/date-debug.sh @@ -52,10 +52,11 @@ date: output timezone: +09:00 (set from date: final: 661095000.000000000 (epoch-seconds) date: final: (Y-M-D) 1990-12-13 13:30:00 (UTC0) date: final: (Y-M-D) 1990-12-13 22:30:00 (output timezone TZ=+09:00) -Thu Dec 13 07:30:00 CST 1990 +Thu Dec 13 07:30:00 -0600 1990 EOF -TZ=America/Belize date --debug -d "$in1" >out1 2>&1 || fail=1 +TZ=America/Belize date --debug -d "$in1" +'%a %b %e %T %z %Y' >out1 2>&1 || + fail=1 compare exp1 out1 || fail=1 @@ -94,10 +95,10 @@ date: output timezone: -05:00 (set from date: final: 1.000000000 (epoch-seconds) date: final: (Y-M-D) 1970-01-01 00:00:01 (UTC0) date: final: (Y-M-D) 1969-12-31 19:00:01 (output timezone TZ=-05:00) -Wed Dec 31 19:00:01 PET 1969 +Wed Dec 31 19:00:01 -0500 1969 EOF -TZ=America/Lima date --debug -d "$in3" >out3 2>&1 || fail=1 +TZ=America/Lima date --debug -d "$in3" +'%a %b %e %T %z %Y' >out3 2>&1 || fail=1 compare exp3 out3 || fail=1 ## ++++++ coreutils-tests-shorten-extreme-factor-tests.patch ++++++ --- /var/tmp/diff_new_pack.M3LqOr/_old 2017-03-21 22:42:12.609025496 +0100 +++ /var/tmp/diff_new_pack.M3LqOr/_new 2017-03-21 22:42:12.609025496 +0100 @@ -16,7 +16,7 @@ =================================================================== --- tests/local.mk.orig +++ tests/local.mk -@@ -691,14 +691,9 @@ all_tests = \ +@@ -693,14 +693,9 @@ all_tests = \ # See tests/factor/create-test.sh. tf = tests/factor factor_tests = \ ++++++ coreutils.keyring ++++++ Binary files /var/tmp/diff_new_pack.M3LqOr/_old and /var/tmp/diff_new_pack.M3LqOr/_new differ