Add a patch to remove executable stacks, thanks to Martin von Gagern in bug #131155.

(Portage version: 2.1_pre9-r4)

6 files changed, 38 insertions, 2 deletions

diff --git a/media-libs/libmpeg3/ChangeLog b/media-libs/libmpeg3/ChangeLog
index c24c1de27a54..87c0cf620032 100644
--- a/media-libs/libmpeg3/ChangeLog
+++ b/media-libs/libmpeg3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libmpeg3
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.40 2006/04/20 03:35:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.41 2006/04/24 23:58:17 flameeyes Exp $
+
+  24 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libmpeg3-1.5.2-gnustack.patch, libmpeg3-1.5.2-r3.ebuild:
+  Add a patch to remove executable stacks, thanks to Martin von Gagern in bug
+  #131155.
 
 *libmpeg3-1.5.2-r3 (20 Apr 2006)
 
diff --git a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2 b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2
index 86706bf5725d..78db72b632c0 100644
--- a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2
+++ b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2
@@ -1,2 +1,4 @@
 MD5 d2b12624e8e2eed1a03c4f837f33a90f libmpeg3-1.5.2-src.tar.bz2 625682
+RMD160 3198e42f529c5699dc7cf376d100831d0648f10f libmpeg3-1.5.2-src.tar.bz2 625682
+SHA256 dac7ed679476f6a011a603bba8e4eacf998650dc1ae74537f17326859c3aa7ba libmpeg3-1.5.2-src.tar.bz2 625682
 MD5 2ae9393b4a201b0d6416cb8d3d338b9d libmpeg3-patches-1.tar.bz2 4176
diff --git a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r1 b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r1
index 86706bf5725d..78db72b632c0 100644
--- a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r1
+++ b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r1
@@ -1,2 +1,4 @@
 MD5 d2b12624e8e2eed1a03c4f837f33a90f libmpeg3-1.5.2-src.tar.bz2 625682
+RMD160 3198e42f529c5699dc7cf376d100831d0648f10f libmpeg3-1.5.2-src.tar.bz2 625682
+SHA256 dac7ed679476f6a011a603bba8e4eacf998650dc1ae74537f17326859c3aa7ba libmpeg3-1.5.2-src.tar.bz2 625682
 MD5 2ae9393b4a201b0d6416cb8d3d338b9d libmpeg3-patches-1.tar.bz2 4176
diff --git a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r2 b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r2
index ce447bc53938..21d1de144fcb 100644
--- a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r2
+++ b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r2
@@ -1,2 +1,6 @@
 MD5 d2b12624e8e2eed1a03c4f837f33a90f libmpeg3-1.5.2-src.tar.bz2 625682
+RMD160 3198e42f529c5699dc7cf376d100831d0648f10f libmpeg3-1.5.2-src.tar.bz2 625682
+SHA256 dac7ed679476f6a011a603bba8e4eacf998650dc1ae74537f17326859c3aa7ba libmpeg3-1.5.2-src.tar.bz2 625682
 MD5 84f32e19c88437cbb043367cdc87d2c4 libmpeg3-patches-3.tar.bz2 4251
+RMD160 7fbb16804ce0c1cb6b6fc3a7467cc7efa4989988 libmpeg3-patches-3.tar.bz2 4251
+SHA256 2b4b200337802a572c321e4a6744c4ea9a889acd3d1325337a80424aaede5186 libmpeg3-patches-3.tar.bz2 4251
diff --git a/media-libs/libmpeg3/files/libmpeg3-1.5.2-gnustack.patch b/media-libs/libmpeg3/files/libmpeg3-1.5.2-gnustack.patch
new file mode 100644
index 000000000000..e43d52fdbe9f
--- /dev/null
+++ b/media-libs/libmpeg3/files/libmpeg3-1.5.2-gnustack.patch
@@ -0,0 +1,22 @@
+diff -ru libmpeg3-1.5.2.orig/video/mmxidct.S libmpeg3-1.5.2/video/mmxidct.S
+--- libmpeg3-1.5.2.orig/video/mmxidct.S	2006-04-24 23:13:14.000000000 +0200
++++ libmpeg3-1.5.2/video/mmxidct.S	2006-04-24 23:13:47.000000000 +0200
+@@ -673,3 +673,7 @@
+ 	ret
+ .Lfe1:
+ 	.size	 IDCT_mmx,.Lfe1-IDCT_mmx
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -ru libmpeg3-1.5.2.orig/video/reconmmx.s libmpeg3-1.5.2/video/reconmmx.s
+--- libmpeg3-1.5.2.orig/video/reconmmx.s	2006-04-24 23:13:14.000000000 +0200
++++ libmpeg3-1.5.2/video/reconmmx.s	2006-04-24 23:13:20.000000000 +0200
+@@ -298,4 +298,6 @@
+   pop        esi
+   ret
+ 
+-
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
diff --git a/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild b/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild
index b2abc63a2259..10d6d3e83b3e 100644
--- a/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild,v 1.1 2006/04/20 03:35:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild,v 1.2 2006/04/24 23:58:17 flameeyes Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -37,6 +37,7 @@ src_unpack() {
 	sed -i -e "/LIBS = /s:$: -L\${ROOT}usr/$(get_libdir) -la52:" Makefile
 
 	epatch "${FILESDIR}/${P}-a52.patch"
+	epatch "${FILESDIR}/${P}-gnustack.patch"
 
 	if ! use mmx || has_pic ; then
 		sed -i -e 's:^NASM =.*:NASM =:' \