remove need for an executable stack

Package-Manager: portage-2.1.3_rc6

4 files changed, 68 insertions, 12 deletions

diff --git a/games-fps/tenebrae/ChangeLog b/games-fps/tenebrae/ChangeLog
index 46b92e3ff052..9fd5a65ac844 100644
--- a/games-fps/tenebrae/ChangeLog
+++ b/games-fps/tenebrae/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/tenebrae
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/ChangeLog,v 1.9 2007/02/22 00:30:49 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/ChangeLog,v 1.10 2007/07/02 17:39:11 nyhm Exp $
+
+  02 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/tenebrae-1.04-exec-stack.patch, tenebrae-1.04.ebuild:
+  remove need for an executable stack
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/games-fps/tenebrae/Manifest b/games-fps/tenebrae/Manifest
index 2bd5dfa8f99f..930baada4b96 100644
--- a/games-fps/tenebrae/Manifest
+++ b/games-fps/tenebrae/Manifest
@@ -1,17 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.04-glhax.patch 1091 RMD160 e43743b9172fb2497bba7d463db9fd1b53c2dfbf SHA1 f4cb8ef97294c9d78dfa6183e76f1ce268202474 SHA256 d856ea6bc1c5093d9d37997066b063761e46427fda9d6e4c817c227e2b42a8b6
 MD5 9a02c13ded49f8e230aa3f96e01052c7 files/1.04-glhax.patch 1091
 RMD160 e43743b9172fb2497bba7d463db9fd1b53c2dfbf files/1.04-glhax.patch 1091
 SHA256 d856ea6bc1c5093d9d37997066b063761e46427fda9d6e4c817c227e2b42a8b6 files/1.04-glhax.patch 1091
+AUX tenebrae-1.04-exec-stack.patch 642 RMD160 ddb22f84e2daf1f2eee27ad13e30b7175aab2e4f SHA1 3df0fd513eb05e63ac83e897aef0cff51b7dcbb5 SHA256 d04cbf31f16929b27040ea9f4e599db2ea4e14b696708034ae523ff406de011c
+MD5 6e2534655bf0e638b3faf1e126999ec8 files/tenebrae-1.04-exec-stack.patch 642
+RMD160 ddb22f84e2daf1f2eee27ad13e30b7175aab2e4f files/tenebrae-1.04-exec-stack.patch 642
+SHA256 d04cbf31f16929b27040ea9f4e599db2ea4e14b696708034ae523ff406de011c files/tenebrae-1.04-exec-stack.patch 642
 DIST tenebrae-1.04.tbz2 625988 RMD160 bc1c10a607619c5a6849e51dcd15f130b45fee87 SHA1 bc6ee34bb583d16c493a3e88f43bd24598a34907 SHA256 61277ecb41dc7c4adbfbad81cd5bfd69e3d63a8e7b41a4860bd879011a735f6c
 DIST tenebraedata.zip 3989498 RMD160 2524c6b483d52bc2aca97e8c626bf324023442e3 SHA1 9edc109d204e314d344ee982f2e66cc473bb809f SHA256 35db2e1dfe917ec5e62d8ad50fb5ccc73418a7dc3ef1e16cba9eb01f1e1177b8
-EBUILD tenebrae-1.04.ebuild 1601 RMD160 c029d8ac93675ad8a2dd79ab0f93e52e50a20248 SHA1 aab8490a6029f8fbb5df11b1f0703d714f104dee SHA256 d8416e0e224d54f60642e1d9b2d7e5df132ad568a7346d9a6f9b4e97192a2035
-MD5 1ef1b8778debf8f787189ee9443e9241 tenebrae-1.04.ebuild 1601
-RMD160 c029d8ac93675ad8a2dd79ab0f93e52e50a20248 tenebrae-1.04.ebuild 1601
-SHA256 d8416e0e224d54f60642e1d9b2d7e5df132ad568a7346d9a6f9b4e97192a2035 tenebrae-1.04.ebuild 1601
-MISC ChangeLog 1160 RMD160 47ad419267a426dffe7ee724e521a84f30f4e9f2 SHA1 0a3a3c5ccf98fc7abc7afac69b7bd7f71e36d19a SHA256 32d06cfb36434f653ebfd35ec4508cfe59d8aea922dc40e202117bb7ca5c049d
-MD5 0907d8be30d228a9f484801981022065 ChangeLog 1160
-RMD160 47ad419267a426dffe7ee724e521a84f30f4e9f2 ChangeLog 1160
-SHA256 32d06cfb36434f653ebfd35ec4508cfe59d8aea922dc40e202117bb7ca5c049d ChangeLog 1160
+EBUILD tenebrae-1.04.ebuild 1641 RMD160 e81a24821842c27443e29b575778dc0263714871 SHA1 38aa300d097c35e6fc5c6ff5afccc7f824b0ba3e SHA256 1b7fc28ea058ab22eb710cf73fd05fec7e26c8d3d0db3b58daf3ebfe2d7c8c09
+MD5 682270c11939a4d8a5986090d7e82f1e tenebrae-1.04.ebuild 1641
+RMD160 e81a24821842c27443e29b575778dc0263714871 tenebrae-1.04.ebuild 1641
+SHA256 1b7fc28ea058ab22eb710cf73fd05fec7e26c8d3d0db3b58daf3ebfe2d7c8c09 tenebrae-1.04.ebuild 1641
+MISC ChangeLog 1310 RMD160 8552a31514c58688181dae978d807b277cb9286f SHA1 e099ba7615f1b13a0b3aae1bb8d2305c856327a5 SHA256 d57585b0247bf23d9b49bc4e547a9b846066e10fdc351a172f548dfda98c6ca2
+MD5 eb73d0b180df45456e86c3a8be456a2b ChangeLog 1310
+RMD160 8552a31514c58688181dae978d807b277cb9286f ChangeLog 1310
+SHA256 d57585b0247bf23d9b49bc4e547a9b846066e10fdc351a172f548dfda98c6ca2 ChangeLog 1310
 MISC metadata.xml 535 RMD160 dc577d8e694987191c2dd42bbb40ad2f01452fae SHA1 3cf32fbcba2c238cb84740d6c22fc3e0f5f692c1 SHA256 f67ad81390e2ee2e5582b15bcc878e804028acce9a240f3885e3634a86a4fc1c
 MD5 6860ed332eb71e3d21f18920f757fc33 metadata.xml 535
 RMD160 dc577d8e694987191c2dd42bbb40ad2f01452fae metadata.xml 535
@@ -19,3 +26,10 @@ SHA256 f67ad81390e2ee2e5582b15bcc878e804028acce9a240f3885e3634a86a4fc1c metadata
 MD5 975c087285c12ad8b8f020db6d6e0536 files/digest-tenebrae-1.04 467
 RMD160 9f1d0132255ef6f26dfef8d4f43de9e6d1b1ceba files/digest-tenebrae-1.04 467
 SHA256 5e451e316dfaa5eee2162663b5de9cfc0d7070b11e9755e5f166d796ce75104d files/digest-tenebrae-1.04 467
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGiThGdz7hIScOURERApDJAJsFYNwwQAEGFF4SSmYpG37zBUqBUACgmF0T
++gA8h47lLvxXyM8bubwult0=
+=rTmy
+-----END PGP SIGNATURE-----
diff --git a/games-fps/tenebrae/files/tenebrae-1.04-exec-stack.patch b/games-fps/tenebrae/files/tenebrae-1.04-exec-stack.patch
new file mode 100644
index 000000000000..bc74e951fe6a
--- /dev/null
+++ b/games-fps/tenebrae/files/tenebrae-1.04-exec-stack.patch
@@ -0,0 +1,36 @@
+--- math.s
++++ math.s
+@@ -416,3 +416,6 @@
+ 	call	C(BOPS_Error)
+ 
+ #endif	// id386
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+--- snd_mixa.s
++++ snd_mixa.s
+@@ -216,3 +216,6 @@
+ 
+ #endif	// id386
+ 
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+--- sys_dosa.s
++++ sys_dosa.s
+@@ -93,3 +93,6 @@
+ 
+ 	ret
+ 
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+--- worlda.s
++++ worlda.s
+@@ -142,3 +142,6 @@
+ 
+ #endif	// id386
+ 
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/games-fps/tenebrae/tenebrae-1.04.ebuild b/games-fps/tenebrae/tenebrae-1.04.ebuild
index 378b9f0de6a2..a743066bf3e5 100644
--- a/games-fps/tenebrae/tenebrae-1.04.ebuild
+++ b/games-fps/tenebrae/tenebrae-1.04.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/tenebrae-1.04.ebuild,v 1.11 2006/12/05 18:02:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/tenebrae-1.04.ebuild,v 1.12 2007/07/02 17:39:11 nyhm Exp $
 
 #ECVS_SERVER="cvs.tenebrae.sourceforge.net:/cvsroot/tenebrae"
 #ECVS_MODULE="tenebrae_0"
@@ -38,7 +38,9 @@ src_unpack() {
 		cvs_src_unpack
 	fi
 	cd tenebrae_0
-	epatch "${FILESDIR}"/${PV}-glhax.patch
+	epatch \
+		"${FILESDIR}"/${PV}-glhax.patch \
+		"${FILESDIR}"/${P}-exec-stack.patch
 	cd linux
 	sed "s:-mpentiumpro -O6:${CFLAGS}:" Makefile.i386linux > Makefile
 	#if use sdl ; then