From 353d3c183a43dce9c5fa0408de03f21b2fa5f2ef Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 17 Dec 2005 00:34:44 +0000 Subject: Kevin F. Quinn: fix PaX support #115100. Package-Manager: portage-2.0.53 --- dev-libs/elfutils/ChangeLog | 8 +++++-- dev-libs/elfutils/Manifest | 15 ++++++------- dev-libs/elfutils/elfutils-0.118.ebuild | 3 ++- .../files/elfutils-0.118-PaX-support.patch | 26 ++++++++++++++++++++++ 4 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 dev-libs/elfutils/files/elfutils-0.118-PaX-support.patch (limited to 'dev-libs') diff --git a/dev-libs/elfutils/ChangeLog b/dev-libs/elfutils/ChangeLog index f525e3bd0c58..8e48e6e398d0 100644 --- a/dev-libs/elfutils/ChangeLog +++ b/dev-libs/elfutils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/elfutils -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/ChangeLog,v 1.70 2005/12/10 13:51:23 solar Exp $ +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/ChangeLog,v 1.71 2005/12/17 00:34:44 vapier Exp $ + + 17 Dec 2005; Mike Frysinger + +files/elfutils-0.118-PaX-support.patch, elfutils-0.118.ebuild: + Kevin F. Quinn: fix PaX support #115100. 10 Dec 2005; elfutils-0.108-r1.ebuild, elfutils-0.108.ebuild, elfutils-0.118.ebuild: diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest index ec9983ca2ded..69574f942578 100644 --- a/dev-libs/elfutils/Manifest +++ b/dev-libs/elfutils/Manifest @@ -1,23 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 f75478cf06f0c1c6bdb384be0a8524a8 ChangeLog 9369 +MD5 79d6d9746161cb5045a53e1bba6b8ccb ChangeLog 9530 MD5 0ffad2235361cffdfff3684c03ac028a elfutils-0.108-r1.ebuild 1778 MD5 b2fd70caba6530bf2fe7b375e0023073 elfutils-0.108.ebuild 1761 -MD5 f827088ae834ebb20d11efe5bea91c10 elfutils-0.118.ebuild 1686 +MD5 073900c80a1669090a483ded94c455d9 elfutils-0.118.ebuild 1732 MD5 648c7e7b8f19b21266e556cc6979c0a6 files/digest-elfutils-0.108 143 MD5 e9fcbbccbeaf0d6f3fdfb27f9563e824 files/digest-elfutils-0.108-r1 145 MD5 d27a5faa3886979a3b6592519692fe22 files/digest-elfutils-0.118 145 MD5 1e6460efdb609828aa57b5874813972a files/elfutils-0.101-bswap.patch 849 MD5 41c5834ecf3d28e43b7fbe3b927e582a files/elfutils-0.108-portability.patch 18453 MD5 a5bda0a1599fd2232fb0d2cf5f3269a7 files/elfutils-0.108-robustify2.patch 12832 +MD5 c96d3cf0593d10e4994829b1bfe3995b files/elfutils-0.118-PaX-support.patch 954 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) +Version: GnuPG v1.4.2 (GNU/Linux) -iQCVAwUBQ5rdaJ4WFLgrx1GWAQIZqwQAlYywNqDFSYCDmuk7RioDqMaB8bbJnAif -ctZ0KZTFjS7nJzTLIB0wr3s4hTRztIxLBUHx6CiH2Xq2ZoMXWKHp07FuXuXZo3ZH -pH0PLwPtOAlLQC/PVfNrc0/CCGPGYXLAs1m/kP+zjiYymP3UjSe2VKR5jS1n8CNQ -NgBcrERCJJQ= -=NohZ +iD8DBQFDo11C2+ySkm8kpY0RAnQeAJ4/ASUImYoocr+hQ+KHnC7zp/b1HQCgkuOQ +y1hQ5enLDExI7lsq9zAPF30= +=xTQn -----END PGP SIGNATURE----- diff --git a/dev-libs/elfutils/elfutils-0.118.ebuild b/dev-libs/elfutils/elfutils-0.118.ebuild index 4b22c37877e1..177658b6ec41 100644 --- a/dev-libs/elfutils/elfutils-0.118.ebuild +++ b/dev-libs/elfutils/elfutils-0.118.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.118.ebuild,v 1.2 2005/12/10 13:51:23 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.118.ebuild,v 1.3 2005/12/17 00:34:44 vapier Exp $ inherit eutils @@ -33,6 +33,7 @@ src_unpack() { cd "${S}" EPATCH_SUFFIX="patch" \ epatch "${WORKDIR}"/patch/ + epatch "${FILESDIR}"/${P}-PaX-support.patch # Needed by ${P}-portability.patch autoreconf || die diff --git a/dev-libs/elfutils/files/elfutils-0.118-PaX-support.patch b/dev-libs/elfutils/files/elfutils-0.118-PaX-support.patch new file mode 100644 index 000000000000..083f32ff8553 --- /dev/null +++ b/dev-libs/elfutils/files/elfutils-0.118-PaX-support.patch @@ -0,0 +1,26 @@ +Add support for PaX ELF markings + +Patch by Kevin F. Quinn + +http://bugs.gentoo.org/115100 + +--- libelf/elf.h ++++ libelf/elf.h +@@ -568,6 +568,7 @@ + #define PT_GNU_EH_FRAME 0x6474e550 /* GCC .eh_frame_hdr segment */ + #define PT_GNU_STACK 0x6474e551 /* Indicates stack executability */ + #define PT_GNU_RELRO 0x6474e552 /* Read-only after relocation */ ++#define PT_PAX_FLAGS 0x65041580 /* Indicates PaX flag markings */ + #define PT_LOSUNW 0x6ffffffa + #define PT_SUNWBSS 0x6ffffffa /* Sun Specific segment */ + #define PT_SUNWSTACK 0x6ffffffb /* Stack segment */ +--- src/elflint.c ++++ src/elflint.c +@@ -3187,6 +3187,7 @@ + + if (phdr->p_type >= PT_NUM && phdr->p_type != PT_GNU_EH_FRAME + && phdr->p_type != PT_GNU_STACK && phdr->p_type != PT_GNU_RELRO ++ && phdr->p_type != PT_PAX_FLAGS + /* Check for a known machine-specific type. */ + && ebl_segment_type_name (ebl, phdr->p_type, NULL, 0) == NULL) + ERROR (gettext ("\ -- cgit v1.2.3-65-gdbad