Fix scanelf hang due to grep-style changes with stdin #128247 by Matteo Azzali.

Package-Manager: portage-2.1_pre7-r5

5 files changed, 76 insertions, 16 deletions

diff --git a/app-misc/pax-utils/ChangeLog b/app-misc/pax-utils/ChangeLog
index e3e56df9b1c3..307d7db35136 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.61 2006/03/30 13:13:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/ChangeLog,v 1.62 2006/04/12 04:01:11 vapier Exp $
+
+*pax-utils-0.1.11-r1 (12 Apr 2006)
+
+  12 Apr 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/pax-utils-0.1.11.patch, +pax-utils-0.1.11-r1.ebuild:
+  Fix scanelf hang due to grep-style changes with stdin #128247 by Matteo Azzali.
 
 *pax-utils-0.1.11 (30 Mar 2006)
 
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index e6fb04ca8738..425d3dad4580 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,37 +1,40 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 87f9ef3b472123ec60af002b85313477 ChangeLog 10033
-RMD160 3c9f5c3a5cd2a64d5b965f39dfb4be9a7b89aa6e ChangeLog 10033
-SHA256 c95454b314cf9fa767f3ce6f1dcccd014dc629317227ec2619ff05bd4823c1d8 ChangeLog 10033
+MD5 1f1e556e5ab82d1ff88f87b509ea5603 ChangeLog 10261
+RMD160 20eeb3d1b1401a1d92eba693ca8a2d8e21985663 ChangeLog 10261
+SHA256 99c1a599a54d3dfc49fe553f8e04466c1192b2a2b5187a71a01aa67fcae26247 ChangeLog 10261
 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 e3ac44cf21ae6aa657a4f72fd9f03a9e files/digest-pax-utils-0.1.11 250
-RMD160 cfc47c161f1b864b4bb0e1301699d3e17fe1f558 files/digest-pax-utils-0.1.11 250
-SHA256 a23cbbd80f70f353e8675c767d46ec865fd72ee4d0044c3742533b875df6b61c files/digest-pax-utils-0.1.11 250
+MD5 e3ac44cf21ae6aa657a4f72fd9f03a9e files/digest-pax-utils-0.1.11-r1 250
+RMD160 cfc47c161f1b864b4bb0e1301699d3e17fe1f558 files/digest-pax-utils-0.1.11-r1 250
+SHA256 a23cbbd80f70f353e8675c767d46ec865fd72ee4d0044c3742533b875df6b61c files/digest-pax-utils-0.1.11-r1 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 b98c7b9dfd7e41ac1b8eb030e65e5c9c files/pax-utils-0.1.10.patch 1187
 RMD160 721102c1ea7b7a657a7a5592d06bbddd01167cf6 files/pax-utils-0.1.10.patch 1187
 SHA256 0cc46058e30c3c590fa3da9270f2e7172669f6ea7baaaaf8c8daaefb4bf19b6d files/pax-utils-0.1.10.patch 1187
+MD5 6763325755543476055d2a0fa4ece303 files/pax-utils-0.1.11.patch 409
+RMD160 b8cbc5d4eab2dd6b003c4af0e77083767743c56d files/pax-utils-0.1.11.patch 409
+SHA256 687498a38b23ed5ca0c73a79187543fb90838ff02ea0f9e0ad4f2ee3d966cac9 files/pax-utils-0.1.11.patch 409
 MD5 90f775b6c4fdbeb494f7d8e1d94ad30d metadata.xml 604
 RMD160 7f581ee400ba8449455baf903183c12136a53838 metadata.xml 604
 SHA256 f3aaada3dde296c02797c2f68e88bf7f3cf650449aaf956126bc54ebd36e686e metadata.xml 604
-MD5 959a007d2de1a16ee3fd0030131321f5 pax-utils-0.1.10.ebuild 1181
-RMD160 a0bdeefa77a1efad1ffb634828a4742399a76b21 pax-utils-0.1.10.ebuild 1181
-SHA256 e420271ba794fd1d5f2e1e91996b0065a616e01ed51ad4799f39a3d745c1848d pax-utils-0.1.10.ebuild 1181
-MD5 3494e453d4a6c2e4c24142e245710bab pax-utils-0.1.11.ebuild 1184
-RMD160 f76320e0d556185926abed7edb93129cae6e6628 pax-utils-0.1.11.ebuild 1184
-SHA256 229b021994146faa3eb67470f9948bd4965a105bf04009e1bf381679347cea65 pax-utils-0.1.11.ebuild 1184
+MD5 39c94cf8998ff9521ae1a6c7a45fdead pax-utils-0.1.10.ebuild 1177
+RMD160 e3bdff67c66ba00cbe40c51ccf288656d90a24e9 pax-utils-0.1.10.ebuild 1177
+SHA256 18eff4b80af66006aa4bb3231eb61ba41a4c6e01035bab7e9ee39ff8e78920a3 pax-utils-0.1.10.ebuild 1177
+MD5 dbab609e0e022250cbc832d71acf4a89 pax-utils-0.1.11-r1.ebuild 1259
+RMD160 5143a7e452ac465b162586e220597b65b2f574d5 pax-utils-0.1.11-r1.ebuild 1259
+SHA256 7ace95f282f9d2331bcca688bda108dc746ae52829faaeaf1b33af5778bd6d12 pax-utils-0.1.11-r1.ebuild 1259
 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.2.2 (GNU/Linux)
 
-iD8DBQFEK9l0AiZjviIA2XgRAlZOAJ9f8ddBZT0Y3RpwQCk+44wwpRdQVACfceo9
-SEQvc2F+Nm2vBKPRVjIjNwg=
-=d1gR
+iD8DBQFEPHud2+ySkm8kpY0RAoY5AKCwZ+5qlSUHUiLU1lVL3cJkjXDfCQCeNlJk
+8qPZ52N7cgPgFlVf8y6iy8o=
+=zTAH
 -----END PGP SIGNATURE-----
diff --git a/app-misc/pax-utils/files/digest-pax-utils-0.1.11-r1 b/app-misc/pax-utils/files/digest-pax-utils-0.1.11-r1
new file mode 100644
index 000000000000..d1df02406030
--- /dev/null
+++ b/app-misc/pax-utils/files/digest-pax-utils-0.1.11-r1
@@ -0,0 +1,3 @@
+MD5 9cdfdaa30ea589e8b7e58ad768fd53e2 pax-utils-0.1.11.tar.bz2 52245
+RMD160 cf91ce04dc345a7029a5d51c1910d9ce9aa6037b pax-utils-0.1.11.tar.bz2 52245
+SHA256 d571658aedaddea1dd61fce0f4f6103eb25d86a3f25171ab0139b4cacddffc5f pax-utils-0.1.11.tar.bz2 52245
diff --git a/app-misc/pax-utils/files/pax-utils-0.1.11.patch b/app-misc/pax-utils/files/pax-utils-0.1.11.patch
new file mode 100644
index 000000000000..1ee86483c85e
--- /dev/null
+++ b/app-misc/pax-utils/files/pax-utils-0.1.11.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/128247
+--- scanelf.c
++++ scanelf.c
+@@ -1683,7 +1683,7 @@ static void parseargs(int argc, char *ar
+ 		load_ld_so_conf(0, "/etc/ld.so.conf");
+ 	if (scan_ldpath) scanelf_ldpath();
+ 	if (scan_envpath) scanelf_envpath();
+-	if (!from_file && ttyname(0) == NULL)
++	if (!from_file && optind == argc && ttyname(0) == NULL)
+ 		from_file = "-";
+ 	if (from_file) {
+ 		scanelf_from_file(from_file);
diff --git a/app-misc/pax-utils/pax-utils-0.1.11-r1.ebuild b/app-misc/pax-utils/pax-utils-0.1.11-r1.ebuild
new file mode 100644
index 000000000000..81787b2a5e6e
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-0.1.11-r1.ebuild
@@ -0,0 +1,36 @@
+# 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.11-r1.ebuild,v 1.1 2006/04/12 04:01:11 vapier 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
+	http://dev.gentoo.org/~flameeyes/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 ~x86-fbsd"
+IUSE="caps"
+
+DEPEND="caps? ( sys-libs/libcap )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}.patch
+}
+
+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
+}