Fix from upstream for permission breakage in copy pass through mode #174921 by Karl Hakimian.

(Portage version: 2.1.2.4)

4 files changed, 65 insertions, 1 deletions

diff --git a/app-arch/cpio/ChangeLog b/app-arch/cpio/ChangeLog
index 604bf9c0532c..ba149594b471 100644
--- a/app-arch/cpio/ChangeLog
+++ b/app-arch/cpio/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/cpio
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/ChangeLog,v 1.56 2007/04/15 19:45:08 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/ChangeLog,v 1.57 2007/04/18 19:40:39 vapier Exp $
+
+*cpio-2.7-r2 (18 Apr 2007)
+
+  18 Apr 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/cpio-2.7-copypass.patch, +cpio-2.7-r2.ebuild:
+  Fix from upstream for permission breakage in copy pass through mode #174921
+  by Karl Hakimian.
 
   15 Apr 2007; Markus Rothe <corsair@gentoo.org> cpio-2.7-r1.ebuild:
   Stable on ppc64
diff --git a/app-arch/cpio/cpio-2.7-r2.ebuild b/app-arch/cpio/cpio-2.7-r2.ebuild
new file mode 100644
index 000000000000..07404bbaa698
--- /dev/null
+++ b/app-arch/cpio/cpio-2.7-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/cpio-2.7-r2.ebuild,v 1.1 2007/04/18 19:40:39 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 ~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
+	epatch "${FILESDIR}"/${PN}-2.7-copypass.patch #174921
+}
+
+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
+	rm -f "${D}"/usr/share/man/man1/mt.1
+	rmdir "${D}"/usr/libexec || die
+}
diff --git a/app-arch/cpio/files/cpio-2.7-copypass.patch b/app-arch/cpio/files/cpio-2.7-copypass.patch
new file mode 100644
index 000000000000..d5fd330b3261
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.7-copypass.patch
@@ -0,0 +1,15 @@
+Fix from upstream for permission breakage in copy pass-through mode
+
+http://bugs.gentoo.org/174921
+
+--- cpio-2.7/src/copypass.c
++++ cpio-2.7/src/copypass.c
+@@ -197,7 +197,7 @@
+ 	      if (close (out_file_des) < 0)
+ 		close_error (output_name.ds_string);
+ 
+-	      set_copypass_perms (input_name.ds_string, &in_file_stat);
++	      set_copypass_perms (output_name.ds_string, &in_file_stat);
+ 
+ 	      if (reset_time_flag)
+                 {
diff --git a/app-arch/cpio/files/digest-cpio-2.7-r2 b/app-arch/cpio/files/digest-cpio-2.7-r2
new file mode 100644
index 000000000000..1c0c7862f504
--- /dev/null
+++ b/app-arch/cpio/files/digest-cpio-2.7-r2
@@ -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