- bugfix: dont write to memory when NULL rpaths exists and not using -X/--fix in scanelf

Package-Manager: portage-2.1_pre3-r1

6 files changed, 43 insertions, 14 deletions

diff --git a/app-misc/pax-utils/ChangeLog b/app-misc/pax-utils/ChangeLog
index a0368bc79eb3..59c61f3485bb 100644
--- a/app-misc/pax-utils/ChangeLog
+++ b/app-misc/pax-utils/ChangeLog
@@ -1,6 +1,13 @@
 # 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.39 2006/01/12 18:15:07 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/ChangeLog,v 1.40 2006/01/18 22:53:13 solar Exp $
+
+*pax-utils-0.1.7-r1 (18 Jan 2006)
+
+  18 Jan 2006; <solar@gentoo.org> +files/scanelf-null-rpath.patch,
+  -pax-utils-0.1.7.ebuild, +pax-utils-0.1.7-r1.ebuild:
+  - bugfix: dont write to memory when NULL rpaths exists and not using
+  -X/--fix in scanelf
 
 *pax-utils-0.1.7 (12 Jan 2006)
 
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index d4b84a25355f..5e3c9b3de4a4 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,10 +1,11 @@
-MD5 abd602360cd6e4c184f7c424cc7b8cc4 ChangeLog 6443
+MD5 c3f5c9253271ef5ec2c517352419b218 ChangeLog 6694
 MD5 dc77856d07055e511131e862afbb09eb files/digest-pax-utils-0.1.4 67
 MD5 a600ef77f69ccf3b549a95e326603592 files/digest-pax-utils-0.1.5 67
 MD5 2423859a4ed3486389cbb553bd1bf0f0 files/digest-pax-utils-0.1.6 67
-MD5 c04057e6e31a00de3e0ddef9f4db3f92 files/digest-pax-utils-0.1.7 67
+MD5 c04057e6e31a00de3e0ddef9f4db3f92 files/digest-pax-utils-0.1.7-r1 67
+MD5 4c62b41578df556f326806228afe1f99 files/scanelf-null-rpath.patch 534
 MD5 90f775b6c4fdbeb494f7d8e1d94ad30d metadata.xml 604
 MD5 16be1632892be8a4398d2284ec734854 pax-utils-0.1.4.ebuild 930
 MD5 8b51b7c8db335a2bf83e439832c23a89 pax-utils-0.1.5.ebuild 1028
-MD5 6e43dce5f191f91669166d2e36208e30 pax-utils-0.1.6.ebuild 1015
-MD5 3bca591910e75e1fba0ba467f7e4bc94 pax-utils-0.1.7.ebuild 1012
+MD5 b3f155a95d4684a1c398bdf2dbad2152 pax-utils-0.1.6.ebuild 1013
+MD5 1cf59984913adbf72186dfde270ff096 pax-utils-0.1.7-r1.ebuild 1200
diff --git a/app-misc/pax-utils/files/digest-pax-utils-0.1.7 b/app-misc/pax-utils/files/digest-pax-utils-0.1.7-r1
index 88a22284f6f3..88a22284f6f3 100644
--- a/app-misc/pax-utils/files/digest-pax-utils-0.1.7
+++ b/app-misc/pax-utils/files/digest-pax-utils-0.1.7-r1
diff --git a/app-misc/pax-utils/files/scanelf-null-rpath.patch b/app-misc/pax-utils/files/scanelf-null-rpath.patch
new file mode 100644
index 000000000000..061a4a097a38
--- /dev/null
+++ b/app-misc/pax-utils/files/scanelf-null-rpath.patch
@@ -0,0 +1,16 @@
+Index: scanelf.c
+===================================================================
+RCS file: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v
+retrieving revision 1.106
+diff -u -B -r1.106 scanelf.c
+--- scanelf.c	14 Jan 2006 01:39:55 -0000	1.106
++++ scanelf.c	18 Jan 2006 22:28:02 -0000
+@@ -465,7 +465,7 @@
+ 						} \
+ 					} \
+ 					if (*r) { \
+-						if (fix_elf > 2 || **r == '\0') { \
++						if (fix_elf > 2 || (fix_elf && **r == '\0')) { \
+ 							/* just nuke it */ \
+ 							nuke_it##B: \
+ 							memset(*r, 0x00, offset); \
diff --git a/app-misc/pax-utils/pax-utils-0.1.6.ebuild b/app-misc/pax-utils/pax-utils-0.1.6.ebuild
index 084be8a8446e..a629a89d2a2d 100644
--- a/app-misc/pax-utils/pax-utils-0.1.6.ebuild
+++ b/app-misc/pax-utils/pax-utils-0.1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.6.ebuild,v 1.2 2005/12/31 14:11:42 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.1.6.ebuild,v 1.3 2006/01/18 22:53:13 solar Exp $
 
 inherit flag-o-matic toolchain-funcs
 
diff --git a/app-misc/pax-utils/pax-utils-0.1.7.ebuild b/app-misc/pax-utils/pax-utils-0.1.7-r1.ebuild
index cc10ec461348..0ba67e972a30 100644
--- a/app-misc/pax-utils/pax-utils-0.1.7.ebuild
+++ b/app-misc/pax-utils/pax-utils-0.1.7-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.7.ebuild,v 1.1 2006/01/12 18:15:07 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.1.7-r1.ebuild,v 1.1 2006/01/18 22:53:13 solar Exp $
 
-inherit flag-o-matic toolchain-funcs
+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"
@@ -17,12 +17,17 @@ IUSE="caps"
 
 DEPEND="caps? ( sys-libs/libcap )"
 
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}"/scanelf-null-rpath.patch
+}
+
 src_compile() {
-	if use caps ; then
-		append-flags -DWANT_SYSCAP
-		append-ldflags -lcap
-	fi
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" all || die
+	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() {