patch from Spanky to deal with executable stacks

Package-Manager: portage-2.1_pre5-r4

4 files changed, 143 insertions, 9 deletions

diff --git a/games-emulation/gngeo/ChangeLog b/games-emulation/gngeo/ChangeLog
index cfdac5277b07..de08731bcbce 100644
--- a/games-emulation/gngeo/ChangeLog
+++ b/games-emulation/gngeo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/gngeo
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/ChangeLog,v 1.10 2006/03/06 17:21:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/ChangeLog,v 1.11 2006/03/06 19:58:41 mr_bones_ Exp $
+
+  06 Mar 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/gngeo-0.6.10-execstacks.patch, gngeo-0.6.10.ebuild:
+  patch from Spanky to deal with executable stacks
 
 *gngeo-0.6.10 (06 Mar 2006)
 
diff --git a/games-emulation/gngeo/Manifest b/games-emulation/gngeo/Manifest
index 30b495565adb..e3cb32b8d551 100644
--- a/games-emulation/gngeo/Manifest
+++ b/games-emulation/gngeo/Manifest
@@ -1,6 +1,6 @@
-MD5 3aa956c00f3b1b58033ba4f318ffec85 ChangeLog 1234
-RMD160 c80fe0003d45384c585872e6c25d69f6ff6757ee ChangeLog 1234
-SHA256 8fb18b37956886b471a10c78d63b93887c125a47e639baf6f249023468826800 ChangeLog 1234
+MD5 63551409073b3f7ef1cf3dce908a1b1e ChangeLog 1402
+RMD160 c8767ea783fbe4058dad962a4d714400cb66d60e ChangeLog 1402
+SHA256 001e8afc6248bc7aad07207f400c01cdfc8e4138199412ca556ec29e732ed5ea ChangeLog 1402
 MD5 1c9b633849c5cffeec54088d4c3c4f07 files/digest-gngeo-0.6.10 241
 RMD160 cef89d9516bf128fb6bea400f63dcc5202d067e7 files/digest-gngeo-0.6.10 241
 SHA256 8150e8f68e3616915691943c9f71a90230004c80643353bfe20ae033cee8b240 files/digest-gngeo-0.6.10 241
@@ -10,9 +10,12 @@ SHA256 ef71ff827bac5cb94f62b2f5f9984d5b11e538c0499e2249079c98d8a2619f9e files/di
 MD5 16a01069d300746f49a602bc6362de8d files/digest-gngeo-0.6.7 63
 RMD160 6484cda8983ce6ebc2fe4953332f712075a1abcd files/digest-gngeo-0.6.7 63
 SHA256 0793ed779ca5ea82dc71d4f90278762eeb5c8b9eb2d8f2143c09006f4b3213c6 files/digest-gngeo-0.6.7 63
-MD5 3a9f342e375724975f236338b1edbe9e gngeo-0.6.10.ebuild 840
-RMD160 2275ed86df33b34c1cd9623072e2faf76729b8fa gngeo-0.6.10.ebuild 840
-SHA256 91405680454238155ed32ff2ebdb106bc9e809b1e36045d2b926f004642787a6 gngeo-0.6.10.ebuild 840
+MD5 442e92bbf89563e8f6772d4512c6c0f2 files/gngeo-0.6.10-execstacks.patch 2834
+RMD160 3be24c792743d3468e82872ee5e0959bb80eff70 files/gngeo-0.6.10-execstacks.patch 2834
+SHA256 4a10fd9ae0a62bf9a449877c24adb204e6a1cae9dbd33ee28a511985f4fca616 files/gngeo-0.6.10-execstacks.patch 2834
+MD5 95753249d404e882559a8476378c6c08 gngeo-0.6.10.ebuild 920
+RMD160 a489baa20499cb67f96d8d3ea2630f0537f6b7df gngeo-0.6.10.ebuild 920
+SHA256 2f2eefeb04b6ef14f5e99ed77d42eb6eb3f9f2133d21cf260684b6cfb2df3ead gngeo-0.6.10.ebuild 920
 MD5 05b6293881ff3f58f3f84889f16521c2 gngeo-0.6.3.ebuild 1042
 RMD160 107175e483ec420cc068f079c0b67cecf16b9b68 gngeo-0.6.3.ebuild 1042
 SHA256 2567faf4d22dd889c6c96086ffd81d5f862c7e52ca498cf277e9d3904e6840d8 gngeo-0.6.3.ebuild 1042
diff --git a/games-emulation/gngeo/files/gngeo-0.6.10-execstacks.patch b/games-emulation/gngeo/files/gngeo-0.6.10-execstacks.patch
new file mode 100644
index 000000000000..39b8af99df69
--- /dev/null
+++ b/games-emulation/gngeo/files/gngeo-0.6.10-execstacks.patch
@@ -0,0 +1,121 @@
+--- src/memcpy.S
++++ src/memcpy.S
+@@ -495,4 +495,8 @@
+ 
+ Lmemcpy_bsrcul1l4:
+ add r1, r1, #1
+-b Lmemcpy_bl4
+\ No newline at end of file
++b Lmemcpy_bl4
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- src/video_arm.S
++++ src/video_arm.S
+@@ -441,4 +441,8 @@
+ 	ldmia sp!,{r4-r12}	
+ 	mov pc,lr 		;@ return
+ 	
+-*/
+\ No newline at end of file
++*/
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- ./src/effect/hq3x16.asm
++++ ./src/effect/hq3x16.asm
+@@ -2520,3 +2520,7 @@
+     dd ..@cross8, ..@flag0,  ..@flag0,  ..@flag0,

+     dd ..@flag0,  ..@flag0,  ..@flag0,  ..@flag0

+ 

++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+--- ./src/effect/2xsaimmx.asm
++++ ./src/effect/2xsaimmx.asm
+@@ -2107,3 +2107,7 @@
+ final1b       resb 8
+ final2a       resb 8
+ final2b       resb 8
++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+--- ./src/effect/effect_i386.asm
++++ ./src/effect/effect_i386.asm
+@@ -88,3 +88,7 @@
+ 	emms
+ 	
+ 	endproc
++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+--- ./src/effect/hq2x16.asm
++++ ./src/effect/hq2x16.asm
+@@ -1935,3 +1935,7 @@
+     dd ..@cross8, ..@flag0,  ..@flag0,  ..@flag0,

+     dd ..@flag0,  ..@flag0,  ..@flag0,  ..@flag0

+ 

++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+--- ./src/video_i386.asm
++++ ./src/video_i386.asm
+@@ -86,3 +86,7 @@
+ 	
+ 	popa
+ 	endproc
++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+
+ *Note: there are three underscores here on purpose ... otherwise the strip_
+        script will produce _OUTPUT_FORMAT__ instead of __OUTPUT_FORMAT__
+--- ./src/raze/raze.asm
++++ ./src/raze/raze.asm
+@@ -4259,3 +4259,6 @@
+ 
+ ;- the end ------------------------------------------------------------------;
+ 
++%ifidn ___OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+--- ./src/screen_i386.asm
++++ ./src/screen_i386.asm
+@@ -96,3 +96,6 @@
+ 	endproc
+ 
+ 
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+--- src/raze/Makefile.in
++++ src/raze/Makefile.in
+@@ -238,7 +238,7 @@
+ 	./strip_ raze.reg raze.regu
+ 
+ raze2.asm: raze.asmu raze.incu raze.regu
+-	nasm -w+orphan-labels -e $< -o $@
++	nasm -w+orphan-labels -f elf -e $< -o $@
+ 
+ # This assembles the file, once it's been pre-processed
+ raze.o: raze2.asm
+--- src/star/star.c
++++ src/star/star.c
+@@ -2431,6 +2431,10 @@
+ */
+ static void suffixes(void) {
+ 	emit("end\n");
++
++	emit("%%ifidn ___OUTPUT_FORMAT__,elf\n");
++	emit("section .note.GNU-stack noalloc noexec nowrite progbits\n");
++	emit("%%endif\n");
+ }
+ 
+ /****************************************************************************
diff --git a/games-emulation/gngeo/gngeo-0.6.10.ebuild b/games-emulation/gngeo/gngeo-0.6.10.ebuild
index 8c802aa62180..43e6312d6960 100644
--- a/games-emulation/gngeo/gngeo-0.6.10.ebuild
+++ b/games-emulation/gngeo/gngeo-0.6.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/gngeo-0.6.10.ebuild,v 1.1 2006/03/06 17:21:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/gngeo-0.6.10.ebuild,v 1.2 2006/03/06 19:58:41 mr_bones_ Exp $
 
-inherit flag-o-matic games
+inherit eutils games
 
 DESCRIPTION="A NeoGeo emulator"
 HOMEPAGE="http://m.peponas.free.fr/gngeo/"
@@ -20,6 +20,12 @@ RDEPEND="virtual/opengl
 DEPEND="${RDEPEND}
 	x86? ( >=dev-lang/nasm-0.98 )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-execstacks.patch"
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS NEWS README sample_gngeorc