Re: Bug#453435: cpio cannot read its own tarfiles
On Sun, Dec 09, 2007 at 05:36:31PM +0100, Luk Claes wrote:
> Hi
>
> Sorry for the rather late reply.
>
> Can you please include a diff so we can review it and have an idea about
> the impact of the update?
I suppose the proposed change would be something like
diff -ur cpio-2.6.old/debian/changelog cpio-2.6/debian/changelog
--- cpio-2.6.old/debian/changelog 2007-12-09 11:51:24.000000000 -0500
+++ cpio-2.6/debian/changelog 2007-12-09 11:59:20.815094007 -0500
@@ -1,3 +1,10 @@
+cpio (2.6-18) stable; urgency=low
+
+ * Apply patch from Russell Stuart to fix some malformed
+ creation of ustar archives. closes: #358990.
+
+ -- Clint Adams <schizo@debian.org> Sun, 09 Dec 2007 11:57:52 -0500
+
cpio (2.6-17) unstable; urgency=high
* Fix setlocale glitch. closes: #381348.
diff -ur cpio-2.6.old/src/copyout.c cpio-2.6/src/copyout.c
--- cpio-2.6.old/src/copyout.c 2007-12-09 11:56:28.299124000 -0500
+++ cpio-2.6/src/copyout.c 2007-12-09 11:56:40.800281845 -0500
@@ -857,8 +857,9 @@
file_hdr.c_mode = (file_stat.st_mode & 07777);
file_hdr.c_mode |= CP_IFREG;
file_hdr.c_tar_linkname = otherfile;
- if (write_out_header (&file_hdr, out_file_des))
- continue;
+ file_hdr.c_filesize = 0;
+ write_out_header (&file_hdr, out_file_des);
+ continue;
break;
}
add_inode (file_hdr.c_ino, file_hdr.c_name,
Reply to: