Add fix from Debian for struct packing (i.e. arm) #255096 by Raúl Porcel.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 90 insertions, 14 deletions

diff --git a/app-arch/cpio/ChangeLog b/app-arch/cpio/ChangeLog
index f9ae1345c3c5..566715825e46 100644
--- a/app-arch/cpio/ChangeLog
+++ b/app-arch/cpio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/cpio
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/ChangeLog,v 1.90 2008/06/01 23:04:31 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/ChangeLog,v 1.91 2009/01/17 17:57:05 vapier Exp $
+
+*cpio-2.9-r3 (17 Jan 2009)
+
+  17 Jan 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/cpio-2.9-packed.patch, +cpio-2.9-r3.ebuild:
+  Add fix from Debian for struct packing (i.e. arm) #255096 by Raúl Porcel.
 
 *cpio-2.9-r2 (01 Jun 2008)
 
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 27c4b3e34cde..ad638b731139 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -1,25 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX cpio-2.7-copypass.patch 439 RMD160 099995b064adc56e194aa8515783da628a7937de SHA1 1bab5e3fd912b9e9a4d83eeb44563b26461c8465 SHA256 068a0d9e30641eebe9ab1d789b31b2d0214346f5f0b01364e3fb6cc09637cde3
-AUX cpio-2.7-link-terminate.patch 542 RMD160 1b2bf69ec397c73a802527e34537252f306a8d76 SHA1 aa053ab524f48520227d3c6d9a8ebf63a27d5473 SHA256 3a868339b78d4bb66c7efb1d0bfdd70a5c5ecd48ac6a7ba2fe60097f308fccba
 AUX cpio-2.9-CVE-2007-4476.patch 2330 RMD160 88ba8d2103f9666f7886f6a39696ab47f46c8d5d SHA1 da29807e9ffb0dbb39e69eff44cc6ad44977764f SHA256 0c0a2fb1c1c02da04fd9b4d2ecb28087849611a2dfaeea821ba7fce0313c61f7
 AUX cpio-2.9-gnu-inline.patch 5997 RMD160 2345e986c114aa4498f4e4fabab9453e02afcc93 SHA1 7b20f00dbdd4edb580ee075ea8372166dec7345c SHA256 8321e782c140397c025822cde84c7f737eb7631655ab07f1803441627086c784
+AUX cpio-2.9-packed.patch 853 RMD160 0c500d121d054a398919a6539450dee66bf41162 SHA1 eb510d8d0092430a51a92e0afbbfef1c90a79000 SHA256 ef9655822561577debf39376d7e6f317184347271c34ab86029c36d3308c22e6
 AUX cpio-2.9-restore-perms-owners.patch 3082 RMD160 e4cee4074f4402f546877bc3e44c6284dedbe7ea SHA1 351084cdb95f2c2a95f1fc799829b5958d6b461c SHA256 f237971131763f18bb419d38941bc2942bb946961d2a32ca18284b0f6c212517
-DIST cpio-2.7.tar.bz2 698221 RMD160 0ae35717237133da5bba18376af0ec685ac67360 SHA1 ce1c8ab703d62fc1d30ca59e044ba9f43c3db574 SHA256 b59390450233b5298d210f6369e98d91d07b7f4261ddb962d654185dd02b5b0e
-DIST cpio-2.8.tar.bz2 745180 RMD160 23d321a656eced97e9cd4cfc13b068fbc95ff900 SHA1 73517edeb77a8723c003b0b0dd1a5159411d0cdf SHA256 b0a12fabee60023a99e8dbd97a83b6c0e3846054cc6c24a33ab56db58db182f0
 DIST cpio-2.9.tar.bz2 758195 RMD160 6fbd93755e266ad7ff9644cb7fe3c3e54d61ac44 SHA1 ef381d0f33f1ea74475b6d813c42a74327762c4a SHA256 bb9a5fa693a8f4ef4685eb447cea1dc5b787e37c302569928ef74df460724707
-EBUILD cpio-2.7-r2.ebuild 978 RMD160 28f367500a3392d33f51e19c7dd104dfd27aac85 SHA1 0263d4ac2053554a3695cdd7e15137a3d95c95a0 SHA256 17d6419998adccd1b205dd76e4053c43ae19d7f77e9e009ec6402b38b27a62ef
-EBUILD cpio-2.8.ebuild 804 RMD160 295ad523964fe7fce42311cba0aa9e392b2d0af5 SHA1 eaf6dc77470d3fbd2a6c2b94e78efc018dc1d7f1 SHA256 1ca0633111001c8b39207ac5e031bba1fa7880ad327419fe673019d822031679
 EBUILD cpio-2.9-r1.ebuild 971 RMD160 b4708a489afe9241ef29f9161dba34d8a8cd6a0f SHA1 e5956e7fb181c2de04cdddefcb7474f46054a587 SHA256 051fbf6eea0e4410d3d02a1d38fcb9036c3b10333b83dc87ac702fde3f425f97
 EBUILD cpio-2.9-r2.ebuild 1046 RMD160 926919f2223aac753652288976896d0b998905fe SHA1 35116a68d0eeccffcfa0c6d9fcabd91642ead709 SHA256 dc727342000c577ec1445625336ab5763ed4eff58be0002666c1bf06ea3d53dd
-EBUILD cpio-2.9.ebuild 804 RMD160 3ee6466ae074f329bcf64881650fdf560c269d2f SHA1 affd959396a075b77f7d3594d7d4a8cd2621d8a6 SHA256 57a1632698de87e26e8097595ef8779f4652242fb0fa37d433b14a2574b2b882
-MISC ChangeLog 12547 RMD160 5536de1f532cba2a6e18e5967dd9f8de8043f435 SHA1 ed5e138846c0cf233da4385d896ca0ff8f1a4686 SHA256 6b38e7ffdd4c310e9d67cd8adaa9db010e1df16375275d3b985b8cea8d954e07
+EBUILD cpio-2.9-r3.ebuild 1094 RMD160 370b7ae3ee8a46c3c8d5b1577f70349e0ae13d60 SHA1 e1528f44b92b8c62aee8220b4b0ba1d76907b61e SHA256 cf711d25e2a60cbd5761faf3ca9e1927ebf9a5fe2177f275cc0d56d076c8cda9
+MISC ChangeLog 12756 RMD160 a9e2e4ac04a6bf26ecf1477460a3ab1dcf346f82 SHA1 610f29baef62e86719abb67b214ec583483e8b13 SHA256 f162a815526b55306c67730aaedbf05d5537da3fc4f1639ee31188904a587b54
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFIQysFj9hvisErhMIRAkvfAKCj3GnFUVxqWnYG1noW+byk/qaTFACgycIK
-wr6ZHtX7foDQUvowbBV+jps=
-=VI/d
+iEYEARECAAYFAklyG/cACgkQn/5bYzqsSmFdIwCgmvR3GeWic+sWTNQTUqNyVozC
+yLAAnjEdsCbbO4UI46FB9iBTsrZPgaBg
+=YXGN
 -----END PGP SIGNATURE-----
diff --git a/app-arch/cpio/cpio-2.9-r3.ebuild b/app-arch/cpio/cpio-2.9-r3.ebuild
new file mode 100644
index 000000000000..76ed187276e7
--- /dev/null
+++ b/app-arch/cpio/cpio-2.9-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/cpio-2.9-r3.ebuild,v 1.1 2009/01/17 17:57:05 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-3"
+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}"/${P}-CVE-2007-4476.patch #196978
+	epatch "${FILESDIR}"/${P}-gnu-inline.patch #198817
+	epatch "${FILESDIR}"/${P}-restore-perms-owners.patch #218040
+	epatch "${FILESDIR}"/${P}-packed.patch #255096
+}
+
+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.9-packed.patch b/app-arch/cpio/files/cpio-2.9-packed.patch
new file mode 100644
index 000000000000..e6579cd41707
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.9-packed.patch
@@ -0,0 +1,34 @@
+http://bugs.debian.org/438155
+
+force structures that are overlaid on files via mmap to be packed so that
+alignment doesnt screw up the offsets
+
+--- cpio-2.9/src/cpiohdr.h
++++ cpio-2.9/src/cpiohdr.h
+@@ -35,7 +35,7 @@
+   unsigned short c_mtimes[2];
+   unsigned short c_namesize;
+   unsigned short c_filesizes[2];
+-};
++} __attribute__((packed));
+ 
+ struct old_ascii_header
+ {
+@@ -50,7 +50,7 @@
+   char c_mtime[11];
+   char c_namesize[6];
+   char c_filesize[11];
+-};
++} __attribute__((packed));
+ 
+ /* "New" portable format and CRC format:
+ 
+@@ -80,7 +80,7 @@
+   char c_namesize[8];  /* count includes terminating NUL in pathname */
+   char c_chksum[8];    /* 0 for "new" portable format; for CRC format
+ 			  the sum of all the bytes in the file  */
+-};
++} __attribute__((packed));
+ 
+ struct cpio_file_stat /* Internal representation of a CPIO header */
+ {