Make sure that the libsmpeg.so has a non-executable gnu stack marking.

Package-Manager: portage-2.0.51.19

5 files changed, 48 insertions, 13 deletions

diff --git a/media-libs/smpeg/ChangeLog b/media-libs/smpeg/ChangeLog
index 01e06a7593bb..125627670e36 100644
--- a/media-libs/smpeg/ChangeLog
+++ b/media-libs/smpeg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/smpeg
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/ChangeLog,v 1.19 2004/08/12 00:19:45 mr_bones_ Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/ChangeLog,v 1.20 2005/03/29 06:55:26 vapier Exp $
+
+*smpeg-0.4.4-r5 (29 Mar 2005)
+
+  29 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/smpeg-0.4.4-gnu-stack.patch, -smpeg-0.4.4-r4.ebuild,
+  +smpeg-0.4.4-r5.ebuild:
+  Make sure that the libsmpeg.so has a non-executable gnu stack marking.
 
   11 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> smpeg-0.4.4-r4.ebuild:
   gnuconfig_update in src_unpack
diff --git a/media-libs/smpeg/Manifest b/media-libs/smpeg/Manifest
index 247184242d6a..ba49571c04a0 100644
--- a/media-libs/smpeg/Manifest
+++ b/media-libs/smpeg/Manifest
@@ -1,3 +1,4 @@
-MD5 64ba581d6ce48975caad98ec9f8af8b1 ChangeLog 2724
-MD5 b55cebdd89364e8abbe3d58fd36afa41 smpeg-0.4.4-r4.ebuild 1439
-MD5 228adf6a40bb4eef222c38d23f97014b files/digest-smpeg-0.4.4-r4 63
+MD5 f29cad817e61bb94d6244bdeece339fd ChangeLog 2964
+MD5 53bcb83a6322ddf97adc35f0b04f1a80 smpeg-0.4.4-r5.ebuild 1460
+MD5 ff8036a570bdd3a43ed9710f91ca0556 files/smpeg-0.4.4-gnu-stack.patch 907
+MD5 228adf6a40bb4eef222c38d23f97014b files/digest-smpeg-0.4.4-r5 63
diff --git a/media-libs/smpeg/files/digest-smpeg-0.4.4-r4 b/media-libs/smpeg/files/digest-smpeg-0.4.4-r5
index 9aa5597db6c8..9aa5597db6c8 100644
--- a/media-libs/smpeg/files/digest-smpeg-0.4.4-r4
+++ b/media-libs/smpeg/files/digest-smpeg-0.4.4-r5
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-gnu-stack.patch b/media-libs/smpeg/files/smpeg-0.4.4-gnu-stack.patch
new file mode 100644
index 000000000000..a48b6280694b
--- /dev/null
+++ b/media-libs/smpeg/files/smpeg-0.4.4-gnu-stack.patch
@@ -0,0 +1,28 @@
+Make sure that the asm files don't incorrectly trigger an executable
+stack marking in the final shared library.  That's bad, mmmkay.
+
+before:
+$ readelf -l /usr/lib/libsmpeg.so | grep -A 1 GNU_STACK
+  GNU_STACK      0x0000000000000000 0x0000000000000000 0x0000000000000000
+                 0x0000000000000000 0x0000000000000000  RWE    8
+after:
+$ readelf -l /usr/lib/libsmpeg.so | grep -A 1 GNU_STACK
+  GNU_STACK      0x0000000000000000 0x0000000000000000 0x0000000000000000
+                 0x0000000000000000 0x0000000000000000  RW     8
+
+--- smpeg-0.4.4/video/mmxflags_asm.S
++++ smpeg-0.4.4/video/mmxflags_asm.S
+@@ -57,3 +57,5 @@
+ 	.size	 cpu_flags,.Lfe1-cpu_flags
+ 
+ #endif /* i386 && USE_MMX */
++
++.section .note.GNU-stack,"",@progbits
+--- smpeg-0.4.4/video/mmxidct_asm.S
++++ smpeg-0.4.4/video/mmxidct_asm.S
+@@ -673,3 +673,5 @@
+ 
+ 
+ #endif /* i386 && USE_MMX */
++
++.section .note.GNU-stack,"",@progbits
diff --git a/media-libs/smpeg/smpeg-0.4.4-r4.ebuild b/media-libs/smpeg/smpeg-0.4.4-r5.ebuild
index 40e4c6ecf8b5..26247b198724 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r4.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r4.ebuild,v 1.18 2004/08/12 00:19:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r5.ebuild,v 1.1 2005/03/29 06:55:26 vapier Exp $
 
-inherit eutils gcc gnuconfig
+inherit eutils toolchain-funcs
 
 DESCRIPTION="SDL MPEG Player Library"
 HOMEPAGE="http://www.lokigames.com/development/smpeg.php3"
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.lokigames.com/pub/open-source/smpeg/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc ~mips alpha hppa amd64 ppc64"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
 IUSE="X gtk opengl debug"
 
 DEPEND=">=media-libs/libsdl-1.2.0
@@ -20,18 +20,17 @@ DEPEND=">=media-libs/libsdl-1.2.0
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gnu-stack.patch
 	sed -i \
 		-e 's:-mcpu=ev4 -Wa,-mall::' \
 		-e 's:-march=486::' \
 		-e 's:-march=pentium -mcpu=pentiumpro::' \
-		configure \
-		|| die "sed configure failed"
+		configure || die "sed configure failed"
 	# GCC 3.1 fix from bug #5558 (cardoe 08/03/02)
 	sed -i \
 		-e '/^libsmpeg_la_LIBADD =/s:$: -lsupc++:' Makefile.in \
 		|| die "sed Makefile.in failed"
-	gnuconfig_update
 }
 
 src_compile() {