[gentoo-commits] proj/elfix:master commit in: scripts/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     0552fd71e796816c4ccf383b05a2592d9c0a7e1e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 20:55:00 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 20:55:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=0552fd71

scripts/{paxmodule.c,revdep-pax}: removed EI_PAX markings, bug #387459

---
 scripts/paxmodule.c |   18 +++++++++++++++++-
 scripts/revdep-pax  |    2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/scripts/paxmodule.c b/scripts/paxmodule.c
index 32c8768..45e9f26 100644
--- a/scripts/paxmodule.c
+++ b/scripts/paxmodule.c
@@ -9,6 +9,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+/* Gentoo bug #387459
 
 #define HF_PAX_PAGEEXEC		1
 #define HF_PAX_EMUTRAMP		2
@@ -18,6 +19,7 @@
 #define HF_PAX_SEGMEXEC		32
 
 #define EI_PAX			14	// Index to read the PaX flags into ELF header e_ident[] array
+*/
 
 #define BUF_SIZE		7	//Buffer for holding human readable flags
 
@@ -58,7 +60,9 @@ pax_getflags(PyObject *self, PyObject *args)
 	char pax_buf[BUF_SIZE];
 	uint16_t pax_flags;
 
-	GElf_Ehdr ehdr;
+	/* Gentoo bug #387459
+	GElf_Ehdr ehdr; 
+	*/
 	GElf_Phdr phdr;
 	char found_pt_pax;
 	size_t i, phnum;
@@ -140,6 +144,12 @@ pax_getflags(PyObject *self, PyObject *args)
 
 	if(!found_pt_pax)
 	{
+		//Set to the strictest possible
+	}
+
+	/* Gentoo bug #387459
+	if(!found_pt_pax)
+	{
 		if(gelf_getehdr(elf, &ehdr) != &ehdr)
 		{
 			elf_end(elf);
@@ -157,6 +167,7 @@ pax_getflags(PyObject *self, PyObject *args)
 		pax_buf[4] = pax_flags & HF_PAX_RANDMMAP ? 'r' : 'R';
 		pax_buf[5] = pax_flags & HF_PAX_RANDEXEC ? 'X' : 'x';
 	}
+	*/
 
 	elf_end(elf);
 	close(fd);
@@ -174,8 +185,10 @@ pax_setflags(PyObject *self, PyObject *args)
 
 	Elf *elf;
 
+	/* Gentoo bug #387459
 	GElf_Ehdr ehdr;
 	uint16_t ei_flags;
+	*/
 
 	GElf_Phdr phdr;
 	size_t i, phnum;
@@ -213,6 +226,8 @@ pax_setflags(PyObject *self, PyObject *args)
 		return NULL;
 	}
 
+	/* Gentoo bug #387459
+
 	if(gelf_getehdr(elf, &ehdr) != &ehdr)
 	{
 		elf_end(elf);
@@ -276,6 +291,7 @@ pax_setflags(PyObject *self, PyObject *args)
 		PyErr_SetString(PaxError, "pax_setflags: gelf_update_ehdr() failed");
 		return NULL;
 	}
+	*/
 
 
 	elf_getphdrnum(elf, &phnum);

diff --git a/scripts/revdep-pax b/scripts/revdep-pax
index a5636bd..59b8b4e 100755
--- a/scripts/revdep-pax
+++ b/scripts/revdep-pax
@@ -314,7 +314,7 @@ def run_soname(name, verbose, use_soname, mark):
 		except:
 			print 'cannot obtain pax flags for %s' % binary
 
-	if len(mismatched_binaries) == 0
+	if len(mismatched_binaries) == 0:
 		print
 		print '\tNo mismatches'
 		print