- Using flags -Xe on ppc would lead to the PT_LOAD executable bits being stripped (bad). glob64->glob touchup for the BSD guys

Package-Manager: portage-2.1_pre4-r1

4 files changed, 65 insertions, 20 deletions

diff --git a/app-misc/pax-utils/ChangeLog b/app-misc/pax-utils/ChangeLog
index a966051b299b..83120b842221 100644
--- a/app-misc/pax-utils/ChangeLog
+++ b/app-misc/pax-utils/ChangeLog
@@ -1,6 +1,12 @@
 # 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.52 2006/02/18 19:01:50 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/ChangeLog,v 1.53 2006/02/22 15:13:35 solar Exp $
+
+  22 Feb 2006; <solar@gentoo.org> +files/pax-utils-0.1.10.patch,
+  pax-utils-0.1.10.ebuild:
+  - Using the flags -Xe on ppc and probably others would lead to the PT_LOAD
+  executable bits being stripped (very bad thing). glob64->glob touchup for
+  the BSD guys
 
 *pax-utils-0.1.10 (18 Feb 2006)
 
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 398a423746a4..aba253932a3b 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,30 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5ff3c11d1a20a96888f54d1efb176139 ChangeLog 8863
-RMD160 1b8e80efa7b530751e89de1e6f966a92208b0887 ChangeLog 8863
-SHA256 563e561dbfc77efd5ab9c982971dc8b8ba3d26d217bb138a876aae36a19e2533 ChangeLog 8863
+MD5 d5e7c2e3affa5ca5a50862aebec4ac21 ChangeLog 9124
+RMD160 a46abcb8667a77e677e730c2745a22c0b983d1f1 ChangeLog 9124
+SHA256 f75583266ab2836b9e2eb95f57689e319d22aab8008e522c29075085cbcf88ac ChangeLog 9124
 MD5 ef0d6edb066135c347d7cf0b303e502d files/digest-pax-utils-0.1.10 250
 RMD160 6e1b1941e72c6ce2d9b7cf7122c504d807e46651 files/digest-pax-utils-0.1.10 250
 SHA256 b7dfe0f488fa34a13c0bb7ebc34076ddbff90184f187436cdaad8db0644893a9 files/digest-pax-utils-0.1.10 250
 MD5 496d43931c308efd71d497e2a0145a26 files/digest-pax-utils-0.1.9 247
 RMD160 fd5739cef65eecb8957ab4ead4bf920b493e5482 files/digest-pax-utils-0.1.9 247
 SHA256 8b550e9f6744a2e4bd23d0a26f87d7e18a99e86d0c73f49a0b191735d7c6512b files/digest-pax-utils-0.1.9 247
+MD5 cb9d1e405b28311f4c0db86fb70a7c1f files/pax-utils-0.1.10.patch 1496
+RMD160 ec3565564a93bb3b34df07ee6155bca4057b4d4c files/pax-utils-0.1.10.patch 1496
+SHA256 404e9a6504104d2f75612d7e287db8d374c310da02f7bdaa3e60fbb89f1ed8df files/pax-utils-0.1.10.patch 1496
 MD5 90f775b6c4fdbeb494f7d8e1d94ad30d metadata.xml 604
 RMD160 7f581ee400ba8449455baf903183c12136a53838 metadata.xml 604
 SHA256 f3aaada3dde296c02797c2f68e88bf7f3cf650449aaf956126bc54ebd36e686e metadata.xml 604
-MD5 07a4d155fa8ba1d4ff7303d7e14f09e7 pax-utils-0.1.10.ebuild 1107
-RMD160 11b54ddb51bcb3d855814587a7efafd94731ef18 pax-utils-0.1.10.ebuild 1107
-SHA256 10afb22498c506ba6dc85fa7e540041fa5db5a9fad5d4762a2955804e4920557 pax-utils-0.1.10.ebuild 1107
+MD5 5e0c921ba5cf152272fa81f4d816d357 pax-utils-0.1.10.ebuild 1188
+RMD160 2889d27bfe4b0958034021c994d025c185aa99b5 pax-utils-0.1.10.ebuild 1188
+SHA256 97fcb4259aa332c6fb0bb0694a5d6338f1f7c38e9e23dae69dc9d2ad08e1fbb7 pax-utils-0.1.10.ebuild 1188
 MD5 ecc20ffdd7188cc6b47fd7aa6a9234d4 pax-utils-0.1.9.ebuild 1094
 RMD160 5915fa639bb41710494f8741df20589ba55a4e98 pax-utils-0.1.9.ebuild 1094
 SHA256 c8a258265fd59e4c0aec9614075b198d895e8cad231aea6b919d40b2ff38ad5e pax-utils-0.1.9.ebuild 1094
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iQCVAwUBQ/dv8Z4WFLgrx1GWAQJQqQQAn47CDOL72B0GiLCLg2cID6f8YmK1Jf9y
-W73YDiW7Q7rL1Rxozgsltz4ocr9VbCStfaobtbXytaIeAN/r0kg/EbMn151OHn0d
-8ejDa+AFHOuZW2NX86o9XIERxQjgFrDhJ+WiTf5scHULJJ4DUtG26Ile+gbRTl1N
-SwdzwNtCLl8=
-=JrKL
------END PGP SIGNATURE-----
diff --git a/app-misc/pax-utils/files/pax-utils-0.1.10.patch b/app-misc/pax-utils/files/pax-utils-0.1.10.patch
new file mode 100644
index 000000000000..d4815f76ab7b
--- /dev/null
+++ b/app-misc/pax-utils/files/pax-utils-0.1.10.patch
@@ -0,0 +1,42 @@
+diff -Nrup pax-utils-0.1.10/porting.h pax-utils/porting.h
+--- pax-utils-0.1.10/porting.h	2006-02-18 11:43:13.000000000 -0500
++++ pax-utils/porting.h	2006-02-22 09:58:22.000000000 -0500
+@@ -32,8 +32,16 @@
+ #ifndef HATE_GLOB
+ # undef HAVE_GLOB
+ # define HAVE_GLOB
++
+ # include <glob.h>
+-#endif
++
++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__NetBSD__)
++# define glob64_t glob_t
++# define globfree64 globfree
++# define glob64 glob
++#endif /* BSD */
++
++#endif /* !HATE_GLOB */
+ 
+ #include <sys/mman.h>
+ #include "elf.h"
+diff -Nrup pax-utils-0.1.10/scanelf.c pax-utils/scanelf.c
+--- pax-utils-0.1.10/scanelf.c	2006-02-18 11:43:13.000000000 -0500
++++ pax-utils/scanelf.c	2006-02-22 09:58:22.000000000 -0500
+@@ -9,7 +9,7 @@
+ 
+ #include "paxinc.h"
+ 
+-static const char *rcsid = "$Id: pax-utils-0.1.10.patch,v 1.1 2006/02/22 15:13:35 solar Exp $";
++static const char *rcsid = "$Id: pax-utils-0.1.10.patch,v 1.1 2006/02/22 15:13:35 solar Exp $";
+ #define argv0 "scanelf"
+ 
+ #define IS_MODIFIER(c) (c == '%' || c == '#')
+@@ -204,7 +204,7 @@ static char *scanelf_file_phdr(elfobj *e
+ 			flags = EGET(phdr[i].p_flags); \
+ 			if (be_quiet && ((flags & check_flags) != check_flags)) \
+ 				continue; \
+-			if (fix_elf && ((flags & PF_X) != flags)) { \
++			if ((EGET(phdr[i].p_type) != PT_LOAD) && (fix_elf && ((flags & PF_X) != flags))) { \
+ 				ESET(phdr[i].p_flags, flags & (PF_X ^ (size_t)-1)); \
+ 				ret[3] = ret[7] = '!'; \
+ 				flags = EGET(phdr[i].p_flags); \
diff --git a/app-misc/pax-utils/pax-utils-0.1.10.ebuild b/app-misc/pax-utils/pax-utils-0.1.10.ebuild
index 00182ffdd319..9f00b42431dc 100644
--- a/app-misc/pax-utils/pax-utils-0.1.10.ebuild
+++ b/app-misc/pax-utils/pax-utils-0.1.10.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.10.ebuild,v 1.1 2006/02/18 19:01:50 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.1.10.ebuild,v 1.2 2006/02/22 15:13:35 solar Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -17,6 +17,12 @@ IUSE="caps"
 
 DEPEND="caps? ( sys-libs/libcap )"
 
+src_unpack() {
+	unpack ${A}
+	cd  ${S} || die
+	epatch "${FILESDIR}"/${P}.patch
+}
+
 src_compile() {
 	use caps && append-flags -DWANT_SYSCAP
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" dumpelf scanelf || die