rpms/SDL/devel SDL-1.2.9-no_exec_stack.patch, NONE, 1.1 SDL.spec, 1.34, 1.35

[fedora-cvs-commits at redhat.com]

Author: twoerner

Update of /cvs/dist/rpms/SDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24784

Modified Files:
	SDL.spec 
Added Files:
	SDL-1.2.9-no_exec_stack.patch 
Log Message:
[tw] - added upstream no exec stack patch



SDL-1.2.9-no_exec_stack.patch:
 mmx_main.asm |    5 +++--
 mmxp2_32.asm |    5 +++--
 x86_main.asm |    4 ++++
 x86p_16.asm  |    3 +++
 x86p_32.asm  |    4 ++++
 5 files changed, 17 insertions(+), 4 deletions(-)

--- NEW FILE SDL-1.2.9-no_exec_stack.patch ---
--- SDL-1.2.9/src/hermes/x86p_16.asm.no_exec_stack	2001-04-26 18:45:45.000000000 +0200
+++ SDL-1.2.9/src/hermes/x86p_16.asm	2006-01-27 14:04:14.000000000 +0100
@@ -494,3 +494,6 @@
 .L7 pop ebp
     jmp _x86return
 
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
--- SDL-1.2.9/src/hermes/x86_main.asm.no_exec_stack	2001-04-26 18:45:45.000000000 +0200
+++ SDL-1.2.9/src/hermes/x86_main.asm	2006-01-27 14:04:14.000000000 +0100
@@ -123,3 +123,7 @@
 
 .L1:	
 	ret
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
--- SDL-1.2.9/src/hermes/mmx_main.asm.no_exec_stack	2001-04-26 18:45:45.000000000 +0200
+++ SDL-1.2.9/src/hermes/mmx_main.asm	2006-01-27 14:04:14.000000000 +0100
@@ -70,5 +70,6 @@
 	
 	ret		
 
-
-
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
--- SDL-1.2.9/src/hermes/mmxp2_32.asm.no_exec_stack	2002-03-01 19:01:16.000000000 +0100
+++ SDL-1.2.9/src/hermes/mmxp2_32.asm	2006-01-27 14:04:14.000000000 +0100
@@ -382,5 +382,6 @@
 .L4:		
 	jmp _mmxreturn
 
-
-
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
--- SDL-1.2.9/src/hermes/x86p_32.asm.no_exec_stack	2001-04-26 18:45:45.000000000 +0200
+++ SDL-1.2.9/src/hermes/x86p_32.asm	2006-01-27 14:04:14.000000000 +0100
@@ -1041,3 +1041,7 @@
 	
 .L4:	
 	jmp _x86return
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif


Index: SDL.spec
===================================================================
RCS file: /cvs/dist/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- SDL.spec	26 Jan 2006 13:57:02 -0000	1.34
+++ SDL.spec	27 Jan 2006 13:21:32 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: A cross-platform multimedia library.
 Name: SDL
 Version: 1.2.9
-Release: 4
+Release: 5
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Patch0: SDL-1.1.7-byteorder.patch
 Patch13: SDL-1.2.7-ppc_modes.patch
@@ -9,6 +9,7 @@
 Patch17: SDL-1.2.8-libdir.patch
 Patch18: SDL-1.2.9-yuv_mmx_gcc4.patch
 Patch19: SDL-1.2.8-preferalsa.patch
+Patch20: SDL-1.2.9-no_exec_stack.patch
 URL: http://www.libsdl.org/
 License: LGPL
 Group: System Environment/Libraries
@@ -45,6 +46,7 @@
 %patch17 -p1 -b .libdir
 %patch18 -p1 -b .yuv_mmx_gcc4
 %patch19 -p1 -b .prefer
+%patch20 -p1 -b .no_exec_stack
 
 %build
 #libtoolize --copy --force
@@ -100,6 +102,9 @@
 %{_mandir}/man3/SDL*.3*
 
 %changelog
+* Fri Jan 27 2006 Thomas Woerner <twoerner at redhat.com> 1.2.9-5
+- added upstream no exec stack patch
+
 * Thu Jan 26 2006 Thomas Woerner <twoerner at redhat.com> 1.2.9-4
 - prefer alsa sound output, then artsd and esd