public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpio: unneeded patches removed 

svn path=/nixpkgs/branches/stdenv-updates/; revision=9817
This commit is contained in:
Yury G. Kudryashov 2007-12-01 20:04:21 +00:00
parent 672b4d3002
commit a1f7a312c0
3 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/tools/archivers/cpio/default.nix
View File

@ -6,5 +6,4 @@ stdenv.mkDerivation {
url = mirror://gnu/cpio/cpio-2.9.tar.bz2; url = mirror://gnu/cpio/cpio-2.9.tar.bz2;
sha256 = "01s7f9hg8kgpis96j99hgkiqgdy53pm7qi7bhm3fzx58jfk5z6mv"; sha256 = "01s7f9hg8kgpis96j99hgkiqgdy53pm7qi7bhm3fzx58jfk5z6mv";
}; };
patches = [./symlink.patch ./gnulib-futimens.patch];
} }

30
pkgs/tools/archivers/cpio/gnulib-futimens.patch
View File

@ -1,30 +0,0 @@
now hat glibc-2.6 declares futimens.
http://lists.gnu.org/archive/html/bug-gnulib/2007-05/msg00089.html
diff -ru cpio-2.7.orig/lib/utimens.c cpio-2.7/lib/utimens.c
--- cpio-2.7.orig/lib/utimens.c 2007-05-20 21:23:57.000000000 +0900
+++ cpio-2.7/lib/utimens.c 2007-05-21 08:40:22.000000000 +0900
@@ -73,7 +73,7 @@
Return 0 on success, -1 (setting errno) on failure. */
int
-futimens (int fd ATTRIBUTE_UNUSED,
+gl_futimens (int fd ATTRIBUTE_UNUSED,
char const *file, struct timespec const timespec[2])
{
/* There's currently no interface to set file timestamps with
@@ -166,5 +166,5 @@
int
utimens (char const *file, struct timespec const timespec[2])
{
- return futimens (-1, file, timespec);
+ return gl_futimens (-1, file, timespec);
}
diff -ru cpio-2.7.orig/lib/utimens.h cpio-2.7/lib/utimens.h
--- cpio-2.7.orig/lib/utimens.h 2007-05-20 21:23:57.000000000 +0900
+++ cpio-2.7/lib/utimens.h 2007-05-21 08:39:57.000000000 +0900
@@ -1,3 +1,3 @@
#include "timespec.h"
-int futimens (int, char const *, struct timespec const [2]);
+int gl_futimens (int, char const *, struct timespec const [2]);
int utimens (char const *, struct timespec const [2]);

13
pkgs/tools/archivers/cpio/symlink.patch
View File

@ -1,13 +0,0 @@
http://lists.gnu.org/archive/html/bug-cpio/2006-11/msg00003.html
diff -Ndpru cpio-2.7/src/copyout.c cpio-2.7.fixed/src/copyout.c
--- cpio-2.7/src/copyout.c 2006-09-27 02:19:44.000000000 -0600
+++ cpio-2.7.fixed/src/copyout.c 2006-11-12 18:58:25.000000000 -0700
@@ -806,6 +806,7 @@ process_copy_out ()
free (link_name);
continue;
}
+ link_name[link_size] = '\0';
cpio_safer_name_suffix (link_name, false,
!no_abs_paths_flag, true);
link_size = strlen (link_name);