From 6e4e0cf44d50826713830d7b12f7939c805535e2 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix+github@lancelotsix.com>
Date: Sun, 1 Sep 2019 05:03:04 +0200
Subject: [PATCH] findutils: 4.6.0 -> 4.7.0 (#67753)

See https://lists.gnu.org/archive/html/info-gnu/2019-08/msg00009.html
for release information
---
 pkgs/tools/misc/findutils/default.nix         | 12 +++------
 .../disable-getdtablesize-test.patch          | 25 -------------------
 pkgs/tools/misc/findutils/memory-leak.patch   | 21 ----------------
 3 files changed, 4 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/tools/misc/findutils/disable-getdtablesize-test.patch
 delete mode 100644 pkgs/tools/misc/findutils/memory-leak.patch

diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 9db66480cb10..2df8ee420fae 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -3,20 +3,16 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "findutils-4.6.0";
+  pname = "findutils";
+  version = "4.7.0";
 
   src = fetchurl {
-    url = "mirror://gnu/findutils/${name}.tar.gz";
-    sha256 = "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y";
+    url = "mirror://gnu/findutils/${pname}-${version}.tar.xz";
+    sha256 = "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5";
   };
 
   patches = [
-    ./memory-leak.patch
     ./no-install-statedir.patch
-
-    # Prevent tests from failing on old kernels (2.6x)
-    # getdtablesize reports incorrect values if getrlimit() fails
-    ./disable-getdtablesize-test.patch
   ];
 
   buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort
diff --git a/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch b/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch
deleted file mode 100644
index 611df364b687..000000000000
--- a/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/tests/test-dup2.c b/tests/test-dup2.c
---- a/tests/test-dup2.c
-+++ b/tests/test-dup2.c
-@@ -157,8 +157,6 @@ main (void)
-       ASSERT (close (255) == 0);
-       ASSERT (close (256) == 0);
-     }
--  ASSERT (dup2 (fd, bad_fd - 1) == bad_fd - 1);
--  ASSERT (close (bad_fd - 1) == 0);
-   errno = 0;
-   ASSERT (dup2 (fd, bad_fd) == -1);
-   ASSERT (errno == EBADF);
-diff --git a/tests/test-getdtablesize.c b/tests/test-getdtablesize.c
-index a0325af..a83f8ec 100644
---- a/tests/test-getdtablesize.c
-+++ b/tests/test-getdtablesize.c
-@@ -29,8 +29,6 @@ int
- main (int argc, char *argv[])
- {
-   ASSERT (getdtablesize () >= 3);
--  ASSERT (dup2 (0, getdtablesize() - 1) == getdtablesize () - 1);
--  ASSERT (dup2 (0, getdtablesize()) == -1);
- 
-   return 0;
- }
diff --git a/pkgs/tools/misc/findutils/memory-leak.patch b/pkgs/tools/misc/findutils/memory-leak.patch
deleted file mode 100644
index 56f65f856224..000000000000
--- a/pkgs/tools/misc/findutils/memory-leak.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-http://git.savannah.gnu.org/cgit/findutils.git/patch/?id=c1556892a
-diff --git a/find/fstype.c b/find/fstype.c
-index 535f920..a0ac8bc 100644
---- a/find/fstype.c
-+++ b/find/fstype.c
-@@ -75,14 +75,7 @@ free_file_system_list (struct mount_entry *p)
-   while (p)
-     {
-       struct mount_entry *pnext = p->me_next;
--
--      free (p->me_devname);
--      free (p->me_mountdir);
--
--      if (p->me_type_malloced)
--	free (p->me_type);
--      p->me_next = NULL;
--      free (p);
-+      free_mount_entry (p);
-       p = pnext;
-     }
- }