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

Package-Manager: portage-2.1.2.4

diff --git a/app-arch/cpio/ChangeLog b/app-arch/cpio/ChangeLog
index 604bf9c0532cbb1bdab9ed8efe9df6a5c5abbd13..ba149594b4718e24058c1a226c5a1db34c81b507 100644 (file)
--- 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/Manifest b/app-arch/cpio/Manifest
index 214f3df0dda154cf8080ecfd23c7e342444c1e33..e673e6b26717b93ac5c95dbe689d106d5cd3a630 100644 (file)
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.6-isnumber.patch 861 RMD160 9354385fd0838cd8c9b43f8dcfc3c0b3547858de SHA1 942081f1adf828e5f1444f8c7edeb46fa8c1edb8 SHA256 b38b263324b06de3d57e4d9e30f04da411821ed97fa8f95b1c4832bdd43b5463
 MD5 527f6d401d12741d17a7ac7761a6d2d7 files/2.6-isnumber.patch 861
 RMD160 9354385fd0838cd8c9b43f8dcfc3c0b3547858de files/2.6-isnumber.patch 861
@@ -42,6 +45,10 @@ 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-copypass.patch 439 RMD160 099995b064adc56e194aa8515783da628a7937de SHA1 1bab5e3fd912b9e9a4d83eeb44563b26461c8465 SHA256 068a0d9e30641eebe9ab1d789b31b2d0214346f5f0b01364e3fb6cc09637cde3
+MD5 e6bb7e6cda41fa5527b4992e696bc7a3 files/cpio-2.7-copypass.patch 439
+RMD160 099995b064adc56e194aa8515783da628a7937de files/cpio-2.7-copypass.patch 439
+SHA256 068a0d9e30641eebe9ab1d789b31b2d0214346f5f0b01364e3fb6cc09637cde3 files/cpio-2.7-copypass.patch 439
 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
@@ -56,10 +63,14 @@ EBUILD cpio-2.7-r1.ebuild 936 RMD160 75b095065e275ce3b73b9694a7252b034502f4ac SH
 MD5 0a320971268d4f437fa96b52d7674253 cpio-2.7-r1.ebuild 936
 RMD160 75b095065e275ce3b73b9694a7252b034502f4ac cpio-2.7-r1.ebuild 936
 SHA256 41ec073258101cb08cd046e34195436af1c7b79ccebbd62a4847f57073c10ec5 cpio-2.7-r1.ebuild 936
-MISC ChangeLog 8747 RMD160 815c793a41915e755b2de24d42db418cb53dda98 SHA1 78146f547768e852526cd20c89defc12e320e679 SHA256 37aeb2c5fe38b999dd9128ab4d58194e30a1b08489f4a31df10b41f3d216e0fe
-MD5 4c54224eb6fe45b454fcf1c4ebbcf225 ChangeLog 8747
-RMD160 815c793a41915e755b2de24d42db418cb53dda98 ChangeLog 8747
-SHA256 37aeb2c5fe38b999dd9128ab4d58194e30a1b08489f4a31df10b41f3d216e0fe ChangeLog 8747
+EBUILD cpio-2.7-r2.ebuild 1000 RMD160 7cb0ce004093c7208c397c9956ee7421d9c32434 SHA1 e60e73bb0040b71aa756c513377c2f44cd9436dd SHA256 54528ea2d33b20ef513b84d2e1f075294fa72bdc738004802cf6f8f02711910b
+MD5 f1d09ac7abf08fc6d0639be2c34aefdf cpio-2.7-r2.ebuild 1000
+RMD160 7cb0ce004093c7208c397c9956ee7421d9c32434 cpio-2.7-r2.ebuild 1000
+SHA256 54528ea2d33b20ef513b84d2e1f075294fa72bdc738004802cf6f8f02711910b cpio-2.7-r2.ebuild 1000
+MISC ChangeLog 8978 RMD160 1db92c9f6fbffd5c67b341b779bf664ba85e6788 SHA1 4b234fe07d0e69b7df531cdcfc2c826ae012c0b3 SHA256 a42a76b7c81eb218f95e5a97f775ff8f47d4b40b4fb727a01aac5c3de4c83203
+MD5 c47a99d30fb58d0ec29953e9e5706ef1 ChangeLog 8978
+RMD160 1db92c9f6fbffd5c67b341b779bf664ba85e6788 ChangeLog 8978
+SHA256 a42a76b7c81eb218f95e5a97f775ff8f47d4b40b4fb727a01aac5c3de4c83203 ChangeLog 8978
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -70,3 +81,13 @@ SHA256 6052e569e0bd559ae4cc8b4173a48f2d0ee7a754d0ec19b67e5a9bdda3ce0266 files/di
 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
+MD5 ac5c998994855bb75aa7658b7eb64966 files/digest-cpio-2.7-r2 229
+RMD160 9552f623fc8ba0f30a5a3ccfe46faf79c34d68bf files/digest-cpio-2.7-r2 229
+SHA256 0e78bc2601b3919276568d6f1ab37939cc6b5d91d2ec5da21efa141aab888f4b files/digest-cpio-2.7-r2 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGJnRM8bi6rjpTunYRAukSAJ9sINoOPOxSNzoWgPYGhmwC7QVD1ACgv8NJ
+ZHc+W0W6XMcCoWozOJ8Qd84=
+=wd9X
+-----END PGP SIGNATURE-----

diff --git a/app-arch/cpio/cpio-2.7-r2.ebuild b/app-arch/cpio/cpio-2.7-r2.ebuild
new file mode 100644 (file)
index 0000000..07404bb
--- /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 (file)
index 0000000..d5fd330
--- /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 (file)
index 0000000..1c0c786
--- /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