Hi folks,
Slightly confused by the packages.qa.d.o page about coreutils, I
started investigating FTBFS on powerpc. I've since seen that 8.13-3.4
is already built and installed everywhere, but it reliably fails to
build for me with testsuite failures similar to those reported in
#687906, reported against 8.13-3.3. Building on my local powerpc box
works with the attached debdiff, and I'm worried about maybe releasing
wheezy with stuff that doesn't build. What do you think of this debdiff?
--
Steve McIntyre, Cambridge, UK. st...@einval.com
Can't keep my eyes from the circling sky,
Tongue-tied & twisted, Just an earth-bound misfit, I...
diff -u coreutils-8.13/debian/changelog coreutils-8.13/debian/changelog
--- coreutils-8.13/debian/changelog
+++ coreutils-8.13/debian/changelog
@@ -1,3 +1,14 @@
+coreutils (8.13-3.5) wheezy; urgency=low
+
+ * Non-maintainer upload.
+ * Multiple test-suite fixes. Closes: #687906
+ + Extend the fix for #685238: recognise if valgrind is not
+ installed and skip the test
+ + Apply upstream fix in the test for parse-datetime so that it works
+ regardless of system DST status
+
+ -- Steve McIntyre <93...@debian.org> Sat, 26 Jan 2013 12:10:17 +0000
+
coreutils (8.13-3.4) wheezy; urgency=low
* Non-maintainer upload.
diff -u coreutils-8.13/debian/patches/00list
coreutils-8.13/debian/patches/00list
--- coreutils-8.13/debian/patches/00list
+++ coreutils-8.13/debian/patches/00list
@@ -8,6 +8,7 @@
84_getcwd
85_timer_settime
86_float_ppc
+99_fix_parse-datetime-test.dpatch
99_disable_tests.misc.ls-time
99_kfbsd_build_tests
99_kfbsd_fstat_patch
diff -u coreutils-8.13/debian/patches/99_sort_-u_data_loss.dpatch
coreutils-8.13/debian/patches/99_sort_-u_data_loss.dpatch
--- coreutils-8.13/debian/patches/99_sort_-u_data_loss.dpatch
+++ coreutils-8.13/debian/patches/99_sort_-u_data_loss.dpatch
@@ -10,18 +10,18 @@
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
coreutils-8.13~/THANKS.in coreutils-8.13/THANKS.in
--- coreutils-8.13~/THANKS.in 2011-08-08 09:16:09.000000000 +0100
-+++ coreutils-8.13/THANKS.in 2012-09-10 13:25:46.000000000 +0100
++++ coreutils-8.13/THANKS.in 2013-01-26 14:13:20.000000000 +0000
@@ -486,6 +486,7 @@
Rainer Orth r...@techfak.uni-bielefeld.de
Ralf W. Stephan step...@tmt.de
Ralph Loader loa...@maths.ox.ac.uk
+Rasmus Borup Hansen r...@intomics.com
Raul Miller m...@magenta.com
- Ra�l N��ez de Arenas Coronado r...@pleyades.net
+ Raúl Núñez de Arenas Coronado r...@pleyades.net
Richard A Downing richard.down...@bcs.org.uk
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
coreutils-8.13~/src/sort.c coreutils-8.13/src/sort.c
--- coreutils-8.13~/src/sort.c 2011-07-29 09:12:25.000000000 +0100
-+++ coreutils-8.13/src/sort.c 2012-09-10 13:26:34.000000000 +0100
++++ coreutils-8.13/src/sort.c 2013-01-26 14:13:20.000000000 +0000
@@ -263,6 +263,9 @@
when popping. */
};
@@ -58,7 +58,7 @@
{
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
coreutils-8.13~/tests/Makefile.am coreutils-8.13/tests/Makefile.am
--- coreutils-8.13~/tests/Makefile.am 2011-09-02 13:08:40.000000000 +0100
-+++ coreutils-8.13/tests/Makefile.am 2012-09-10 13:27:42.000000000 +0100
++++ coreutils-8.13/tests/Makefile.am 2013-01-26 14:13:20.000000000 +0000
@@ -249,6 +249,7 @@
misc/sort-unique \
misc/sort-unique-segv \
@@ -67,9 +67,25 @@
split/filter \
split/suffix-length \
split/b-chunk \
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
coreutils-8.13~/tests/init.cfg coreutils-8.13/tests/init.cfg
+--- coreutils-8.13~/tests/init.cfg 2013-01-26 14:13:14.000000000 +0000
++++ coreutils-8.13/tests/init.cfg 2013-01-26 14:14:12.000000000 +0000
+@@ -112,6 +112,12 @@
+ && skip_ "this shell lacks ulimit support"
+ }
+
++# Skip the current test if valgrind doesn't work.
++require_valgrind_()
++{
++ valgrind --help >/dev/null || skip_ "requires valgrind"
++}
++
+ require_readable_root_()
+ {
+ test -r / || skip_ "/ is not readable"
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
coreutils-8.13~/tests/misc/sort coreutils-8.13/tests/misc/sort
--- coreutils-8.13~/tests/misc/sort 2011-07-28 11:38:27.000000000 +0100
-+++ coreutils-8.13/tests/misc/sort 2012-09-10 13:27:26.000000000 +0100
++++ coreutils-8.13/tests/misc/sort 2013-01-26 14:13:20.000000000 +0000
@@ -227,6 +227,21 @@
["15d", '-i -u', {IN=>"\1a\na\n"}, {OUT=>"\1a\n"}],
["15e", '-i -u', {IN=>"a\n\1\1\1\1\1a\1\1\1\1\n"}, {OUT=>"a\n"}],
@@ -91,10 +107,10 @@
+
# From Erick Branderhorst -- fixed around 1.19e
["16a", '-f',
- {IN=>"�minence\n�berhaupt\n's-Gravenhage\na�roclub\nAag\naagtappels\n"},
+ {IN=>"éminence\nüberhaupt\n's-Gravenhage\naëroclub\nAag\naagtappels\n"},
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
coreutils-8.13~/tests/misc/sort-u-FMR coreutils-8.13/tests/misc/sort-u-FMR
--- coreutils-8.13~/tests/misc/sort-u-FMR 1970-01-01 01:00:00.000000000
+0100
-+++ coreutils-8.13/tests/misc/sort-u-FMR 2012-09-10 13:27:26.000000000
+0100
++++ coreutils-8.13/tests/misc/sort-u-FMR 2013-01-26 14:13:20.000000000
+0000
@@ -0,0 +1,29 @@
+#!/bin/sh
+# Before 8.19, this would trigger a free-memory read.
only in patch2:
unchanged:
--- coreutils-8.13.orig/debian/patches/99_fix_parse-datetime-test.dpatch
+++ coreutils-8.13/debian/patches/99_fix_parse-datetime-test.dpatch
@@ -0,0 +1,75 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_fix_parse-datetime-test.dpatch by <93...@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Apply fix from upstream so that test-parse-datetime will work
+## DP: regardless of DST.
+## DP: http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28825
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
coreutils-8.13~/gnulib-tests/test-parse-datetime.c
coreutils-8.13/gnulib-tests/test-parse-datetime.c
+--- coreutils-8.13~/gnulib-tests/test-parse-datetime.c 2011-08-31
18:01:21.000000000 +0100
++++ coreutils-8.13/gnulib-tests/test-parse-datetime.c 2013-01-26
14:04:38.000000000 +0000
+@@ -96,20 +96,17 @@
+ #endif /* ! HAVE_TM_GMTOFF */
+
+ static long
+-gmt_offset ()
++gmt_offset (time_t s)
+ {
+- time_t now;
+ long gmtoff;
+
+- time (&now);
+-
+ #if !HAVE_TM_GMTOFF
+- struct tm tm_local = *localtime (&now);
+- struct tm tm_gmt = *gmtime (&now);
++ struct tm tm_local = *localtime (&s);
++ struct tm tm_gmt = *gmtime (&s);
+
+ gmtoff = tm_diff (&tm_local, &tm_gmt);
+ #else
+- gmtoff = localtime (&now)->tm_gmtoff;
++ gmtoff = localtime (&s)->tm_gmtoff;
+ #endif
+
+ return gmtoff;
+@@ -125,16 +122,17 @@
+ const char *p;
+ int i;
+ long gmtoff;
++ time_t ref_time = 1304250918;
+
+ set_program_name (argv[0]);
+
+- gmtoff = gmt_offset ();
++ gmtoff = gmt_offset (ref_time);
+
+
+ /* ISO 8601 extended date and time of day representation,
+ 'T' separator, local time zone */
+ p = "2011-05-01T11:55:18";
+- expected.tv_sec = 1304250918 - gmtoff;
++ expected.tv_sec = ref_time - gmtoff;
+ expected.tv_nsec = 0;
+ ASSERT (parse_datetime (&result, p, 0));
+ LOG (p, expected, result);
+@@ -144,7 +142,7 @@
+ /* ISO 8601 extended date and time of day representation,
+ ' ' separator, local time zone */
+ p = "2011-05-01 11:55:18";
+- expected.tv_sec = 1304250918 - gmtoff;
++ expected.tv_sec = ref_time - gmtoff;
+ expected.tv_nsec = 0;
+ ASSERT (parse_datetime (&result, p, 0));
+ LOG (p, expected, result);
+@@ -155,7 +153,7 @@
+ /* ISO 8601, extended date and time of day representation,
+ 'T' separator, UTC */
+ p = "2011-05-01T11:55:18Z";
+- expected.tv_sec = 1304250918;
++ expected.tv_sec = ref_time;
+ expected.tv_nsec = 0;
+ ASSERT (parse_datetime (&result, p, 0));
+ LOG (p, expected, result);
