* Fix corrupt archives in cpio 2.7 when dealing with symlinks.
svn path=/nixpkgs/trunk/; revision=7143
This commit is contained in:
parent
8c4574571d
commit
eed02cb58f
2 changed files with 14 additions and 0 deletions
|
@ -6,4 +6,5 @@ stdenv.mkDerivation {
|
||||||
url = http://ftp.gnu.org/gnu/cpio/cpio-2.7.tar.bz2;
|
url = http://ftp.gnu.org/gnu/cpio/cpio-2.7.tar.bz2;
|
||||||
md5 = "69ad6cb3d288aafe5f969f68d9fd0fb7";
|
md5 = "69ad6cb3d288aafe5f969f68d9fd0fb7";
|
||||||
};
|
};
|
||||||
|
patches = [./symlink.patch];
|
||||||
}
|
}
|
||||||
|
|
13
pkgs/tools/archivers/cpio/symlink.patch
Normal file
13
pkgs/tools/archivers/cpio/symlink.patch
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
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);
|
Loading…
Reference in a new issue