Dont abort with long file names in archives #87540 by Jim Faulkner.

Package-Manager: portage-2.0.51.20-r4

4 files changed, 41 insertions, 9 deletions

diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog
index 0b0d5da1bf30..a90ac70060e4 100644
--- a/app-arch/tar/ChangeLog
+++ b/app-arch/tar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/tar
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.46 2005/04/08 10:48:23 corsair Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.47 2005/04/27 03:35:29 vapier Exp $
+
+  27 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/tar-1.15.1-dont-abort-long-names.patch, tar-1.15.1.ebuild:
+  Dont abort with long file names in archives #87540 by Jim Faulkner.
 
   08 Apr 2005; Markus Rothe <corsair@gentoo.org> tar-1.15.1.ebuild:
   Stable on ppc64
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 99ace70089bf..92b7cdcf5c83 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,13 +1,14 @@
-MD5 8df8e7f2928679abee2fb78f8455e2a5 ChangeLog 9750
+MD5 8486b9ce84a3dd92d2347285379de0ff ChangeLog 9938
+MD5 2c21ebeb68a5abfc12032956d2275312 tar-1.15.1.ebuild 1511
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 e3ae7c0cd3dad23afa5880a6264b4bfd tar-1.13.92-r3.ebuild 1628
 MD5 8225082dd117d92a599d4b01e9d2ee74 tar-1.14.ebuild 1344
-MD5 a436244810e3c6a611595854580219ac tar-1.15.1.ebuild 1458
+MD5 e3ae7c0cd3dad23afa5880a6264b4bfd tar-1.13.92-r3.ebuild 1628
+MD5 1ce0c7df0ad9ec0c279340132692d7d4 files/digest-tar-1.15.1 64
 MD5 a1433bcc25f8f63d8ee96bddbf877962 files/1.15.1-flex-arg.patch 519
 MD5 e4017a705a2d9950c025b458ead9ac79 files/digest-tar-1.13.92-r3 65
+MD5 c94df05539a43d66c055452ef5acfb3b files/tar.1 12154
 MD5 e7c9ac5824e453f73a56032123c46f97 files/digest-tar-1.14 62
-MD5 1ce0c7df0ad9ec0c279340132692d7d4 files/digest-tar-1.15.1 64
 MD5 8adb291e1142c213ed26260319bef9f4 files/tar-1.13.92-dont-strip-dot_slash.patch 893
 MD5 e05d36a6f2aeb7f6374d04d61872bd53 files/tar-1.13.92-fix-one_file_system.patch 547
-MD5 c94df05539a43d66c055452ef5acfb3b files/tar.1 12154
 MD5 971970980dc4f15a093acfe810dae560 files/tar-1.15.1-gcc4-test.patch 637
+MD5 4ba57b9490ec07c16c7940506ca29717 files/tar-1.15.1-dont-abort-long-names.patch 951
diff --git a/app-arch/tar/files/tar-1.15.1-dont-abort-long-names.patch b/app-arch/tar/files/tar-1.15.1-dont-abort-long-names.patch
new file mode 100644
index 000000000000..156067256ace
--- /dev/null
+++ b/app-arch/tar/files/tar-1.15.1-dont-abort-long-names.patch
@@ -0,0 +1,26 @@
+Add a workaround for invalid aborts until the next tar release 
+which has this fixed properly.  Thanks to Jim Faulkner for 
+reporting and tracking this down !
+
+http://lists.gnu.org/archive/html/bug-tar/2005-04/msg00012.html
+http://bugs.gentoo.org/show_bug.cgi?id=87540
+
+Index: src/buffer.c
+===================================================================
+RCS file: /cvsroot/tar/tar/src/buffer.c,v
+retrieving revision 1.81
+retrieving revision 1.82
+diff -u -r1.81 -r1.82
+--- src/buffer.c	4 Apr 2005 18:21:55 -0000	1.81
++++ src/buffer.c	7 Apr 2005 17:26:11 -0000	1.82
+@@ -653,8 +653,8 @@
+ 	record_start++;
+ 
+       if (strlen (real_s_name) > NAME_FIELD_SIZE)
+-	FATAL_ERROR ((0, 0,
+-		      _("%s: file name too long to be stored in a GNU multivolume header"),
++	WARN ((0, 0,
++	      _("%s: file name too long to be stored in a GNU multivolume header, truncated"),
+ 		      quotearg_colon (real_s_name)));
+ 
+       memset (record_start, 0, BLOCKSIZE);
diff --git a/app-arch/tar/tar-1.15.1.ebuild b/app-arch/tar/tar-1.15.1.ebuild
index b7d0d2c5a7e6..ae1160af6139 100644
--- a/app-arch/tar/tar-1.15.1.ebuild
+++ b/app-arch/tar/tar-1.15.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.15.1.ebuild,v 1.8 2005/04/08 10:48:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.15.1.ebuild,v 1.9 2005/04/27 03:35:29 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls static build"
 
 DEPEND="app-arch/gzip
@@ -26,6 +26,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${PV}-flex-arg.patch
 	epatch "${FILESDIR}"/${P}-gcc4-test.patch
+	epatch "${FILESDIR}"/${P}-dont-abort-long-names.patch
 }
 
 src_compile() {