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

Package-Manager: portage-2.1.2_rc1-r5

5 files changed, 85 insertions, 15 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/Manifest b/app-arch/cpio/Manifest
index 1d9c5f6bd3d7..ea91254a98e6 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -45,20 +45,24 @@ AUX cpio-2.6-writeOutHeaderBufferOverflow.patch 18611 RMD160 f5424c6e3c39a257873
 MD5 8e7b24c3c6b13e2228034d738bc9732b files/cpio-2.6-writeOutHeaderBufferOverflow.patch 18611
 RMD160 f5424c6e3c39a2578737165dbbb6276de880eb45 files/cpio-2.6-writeOutHeaderBufferOverflow.patch 18611
 SHA256 aed95b698c91951063371bcf524bc0f15b31fe9d967519b0043a886995368f69 files/cpio-2.6-writeOutHeaderBufferOverflow.patch 18611
+AUX cpio-2.7-link-terminate.patch 542 RMD160 1b2bf69ec397c73a802527e34537252f306a8d76 SHA1 aa053ab524f48520227d3c6d9a8ebf63a27d5473 SHA256 3a868339b78d4bb66c7efb1d0bfdd70a5c5ecd48ac6a7ba2fe60097f308fccba
+MD5 51a98390e403e158256d8351e7e2a66e files/cpio-2.7-link-terminate.patch 542
+RMD160 1b2bf69ec397c73a802527e34537252f306a8d76 files/cpio-2.7-link-terminate.patch 542
+SHA256 3a868339b78d4bb66c7efb1d0bfdd70a5c5ecd48ac6a7ba2fe60097f308fccba files/cpio-2.7-link-terminate.patch 542
 DIST cpio-2.6.tar.bz2 448452 RMD160 52b7e21c9989dd28da5dae1630b57a301817a788 SHA1 4f65821ec10eb2c330a582fbc8112960c9849ecd SHA256 6e60c5c370d451605fcb23e26cc37c18182f62009282ca73bf5dea4519e17360
 DIST cpio-2.7.tar.bz2 698221 RMD160 0ae35717237133da5bba18376af0ec685ac67360 SHA1 ce1c8ab703d62fc1d30ca59e044ba9f43c3db574 SHA256 b59390450233b5298d210f6369e98d91d07b7f4261ddb962d654185dd02b5b0e
 EBUILD cpio-2.6-r5.ebuild 1657 RMD160 81af7eb5085f843450aa6b8411ac217c5664a0b9 SHA1 42d5915475b282d10a6fa2070b175c18b87cb5fb SHA256 188a1a2724318611c70d330bc38f77470efa3069f6f94b199fcf53da3dc85fab
 MD5 6434cda4341f9caae84431e741c60c2e cpio-2.6-r5.ebuild 1657
 RMD160 81af7eb5085f843450aa6b8411ac217c5664a0b9 cpio-2.6-r5.ebuild 1657
 SHA256 188a1a2724318611c70d330bc38f77470efa3069f6f94b199fcf53da3dc85fab cpio-2.6-r5.ebuild 1657
-EBUILD cpio-2.7.ebuild 957 RMD160 cd27b888f19d2076d8d2c3e7b35b6ee7c315d29f SHA1 4c37cbbb6181aadbd231c5c03cc9d3c18c9dfc37 SHA256 c4ac62b18ac732ab121c485fb7ea2e6787abae641cfd2e9c83262de03c6897cf
-MD5 2e4f9458756d84e82a570bacd3db8a1b cpio-2.7.ebuild 957
-RMD160 cd27b888f19d2076d8d2c3e7b35b6ee7c315d29f cpio-2.7.ebuild 957
-SHA256 c4ac62b18ac732ab121c485fb7ea2e6787abae641cfd2e9c83262de03c6897cf cpio-2.7.ebuild 957
-MISC ChangeLog 8111 RMD160 6fbf9bc7f331f8e5244fcd871f6a7acf75cec2ba SHA1 213bd2a5649165b18c819f03655d5a6623e96d41 SHA256 5b953ed1ccb8c93147e70f0b93861aba7d15448cd9102996067490c8fdcfd9fe
-MD5 00fc2d2bf3c625a8c4a7402541115c57 ChangeLog 8111
-RMD160 6fbf9bc7f331f8e5244fcd871f6a7acf75cec2ba ChangeLog 8111
-SHA256 5b953ed1ccb8c93147e70f0b93861aba7d15448cd9102996067490c8fdcfd9fe ChangeLog 8111
+EBUILD cpio-2.7-r1.ebuild 964 RMD160 26856a9f2f6fb1b0606d7aea9a2f5d7dffa454d6 SHA1 5e71efcb438d8f556c160d99232826f3bae09c82 SHA256 6f72e65c2a3ab6d98d6830da7a6b5a4a82ca5cde3a361e171a9e01386f67eb48
+MD5 1a417dc6518b864923c4e64c06219dda cpio-2.7-r1.ebuild 964
+RMD160 26856a9f2f6fb1b0606d7aea9a2f5d7dffa454d6 cpio-2.7-r1.ebuild 964
+SHA256 6f72e65c2a3ab6d98d6830da7a6b5a4a82ca5cde3a361e171a9e01386f67eb48 cpio-2.7-r1.ebuild 964
+MISC ChangeLog 8309 RMD160 8757f187b31e99fdc080d124b388792efa64c209 SHA1 9236de91c30cf1d889ce8d9bfb8c908a568f91bd SHA256 f858db0277bd31328efc0784b5fe0a13443311254d52b826421d2e32383f0146
+MD5 9341e276b277ab6195f446fdebdc2eee ChangeLog 8309
+RMD160 8757f187b31e99fdc080d124b388792efa64c209 ChangeLog 8309
+SHA256 f858db0277bd31328efc0784b5fe0a13443311254d52b826421d2e32383f0146 ChangeLog 8309
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -66,13 +70,13 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 MD5 bef54a4a4a27985f98e3bbbf5e60be49 files/digest-cpio-2.6-r5 229
 RMD160 d4edaf1f65000fc94e922b3db987e3d488936ea8 files/digest-cpio-2.6-r5 229
 SHA256 6052e569e0bd559ae4cc8b4173a48f2d0ee7a754d0ec19b67e5a9bdda3ce0266 files/digest-cpio-2.6-r5 229
-MD5 ac5c998994855bb75aa7658b7eb64966 files/digest-cpio-2.7 229
-RMD160 9552f623fc8ba0f30a5a3ccfe46faf79c34d68bf files/digest-cpio-2.7 229
-SHA256 0e78bc2601b3919276568d6f1ab37939cc6b5d91d2ec5da21efa141aab888f4b files/digest-cpio-2.7 229
+MD5 ac5c998994855bb75aa7658b7eb64966 files/digest-cpio-2.7-r1 229
+RMD160 9552f623fc8ba0f30a5a3ccfe46faf79c34d68bf files/digest-cpio-2.7-r1 229
+SHA256 0e78bc2601b3919276568d6f1ab37939cc6b5d91d2ec5da21efa141aab888f4b files/digest-cpio-2.7-r1 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFOpi8amhnQswr0vIRAkdWAJ9d7S15VOlrJZuKgeoz2iEU+ue1QQCgknak
-FMDTrIojY3c5GO+E+Aiv7as=
-=00Er
+iD8DBQFFVXSfamhnQswr0vIRAsCPAJ0UsF/A8/rvR0AgkNRsRoCxApMwbgCgqqkx
+AB0PTxwwKmXMp6RDmxLI5L4=
+=i71Y
 -----END PGP SIGNATURE-----
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