summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-04-27 03:35:29 +0000
committerMike Frysinger <vapier@gentoo.org>2005-04-27 03:35:29 +0000
commit3787a79c2c3a381fdf474d8b43d58a95716da244 (patch)
treeef80bd3a17e9d3a9ec48718a7f96b35e2e0311a1 /app-arch
parentdont need to hack autogen anymore (diff)
downloadgentoo-2-3787a79c2c3a381fdf474d8b43d58a95716da244.tar.gz
gentoo-2-3787a79c2c3a381fdf474d8b43d58a95716da244.tar.bz2
gentoo-2-3787a79c2c3a381fdf474d8b43d58a95716da244.zip
Dont abort with long file names in archives #87540 by Jim Faulkner.
(Portage version: 2.0.51.20-r4)
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/tar/ChangeLog8
-rw-r--r--app-arch/tar/files/tar-1.15.1-dont-abort-long-names.patch26
-rw-r--r--app-arch/tar/tar-1.15.1.ebuild5
3 files changed, 35 insertions, 4 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/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() {