update exec stack patch

Package-Manager: portage-2.1.3_rc6

3 files changed, 67 insertions, 66 deletions

diff --git a/games-emulation/gngeo/ChangeLog b/games-emulation/gngeo/ChangeLog
index 6a3682cfa2f6..5ec2b325c6b3 100644
--- a/games-emulation/gngeo/ChangeLog
+++ b/games-emulation/gngeo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/gngeo
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/ChangeLog,v 1.18 2007/02/07 13:51:06 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/ChangeLog,v 1.19 2007/07/02 16:50:59 nyhm Exp $
+
+  02 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
+  files/gngeo-0.7-execstacks.patch:
+  update exec stack patch
 
   07 Feb 2007; Tristan Heaven <nyhm@gentoo.org> gngeo-0.7.ebuild:
   Use mirror://berlios
diff --git a/games-emulation/gngeo/Manifest b/games-emulation/gngeo/Manifest
index e59029ec9a94..f7608b6239a3 100644
--- a/games-emulation/gngeo/Manifest
+++ b/games-emulation/gngeo/Manifest
@@ -9,19 +9,19 @@ AUX gngeo-0.7-concurrentMake.patch 512 RMD160 f5a3bf730e0c2c2cd86a525a937171427a
 MD5 e1135f02f15e884a523a10ed49cb4ee6 files/gngeo-0.7-concurrentMake.patch 512
 RMD160 f5a3bf730e0c2c2cd86a525a937171427aa5e699 files/gngeo-0.7-concurrentMake.patch 512
 SHA256 dc16caf67c38ac7a94ebeff1f994216352682d36f82f15f80d962a374902551a files/gngeo-0.7-concurrentMake.patch 512
-AUX gngeo-0.7-execstacks.patch 2724 RMD160 167253d907770e72354e524db79ee257621774cb SHA1 74cb3f599f442a0c60cefea5b18c1a9cf03e13c6 SHA256 b9883d76d5b23d3c3b73359055a465a0cf6ff34063b1ec7630ddcd01c091e6d0
-MD5 eb3fb79379d54c7ed1e7dee76f7db95a files/gngeo-0.7-execstacks.patch 2724
-RMD160 167253d907770e72354e524db79ee257621774cb files/gngeo-0.7-execstacks.patch 2724
-SHA256 b9883d76d5b23d3c3b73359055a465a0cf6ff34063b1ec7630ddcd01c091e6d0 files/gngeo-0.7-execstacks.patch 2724
+AUX gngeo-0.7-execstacks.patch 2465 RMD160 c51addac07baa440d0be1633a985e6c5c0277a51 SHA1 19068d08171b2700a26c9207176381efad383c3a SHA256 5ddb3327424b6ec92f274e5e0fe38dc90efa1906afd350ab056ba33982dcbf11
+MD5 cbd1213dca759f79615b77e813d3f465 files/gngeo-0.7-execstacks.patch 2465
+RMD160 c51addac07baa440d0be1633a985e6c5c0277a51 files/gngeo-0.7-execstacks.patch 2465
+SHA256 5ddb3327424b6ec92f274e5e0fe38dc90efa1906afd350ab056ba33982dcbf11 files/gngeo-0.7-execstacks.patch 2465
 DIST gngeo-0.7.tar.gz 853892 RMD160 a55a14d3ce2e3665a55c625688de907f7992548e SHA1 1da0daa0f2af0c3964fc857b68900c46015d09ac SHA256 4c1c56aacede9aceb0d8b2900d7b3edccd2ac6efe7f81a0d3723e998177ab5dc
 EBUILD gngeo-0.7.ebuild 998 RMD160 ebfe3a8021da42c3dd891116dc9464e4af25e655 SHA1 7ba9d619ee067ec32542b493a8f7bfff78d57f9c SHA256 536c078402d275781e4c3f19ef75bdc975c64871c1612951f9f660bbe0a23ce0
 MD5 65614b5d0d43e914847cd4cfecbd2ab3 gngeo-0.7.ebuild 998
 RMD160 ebfe3a8021da42c3dd891116dc9464e4af25e655 gngeo-0.7.ebuild 998
 SHA256 536c078402d275781e4c3f19ef75bdc975c64871c1612951f9f660bbe0a23ce0 gngeo-0.7.ebuild 998
-MISC ChangeLog 2474 RMD160 a9ad689f48ca6a23019e1bba7236b2ba88aeab91 SHA1 9d7c26ee2f3dff2efdcd69cffa4e884145506e35 SHA256 a9d1bfac9ad67affbd66c5c3171a10214769b2d969582f238102c9b3fb053cff
-MD5 d723333c4d4dd5bbba794e2c0e2744eb ChangeLog 2474
-RMD160 a9ad689f48ca6a23019e1bba7236b2ba88aeab91 ChangeLog 2474
-SHA256 a9d1bfac9ad67affbd66c5c3171a10214769b2d969582f238102c9b3fb053cff ChangeLog 2474
+MISC ChangeLog 2585 RMD160 d034c730db918fd500913259295143324461299a SHA1 17575374c0fc2ab2f5502bf81313d2d3faaeddc2 SHA256 efdb28ada9991a8dcad70ac8d00842569eeb9bfbb4376c7fa8c3290ff0246c3d
+MD5 fad4abfe6525f735940b4999af9eed55 ChangeLog 2585
+RMD160 d034c730db918fd500913259295143324461299a ChangeLog 2585
+SHA256 efdb28ada9991a8dcad70ac8d00842569eeb9bfbb4376c7fa8c3290ff0246c3d ChangeLog 2585
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -30,9 +30,9 @@ MD5 ffea421966a809ad8f17a1b136ac4a71 files/digest-gngeo-0.7 229
 RMD160 f8224fcc2cb13870df2fb0323c9cb7e287d8cdae files/digest-gngeo-0.7 229
 SHA256 bd83bf9d6a1f3d62c5da42433384024c24ab88d2cc8fa8322eeb5264153b146a files/digest-gngeo-0.7 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFFydlRdz7hIScOURERAksFAKClM/jIFmbJZOpuMaG1c+waZ2imeACgzbal
-fHa2cRw6K+RRBdOVYzm527s=
-=ZUOc
+iD8DBQFGiSz5dz7hIScOURERAgNGAJ4lA2ctIx23vS52B2usPK86YiIJVQCeIZ6y
+BjEvh4DX6OndwKFM9pGJMt4=
+=uNdB
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/gngeo/files/gngeo-0.7-execstacks.patch b/games-emulation/gngeo/files/gngeo-0.7-execstacks.patch
index 394f86764843..17c576b7d634 100644
--- a/games-emulation/gngeo/files/gngeo-0.7-execstacks.patch
+++ b/games-emulation/gngeo/files/gngeo-0.7-execstacks.patch
@@ -1,28 +1,5 @@
---- 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/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
+--- src/effect/2xsaimmx.asm
++++ src/effect/2xsaimmx.asm
 @@ -2107,3 +2107,7 @@
  final1b       resb 8
  final2a       resb 8
@@ -31,8 +8,8 @@
 +%ifidn __OUTPUT_FORMAT__,elf
 +section .note.GNU-stack noalloc noexec nowrite progbits
 +%endif
---- ./src/effect/effect_i386.asm
-+++ ./src/effect/effect_i386.asm
+--- src/effect/effect_i386.asm
++++ src/effect/effect_i386.asm
 @@ -88,3 +88,7 @@
  	emms
  	
@@ -41,8 +18,8 @@
 +%ifidn __OUTPUT_FORMAT__,elf
 +section .note.GNU-stack noalloc noexec nowrite progbits
 +%endif
---- ./src/effect/hq2x16.asm
-+++ ./src/effect/hq2x16.asm
+--- src/effect/hq2x16.asm
++++ src/effect/hq2x16.asm
 @@ -1935,3 +1935,7 @@
      dd ..@cross8, ..@flag0,  ..@flag0,  ..@flag0,

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

@@ -51,21 +28,42 @@
 +%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
+--- 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
-
- *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
+--- 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/raze/Makefile.am
++++ src/raze/Makefile.am
+@@ -20,7 +20,7 @@
+ 	$(srcdir)/strip_ $< $@
+ 
+ raze2.asm: raze.asmu raze.incu raze.regu
+-	nasm -w+orphan-labels -I $(srcdir)/ -e $< -o $@
++	nasm -w+orphan-labels -f elf -I $(srcdir)/ -e $< -o $@
+ 
+ # This assembles the file, once it's been pre-processed
+ raze.o: raze2.asm
+--- src/raze/raze.asm
++++ src/raze/raze.asm
 @@ -4259,3 +4259,6 @@
  
  ;- the end ------------------------------------------------------------------;
@@ -73,8 +71,8 @@
 +%ifidn ___OUTPUT_FORMAT__,elf
 +section .note.GNU-stack noalloc noexec nowrite progbits
 +%endif
---- ./src/screen_i386.asm
-+++ ./src/screen_i386.asm
+--- src/screen_i386.asm
++++ src/screen_i386.asm
 @@ -96,3 +96,6 @@
  	endproc
  
@@ -95,14 +93,13 @@
  }
  
  /****************************************************************************
---- src/raze/Makefile.in.orig	2006-09-02 02:14:11.000000000 -0400
-+++ src/raze/Makefile.in	2006-09-02 02:14:34.000000000 -0400
-@@ -246,7 +246,7 @@
- 	$(srcdir)/strip_ $< $@
- 
- raze2.asm: raze.asmu raze.incu raze.regu
--	nasm -w+orphan-labels -I $(srcdir)/ -e $< -o $@
-+	nasm -w+orphan-labels -f elf -I $(srcdir)/ -e $< -o $@
- 
- # This assembles the file, once it's been pre-processed
- raze.o: raze2.asm
+--- 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