diffstat of debian/ for coreutils_8.30-1 coreutils_8.30-1ubuntu1 changelog | 451 +++++++++++++++++++++++++++++++- control | 3 patches/80_fedora_sysinfo.patch | 74 +++++ patches/99_float_endian_detection.patch | 65 ++++ patches/series | 2 rules | 44 ++- tests/control | 2 tests/upstream | 348 ++++++++++++++++++++++++ 8 files changed, 984 insertions(+), 5 deletions(-) diff -Nru coreutils-8.30/debian/changelog coreutils-8.30/debian/changelog --- coreutils-8.30/debian/changelog 2018-08-29 20:20:06.000000000 +0000 +++ coreutils-8.30/debian/changelog 2019-01-14 12:17:34.000000000 +0000 @@ -1,3 +1,25 @@ +coreutils (8.30-1ubuntu1) disco; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/rules: + + Allow crossbuilding + + Run tests + - debian/tests: + + Add dep8 tests + - debian/patches/80_fedora_sysinfo.patch + + Make 'uname -i -p' return the real processor/hardware, + instead of unknown. + - debian/patches/99_float_endian_detection.patch: + + Fix detection of floating point endianness. + - Ignore the cut-huge-range test failure on armhf, only seen on the + buildds. + * Dropped changes, included upstream: + - debian/patches/adjust_to_glibc_2.28_libio.patch: adjust to glibc + 2.28's libio.h removal: check for _IO_EOF_SEEN instead of + _IO_ftrylockfile, and define _IO_IN_BACKUP for ourselves. + + -- Steve Langasek Mon, 14 Jan 2019 14:17:34 +0200 + coreutils (8.30-1) unstable; urgency=low * New upstream version @@ -10,6 +32,32 @@ -- Michael Stone Wed, 29 Aug 2018 16:20:06 -0400 +coreutils (8.28-1ubuntu2) cosmic; urgency=medium + + * debian/patches/adjust_to_glibc_2.28_libio.patch: adjust to glibc 2.28's + libio.h removal: check for _IO_EOF_SEEN instead of _IO_ftrylockfile, and + define _IO_IN_BACKUP for ourselves. + + -- Mathieu Trudel-Lapierre Thu, 04 Oct 2018 19:50:13 -0400 + +coreutils (8.28-1ubuntu1) bionic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/rules: + + Allow crossbuilding + + Run tests + - debian/tests: + + Add dep8 tests + - debian/patches/80_fedora_sysinfo.patch + + Make 'uname -i -p' return the real processor/hardware, + instead of unknown. + - debian/patches/99_float_endian_detection.patch: + + Fix detection of floating point endianness. + - Ignore the cut-huge-range test failure on armhf, only seen on the + buildds. + + -- Julian Andres Klode Thu, 18 Jan 2018 10:43:49 +0100 + coreutils (8.28-1) unstable; urgency=low * New upstream version @@ -32,6 +80,35 @@ -- Michael Stone Mon, 02 Oct 2017 13:51:20 -0400 +coreutils (8.26-3ubuntu4) artful; urgency=medium + + * debian/patches/test-misc-date-tzdb-2017a.patch: fixes date test + caused by tzdb-2017a update. LP: #1679865. + + -- Tiago Stürmer Daitx Wed, 04 Oct 2017 19:56:41 +0000 + +coreutils (8.26-3ubuntu3) zesty; urgency=medium + + * Ignore the cut-huge-range test failure on armhf, only seen on the buildds. + + -- Matthias Klose Wed, 01 Mar 2017 09:33:36 +0100 + +coreutils (8.26-3ubuntu1) zesty; urgency=medium + + * Merge with Debian; remaining changes: + - debian/rules: + + Allow crossbuilding + + Run tests + - debian/tests: + + Add dep8 tests + - debian/patches/80_fedora_sysinfo.patch + + Make 'uname -i -p' return the real processor/hardware, + instead of unknown. + - debian/patches/99_float_endian_detection.patch: + + Fix detection of floating point endianness. + + -- Matthias Klose Tue, 28 Feb 2017 10:10:28 +0100 + coreutils (8.26-3) unstable; urgency=medium * Update standards version to 3.9.8.0 (no changes) @@ -54,6 +131,30 @@ -- Michael Stone Fri, 09 Dec 2016 09:08:27 -0500 +coreutils (8.25-2ubuntu2) xenial; urgency=medium + + * debian/tests/upstream: + - Whoops, drop four tests that have been removed upstream + + -- Michael Terry Thu, 18 Feb 2016 08:27:50 -0500 + +coreutils (8.25-2ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/rules: + + Allow crossbuilding + + Run tests + - debian/tests: + + Add dep8 tests + - debian/patches/80_fedora_sysinfo.patch + + Make 'uname -i -p' return the real processor/hardware, + instead of unknown. + - debian/patches/99_float_endian_detection.patch: + + Fix detection of floating point endianness. + * Drop 99_mountinfo.patch, it's been applied upstream + + -- Michael Terry Wed, 17 Feb 2016 14:52:46 -0500 + coreutils (8.25-2) unstable; urgency=medium * Disable default ls quoting for now to get the rest of 8.25 into testing. @@ -85,6 +186,40 @@ -- Michael Stone Mon, 18 Jan 2016 15:34:49 -0500 +coreutils (8.23-4ubuntu2) wily; urgency=medium + + * debian/patches/33_chroot_always.dpatch: + - Update Debian's patch to also comment out the tests that are made + obsolete by the same patch. We no longer have non-root support + for "chroot /". Fixes FTBFS. + + -- Michael Terry Wed, 14 Oct 2015 15:44:28 -0400 + +coreutils (8.23-4ubuntu1) wily; urgency=low + + [ Michael Terry ] + * Merge from Debian unstable. Remaining changes: + - debian/rules: Let it cross build: + + Preseed some autoconf tests. + + Don't rebuild the man pages. + - debian/control: + + Depend on acl and strace for autopkgtests. + - debian/tests/upstream: + + Adjust for changed test layout in 8.20. + + Update list of autopkgtest-runnable unit tests (LP: #1246805). + - debian/patches/80_fedora_sysinfo.dpatch + + Make 'uname -i -p' return the real processor/hardware, + instead of unknown. + - debian/patches/99_float_endian_detection: + + Fix detection of floating point endianness. + + [ Dave Chiluk ] + * Add support for correctly processing /proc/self/mountinfo. + * Fix df to prioritize mounts of the root of a device over bind mounts. + (LP: #1432871) + + -- Michael Terry Wed, 14 Oct 2015 13:04:46 -0400 + coreutils (8.23-4) unstable; urgency=low * [33] remove chroot optimization that avoids the actual chroot when @@ -98,6 +233,28 @@ -- Michael Stone Sat, 14 Mar 2015 07:59:06 -0400 +coreutils (8.23-3ubuntu1) vivid; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/rules: Let it cross build: + + Preseed some autoconf tests. + + Don't rebuild the man pages. + - debian/control: + + Depend on acl and strace for autopkgtests. + - debian/tests/upstream: + + Adjust for changed test layout in 8.20. + + Update list of autopkgtest-runnable unit tests (LP: #1246805). + - debian/patches/80_fedora_sysinfo.dpatch + + Make 'uname -i -p' return the real processor/hardware, + instead of unknown. + - debian/patches/99_float_endian_detection: + + Fix detection of floating point endianness. + * update "Remaining changes" to reflect current status + * drop debian/patches/99_test_nohup_tty.dpatch as its upstream + * remove leftover ".failed" patch files from some earlier merge + + -- Michael Vogt Mon, 03 Nov 2014 08:08:11 +0100 + coreutils (8.23-3) unstable; urgency=low * Standards version 3.9.6.0 @@ -109,6 +266,37 @@ -- Michael Stone Wed, 29 Oct 2014 20:58:59 -0400 +coreutils (8.23-2ubuntu3) utopic; urgency=medium + + * Don't run tests during autopkg tests which depend on the test + binaries (getlimits, ginstall). + + -- Matthias Klose Mon, 08 Sep 2014 13:03:00 +0200 + +coreutils (8.23-2ubuntu2) utopic; urgency=medium + + * Update the list of skipped autopkg tests. + + -- Matthias Klose Wed, 03 Sep 2014 19:36:19 +0200 + +coreutils (8.23-2ubuntu1) utopic; urgency=medium + + * Merge with Debian; remaining changes: + - Make 'uname -i -p' return the real processor/hardware, instead of + unknown. + - debian/tests/upstream: Adjust for changed test layout in 8.20. + - Configure with --disable-silent-rules. + - Let it cross build: + + Preseed some autoconf tests. + + Don't rebuild the man pages. + - Re-enable tests, except when cross-building. + - Fix detection of floating point endianness. + - Update list of autopkgtest-runnable unit tests (LP: #1246805). + - Ignore skipped tests in autopkgtest harness. + - Depend on acl and strace for autopkgtests. + + -- Matthias Klose Tue, 02 Sep 2014 22:54:09 +0200 + coreutils (8.23-2) unstable; urgency=low * Added missing replaces (Closes: #760233, #760234) @@ -143,6 +331,48 @@ -- Samuel Thibault Wed, 05 Feb 2014 22:50:43 +0000 +coreutils (8.21-1ubuntu5) trusty; urgency=medium + + * Pull patch from upstream to fix nohup test with the new bash. + + -- Adam Conrad Mon, 24 Mar 2014 00:42:22 -0600 + +coreutils (8.21-1ubuntu4) trusty; urgency=medium + + * Fix detection of floating point endianness. + + -- Colin Watson Wed, 18 Dec 2013 13:29:08 +0000 + +coreutils (8.21-1ubuntu3) trusty; urgency=low + + * Update list of autopkgtest-runnable unit tests (LP: #1246805). + * Ignore skipped tests in autopkgtest harness. + * Depend on acl and strace for autopkgtests. + + -- Colin Watson Thu, 31 Oct 2013 11:22:35 -0700 + +coreutils (8.21-1ubuntu2) trusty; urgency=low + + * Backport from gnulib upstream (Paul Eggert): + - xvasprintf-tests: port to GCC with hardening flags + + -- Colin Watson Thu, 31 Oct 2013 08:33:23 -0700 + +coreutils (8.21-1ubuntu1) trusty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Make 'uname -i -p' return the real processor/hardware, instead of + unknown. + - debian/tests/upstream: Adjust for changed test layout in 8.20. + - Configure with --disable-silent-rules. + - Let it cross build: + + Preseed some autoconf tests. + + Don't rebuild the man pages. + - (aarch64): Make add_ssaaaa and sub_ddmmss actually work. + * Re-enable tests, except when cross-building. + + -- Colin Watson Thu, 31 Oct 2013 07:24:28 -0700 + coreutils (8.21-1) unstable; urgency=low * New upstream version @@ -154,6 +384,47 @@ -- Michael Stone Sat, 20 Jul 2013 15:45:55 -0400 +coreutils (8.20-3ubuntu5) raring; urgency=low + + * Backport from gmp upstream: + - (aarch64): Make add_ssaaaa and sub_ddmmss actually work. + + -- Colin Watson Thu, 17 Jan 2013 04:21:35 +0000 + +coreutils (8.20-3ubuntu4) raring; urgency=low + + * Configure with --disable-silent-rules. + * Let it cross build: + - Preseed some autoconf tests. + - Build make-prime-list with the build compiler. + - Don't rebuild the man pages. + + -- Matthias Klose Wed, 12 Dec 2012 18:38:55 +0100 + +coreutils (8.20-3ubuntu3) raring; urgency=low + + * debian/tests/upstream: Adjust for changed test layout in 8.20. + + -- Martin Pitt Fri, 30 Nov 2012 22:08:22 +0100 + +coreutils (8.20-3ubuntu2) raring; urgency=low + + * Avoid PPC64 instructions unless _LP64 is defined. + * Revert build-dependency from gettext:any to gettext, now that gettext is + Multi-Arch: foreign. + + -- Colin Watson Thu, 29 Nov 2012 14:32:40 +0000 + +coreutils (8.20-3ubuntu1) raring; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Make 'uname -i -p' return the real processor/hardware, instead of + unknown. + - Build-depend on gettext:any instead of on gettext, so that apt-get can + properly resolve build-dependencies on the tool when cross-building. + + -- Colin Watson Wed, 28 Nov 2012 03:03:42 +0000 + coreutils (8.20-3) unstable; urgency=low * actually include autopkgtest changes @@ -194,6 +465,75 @@ -- Jonathan Nieder Mon, 10 Sep 2012 22:02:19 -0700 +coreutils (8.13-3.2ubuntu7) raring; urgency=low + + * Backport require_valgrind_ so that tests work better. + * Make valgrind failures non-fatal; we don't have sufficiently accurate + suppressions for linker startup issues on all architectures. However, + do still run those tests and check for corrupted output. + * Don't build-depend on valgrind on armhf, as it apparently breaks there. + + -- Colin Watson Fri, 09 Nov 2012 10:01:28 +0000 + +coreutils (8.13-3.2ubuntu6) raring; urgency=low + + * Backport upstream patch to avoid data-corrupting free-memory-read in + cp/mv/install when dealing with a very fragmented and sparse input file + on certain filesystems (LP: #1073514). + * Build-depend on valgrind in order to be able to run the test for the + above fix. + * Fix 99_sort_-u_data_loss.dpatch so that the added test is actually run. + + -- Colin Watson Thu, 08 Nov 2012 16:24:07 +0000 + +coreutils (8.13-3.2ubuntu5) raring; urgency=low + + * debian/tests/upstream: Drop the three tests that fail with "skipped test: + this shell lacks ulimit support" in our test environment. + + -- Martin Pitt Thu, 08 Nov 2012 06:01:55 +0100 + +coreutils (8.13-3.2ubuntu4) raring; urgency=low + + [ Paul Larson ] + * Fix debian/tests/upstream: Make the test script count the number of test + failures, declare them at the end of the test run, and exit with the + number of failed tests. (LP: #1075612) + + [ Martin Pitt ] + * debian/tests/upstream: Drop du/bigtime test, does not work in our test + environment. + + -- Martin Pitt Wed, 07 Nov 2012 15:51:30 +0100 + +coreutils (8.13-3.2ubuntu3) raring; urgency=low + + * Add debian/tests/: autopkgtest for running a subset of the upstream tests + against the system installed binaries. The other upstream tests need a + built tree, and are run during package build. (LP: #1073445) + * Add 01_gnulib-gets.dpatch: Avoid assuming that gets is declared in bundled + gnulib. Backported from upstream gnulib SVN to fix FTBFS. + + -- Martin Pitt Tue, 06 Nov 2012 13:21:20 +0100 + +coreutils (8.13-3.2ubuntu2) quantal; urgency=low + + * Update config.guess,sub for aarch64 + + -- Wookey Mon, 01 Oct 2012 15:41:06 +0100 + +coreutils (8.13-3.2ubuntu1) quantal; urgency=low + + * Resynchronise with Debian. Remaining changes: + - [80] Make 'uname -i -p' return the real processor/hardware, instead of + unknown. + - Build-depend on gettext:any instead of on gettext, so that apt-get can + properly resolve build-dependencies on the tool when cross-building. + * Backport upstream patches to fix data-loss and free-memory read bugs in + 'sort -u' (LP: #1038468). + + -- Colin Watson Mon, 10 Sep 2012 14:07:50 +0100 + coreutils (8.13-3.2) unstable; urgency=low * Non-maintainer upload. @@ -214,6 +554,34 @@ -- Steve Langasek Wed, 02 May 2012 02:27:43 +0000 +coreutils (8.13-3.1ubuntu1) quantal; urgency=low + + * Merge from Debian unstable, remaining changes: + - [80] Make 'uname -i -p' return the real processor/hardware, instead of + unknown. + - Build-depend on gettext:any instead of on gettext, so that apt-get can + properly resolve build-dependencies on the tool when cross-building. + * Incorporate changes from Debian NMU to DELAYED/5-days: + - Don't declare separate build-arch/build-indep targets when they just + fall through to the same common build rule, since they don't have + correct target dependencies themselves. Closes: #670481. + - Enable hardening build flags. Thanks to Moritz Muehlenhoff for the + patch. Closes: #653743. + - debian/patches/99_Werror-format-string.dpatch: fix the gnulib test + suite so that it doesn't fail to build with hardening flags on. + - Mark coreutils Multi-Arch: foreign. Thanks to Colin Watson. + Closes: #649397. + - debian/patches/99_tests-misc-sort-continue-Port-to-Fedora-15.dpatch: + cherry-pick from upstream to fix a build failure whenever the build + system happens to be holding an fd open, as happens when running in + certain environments (e.g., Lucas's test rebuild farm, or + bzr-builddeb). Closes: #669555. + * Dropped changes, superseded by the above NMU: + - Filter out -Werror=format-security from CFLAGS when building tests, to + avoid a build failure in gnulib-tests/test-xvasprintf.c. + + -- Steve Langasek Tue, 01 May 2012 22:07:44 -0700 + coreutils (8.13-3.1) unstable; urgency=low * Non-maintainer upload. @@ -223,6 +591,29 @@ -- Jakub Wilk Wed, 29 Feb 2012 00:11:27 +0100 +coreutils (8.13-3ubuntu3) precise; urgency=low + + * Build-depend on gettext:any instead of on gettext, so that apt-get can + properly resolve build-dependencies on the tool when cross-building. + + -- Steve Langasek Sat, 31 Mar 2012 14:54:13 -0700 + +coreutils (8.13-3ubuntu2) precise; urgency=low + + * Mark coreutils Multi-Arch: foreign. + + -- Colin Watson Sun, 20 Nov 2011 17:21:08 +0000 + +coreutils (8.13-3ubuntu1) precise; urgency=low + + * Resynchronise with Debian. Remaining changes: + - [80] Make 'uname -i -p' return the real processor/hardware, instead of + unknown. + * Filter out -Werror=format-security from CFLAGS when building tests, to + avoid a build failure in gnulib-tests/test-xvasprintf.c. + + -- Colin Watson Tue, 18 Oct 2011 10:59:14 +0100 + coreutils (8.13-3) unstable; urgency=low * revert previous change to -mlong-double-64 @@ -254,6 +645,51 @@ -- Michael Stone Mon, 12 Sep 2011 17:21:19 -0400 +coreutils (8.5-1ubuntu6) natty; urgency=low + + * Backport from upstream (Jim Meyering): + - tail: avoid new diagnostic when applying -f to a pipe on linux-2.6.38. + + -- Colin Watson Wed, 23 Feb 2011 13:06:43 +0000 + +coreutils (8.5-1ubuntu5) natty; urgency=low + + * debian/patches/80_fedora_sysinfo.dpatch: make 'uname -i -p' return the + real processor/hardware, instead of unknown. Patch cherry-picked from + Fedora 12 (original: coreutils-4.5.3-sysinfo.patch, from the + coreutils-7.6-5.src.rpm). LP: #470550. + + -- C de-Avillez Tue, 10 Nov 2009 12:38:24 -0600 + +coreutils (8.5-1ubuntu4) natty; urgency=low + + * No-change upload to drop upstream changelog, and build with natty + toolchain. + + -- Martin Pitt Fri, 03 Dec 2010 08:40:09 +0100 + +coreutils (8.5-1ubuntu3) maverick; urgency=low + + * Maybe test that the package builds first before uploading; dpatch is a + picky one, isn't it? + + -- Steve Langasek Fri, 11 Jun 2010 06:49:02 +0000 + +coreutils (8.5-1ubuntu2) maverick; urgency=low + + [ John Rigby ] + * debian/patches/99_stat_prototype_for_linkat.dpatch: Add missing header + include for stat() prototype. LP: #591968. + + -- Steve Langasek Fri, 11 Jun 2010 06:03:58 +0000 + +coreutils (8.5-1ubuntu1) maverick; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/rules: Do not install dangling LC_TIME symlinks + + -- Steve Langasek Mon, 07 Jun 2010 01:41:56 +0000 + coreutils (8.5-1) unstable; urgency=low * New upstream version @@ -350,6 +786,20 @@ -- Michael Stone Wed, 02 Sep 2009 20:50:02 -0400 +coreutils (7.4-2ubuntu2) lucid; urgency=low + + * rebuild rest of main for armel armv7/thumb2 optimization; + UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2 + + -- Alexander Sack Fri, 05 Mar 2010 04:06:08 +0100 + +coreutils (7.4-2ubuntu1) karmic; urgency=low + + * debian/rules: Do not install dangling LC_TIME symlinks, they are not + needed. (LP: #42293) + + -- Martin Pitt Tue, 06 Oct 2009 12:22:48 +0200 + coreutils (7.4-2) unstable; urgency=low * move mktemp to /bin instead of /usr/bin (Closes: #531842) @@ -1096,4 +1546,3 @@ -- Michael Stone Fri, 13 Sep 2002 21:00:15 -0400 - diff -Nru coreutils-8.30/debian/control coreutils-8.30/debian/control --- coreutils-8.30/debian/control 2017-10-02 17:02:04.000000000 +0000 +++ coreutils-8.30/debian/control 2018-10-13 23:13:23.000000000 +0000 @@ -1,5 +1,6 @@ Source: coreutils -Maintainer: Michael Stone +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Michael Stone Section: utils Priority: required Standards-Version: 4.1.1.0 diff -Nru coreutils-8.30/debian/patches/80_fedora_sysinfo.patch coreutils-8.30/debian/patches/80_fedora_sysinfo.patch --- coreutils-8.30/debian/patches/80_fedora_sysinfo.patch 1970-01-01 00:00:00.000000000 +0000 +++ coreutils-8.30/debian/patches/80_fedora_sysinfo.patch 2017-02-28 09:13:10.000000000 +0000 @@ -0,0 +1,74 @@ +Index: coreutils-8.25-2ubuntu1/src/uname.c +=================================================================== +--- coreutils-8.25-2ubuntu1.orig/src/uname.c ++++ coreutils-8.25-2ubuntu1/src/uname.c +@@ -258,7 +258,7 @@ decode_switches (int argc, char **argv) + int + main (int argc, char **argv) + { +- static char const unknown[] = "unknown"; ++ static char unknown[] = "unknown"; + + /* Mask indicating which elements to print. */ + unsigned int toprint = 0; +@@ -299,13 +299,35 @@ main (int argc, char **argv) + + if (toprint & PRINT_PROCESSOR) + { +- char const *element = unknown; ++ char *element = unknown; + #if HAVE_SYSINFO && defined SI_ARCHITECTURE + { + static char processor[257]; + if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) + element = processor; + } ++#else ++ { ++ struct utsname u; ++ uname(&u); ++ element = u.machine; ++#ifdef linux ++ if(!strcmp(element, "i686")) { /* Check for Athlon */ ++ char cinfo[1024]; ++ FILE *f=fopen("/proc/cpuinfo", "r"); ++ if(f) { ++ while(fgets(cinfo, 1024, f)) { ++ if(!strncmp(cinfo, "vendor_id", 9)) { ++ if(strstr(cinfo, "AuthenticAMD")) ++ element="athlon"; ++ break; ++ } ++ } ++ fclose(f); ++ } ++ } ++#endif ++ } + #endif + #ifdef UNAME_PROCESSOR + if (element == unknown) +@@ -343,7 +365,7 @@ main (int argc, char **argv) + + if (toprint & PRINT_HARDWARE_PLATFORM) + { +- char const *element = unknown; ++ char *element = unknown; + #if HAVE_SYSINFO && defined SI_PLATFORM + { + static char hardware_platform[257]; +@@ -351,6 +373,14 @@ main (int argc, char **argv) + hardware_platform, sizeof hardware_platform)) + element = hardware_platform; + } ++#else ++ { ++ struct utsname u; ++ uname(&u); ++ element = u.machine; ++ if(strlen(element)==4 && element[0]=='i' && element[2]=='8' && element[3]=='6') ++ element[1]='3'; ++ } + #endif + #ifdef UNAME_HARDWARE_PLATFORM + if (element == unknown) diff -Nru coreutils-8.30/debian/patches/99_float_endian_detection.patch coreutils-8.30/debian/patches/99_float_endian_detection.patch --- coreutils-8.30/debian/patches/99_float_endian_detection.patch 1970-01-01 00:00:00.000000000 +0000 +++ coreutils-8.30/debian/patches/99_float_endian_detection.patch 2017-02-28 09:13:10.000000000 +0000 @@ -0,0 +1,65 @@ +Author: Colin Watson +Description: Fix detection of floating point endianness. + See https://lists.gnu.org/archive/html/bug-gnulib/2013-12/msg00104.html + Based on a suggestion by Alan Modra. + +Index: coreutils-8.25-2ubuntu1/gnulib-tests/test-isnanl.h +=================================================================== +--- coreutils-8.25-2ubuntu1.orig/gnulib-tests/test-isnanl.h ++++ coreutils-8.25-2ubuntu1/gnulib-tests/test-isnanl.h +@@ -24,6 +24,12 @@ + #include "nan.h" + #include "macros.h" + ++#ifdef __FLOAT_WORD_ORDER__ ++# define FLOAT_BIG_ENDIAN (__FLOAT_WORD_ORDER__ != __ORDER_LITTLE_ENDIAN__) ++#else ++# define FLOAT_BIG_ENDIAN (LDBL_EXPBIT0_WORD < NWORDS / 2) ++#endif ++ + int + main () + { +@@ -65,10 +71,10 @@ main () + # if LDBL_EXPBIT0_BIT > 0 + m.word[LDBL_EXPBIT0_WORD] ^= (unsigned int) 1 << (LDBL_EXPBIT0_BIT - 1); + # else +- m.word[LDBL_EXPBIT0_WORD + (LDBL_EXPBIT0_WORD < NWORDS / 2 ? 1 : - 1)] ++ m.word[LDBL_EXPBIT0_WORD + (FLOAT_BIG_ENDIAN ? 1 : - 1)] + ^= (unsigned int) 1 << (sizeof (unsigned int) * CHAR_BIT - 1); + # endif +- m.word[LDBL_EXPBIT0_WORD + (LDBL_EXPBIT0_WORD < NWORDS / 2 ? 1 : - 1)] ++ m.word[LDBL_EXPBIT0_WORD + (FLOAT_BIG_ENDIAN ? 1 : - 1)] + |= (unsigned int) 1 << LDBL_EXPBIT0_BIT; + ASSERT (isnanl (m.value)); + } +Index: coreutils-8.25-2ubuntu1/gnulib-tests/test-signbit.c +=================================================================== +--- coreutils-8.25-2ubuntu1.orig/gnulib-tests/test-signbit.c ++++ coreutils-8.25-2ubuntu1/gnulib-tests/test-signbit.c +@@ -36,6 +36,12 @@ float zerof = 0.0f; + double zerod = 0.0; + long double zerol = 0.0L; + ++#ifdef __FLOAT_WORD_ORDER__ ++# define FLOAT_BIG_ENDIAN (__FLOAT_WORD_ORDER__ != __ORDER_LITTLE_ENDIAN__) ++#else ++# define FLOAT_BIG_ENDIAN (LDBL_EXPBIT0_WORD < NWORDS / 2) ++#endif ++ + static void + test_signbitf () + { +@@ -166,10 +172,10 @@ test_signbitl () + # if LDBL_EXPBIT0_BIT > 0 + m.word[LDBL_EXPBIT0_WORD] ^= (unsigned int) 1 << (LDBL_EXPBIT0_BIT - 1); + # else +- m.word[LDBL_EXPBIT0_WORD + (LDBL_EXPBIT0_WORD < NWORDS / 2 ? 1 : - 1)] ++ m.word[LDBL_EXPBIT0_WORD + (FLOAT_BIG_ENDIAN ? 1 : - 1)] + ^= (unsigned int) 1 << (sizeof (unsigned int) * CHAR_BIT - 1); + # endif +- m.word[LDBL_EXPBIT0_WORD + (LDBL_EXPBIT0_WORD < NWORDS / 2 ? 1 : - 1)] ++ m.word[LDBL_EXPBIT0_WORD + (FLOAT_BIG_ENDIAN ? 1 : - 1)] + |= (unsigned int) 1 << LDBL_EXPBIT0_BIT; + (void) signbit (m.value); + #undef NWORDS diff -Nru coreutils-8.30/debian/patches/series coreutils-8.30/debian/patches/series --- coreutils-8.30/debian/patches/series 2017-10-02 17:31:47.000000000 +0000 +++ coreutils-8.30/debian/patches/series 2019-01-14 12:17:34.000000000 +0000 @@ -1,5 +1,7 @@ 61_whoips.patch 63_dd-appenderrors.patch 72_id_checkngroups.patch +80_fedora_sysinfo.patch 85_timer_settime.patch 99_kfbsd_fstat_patch.patch +99_float_endian_detection.patch diff -Nru coreutils-8.30/debian/rules coreutils-8.30/debian/rules --- coreutils-8.30/debian/rules 2016-01-18 20:35:34.000000000 +0000 +++ coreutils-8.30/debian/rules 2018-10-13 23:13:23.000000000 +0000 @@ -13,13 +13,23 @@ DEB_CFLAGS_MAINT_APPEND += -mieee endif +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + cross_build := yes + CROSS_CONFIGURE_FLAGS = --cache-file=./config.cache + CROSS_BUILD_FLAGS = run_help2man=$(CURDIR)/man/dummy-man + CROSS_INSTALL_FLAGS = EXTRA_MANS= +endif + BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false ln ls mkdir \ mknod mv pwd readlink rm rmdir vdir sleep stty sync touch true uname \ mktemp d=debian/coreutils override_dh_auto_configure: - dh_auto_configure -- --enable-install-program=arch +ifeq ($(cross_build),yes) + echo 'fu_cv_sys_stat_statfs2_bsize=yes' > config.cache +endif + dh_auto_configure -- --enable-install-program=arch $(CROSS_CONFIGURE_FLAGS) %: dh $@ @@ -27,11 +37,39 @@ override_dh_auto_clean: make distclean || true +override_dh_auto_build: + dh_auto_build -- $(CROSS_BUILD_FLAGS) + override_dh_auto_test: - # tests fail a lot on the buildds +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) +ifneq ($(cross_build),yes) + ifeq ($(DEB_HOST_ARCH),armhf) + : # on armhf, the cut-huge-range test fails on the buildds when run + : # in the test suite. Run it explicitely, and then ignore the + : # test results when run in the test suite. + : # XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + -$(MAKE) SHELL=/bin/dash TESTS=tests/misc/cut-huge-range.sh check + cat tests/misc/cut-huge-range.log + rm -f tests/misc/cut-huge-range.log tests/misc/cut-huge-range.trs + : # XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + if dh_auto_test; then \ + echo "tests succeeded unexpectedly" ; \ + else \ + echo XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX; \ + echo "TEST FAILURES (log)"; \ + cat tests/misc/cut-huge-range.log; \ + echo "TEST FAILURES (trs)"; \ + cat tests/misc/cut-huge-range.trs; \ + echo "ignoring the cut-huge-range test failure" ; \ + fi + else + dh_auto_test + endif +endif +endif override_dh_auto_install: - dh_auto_install --destdir=$(d) + dh_auto_install --destdir=$(d) -- $(CROSS_INSTALL_FLAGS) override_dh_install-arch: dh_install -a diff -Nru coreutils-8.30/debian/tests/control coreutils-8.30/debian/tests/control --- coreutils-8.30/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ coreutils-8.30/debian/tests/control 2017-02-28 09:13:10.000000000 +0000 @@ -0,0 +1,2 @@ +Tests: upstream +Depends: coreutils, acl, strace diff -Nru coreutils-8.30/debian/tests/upstream coreutils-8.30/debian/tests/upstream --- coreutils-8.30/debian/tests/upstream 1970-01-01 00:00:00.000000000 +0000 +++ coreutils-8.30/debian/tests/upstream 2017-02-28 09:13:10.000000000 +0000 @@ -0,0 +1,348 @@ +#!/bin/sh +# Run a subset of the upstream tests which work in an unbuilt tree against the +# system installed package; these have been selected with +# +# for t in tests/*/*; do if env LANG= LANGUAGE= LC_ALL=C CONFIG_HEADER=/dev/null $t >/dev/null 2>&1; then echo ${t#tests/}; fi; done + +# plus remove all tests depending on test binaries (getlimits, ginstall). +#set -e + +# ensure that we do not stumble over translations +unset LANG +unset LANGUAGE +export LC_ALL=C +fails=0 + +for test in \ + chgrp/basic.sh \ + chgrp/default-no-deref.sh \ + chgrp/deref.sh \ + chgrp/no-x.sh \ + chgrp/posix-H.sh \ + chgrp/recurse.sh \ + chmod/c-option.sh \ + chmod/equal-x.sh \ + chmod/equals.sh \ + chmod/inaccessible.sh \ + chmod/no-x.sh \ + chmod/octal.sh \ + chmod/setgid.sh \ + chmod/silent.sh \ + chmod/thru-dangling.sh \ + chmod/umask-x.sh \ + chmod/usage.sh \ + chown/deref.sh \ + chown/preserve-root.sh \ + cp/abuse.sh \ + cp/attr-existing.sh \ + cp/backup-1.sh \ + cp/backup-dir.sh \ + cp/backup-is-src.sh \ + cp/cp-HL.sh \ + cp/cp-deref.sh \ + cp/cp-i.sh \ + cp/cp-mv-backup.sh \ + cp/cp-parents.sh \ + cp/deref-slink.sh \ + cp/dir-rm-dest.sh \ + cp/dir-slash.sh \ + cp/dir-vs-file.sh \ + cp/existing-perm-dir.sh \ + cp/fail-perm.sh \ + cp/into-self.sh \ + cp/link-deref.sh \ + cp/link-no-deref.sh \ + cp/link-preserve.sh \ + cp/link-symlink.sh \ + cp/link.sh \ + cp/no-deref-link1.sh \ + cp/no-deref-link2.sh \ + cp/no-deref-link3.sh \ + cp/preserve-link.sh \ + cp/preserve-mode.sh \ + cp/proc-short-read.sh \ + cp/proc-zero-len.sh \ + cp/r-vs-symlink.sh \ + cp/reflink-perm.sh \ + cp/same-file.sh \ + cp/slink-2-slink.sh \ + cp/sparse-to-pipe.sh \ + cp/sparse.sh \ + cp/special-f.sh \ + cp/src-base-dot.sh \ + cp/symlink-slash.sh \ + cp/thru-dangling.sh \ + dd/ascii.sh \ + dd/bytes.sh \ + dd/direct.sh \ + dd/misc.sh \ + dd/no-allocate.sh \ + dd/nocache.sh \ + dd/not-rewound.sh \ + dd/reblock.sh \ + dd/skip-seek2.sh \ + dd/sparse.sh \ + dd/stderr.sh \ + dd/unblock-sync.sh \ + df/df-P.sh \ + df/df-output.sh \ + df/header.sh \ + df/unreadable.sh \ + du/8gb.sh \ + du/basic.sh \ + du/bigtime.sh \ + du/deref-args.sh \ + du/deref.sh \ + du/exclude.sh \ + du/files0-from-dir.sh \ + du/hard-link.sh \ + du/inacc-dest.sh \ + du/inacc-dir.sh \ + du/inodes.sh \ + du/long-from-unreadable.sh \ + du/long-sloop.sh \ + du/max-depth.sh \ + du/no-deref.sh \ + du/no-x.sh \ + du/restore-wd.sh \ + du/slash.sh \ + du/threshold.sh \ + du/trailing-slash.sh \ + du/two-args.sh \ + fmt/goal-option.sh \ + fmt/long-line.sh \ + id/uid.sh \ + id/zero.sh \ + install/trap.sh \ + ln/backup-1.sh \ + ln/hard-backup.sh \ + ln/hard-to-sym.sh \ + ln/relative.sh \ + ln/sf-1.sh \ + ln/slash-decorated-nonexistent-dest.sh \ + ln/target-1.sh \ + ls/abmon-align.sh \ + ls/block-size.sh \ + ls/color-clear-to-eol.sh \ + ls/color-dtype-dir.sh \ + ls/color-norm.sh \ + ls/color-term.sh \ + ls/dangle.sh \ + ls/dired.sh \ + ls/file-type.sh \ + ls/follow-slink.sh \ + ls/infloop.sh \ + ls/inode.sh \ + ls/m-option.sh \ + ls/multihardlink.sh \ + ls/no-arg.sh \ + ls/proc-selinux-segfault.sh \ + ls/recursive.sh \ + ls/root-rel-symlink-color.sh \ + ls/rt-1.sh \ + ls/slink-acl.sh \ + ls/stat-dtype.sh \ + ls/stat-failed.sh \ + ls/stat-free-symlinks.sh \ + ls/stat-vs-dirent.sh \ + ls/symlink-slash.sh \ + ls/time-style-diag.sh \ + ls/x-option.sh \ + misc/cat-proc.sh \ + misc/chcon-fail.sh \ + misc/csplit-1000.sh \ + misc/csplit-heap.sh \ + misc/csplit.sh \ + misc/date-sec.sh \ + misc/env-null.sh \ + misc/false-status.sh \ + misc/head-pos.sh \ + misc/head-write-error.sh \ + misc/invalid-opt.pl \ + misc/ls-time.sh \ + misc/md5sum-bsd.sh \ + misc/md5sum-parallel.sh \ + misc/mknod.sh \ + misc/nice-fail.sh \ + misc/nice.sh \ + misc/nl.sh \ + misc/nohup.sh \ + misc/nproc-avail.sh \ + misc/nproc-positive.sh \ + misc/od-N.sh \ + misc/od-endian.sh \ + misc/od-float.sh \ + misc/od-multiple-t.sh \ + misc/od-x8.sh \ + misc/pathchk1.sh \ + misc/printenv.sh \ + misc/printf-hex.sh \ + misc/printf-surprise.sh \ + misc/ptx-overrun.sh \ + misc/pwd-option.sh \ + misc/readlink-fp-loop.sh \ + misc/readlink-root.sh \ + misc/realpath.sh \ + misc/runcon-no-reorder.sh \ + misc/shred-exact.sh \ + misc/shred-passes.sh \ + misc/shred-remove.sh \ + misc/sort-NaN-infloop.sh \ + misc/sort-compress.sh \ + misc/sort-debug-keys.sh \ + misc/sort-debug-warn.sh \ + misc/sort-exit-early.sh \ + misc/sort-merge-fdlimit.sh \ + misc/sort-month.sh \ + misc/sort-rand.sh \ + misc/sort-unique.sh \ + misc/sort-version.sh \ + misc/stat-fmt.sh \ + misc/stat-hyphen.sh \ + misc/stat-mount.sh \ + misc/stat-nanoseconds.sh \ + misc/stat-slash.sh \ + misc/stty-invalid.sh \ + misc/stty-row-col.sh \ + misc/sum-sysv.sh \ + misc/tac-2-nonseekable.sh \ + misc/tee.sh \ + misc/timeout-group.sh \ + misc/timeout.sh \ + misc/tr-case-class.sh \ + misc/truncate-dangling-symlink.sh \ + misc/truncate-dir-fail.sh \ + misc/truncate-fail-diag.sh \ + misc/truncate-fifo.sh \ + misc/truncate-no-create-missing.sh \ + misc/truncate-parameters.sh \ + misc/truncate-relative.sh \ + misc/uniq-perf.sh \ + misc/wc-files0.sh \ + misc/wc-parallel.sh \ + mkdir/p-1.sh \ + mkdir/p-2.sh \ + mkdir/p-3.sh \ + mkdir/p-acl.sh \ + mkdir/p-slashdot.sh \ + mkdir/p-thru-slink.sh \ + mkdir/p-v.sh \ + mkdir/parents.sh \ + mkdir/perm.sh \ + mkdir/special-1.sh \ + mkdir/t-slash.sh \ + mv/atomic.sh \ + mv/atomic2.sh \ + mv/backup-dir.sh \ + mv/childproof.sh \ + mv/diag.sh \ + mv/dir-file.sh \ + mv/dir2dir.sh \ + mv/dup-source.sh \ + mv/force.sh \ + mv/hard-2.sh \ + mv/hard-3.sh \ + mv/hard-4.sh \ + mv/i-2.sh \ + mv/i-3.sh \ + mv/i-4.sh \ + mv/i-5.sh \ + mv/i-link-no.sh \ + mv/into-self-3.sh \ + mv/into-self-4.sh \ + mv/into-self.sh \ + mv/mv-n.sh \ + mv/no-target-dir.sh \ + mv/perm-1.sh \ + mv/symlink-onto-hardlink-to-self.sh \ + mv/symlink-onto-hardlink.sh \ + mv/trailing-slash.sh \ + mv/update.sh \ + readlink/can-e.sh \ + readlink/can-f.sh \ + readlink/can-m.sh \ + readlink/multi.sh \ + readlink/rl-1.sh \ + rm/cycle.sh \ + rm/d-1.sh \ + rm/d-2.sh \ + rm/d-3.sh \ + rm/dangling-symlink.sh \ + rm/deep-1.sh \ + rm/deep-2.sh \ + rm/dir-no-w.sh \ + rm/dir-nonrecur.sh \ + rm/dot-rel.sh \ + rm/empty-inacc.sh \ + rm/f-1.sh \ + rm/fail-eacces.sh \ + rm/i-1.sh \ + rm/i-never.sh \ + rm/i-no-r.sh \ + rm/ignorable.sh \ + rm/interactive-always.sh \ + rm/interactive-once.sh \ + rm/ir-1.sh \ + rm/isatty.sh \ + rm/one-file-system2.sh \ + rm/r-1.sh \ + rm/r-2.sh \ + rm/r-3.sh \ + rm/r-4.sh \ + rm/readdir-bug.sh \ + rm/rm1.sh \ + rm/rm2.sh \ + rm/rm3.sh \ + rm/rm4.sh \ + rm/rm5.sh \ + rm/sunos-1.sh \ + rm/unread2.sh \ + rm/unread3.sh \ + rm/v-slash.sh \ + rmdir/fail-perm.sh \ + rmdir/ignore.sh \ + rmdir/t-slash.sh \ + split/additional-suffix.sh \ + split/b-chunk.sh \ + split/filter.sh \ + split/guard-input.sh \ + split/l-chunk.sh \ + split/line-bytes.sh \ + split/lines.sh \ + split/numeric.sh \ + split/r-chunk.sh \ + split/suffix-auto-length.sh \ + split/suffix-length.sh \ + tail-2/F-vs-rename.sh \ + tail-2/flush-initial.sh \ + tail-2/follow-name.sh \ + tail-2/follow-stdin.sh \ + tail-2/inotify-hash-abuse.sh \ + tail-2/inotify-hash-abuse2.sh \ + tail-2/pipe-f.sh \ + tail-2/pipe-f2.sh \ + tail-2/proc-ksyms.sh \ + tail-2/start-middle.sh \ + tail-2/tail-n0f.sh \ + tail-2/wait.sh \ + touch/60-seconds.sh \ + touch/dangling-symlink.sh \ + touch/dir-1.sh \ + touch/empty-file.sh \ + touch/fail-diag.sh \ + touch/fifo.sh \ + touch/no-create-missing.sh \ + touch/no-rights.sh \ + touch/not-owner.sh \ + touch/obsolescent.sh \ + touch/read-only.sh \ + touch/relative.sh \ + touch/trailing-slash.sh \ +; do + echo "$test" + chmod a+x "tests/$test" + OUT=$(tests/$test 2>&1 9>&1) || [ $? = 77 ] || { fails=$((fails+1)); echo "FAIL:"; echo "$OUT"; } +done + +echo $fails tests failed +exit $fails