From eed02cb58f81bacc087c711886e827f0b2fa34e6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Nov 2006 00:34:05 +0000 Subject: * Fix corrupt archives in cpio 2.7 when dealing with symlinks. svn path=/nixpkgs/trunk/; revision=7143 --- pkgs/tools/archivers/cpio/default.nix | 1 + pkgs/tools/archivers/cpio/symlink.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/tools/archivers/cpio/symlink.patch (limited to 'pkgs') diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index 69e5b1768790..deed73bc0318 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -6,4 +6,5 @@ stdenv.mkDerivation { url = http://ftp.gnu.org/gnu/cpio/cpio-2.7.tar.bz2; md5 = "69ad6cb3d288aafe5f969f68d9fd0fb7"; }; + patches = [./symlink.patch]; } diff --git a/pkgs/tools/archivers/cpio/symlink.patch b/pkgs/tools/archivers/cpio/symlink.patch new file mode 100644 index 000000000000..89f82daa5221 --- /dev/null +++ b/pkgs/tools/archivers/cpio/symlink.patch @@ -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); -- cgit 1.4.1