mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 05:00:16 +00:00
Code Issues Wiki Activity

findutils: 4.6.0 -> 4.7.0 (#67753)

Browse source 
See https://lists.gnu.org/archive/html/info-gnu/2019-08/msg00009.html
for release information
This commit is contained in:
Lancelot SIX 2019-09-01 05:03:04 +02:00 committed by Samuel Leathers
parent e768919148
commit 6e4e0cf44d
3 changed files with 4 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/misc/findutils/default.nix
View file

@ -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

25
pkgs/tools/misc/findutils/disable-getdtablesize-test.patch
View file

@ -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;
}

21
pkgs/tools/misc/findutils/memory-leak.patch
View file

@ -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;
}
}