Grab fix from upstream for #153782 by Brian S. Stephan.

(Portage version: 2.1.2_rc1-r5)

4 files changed, 67 insertions, 1 deletions

diff --git a/app-arch/cpio/ChangeLog b/app-arch/cpio/ChangeLog
index c9d7fd4bfd9c..92206c03b978 100644
--- a/app-arch/cpio/ChangeLog
+++ b/app-arch/cpio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/cpio
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/ChangeLog,v 1.50 2006/10/21 22:00:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/ChangeLog,v 1.51 2006/11/11 06:58:30 vapier Exp $
+
+*cpio-2.7-r1 (11 Nov 2006)
+
+  11 Nov 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/cpio-2.7-link-terminate.patch, +cpio-2.7-r1.ebuild:
+  Grab fix from upstream for #153782 by Brian S. Stephan.
 
 *cpio-2.7 (21 Oct 2006)
 
diff --git a/app-arch/cpio/cpio-2.7-r1.ebuild b/app-arch/cpio/cpio-2.7-r1.ebuild
new file mode 100644
index 000000000000..5fb25fa2aaea
--- /dev/null
+++ b/app-arch/cpio/cpio-2.7-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/cpio-2.7-r1.ebuild,v 1.1 2006/11/11 06:58:30 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="A file archival tool which can also read and write tar files"
+HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html"
+SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="nls"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-2.7-link-terminate.patch #153782
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		--bindir=/bin \
+		--with-rmt=/usr/sbin/rmt \
+		|| die
+	emake || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc ChangeLog NEWS README INSTALL
+	rm -f "${D}"/usr/share/man/man1/mt.1
+	rmdir "${D}"/usr/libexec || die
+}
diff --git a/app-arch/cpio/files/cpio-2.7-link-terminate.patch b/app-arch/cpio/files/cpio-2.7-link-terminate.patch
new file mode 100644
index 000000000000..7a86954fc020
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.7-link-terminate.patch
@@ -0,0 +1,19 @@
+fix from upstream
+
+http://bugs.gentoo.org/153782
+
+===================================================================
+RCS file: /sources/cpio/cpio/src/copyout.c,v
+retrieving revision 1.19
+retrieving revision 1.20
+diff -u -r1.19 -r1.20
+--- cpio/src/copyout.c	2006/09/27 09:28:50	1.19
++++ cpio/src/copyout.c	2006/10/24 10:48:04	1.20
+@@ -806,6 +806,7 @@
+ 		    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);
diff --git a/app-arch/cpio/files/digest-cpio-2.7-r1 b/app-arch/cpio/files/digest-cpio-2.7-r1
new file mode 100644
index 000000000000..1c0c7862f504
--- /dev/null
+++ b/app-arch/cpio/files/digest-cpio-2.7-r1
@@ -0,0 +1,3 @@
+MD5 69ad6cb3d288aafe5f969f68d9fd0fb7 cpio-2.7.tar.bz2 698221
+RMD160 0ae35717237133da5bba18376af0ec685ac67360 cpio-2.7.tar.bz2 698221
+SHA256 b59390450233b5298d210f6369e98d91d07b7f4261ddb962d654185dd02b5b0e cpio-2.7.tar.bz2 698221