From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7DA4B13800E for ; Fri, 27 Jul 2012 22:00:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CEC88E079E; Fri, 27 Jul 2012 22:00:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A153CE079E for ; Fri, 27 Jul 2012 22:00:11 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 093021B40B6 for ; Fri, 27 Jul 2012 22:00:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DD7BAE5436 for ; Fri, 27 Jul 2012 22:00:08 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1343426239.b3e9ab5db62e344bfe72b78c6ab7fcfebf6d9592.blueness@gentoo> Subject: [gentoo-commits] proj/elfix:master commit in: src/ X-VCS-Repository: proj/elfix X-VCS-Files: src/fix-gnustack.c src/paxctl-ng.c X-VCS-Directories: src/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: b3e9ab5db62e344bfe72b78c6ab7fcfebf6d9592 X-VCS-Branch: master Date: Fri, 27 Jul 2012 22:00:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 35b87b39-b60d-4251-a897-d68f388c97b5 X-Archives-Hash: 87d6f82137e5c22f718871a92dac214a commit: b3e9ab5db62e344bfe72b78c6ab7fcfebf6d9592 Author: Anthony G. Basile gentoo org> AuthorDate: Fri Jul 27 21:57:19 2012 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Fri Jul 27 21:57:19 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=b3e9ab5d Revert "src/{fix-gnustack.c,paxctl-ng.c}: ELF_C_RDWR_MMAP -> ELF_C_RDWR for uclibc compat" This reverts commit 02640d9d23cc4736e642600430b13406c33dba9e. Using libelf instead of elfutils to gelf_update_phdr() fails. Revert for now until we figure out what's going on. --- src/fix-gnustack.c | 2 +- src/paxctl-ng.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fix-gnustack.c b/src/fix-gnustack.c index 03da236..15e23e0 100644 --- a/src/fix-gnustack.c +++ b/src/fix-gnustack.c @@ -99,7 +99,7 @@ main( int argc, char *argv[]) { if((fd = open(f_name, O_RDWR)) < 0) error(EXIT_FAILURE, 0, "open() fail."); - if((elf = elf_begin(fd, ELF_C_RDWR, NULL)) == NULL) + if((elf = elf_begin(fd, ELF_C_RDWR_MMAP, NULL)) == NULL) error(EXIT_FAILURE, 0, "elf_begin() fail: %s", elf_errmsg(elf_errno())); } else diff --git a/src/paxctl-ng.c b/src/paxctl-ng.c index 4b7e6fb..025ea24 100644 --- a/src/paxctl-ng.c +++ b/src/paxctl-ng.c @@ -216,7 +216,7 @@ get_pt_flags(int fd, int verbose) return pt_flags; } - if((elf = elf_begin(fd, ELF_C_READ, NULL)) == NULL) + if((elf = elf_begin(fd, ELF_C_READ_MMAP, NULL)) == NULL) { if(verbose) printf("\tELF ERROR: elf_begin() fail: %s\n", elf_errmsg(elf_errno())); @@ -460,7 +460,7 @@ set_pt_flags(int fd, uint16_t pt_flags, int verbose) return; } - if((elf = elf_begin(fd, ELF_C_RDWR, NULL)) == NULL) + if((elf = elf_begin(fd, ELF_C_RDWR_MMAP, NULL)) == NULL) { if(verbose) printf("\tELF ERROR: elf_begin() fail: %s\n", elf_errmsg(elf_errno()));