Merge ~sergiodj/ubuntu/+source/coreutils:coreutils-merge-8.32-2 into ubuntu/+source/coreutils:debian/sid

[Sergio Durigan Junior]

This is the merge of Debian's coreutils 8.32-3.

The merge was relatively painless. I'm keeping the delta since it has been there forever; I do think that some of it could be proposed to Debian, so I'll try to do that.

The "problematic" part of the merge was to solve the ARM64 build failure that was happening. This is a well known issue (https://lists.gnu.org/archive/html/bug-coreutils/2020-03/msg00005.html) and upstream already fixed it, so I backported the patches required to implement the solution. The first patch (restore-ls-behavior-8.31.patch) is the actual fix, but I decided to backport the other patch (improve-removed-directory-test.patch) because it improves the testing, which might fail during dep8.

The PPA with the new version of coreutils can be found here:

https://launchpad.net/~sergiodj/+archive/ubuntu/coreutils-merge

I've ran the dep8 tests from the package on amd64 and ARM64, just to make sure things are OK, and they are:

amd64:
autopkgtest [18:49:57]: test upstream: -----------------------]
autopkgtest [18:49:57]: test upstream: - - - - - - - - - - results - - - - - - - - - -
upstream PASS
autopkgtest [18:49:58]: @@@@@@@@@@@@@@@@@@@@ summary
upstream PASS

ARM64:
autopkgtest [23:23:19]: test upstream: -----------------------]
autopkgtest [23:23:20]: test upstream: - - - - - - - - - - results - - - - - - - - - -
upstream PASS
autopkgtest [23:23:21]: @@@@@@@@@@@@@@@@@@@@ summary
upstream PASS

[Bryce Harrington (bryce)]

* Changelog:
  - [√] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [√] changelog entries correct
  - [√] update-maintainer has been run

* Actual changes:
  - [√] no upstream changes to consider
  - [√] no further upstream version to consider
  - [√] debian changes look safe

* Old Delta:
  - [√] dropped changes are ok to be dropped
  - [√] nothing else to drop
  - [√] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [-] no new patches added
  - [√] patches match what was proposed upstream
  - [√] patches correctly included in debian/patches/series
  - [√] patches have correct DEP3 metadata

* Build/Test:
  - [√] build is ok
  - [√] verified PPA package installs/uninstalls
  - [√] autopkgtest against the PPA package passes
  - [-] sanity checks test fine

Built fine in lxc container, autopkgtests passed fine, and install/uninstall had no troubles.

Reviewed and verified the two new patches against upstream. Is there a Ubuntu bug to associate with them? If there is, make sure to mention them; if not no biggie. Only other change I'd suggest for the patches is a bit of wording, but it's a super minor nitpick:

      which is necessary to prevent using SYS_getdents which doesn't exist on
      ARM64.

If you change the second 'which' to 'that', the grammar will read a bit smoother.

The delta appears to have all been accounted for and carried forward. It sounds like you're attempting to push some upstream, which is great. There is one formatting error:

    - debian/rules:
      + Allow crossbuilding
      + Run tests
    - Ignore the cut-huge-range test failure on armhf, only seen on the
      buildds.

That second bullet should be a sub-bullet of the first. I.e.:

    - debian/rules:
      + Allow crossbuilding
      + Run tests
      + Ignore the cut-huge-range test failure on armhf, only seen on the
        buildds.

As a future note, I have generally tried to split up the distinct changes in rules (and control) as separate commits. I figure that might make it simpler to drop rules delta in the future. But since coreutils hasn't been maintained in git-ubuntu before, at least having the changes split out by file will be an improvement. But do fix up the changelog entry formatting at least, to avoid confusion.

review: Needs Fixing

[Sergio Durigan Junior (sergiodj)]

On Monday, July 27 2020, Bryce Harrington wrote:

> Reviewed and verified the two new patches against upstream. Is there a Ubuntu bug to associate with them? If there is, make sure to mention them; if not no biggie.

No, there isn't a bug filed for this failure on Ubuntu. I looked :-).
I thought about filing one, but thought that it doesn't really make
sense, because the updated package hasn't been uploaded yet, so there is
no bug yet, pedantically speaking.

> Only other change I'd suggest for the patches is a bit of wording, but it's a super minor nitpick:
>
> which is necessary to prevent using SYS_getdents which doesn't exist on
> ARM64.
>
> If you change the second 'which' to 'that', the grammar will read a bit smoother.

Changed, thanks!

> The delta appears to have all been accounted for and carried forward. It sounds like you're attempting to push some upstream, which is great. There is one formatting error:
>
> - debian/rules:
> + Allow crossbuilding
> + Run tests
> - Ignore the cut-huge-range test failure on armhf, only seen on the
> buildds.
>
> That second bullet should be a sub-bullet of the first. I.e.:
>
> - debian/rules:
> + Allow crossbuilding
> + Run tests
> + Ignore the cut-huge-range test failure on armhf, only seen on the
> buildds.
>
> As a future note, I have generally tried to split up the distinct changes in rules (and control) as separate commits. I figure that might make it simpler to drop rules delta in the future. But since coreutils hasn't been maintained in git-ubuntu before, at least having the changes split out by file will be an improvement. But do fix up the changelog entry formatting at least, to avoid confusion.

Yeah, I agree that splitting the changes even more would be beneficial.
The changes are intertwined, and I'd have to rewrite some of the code
there in order to properly separate them, so I thought it'd be better to
leave the d/rules modifications as one single commit, at least for now
(after all, they kind of make sense together).

I've fixed the formatting, thanks for pointing it out.

I'll force-push the branch soon.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

[Sergio Durigan Junior (sergiodj)]

Bryce has merged this one.

diff --git a/debian/changelog b/debian/changelog
index 5b0dad9..879d94d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,36 @@
+coreutils (8.32-3ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1888046). Remaining changes:
+    - debian/rules:
+      + Allow crossbuilding
+      + Run tests
+      + Ignore the cut-huge-range test failure on armhf, only seen on
+        the buildds.
+    - 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.
+    - d/p/treat-devtmpfs-and-squashfs-as-dummy-filesystems.patch:
+      + Avoid displaying snaps in output from df and other tools, by
+        excluding display of squashfs filesystems.
+        (LP #1219529, #1756595)
+      + Exclude devtmpfs filesystems in output from df and other tools
+        since it is a dummy filesystem.
+        (LP #1219529)
+  * Refresh d/patches/.
+  * Fix FTBFS on ARM64.
+    - d/p/restore-ls-behavior-8.31.patch: Upstream patch to restore
+      coreutils ls' 8.31 behavior on removed directories, which is
+      necessary to prevent using SYS_getdents that doesn't exist on
+      ARM64.
+    - d/p/improve-removed-directory-test.patch: Upstream patch to
+      improve ls' removed-directory test.
+
+ -- Sergio Durigan Junior <[e-mail]>  Fri, 24 Jul 2020 15:01:15 -0400
+
 coreutils (8.32-3) unstable; urgency=low
 
   * build with libgmp now that apt pulls it in anyway (Closes: #64527)
@@ -20,6 +53,42 @@ coreutils (8.32-1) unstable; urgency=low
 
  -- Michael Stone <[e-mail]>  Mon, 22 Jun 2020 14:39:28 -0400
 
+coreutils (8.30-3ubuntu3) groovy; urgency=medium
+
+  * d/p/treat-devtmpfs-and-squashfs-as-dummy-filesystems.patch:
+    - Avoid displaying snaps in output from df and other tools, by
+      excluding display of squashfs filesystems.
+      (LP: #1219529, #1756595)
+    - Exclude devtmpfs filesystems in output from df and other tools
+      since it is a dummy filesystem.
+      (LP: #1219529)
+
+ -- Bryce Harrington <[e-mail]>  Thu, 02 Jul 2020 02:30:48 +0000
+
+coreutils (8.30-3ubuntu2) eoan; urgency=medium
+
+  * No-change upload with strops.h and sys/strops.h removed in glibc.
+
+ -- Matthias Klose <[e-mail]>  Thu, 05 Sep 2019 10:38:40 +0000
+
+coreutils (8.30-3ubuntu1) eoan; 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.
+
+ -- Steve Langasek <[e-mail]>  Mon, 22 Apr 2019 11:35:09 -0700
+
 coreutils (8.30-3) unstable; urgency=medium
 
   * Fix renameat2 patch (Closes: #923420)
@@ -34,6 +103,28 @@ coreutils (8.30-2) unstable; urgency=medium
 
  -- Michael Stone <[e-mail]>  Tue, 26 Feb 2019 07:15:19 -0500
 
+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 <[e-mail]>  Mon, 14 Jan 2019 14:17:34 +0200
+
 coreutils (8.30-1) unstable; urgency=low
 
   * New upstream version
@@ -46,6 +137,32 @@ coreutils (8.30-1) unstable; urgency=low
 
  -- Michael Stone <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Thu, 18 Jan 2018 10:43:49 +0100
+
 coreutils (8.28-1) unstable; urgency=low
 
   * New upstream version
@@ -68,6 +185,35 @@ coreutils (8.28-1) unstable; urgency=low
 
  -- Michael Stone <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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)
@@ -90,6 +236,30 @@ coreutils (8.26-1) unstable; urgency=low
 
  -- Michael Stone <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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.
@@ -121,6 +291,40 @@ coreutils (8.24-1) unstable; urgency=low
 
  -- Michael Stone <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 
@@ -134,6 +338,28 @@ coreutils (8.23-4) unstable; urgency=low
 
  -- Michael Stone <[e-mail]>  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 <[e-mail]>  Mon, 03 Nov 2014 08:08:11 +0100
+
 coreutils (8.23-3) unstable; urgency=low
 
   * Standards version 3.9.6.0
@@ -145,6 +371,37 @@ coreutils (8.23-3) unstable; urgency=low
 
  -- Michael Stone <[e-mail]>  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 <[e-mail]>  Mon, 08 Sep 2014 13:03:00 +0200
+
+coreutils (8.23-2ubuntu2) utopic; urgency=medium
+
+  * Update the list of skipped autopkg tests.
+
+ -- Matthias Klose <[e-mail]>  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 <[e-mail]>  Tue, 02 Sep 2014 22:54:09 +0200
+
 coreutils (8.23-2) unstable; urgency=low
 
   * Added missing replaces (Closes: #760233, #760234)
@@ -179,6 +436,48 @@ coreutils (8.21-1.1) unstable; urgency=medium
 
  -- Samuel Thibault <[e-mail]>  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 <[e-mail]>  Mon, 24 Mar 2014 00:42:22 -0600
+
+coreutils (8.21-1ubuntu4) trusty; urgency=medium
+
+  * Fix detection of floating point endianness.
+
+ -- Colin Watson <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Thu, 31 Oct 2013 07:24:28 -0700
+
 coreutils (8.21-1) unstable; urgency=low
 
   * New upstream version
@@ -190,6 +489,47 @@ coreutils (8.21-1) unstable; urgency=low
 
  -- Michael Stone <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Wed, 28 Nov 2012 03:03:42 +0000
+
 coreutils (8.20-3) unstable; urgency=low
 
   * actually include autopkgtest changes
@@ -230,6 +570,75 @@ coreutils (8.13-3.3) unstable; urgency=low
 
  -- Jonathan Nieder <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Tue, 06 Nov 2012 13:21:20 +0100
+
+coreutils (8.13-3.2ubuntu2) quantal; urgency=low
+
+  * Update config.guess,sub for aarch64
+
+ -- Wookey <[e-mail]>  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 <[e-mail]>  Mon, 10 Sep 2012 14:07:50 +0100
+
 coreutils (8.13-3.2) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -250,6 +659,34 @@ coreutils (8.13-3.2) unstable; urgency=low
 
  -- Steve Langasek <[e-mail]>  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 <[e-mail]>  Tue, 01 May 2012 22:07:44 -0700
+
 coreutils (8.13-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -259,6 +696,29 @@ coreutils (8.13-3.1) unstable; urgency=low
 
  -- Jakub Wilk <[e-mail]>  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 <[e-mail]>  Sat, 31 Mar 2012 14:54:13 -0700
+
+coreutils (8.13-3ubuntu2) precise; urgency=low
+
+  * Mark coreutils Multi-Arch: foreign.
+
+ -- Colin Watson <[e-mail]>  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 <[e-mail]>  Tue, 18 Oct 2011 10:59:14 +0100
+
 coreutils (8.13-3) unstable; urgency=low
 
   * revert previous change to -mlong-double-64
@@ -290,6 +750,51 @@ coreutils (8.13-1) unstable; urgency=low
 
  -- Michael Stone <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Mon, 07 Jun 2010 01:41:56 +0000
+
 coreutils (8.5-1) unstable; urgency=low
 
   * New upstream version
@@ -386,6 +891,20 @@ coreutils (7.5-1) unstable; urgency=low
 
  -- Michael Stone <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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)
@@ -1132,4 +1651,3 @@ coreutils (4.5.1-1) unstable; urgency=low
 
  -- Michael Stone <[e-mail]>  Fri, 13 Sep 2002 21:00:15 -0400
 
-
diff --git a/debian/control b/debian/control
index 32d0b2b..1bc4d4c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: coreutils
-Maintainer: Michael Stone <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Michael Stone <[e-mail]>
 Section: utils
 Priority: required
 Standards-Version: 4.5.0
diff --git a/debian/patches/61_whoips.patch b/debian/patches/61_whoips.patch
index 382ba4d..f6be45b 100644
--- a/debian/patches/61_whoips.patch
+++ b/debian/patches/61_whoips.patch
@@ -1,10 +1,10 @@
 Author: 
 Description: 
-Index: coreutils-8.24/src/who.c
+Index: coreutils/src/who.c
 ===================================================================
---- coreutils-8.24.orig/src/who.c
-+++ coreutils-8.24/src/who.c
-@@ -28,6 +28,8 @@
+--- coreutils.orig/src/who.c	2020-07-24 13:38:45.635067123 -0400
++++ coreutils/src/who.c	2020-07-24 13:38:45.631067154 -0400
+@@ -29,6 +29,8 @@
  #include <assert.h>
  
  #include <sys/types.h>
@@ -13,7 +13,7 @@ Index: coreutils-8.24/src/who.c
  #include "system.h"
  
  #include "c-ctype.h"
-@@ -101,6 +103,9 @@ char *ttyname (int);
+@@ -101,6 +103,9 @@
  /* If true, attempt to canonicalize hostnames via a DNS lookup. */
  static bool do_lookup;
  
@@ -23,7 +23,7 @@ Index: coreutils-8.24/src/who.c
  /* If true, display only a list of usernames and count of
     the users logged on.
     Ignored for 'who am i'.  */
-@@ -156,7 +161,8 @@ static int time_format_width;
+@@ -156,7 +161,8 @@
  /* for long options with no corresponding short option, use enum */
  enum
  {
@@ -33,7 +33,7 @@ Index: coreutils-8.24/src/who.c
  };
  
  static struct option const longopts[] =
-@@ -166,6 +172,7 @@ static struct option const longopts[] =
+@@ -166,6 +172,7 @@
    {"count", no_argument, NULL, 'q'},
    {"dead", no_argument, NULL, 'd'},
    {"heading", no_argument, NULL, 'H'},
@@ -41,7 +41,7 @@ Index: coreutils-8.24/src/who.c
    {"login", no_argument, NULL, 'l'},
    {"lookup", no_argument, NULL, LOOKUP_OPTION},
    {"message", no_argument, NULL, 'T'},
-@@ -428,6 +435,63 @@ print_user (const STRUCT_UTMP *utmp_ent,
+@@ -431,6 +438,63 @@
      }
  #endif
  
@@ -105,7 +105,7 @@ Index: coreutils-8.24/src/who.c
    print_line (sizeof UT_USER (utmp_ent), UT_USER (utmp_ent), mesg,
                sizeof utmp_ent->ut_line, utmp_ent->ut_line,
                time_string (utmp_ent), idlestr, pidstr,
-@@ -649,6 +713,11 @@ Print information about users who are cu
+@@ -653,6 +717,11 @@
    -H, --heading     print line of column headings\n\
  "), stdout);
        fputs (_("\
@@ -117,7 +117,7 @@ Index: coreutils-8.24/src/who.c
    -l, --login       print system login processes\n\
  "), stdout);
        fputs (_("\
-@@ -778,6 +847,10 @@ main (int argc, char **argv)
+@@ -782,6 +851,10 @@
            do_lookup = true;
            break;
  
diff --git a/debian/patches/63_dd-appenderrors.patch b/debian/patches/63_dd-appenderrors.patch
index 502f082..b324488 100644
--- a/debian/patches/63_dd-appenderrors.patch
+++ b/debian/patches/63_dd-appenderrors.patch
@@ -1,10 +1,10 @@
 Author: 
 Description: 
-Index: coreutils-8.24/src/dd.c
+Index: coreutils/src/dd.c
 ===================================================================
---- coreutils-8.24.orig/src/dd.c
-+++ coreutils-8.24/src/dd.c
-@@ -1525,6 +1525,9 @@ scanargs (int argc, char *const *argv)
+--- coreutils.orig/src/dd.c	2020-07-24 13:38:45.787065917 -0400
++++ coreutils/src/dd.c	2020-07-24 13:38:45.783065949 -0400
+@@ -1653,6 +1653,9 @@
    if (multiple_bits_set (input_flags & (O_DIRECT | O_NOCACHE))
        || multiple_bits_set (output_flags & (O_DIRECT | O_NOCACHE)))
      die (EXIT_FAILURE, 0, _("cannot combine direct and nocache"));
diff --git a/debian/patches/72_id_checkngroups.patch b/debian/patches/72_id_checkngroups.patch
index 8526079..857fd90 100644
--- a/debian/patches/72_id_checkngroups.patch
+++ b/debian/patches/72_id_checkngroups.patch
@@ -1,10 +1,10 @@
 Author: 
 Description: 
-Index: coreutils-8.24/src/id.c
+Index: coreutils/src/id.c
 ===================================================================
---- coreutils-8.24.orig/src/id.c
-+++ coreutils-8.24/src/id.c
-@@ -416,6 +416,10 @@ print_full_info (const char *username)
+--- coreutils.orig/src/id.c	2020-07-24 13:38:45.955064585 -0400
++++ coreutils/src/id.c	2020-07-24 13:38:45.951064617 -0400
+@@ -405,6 +405,10 @@
          ok &= false;
          return;
        }
diff --git a/debian/patches/80_fedora_sysinfo.patch b/debian/patches/80_fedora_sysinfo.patch
new file mode 100644
index 0000000..29738b5
--- /dev/null
+++ b/debian/patches/80_fedora_sysinfo.patch
@@ -0,0 +1,74 @@
+Index: coreutils/src/uname.c
+===================================================================
+--- coreutils.orig/src/uname.c	2020-07-24 13:38:46.123063253 -0400
++++ coreutils/src/uname.c	2020-07-24 13:38:46.119063285 -0400
+@@ -259,7 +259,7 @@
+ 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;
+@@ -300,13 +300,35 @@
+ 
+   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)
+@@ -344,7 +366,7 @@
+ 
+   if (toprint & PRINT_HARDWARE_PLATFORM)
+     {
+-      char const *element = unknown;
++      char *element = unknown;
+ #if HAVE_SYSINFO && defined SI_PLATFORM
+       {
+         static char hardware_platform[257];
+@@ -352,6 +374,14 @@
+                           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 --git a/debian/patches/85_timer_settime.patch b/debian/patches/85_timer_settime.patch
index c2b2fd1..d68937c 100644
--- a/debian/patches/85_timer_settime.patch
+++ b/debian/patches/85_timer_settime.patch
@@ -2,11 +2,11 @@ Author: <[e-mail]>
 Description: timeout ignores fractional part of sleep times when timeout is more 
 than 100000s (approximately 1 day) on kfbsd. prevents failure modes 
 in libc implementation when timeout approaches max(time_t)
-Index: coreutils-8.24/src/timeout.c
+Index: coreutils/src/timeout.c
 ===================================================================
---- coreutils-8.24.orig/src/timeout.c
-+++ coreutils-8.24/src/timeout.c
-@@ -133,6 +133,11 @@ settimeout (double duration, bool warn)
+--- coreutils.orig/src/timeout.c	2020-07-24 13:38:46.287061953 -0400
++++ coreutils/src/timeout.c	2020-07-24 13:38:46.283061984 -0400
+@@ -122,6 +122,11 @@
     resolution provided by alarm().  */
  
  #if HAVE_TIMER_SETTIME
@@ -18,7 +18,7 @@ Index: coreutils-8.24/src/timeout.c
    struct timespec ts = dtotimespec (duration);
    struct itimerspec its = { {0, 0}, ts };
    timer_t timerid;
-@@ -149,6 +154,7 @@ settimeout (double duration, bool warn)
+@@ -138,6 +143,7 @@
      }
    else if (warn && errno != ENOSYS)
      error (0, errno, _("warning: timer_create"));
diff --git a/debian/patches/99_float_endian_detection.patch b/debian/patches/99_float_endian_detection.patch
new file mode 100644
index 0000000..7965d8e
--- /dev/null
+++ b/debian/patches/99_float_endian_detection.patch
@@ -0,0 +1,65 @@
+Author: Colin Watson <[e-mail]>
+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/gnulib-tests/test-isnanl.h
+===================================================================
+--- coreutils.orig/gnulib-tests/test-isnanl.h	2020-07-24 13:38:46.623059289 -0400
++++ coreutils/gnulib-tests/test-isnanl.h	2020-07-24 13:38:46.623059289 -0400
+@@ -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 @@
+ # 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/gnulib-tests/test-signbit.c
+===================================================================
+--- coreutils.orig/gnulib-tests/test-signbit.c	2020-07-24 13:38:46.623059289 -0400
++++ coreutils/gnulib-tests/test-signbit.c	2020-07-24 13:38:46.623059289 -0400
+@@ -36,6 +36,12 @@
+ 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 @@
+ # 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 --git a/debian/patches/99_kfbsd_fstat_patch.patch b/debian/patches/99_kfbsd_fstat_patch.patch
index fa11942..152891d 100644
--- a/debian/patches/99_kfbsd_fstat_patch.patch
+++ b/debian/patches/99_kfbsd_fstat_patch.patch
@@ -1,10 +1,10 @@
 Author: Michael Stone <[e-mail]>
 Description: No description.
-Index: coreutils-8.24/lib/fstatat.c
+Index: coreutils/lib/fstatat.c
 ===================================================================
---- coreutils-8.24.orig/lib/fstatat.c
-+++ coreutils-8.24/lib/fstatat.c
-@@ -132,4 +132,15 @@ stat_func (char const *name, struct stat
+--- coreutils.orig/lib/fstatat.c	2020-07-24 13:38:46.459060589 -0400
++++ coreutils/lib/fstatat.c	2020-07-24 13:38:46.455060621 -0400
+@@ -145,4 +145,15 @@
  # undef AT_FUNC_POST_FILE_PARAM_DECLS
  # undef AT_FUNC_POST_FILE_ARGS
  
diff --git a/debian/patches/improve-removed-directory-test.patch b/debian/patches/improve-removed-directory-test.patch
new file mode 100644
index 0000000..50f24bc
--- /dev/null
+++ b/debian/patches/improve-removed-directory-test.patch
@@ -0,0 +1,49 @@
+From: Paul Eggert <[e-mail]>
+Date: Sat, 7 Mar 2020 10:29:51 -0800
+Subject: ls: improve removed-directory test
+
+* tests/ls/removed-directory.sh: Remove host_triplet test.
+Skip this test if one cannot remove the working directory.
+From a suggestion by Bernhard Voelker (Bug#39929).
+
+Author: Paul Eggert <[e-mail]>
+Origin: upstream, https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=672819c73f2e94e61386dc0584bddf9da860cc26
+Bug: https://lists.gnu.org/archive/html/bug-coreutils/2020-03/msg00005.html
+Last-Updated: 2020-07-24
+Reviewed-By: Sergio Durigan Junior <[e-mail]>
+---
+ tests/ls/removed-directory.sh | 13 ++++---------
+ 1 file changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh
+index fe8f929..63b209d 100755
+--- a/tests/ls/removed-directory.sh
++++ b/tests/ls/removed-directory.sh
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+-# If ls is asked to list a removed directory (e.g. the parent process's
+-# current working directory that has been removed by another process), it
+-# emits an error message.
++# If ls is asked to list a removed directory (e.g., the parent process's
++# current working directory has been removed by another process), it
++# should not emit an error message merely because the directory is removed.
+ 
+ # Copyright (C) 2020 Free Software Foundation, Inc.
+ 
+@@ -21,15 +21,10 @@
+ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+ print_ver_ ls
+ 
+-case $host_triplet in
+-  *linux*) ;;
+-  *) skip_ 'non linux kernel' ;;
+-esac
+-
+ cwd=$(pwd)
+ mkdir d || framework_failure_
+ cd d || framework_failure_
+-rmdir ../d || framework_failure_
++rmdir ../d || skip_ "can't remove working directory on this platform"
+ 
+ ls >../out 2>../err || fail=1
+ cd "$cwd" || framework_failure_
diff --git a/debian/patches/restore-ls-behavior-8.31.patch b/debian/patches/restore-ls-behavior-8.31.patch
new file mode 100644
index 0000000..d889e22
--- /dev/null
+++ b/debian/patches/restore-ls-behavior-8.31.patch
@@ -0,0 +1,126 @@
+From: Paul Eggert <[e-mail]>
+Date: Thu, 5 Mar 2020 17:25:29 -0800
+Subject: ls: restore 8.31 behavior on removed directories
+
+* NEWS: Mention this.
+* src/ls.c: Do not include <sys/sycall.h>
+(print_dir): Don't worry about whether the directory is removed.
+* tests/ls/removed-directory.sh: Adjust to match new (i.e., old)
+behavior.
+
+This patch is needed because coreutils 8.32 fails to build on ARM64
+with:
+
+src/ls.c: In function 'print_dir':
+src/ls.c:3026:24: error: 'SYS_getdents' undeclared (first use in this function); did you mean 'SYS_getdents64'?
+ 3026 |           if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1
+      |                        ^~~~~~~~~~~~
+      |                        SYS_getdents64
+
+Author: Paul Eggert <[e-mail]>
+Origin: upstream, https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=10fcb97bd728f09d4a027eddf8ad2900f0819b0a
+Bug: https://lists.gnu.org/archive/html/bug-coreutils/2020-03/msg00005.html
+Last-Updated: 2020-07-24
+Reviewed-By: Sergio Durigan Junior <[e-mail]>
+---
+ NEWS                          |  4 ----
+ src/ls.c                      | 22 ----------------------
+ tests/ls/removed-directory.sh | 10 ++--------
+ 3 files changed, 2 insertions(+), 34 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index 3e44c0c..3b419cb 100644
+--- a/NEWS
++++ b/NEWS
+@@ -65,10 +65,6 @@ GNU coreutils NEWS                                    -*- outline -*-
+   [The old behavior was introduced in sh-utils 2.0.15 ca. 1999, predating
+   coreutils package.]
+ 
+-  ls issues an error message on a removed directory, on GNU/Linux systems.
+-  Previously no error and no entries were output, and so indistinguishable
+-  from an empty directory, with default ls options.
+-
+   uniq no longer uses strcoll() to determine string equivalence,
+   and so will operate more efficiently and consistently.
+ 
+diff --git a/src/ls.c b/src/ls.c
+index 24b9832..4acf5f4 100644
+--- a/src/ls.c
++++ b/src/ls.c
+@@ -49,10 +49,6 @@
+ # include <sys/ptem.h>
+ #endif
+ 
+-#ifdef __linux__
+-# include <sys/syscall.h>
+-#endif
+-
+ #include <stdio.h>
+ #include <assert.h>
+ #include <setjmp.h>
+@@ -2896,7 +2892,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
+   struct dirent *next;
+   uintmax_t total_blocks = 0;
+   static bool first = true;
+-  bool found_any_entries = false;
+ 
+   errno = 0;
+   dirp = opendir (name);
+@@ -2972,7 +2967,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
+       next = readdir (dirp);
+       if (next)
+         {
+-          found_any_entries = true;
+           if (! file_ignored (next->d_name))
+             {
+               enum filetype type = unknown;
+@@ -3018,22 +3012,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
+           if (errno != EOVERFLOW)
+             break;
+         }
+-#ifdef __linux__
+-      else if (! found_any_entries)
+-        {
+-          /* If readdir finds no directory entries at all, not even "." or
+-             "..", then double check that the directory exists.  */
+-          if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1
+-              && errno != EINVAL)
+-            {
+-              /* We exclude EINVAL as that pertains to buffer handling,
+-                 and we've passed NULL as the buffer for simplicity.
+-                 ENOENT is returned if appropriate before buffer handling.  */
+-              file_failure (command_line_arg, _("reading directory %s"), name);
+-            }
+-          break;
+-        }
+-#endif
+       else
+         break;
+ 
+diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh
+index e8c835d..fe8f929 100755
+--- a/tests/ls/removed-directory.sh
++++ b/tests/ls/removed-directory.sh
+@@ -26,20 +26,14 @@ case $host_triplet in
+   *) skip_ 'non linux kernel' ;;
+ esac
+ 
+-LS_FAILURE=2
+-
+-cat <<\EOF >exp-err || framework_failure_
+-ls: reading directory '.': No such file or directory
+-EOF
+-
+ cwd=$(pwd)
+ mkdir d || framework_failure_
+ cd d || framework_failure_
+ rmdir ../d || framework_failure_
+ 
+-returns_ $LS_FAILURE ls >../out 2>../err || fail=1
++ls >../out 2>../err || fail=1
+ cd "$cwd" || framework_failure_
+ compare /dev/null out || fail=1
+-compare exp-err err || fail=1
++compare /dev/null err || fail=1
+ 
+ Exit $fail
diff --git a/debian/patches/series b/debian/patches/series
index d6c4297..fb331d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,10 @@
 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
+treat-devtmpfs-and-squashfs-as-dummy-filesystems.patch
+restore-ls-behavior-8.31.patch
+improve-removed-directory-test.patch
diff --git a/debian/patches/treat-devtmpfs-and-squashfs-as-dummy-filesystems.patch b/debian/patches/treat-devtmpfs-and-squashfs-as-dummy-filesystems.patch
new file mode 100644
index 0000000..a6182d4
--- /dev/null
+++ b/debian/patches/treat-devtmpfs-and-squashfs-as-dummy-filesystems.patch
@@ -0,0 +1,32 @@
+From ee5ce3f0637d5533e6e1f68e6a7e7f846ff742c4 Mon Sep 17 00:00:00 2001
+From: Bryce Harrington <[e-mail]>
+Date: Thu, 2 Jul 2020 01:50:48 +0000
+Subject: [PATCH] Treat devtmpfs and squashfs as dummy filesystems
+
+Avoid displaying snaps in output from df and other tools, by excluding
+squashfs filesystems.  Exclude devtmpfs filesystems in output from df
+and other tools since it is a dummy filesystem.
+
+Origin: upstream, https://debbugs.gnu.org/cgi/bugreport.cgi?bug=37702#68
+Bug: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=37702
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/apt/+bug/1756595
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/coreutils/+bug/1219529
+
+---
+ lib/mountlist.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: coreutils/lib/mountlist.c
+===================================================================
+--- coreutils.orig/lib/mountlist.c	2020-07-24 13:38:46.799057894 -0400
++++ coreutils/lib/mountlist.c	2020-07-24 13:38:46.795057925 -0400
+@@ -164,7 +164,9 @@
+ 
+ #define ME_DUMMY_0(Fs_name, Fs_type)            \
+   (strcmp (Fs_type, "autofs") == 0              \
++   || strcmp (Fs_type, "devtmpfs") == 0         \
+    || strcmp (Fs_type, "proc") == 0             \
++   || strcmp (Fs_type, "squashfs") == 0         \
+    || strcmp (Fs_type, "subfs") == 0            \
+    /* for Linux 2.6/3.x */                      \
+    || strcmp (Fs_type, "debugfs") == 0          \
diff --git a/debian/rules b/debian/rules
index ddb98cb..17e8784 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,13 +13,23 @@ ifeq ($(DEB_HOST_ARCH_CPU),sh4)
   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 $@ --with autoreconf
@@ -27,11 +37,39 @@ override_dh_auto_configure:
 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 --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..6d4d638
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+Tests: upstream
+Depends: coreutils, acl, strace
diff --git a/debian/tests/upstream b/debian/tests/upstream
new file mode 100644
index 0000000..0da9089
--- /dev/null
+++ b/debian/tests/upstream
@@ -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