Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/elfix:elfix-0.5.x commit in: scripts/
Date: Fri, 27 Jul 2012 22:33:53
Message-Id: 1343428408.615eea5537d277f217ad7ab68c60e58613f85691.blueness@gentoo
1 commit: 615eea5537d277f217ad7ab68c60e58613f85691
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 27 22:01:19 2012 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 27 22:33:28 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=615eea55
7
8 Revert "scripts/paxmodule.c: ELF_C_RDWR_MMAP -> ELF_C_RDWR for uclibc compat"
9
10 This reverts commit 184b349113189aee285ff9bcb1ca08235a5c29c6.
11
12 Using libelf instead of elfutils to gelf_update_phdr() fails. Revert
13 for now until we figure out what's going on.
14 (cherry picked from commit 47ef483afe7bd19f2b8a9ef77b36b8887ad98518)
15
16 ---
17 scripts/paxmodule.c | 4 ++--
18 1 files changed, 2 insertions(+), 2 deletions(-)
19
20 diff --git a/scripts/paxmodule.c b/scripts/paxmodule.c
21 index 4a08522..c3dfc28 100644
22 --- a/scripts/paxmodule.c
23 +++ b/scripts/paxmodule.c
24 @@ -110,7 +110,7 @@ get_pt_flags(int fd)
25 return pt_flags;
26 }
27
28 - if((elf = elf_begin(fd, ELF_C_READ, NULL)) == NULL)
29 + if((elf = elf_begin(fd, ELF_C_READ_MMAP, NULL)) == NULL)
30 {
31 PyErr_SetString(PaxError, "get_pt_flags: elf_begin() failed");
32 return pt_flags;
33 @@ -275,7 +275,7 @@ set_pt_flags(int fd, uint16_t pt_flags)
34 return;
35 }
36
37 - if((elf = elf_begin(fd, ELF_C_RDWR, NULL)) == NULL)
38 + if((elf = elf_begin(fd, ELF_C_RDWR_MMAP, NULL)) == NULL)
39 {
40 PyErr_SetString(PaxError, "set_pt_flags: elf_begin() failed");
41 return;