12 files changed, 43 insertions, 139 deletions
diff --git a/app-misc/pax-utils/ChangeLog b/app-misc/pax-utils/ChangeLog
index 431f7e4e41e4..a966051b299b 100644
--- a/app-misc/pax-utils/ChangeLog
+++ b/app-misc/pax-utils/ChangeLog
@@ -1,6 +1,18 @@
 # 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.51 2006/02/08 04:58:27 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/ChangeLog,v 1.52 2006/02/18 19:01:50 solar Exp $
+
+*pax-utils-0.1.10 (18 Feb 2006)
+
+  18 Feb 2006; <solar@gentoo.org> -files/pax-utils-0.1.8-etrel-notwx.patch,
+  -files/pax-utils-0.1.8-paxelf-fd-mmap.patch, +pax-utils-0.1.10.ebuild,
+  -pax-utils-0.1.4.ebuild, -pax-utils-0.1.8-r1.ebuild,
+  -pax-utils-0.1.8.ebuild, pax-utils-0.1.9.ebuild:
+  - added -k/--section %k modifier to detect elf a given section exists. added
+  -z to unifiy paxctl/chpax handling into a single util. change max pt loads to
+  2 for netbsd. The -E option now takes strings. The -l option now reads
+  ld.so.conf include files. cleaned up old ebuilds. mips 0.1.9 marked stable
+  checked by kumba
 
   08 Feb 2006; Saleem Abdulrasool <compnerd@gentoo.org>
   pax-utils-0.1.9.ebuild:
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index d5869c93047e..398a423746a4 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,36 +1,30 @@
-MD5 b819efe4509dba493ff21879ba1dff15 ChangeLog 8249
-RMD160 ba66d77cffcdb4ef0bede55d0ac4cb82761660e3 ChangeLog 8249
-SHA256 ad3cc974e1f1cec3ae7ecad1754c12449a10afd5c4a27ef276ef72cb9cb99c99 ChangeLog 8249
-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
-MD5 9e860c5d83a3dfeaea3b092895033a2c files/digest-pax-utils-0.1.8 247
-RMD160 3583aeb057f174bf3dde64c0c0df62ac296b4de0 files/digest-pax-utils-0.1.8 247
-SHA256 40fd140bce16bd8cf040eaac270e353227458feb431a239d6b58d7fc60c1ac14 files/digest-pax-utils-0.1.8 247
-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
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5ff3c11d1a20a96888f54d1efb176139 ChangeLog 8863
+RMD160 1b8e80efa7b530751e89de1e6f966a92208b0887 ChangeLog 8863
+SHA256 563e561dbfc77efd5ab9c982971dc8b8ba3d26d217bb138a876aae36a19e2533 ChangeLog 8863
+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 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
 MD5 90f775b6c4fdbeb494f7d8e1d94ad30d metadata.xml 604
 RMD160 7f581ee400ba8449455baf903183c12136a53838 metadata.xml 604
 SHA256 f3aaada3dde296c02797c2f68e88bf7f3cf650449aaf956126bc54ebd36e686e metadata.xml 604
-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 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
-MD5 aae102b1eb9370ffcdb10cdfbe4642ac pax-utils-0.1.9.ebuild 1097
-RMD160 f18087f175b2bba7efe46c9bf1771845d235eb28 pax-utils-0.1.9.ebuild 1097
-SHA256 467ed83283d8d5ecea1e12219a7ef565ae305512efa31d886278c0dc4b1f166e pax-utils-0.1.9.ebuild 1097
+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 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/digest-pax-utils-0.1.10 b/app-misc/pax-utils/files/digest-pax-utils-0.1.10
new file mode 100644
index 000000000000..4e213a63d0e1
--- /dev/null
+++ b/app-misc/pax-utils/files/digest-pax-utils-0.1.10
@@ -0,0 +1,3 @@
+MD5 d29af73709f87b3bfa84ba123ab2aa74 pax-utils-0.1.10.tar.bz2 51882
+RMD160 480bf6ee9d084f08faf154193a822c097ea70626 pax-utils-0.1.10.tar.bz2 51882
+SHA256 a28715084b9625f9d96c3ce8f70e0abe21c5d58ba7baf384ccdd823eec3e0239 pax-utils-0.1.10.tar.bz2 51882
diff --git a/app-misc/pax-utils/files/digest-pax-utils-0.1.4 b/app-misc/pax-utils/files/digest-pax-utils-0.1.4
deleted file mode 100644
index 5bdeee165759..000000000000
--- a/app-misc/pax-utils/files/digest-pax-utils-0.1.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f4e4bb82747c4740fd31e9f160d396d5 pax-utils-0.1.4.tar.bz2 44708
-RMD160 f0053f3c19c4c19b7e7fe421278fde29d69e3f03 pax-utils-0.1.4.tar.bz2 44708
-SHA256 1f0287199052e2d7e89c0d1a69786d479ed79f8a8a5fe71f26e4a34db51d297c pax-utils-0.1.4.tar.bz2 44708
diff --git a/app-misc/pax-utils/files/digest-pax-utils-0.1.8 b/app-misc/pax-utils/files/digest-pax-utils-0.1.8
deleted file mode 100644
index d9f3f8c17f12..000000000000
--- a/app-misc/pax-utils/files/digest-pax-utils-0.1.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2d2b9fae7deb5a32f22ba0b20df6a01d pax-utils-0.1.8.tar.bz2 49937
-RMD160 14a8d55793df809d791134c09872e14358a10d01 pax-utils-0.1.8.tar.bz2 49937
-SHA256 50f10e4bc94d52b799c5717d83577b3e6a0f92635d50a52f880464d144f6d13e pax-utils-0.1.8.tar.bz2 49937
diff --git a/app-misc/pax-utils/files/digest-pax-utils-0.1.8-r1 b/app-misc/pax-utils/files/digest-pax-utils-0.1.8-r1
deleted file mode 100644
index d9f3f8c17f12..000000000000
--- a/app-misc/pax-utils/files/digest-pax-utils-0.1.8-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2d2b9fae7deb5a32f22ba0b20df6a01d pax-utils-0.1.8.tar.bz2 49937
-RMD160 14a8d55793df809d791134c09872e14358a10d01 pax-utils-0.1.8.tar.bz2 49937
-SHA256 50f10e4bc94d52b799c5717d83577b3e6a0f92635d50a52f880464d144f6d13e pax-utils-0.1.8.tar.bz2 49937
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
deleted file mode 100644
index f7c922cb3a93..000000000000
--- a/app-misc/pax-utils/files/pax-utils-0.1.8-etrel-notwx.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/pax-utils-0.1.8-paxelf-fd-mmap.patch b/app-misc/pax-utils/files/pax-utils-0.1.8-paxelf-fd-mmap.patch
deleted file mode 100644
index 7d271f8d5640..000000000000
--- a/app-misc/pax-utils/files/pax-utils-0.1.8-paxelf-fd-mmap.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: paxelf.c
-===================================================================
-RCS file: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v
-retrieving revision 1.39
-retrieving revision 1.40
-diff -u -b -B -w -p -r1.39 -r1.40
---- paxelf.c	24 Jan 2006 00:29:37 -0000	1.39
-+++ paxelf.c	29 Jan 2006 14:36:41 -0000	1.40
-@@ -443,8 +443,10 @@ elfobj *_readelf_fd(const char *filename
- 	ret = readelf_buffer(filename, buffer, len);
- 	if (ret == NULL)
- 		munmap(buffer, len);
--	else
-+	else {
-+		ret->fd = fd;
- 		ret->is_mmap = 1;
-+	}
- 
- 	return ret;
- }
diff --git a/app-misc/pax-utils/pax-utils-0.1.8.ebuild b/app-misc/pax-utils/pax-utils-0.1.10.ebuild
index d1af883e2cc4..00182ffdd319 100644
--- a/app-misc/pax-utils/pax-utils-0.1.8.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.8.ebuild,v 1.1 2006/01/28 20:35:28 solar Exp $
+# $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 $
 
 inherit flag-o-matic toolchain-funcs eutils
 
diff --git a/app-misc/pax-utils/pax-utils-0.1.4.ebuild b/app-misc/pax-utils/pax-utils-0.1.4.ebuild
deleted file mode 100644
index 0e9cda31839d..000000000000
--- a/app-misc/pax-utils/pax-utils-0.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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.4.ebuild,v 1.5 2006/01/28 20:35:28 solar Exp $
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Various ELF related utils for ELF32, ELF64 binaries useful tools that can check files for security relevant properties"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened"
-SRC_URI="mirror://gentoo/pax-utils-${PV}.tar.bz2
-	http://dev.gentoo.org/~solar/pax/pax-utils-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="caps"
-
-DEPEND="caps? ( sys-libs/libcap )"
-
-src_compile() {
-	if use caps ; then
-		append-flags -DWANT_SYSCAP
-		append-ldflags -lcap
-	fi
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" all || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-}
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
deleted file mode 100644
index e924a7b9c6eb..000000000000
--- a/app-misc/pax-utils/pax-utils-0.1.8-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.2 2006/02/03 01:22:09 solar Exp $
-
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="Various ELF related utils for ELF32, ELF64 binaries useful tools that can check files for security relevant properties"
-HOMEPAGE="http://hardened.gentoo.org/pax-utils.xml"
-SRC_URI="mirror://gentoo/pax-utils-${PV}.tar.bz2
-	http://dev.gentoo.org/~solar/pax/pax-utils-${PV}.tar.bz2
-	http://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="caps"
-
-DEPEND="caps? ( sys-libs/libcap )"
-
-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() {
-	use caps && append-flags -DWANT_SYSCAP
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" dumpelf scanelf || die
-	use caps && append-ldflags -lcap
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" pspax || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-}
diff --git a/app-misc/pax-utils/pax-utils-0.1.9.ebuild b/app-misc/pax-utils/pax-utils-0.1.9.ebuild
index 979666afb308..c96fd1d3ce34 100644
--- a/app-misc/pax-utils/pax-utils-0.1.9.ebuild
+++ b/app-misc/pax-utils/pax-utils-0.1.9.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.9.ebuild,v 1.9 2006/02/08 04:58:27 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.1.9.ebuild,v 1.10 2006/02/18 19:01:50 solar Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/pax-utils-${PV}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc-macos ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ~ppc-macos ppc64 s390 sh sparc x86"
 IUSE="caps"
 
 DEPEND="caps? ( sys-libs/libcap )"