removed executable stacks bug #116930

(Portage version: 2.1_pre2)

8 files changed, 60 insertions, 33 deletions

diff --git a/dev-libs/lzo/ChangeLog b/dev-libs/lzo/ChangeLog
index e96b5cfa9c2d..b8ab0c8e6555 100644
--- a/dev-libs/lzo/ChangeLog
+++ b/dev-libs/lzo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/lzo
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/ChangeLog,v 1.30 2005/12/03 20:23:10 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/ChangeLog,v 1.31 2005/12/28 02:37:02 dragonheart Exp $
+
+  29 Dec 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/lzo-1.08-exec-stack.patch, +files/lzo-2.02-exec-stack.patch,
+  lzo-1.08-r1.ebuild, -lzo-2.02.ebuild, lzo-2.02-r1.ebuild:
+  removed executable stacks bug #116930] thanks to betelgeuse
 
 *lzo-2.02-r1 (03 Dec 2005)
 
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index 634971e8b6c2..6a75924c2988 100644
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -3,7 +3,9 @@ MD5 43fb13762383b572d22152f8815ea4a5 files/1.08-gcc3.patch 738
 MD5 b40c71f87f862f9f4491fd165379f23b files/digest-lzo-1.08-r1 60
 MD5 d4d056e8e36520c54c788a9f0b5171bb files/digest-lzo-2.02 60
 MD5 d4d056e8e36520c54c788a9f0b5171bb files/digest-lzo-2.02-r1 60
-MD5 23c6e385410aeb709e8e857ecf46f2a8 lzo-1.08-r1.ebuild 1008
-MD5 d404e463052fb8e7241fd34fb7e6bbc7 lzo-2.02-r1.ebuild 841
+MD5 2848853211ddc184327a901b10e6052d files/lzo-1.08-exec-stack.patch 367
+MD5 fd06ec9e867bb8726f80fe8066732ffa files/lzo-2.02-exec-stack.patch 734
+MD5 337eac8804a96411da633d9a648f0ba7 lzo-1.08-r1.ebuild 1050
+MD5 c5c31de772b408e645c90d7294a4bd21 lzo-2.02-r1.ebuild 939
 MD5 3780e246fd04d473ec48854c60f6e5d2 lzo-2.02.ebuild 806
 MD5 0807b5c32c038f5ded83ec567061ea2f metadata.xml 295
diff --git a/dev-libs/lzo/files/digest-lzo-2.02 b/dev-libs/lzo/files/digest-lzo-2.02
deleted file mode 100644
index ec046ce41445..000000000000
--- a/dev-libs/lzo/files/digest-lzo-2.02
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6760e5819f4238328709bf93bf10071c lzo-2.02.tar.gz 599387
diff --git a/dev-libs/lzo/files/lzo-1.08-exec-stack.patch b/dev-libs/lzo/files/lzo-1.08-exec-stack.patch
new file mode 100644
index 000000000000..cda165657f15
--- /dev/null
+++ b/dev-libs/lzo/files/lzo-1.08-exec-stack.patch
@@ -0,0 +1,14 @@
+diff -ur lzo-1.08.old/src/i386/src/leave.sh lzo-1.08/src/i386/src/leave.sh
+--- lzo-1.08.old/src/i386/src/leave.sh	2005-12-28 01:18:28.958047816 +0200
++++ lzo-1.08/src/i386/src/leave.sh	2005-12-28 01:17:49.253083888 +0200
+@@ -93,6 +93,10 @@
+ 
+ .L_end:
+ 
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++
+ /*
+ vi:ts=4
+ */
diff --git a/dev-libs/lzo/files/lzo-2.02-exec-stack.patch b/dev-libs/lzo/files/lzo-2.02-exec-stack.patch
new file mode 100644
index 000000000000..2b03669b9a3a
--- /dev/null
+++ b/dev-libs/lzo/files/lzo-2.02-exec-stack.patch
@@ -0,0 +1,25 @@
+--- asm/i386/src_nasm/asminit.def.orig	2005-12-29 22:51:45.000000000 +1100
++++ asm/i386/src_nasm/asminit.def	2005-12-29 22:54:11.000000000 +1100
+@@ -32,6 +32,9 @@
+ ;  <markus@oberhumer.com>
+ ;  http://www.oberhumer.com/opensource/lzo/
+ ;
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+ 
+ %define F(name) name
+ %ifidni __OUTPUT_FORMAT__,elf
+--- asm/i386/src_gas/asminit.def.orig	2005-12-29 22:51:58.000000000 +1100
++++ asm/i386/src_gas/asminit.def	2005-12-29 22:55:29.000000000 +1100
+@@ -32,6 +32,10 @@
+    <markus@oberhumer.com>
+    http://www.oberhumer.com/opensource/lzo/
+ */
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
++
+ 
+ #ifndef F
+ #  define F(name)       name
diff --git a/dev-libs/lzo/lzo-1.08-r1.ebuild b/dev-libs/lzo/lzo-1.08-r1.ebuild
index a77bba11f028..a87ef4b7e049 100644
--- a/dev-libs/lzo/lzo-1.08-r1.ebuild
+++ b/dev-libs/lzo/lzo-1.08-r1.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/lzo/lzo-1.08-r1.ebuild,v 1.18 2005/07/03 21:18:52 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/lzo-1.08-r1.ebuild,v 1.19 2005/12/28 02:37:02 dragonheart Exp $
 
 inherit eutils gnuconfig
 
@@ -18,6 +18,7 @@ RDEPEND=""
 
 src_unpack() {
 	unpack ${A}
+	epatch ${FILESDIR}/${P}-exec-stack.patch
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-gcc3.patch
 	sed -i -e s,-O2,,g ${S}/aclocal.m4
diff --git a/dev-libs/lzo/lzo-2.02-r1.ebuild b/dev-libs/lzo/lzo-2.02-r1.ebuild
index beb679322652..e9778edeeb1c 100644
--- a/dev-libs/lzo/lzo-2.02-r1.ebuild
+++ b/dev-libs/lzo/lzo-2.02-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/lzo-2.02-r1.ebuild,v 1.1 2005/12/03 20:23:10 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/lzo-2.02-r1.ebuild,v 1.2 2005/12/28 02:37:02 dragonheart Exp $
+
+inherit eutils
 
 DESCRIPTION="An extremely fast compression and decompression library"
 HOMEPAGE="http://www.oberhumer.com/opensource/lzo/"
@@ -14,6 +16,12 @@ IUSE="examples"
 DEPEND="x86? ( dev-lang/nasm )"
 RDEPEND=""
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-exec-stack.patch
+}
+
 src_compile() {
 	econf --enable-shared || die
 	emake || die
diff --git a/dev-libs/lzo/lzo-2.02.ebuild b/dev-libs/lzo/lzo-2.02.ebuild
deleted file mode 100644
index d374f5747a5d..000000000000
--- a/dev-libs/lzo/lzo-2.02.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/lzo-2.02.ebuild,v 1.1 2005/11/13 09:48:20 dragonheart Exp $
-
-DESCRIPTION="An extremely fast compression and decompression library"
-HOMEPAGE="http://www.oberhumer.com/opensource/lzo/"
-SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-DEPEND="x86? ( dev-lang/nasm )"
-RDEPEND=""
-
-src_compile() {
-	econf --enable-shared || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS doc/LZO*
-	docinto examples
-	dodoc examples/*.c examples/Makefile
-}