- ET_REL objects were being falsely reported as !WX

Package-Manager: portage-2604-svn

4 files changed, 32 insertions, 13 deletions

diff --git a/app-misc/pax-utils/ChangeLog b/app-misc/pax-utils/ChangeLog
index d84c96627cb8..b31a42f896d8 100644
--- a/app-misc/pax-utils/ChangeLog
+++ b/app-misc/pax-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/pax-utils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/ChangeLog,v 1.42 2006/01/29 15:52:45 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/ChangeLog,v 1.43 2006/02/03 01:22:09 solar Exp $
+
+  02 Feb 2006; <solar@gentoo.org> +files/pax-utils-0.1.8-etrel-notwx.patch,
+  pax-utils-0.1.8-r1.ebuild:
+  - ET_REL objects were being falsely reported as !WX
 
 *pax-utils-0.1.8-r1 (29 Jan 2006)
 
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index daf185be0740..f7276ad5c61e 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 059cff615ee111d02ee6b6119029be4c ChangeLog 7202
-RMD160 7c8f77f211866f3cee77f12e1c8379477fdccc6a ChangeLog 7202
-SHA256 db81ea6b91acebec4abe9a17c40e35c2594ec460499d1f311e9ad69e861caea5 ChangeLog 7202
+MD5 a9d623f07c6e8376920a97a0fcf28ad5 ChangeLog 7362
+RMD160 f8e9240357b76bb5455c10e716a3180dbaffc8f1 ChangeLog 7362
+SHA256 6439306a716672d05cf9d511c44d362b5ee6d4996fdb5e3c2c09dfe57c141724 ChangeLog 7362
 MD5 212af09c0c8a660ecc4dc1df67e8c3b2 files/digest-pax-utils-0.1.4 247
 RMD160 98bff41509da6d7d67c93924b0144011c28b1048 files/digest-pax-utils-0.1.4 247
 SHA256 2cc81e1b4f9b199ddc9f9a04f8cba60f1eeeb0666f3e583c441eb62526feb37c files/digest-pax-utils-0.1.4 247
@@ -13,6 +13,9 @@ SHA256 40fd140bce16bd8cf040eaac270e353227458feb431a239d6b58d7fc60c1ac14 files/di
 MD5 9e860c5d83a3dfeaea3b092895033a2c files/digest-pax-utils-0.1.8-r1 247
 RMD160 3583aeb057f174bf3dde64c0c0df62ac296b4de0 files/digest-pax-utils-0.1.8-r1 247
 SHA256 40fd140bce16bd8cf040eaac270e353227458feb431a239d6b58d7fc60c1ac14 files/digest-pax-utils-0.1.8-r1 247
+MD5 f5a291724f346a0969f325f30ade3557 files/pax-utils-0.1.8-etrel-notwx.patch 521
+RMD160 95d099f6c3deec0cc5e7a326532339982555ffc6 files/pax-utils-0.1.8-etrel-notwx.patch 521
+SHA256 dc988d0515f71f19bc5a977f52d1bea1928161d96dbe7a1e481379c4f2dd9c95 files/pax-utils-0.1.8-etrel-notwx.patch 521
 MD5 1d2fb0772c392d620433367009b70901 files/pax-utils-0.1.8-paxelf-fd-mmap.patch 547
 RMD160 662a0ca2b1c90fc4a8bd50c8ccd54267411c0d2d files/pax-utils-0.1.8-paxelf-fd-mmap.patch 547
 SHA256 8910703ee5aced8ed7f1083f604cc3b9ed6dd7aea396a3e8ce7761574b0eca2e files/pax-utils-0.1.8-paxelf-fd-mmap.patch 547
@@ -22,18 +25,18 @@ SHA256 f3aaada3dde296c02797c2f68e88bf7f3cf650449aaf956126bc54ebd36e686e metadata
 MD5 a068acf44055609fdf44de3c54674cc0 pax-utils-0.1.4.ebuild 926
 RMD160 5f41cecfa6c828bcf480f4f7f7b6a85206ea4a15 pax-utils-0.1.4.ebuild 926
 SHA256 b4d3fabd3fb5998965d5b5750e8e9999c34aa71fc2054b31b2de92450a2edd8e pax-utils-0.1.4.ebuild 926
-MD5 7858695e746e3768602065c2de1865e5 pax-utils-0.1.8-r1.ebuild 1211
-RMD160 dc183780569be9fd2b2ba618a3f37db169f9955f pax-utils-0.1.8-r1.ebuild 1211
-SHA256 1ced4a153ba6516096647988595c6c14b6580d34b74a7796f089059bfd953f58 pax-utils-0.1.8-r1.ebuild 1211
+MD5 268c6be7aa0ae079e8cc5fe5122895f7 pax-utils-0.1.8-r1.ebuild 1270
+RMD160 69e6155d91ea463e65b8dff1537be84c357fb1e9 pax-utils-0.1.8-r1.ebuild 1270
+SHA256 9d3a010e4085785fcb47db2dd797404435e06fb5f9b3b4a2d5be497d631d4003 pax-utils-0.1.8-r1.ebuild 1270
 MD5 1f2aacd06392ac7b7933f7619503e01b pax-utils-0.1.8.ebuild 1106
 RMD160 432465006eed484ac2466db20c2f2e48f2c70992 pax-utils-0.1.8.ebuild 1106
 SHA256 2f4a0215a7277d97cdea4ddf32d6d21c917bd17b0394953e967e77288fa50db6 pax-utils-0.1.8.ebuild 1106
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iQCVAwUBQ9zk2Z4WFLgrx1GWAQKVfgQAhyhzw+1m3Y2rv6my8GMhZI7KRr/ylP8x
-Z/FaVYtNT8YI1Cu2RPKlS5cBdY8CGNkk4WAbv6NnTYeoGtcK1Rt1Hch3KbdNUbsi
-ZtsbjIEY+GrsQnbvVuMdMMQRkmEXgFIIPPQNSlw44Y+Ev9F8OzIJG9zbNuPYcNJX
-gTcjURHFMx4=
-=esnf
+iQCVAwUBQ+KwuZ4WFLgrx1GWAQJCEgP9GR8TZpzQApexXZIm+g8oKz5IPTYVc0ck
+y7v94CGVJufPjwE9Ykbkb6mOeBRgwbq/Lp5dRw9/fSur2NWhZhuqsJQBY37pE7mj
+rP4cuc59s5aroVwRvhZF3b4YrWJ3FdVpJIvEVY1BKp1Q6/JyvLxoC7cK5GJbw4r0
+4eYw7mPlO9Y=
+=C8dE
 -----END PGP SIGNATURE-----
diff --git a/app-misc/pax-utils/files/pax-utils-0.1.8-etrel-notwx.patch b/app-misc/pax-utils/files/pax-utils-0.1.8-etrel-notwx.patch
new file mode 100644
index 000000000000..f7c922cb3a93
--- /dev/null
+++ b/app-misc/pax-utils/files/pax-utils-0.1.8-etrel-notwx.patch
@@ -0,0 +1,11 @@
+--- scanelf.c	28 Jan 2006 19:47:47 -0000	1.117
++++ scanelf.c	3 Feb 2006 00:10:05 -0000	1.118
+@@ -198,7 +198,7 @@ static char *scanelf_file_phdr(elfobj *e
+ 		Elf ## B ## _Shdr *shdr = SHDR ## B (elf->shdr); \
+ 		Elf ## B ## _Shdr *strtbl = shdr + EGET(ehdr->e_shstrndx); \
+ 		char *str; \
+-		if ((void*)strtbl > (void*)(elf->data + sizeof(*strtbl))) \
++		if ((void*)strtbl > (void*)elf->data_end) \
+ 			goto skip_this_shdr##B; \
+ 		check_flags = SHF_WRITE|SHF_EXECINSTR; \
+ 		for (i = 0; i < EGET(ehdr->e_shnum); ++i) { \
diff --git a/app-misc/pax-utils/pax-utils-0.1.8-r1.ebuild b/app-misc/pax-utils/pax-utils-0.1.8-r1.ebuild
index 5da72aaa3f96..e924a7b9c6eb 100644
--- a/app-misc/pax-utils/pax-utils-0.1.8-r1.ebuild
+++ b/app-misc/pax-utils/pax-utils-0.1.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.1.8-r1.ebuild,v 1.1 2006/01/29 15:52:45 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.1.8-r1.ebuild,v 1.2 2006/02/03 01:22:09 solar Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -21,6 +21,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch "${FILESDIR}"/${PN}-${PV}-paxelf-fd-mmap.patch || die
+	epatch "${FILESDIR}"/${PN}-${PV}-etrel-notwx.patch || die
 }
 
 src_compile() {