[Pkg-sdl-commits] r31 - unstable/libsdl1.2/debian/patches

[Sam Hocevar]

Author: sho
Date: 2006-03-02 19:01:24 +0000 (Thu, 02 Mar 2006)
New Revision: 31

Modified:
   unstable/libsdl1.2/debian/patches/012_gnu_stack.diff
Log:
  * 012_gnu_stack.diff: Add explicit "noalloc noexec nowrite progbits"
    keywords to the stack properties.


Modified: unstable/libsdl1.2/debian/patches/012_gnu_stack.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/012_gnu_stack.diff	2006-03-02 00:35:54 UTC (rev 30)
+++ unstable/libsdl1.2/debian/patches/012_gnu_stack.diff	2006-03-02 19:01:24 UTC (rev 31)
@@ -1,45 +1,55 @@
 diff -puriN SDL-1.2.9/src/hermes/mmx_main.asm newSDL-1.2.9/src/hermes/mmx_main.asm
 --- SDL-1.2.9/src/hermes/mmx_main.asm	2001-04-26 18:45:45 +0200
 +++ newSDL-1.2.9/src/hermes/mmx_main.asm	2006-03-01 12:13:17 +0100
-@@ -70,5 +70,5 @@ endconvert:
+@@ -70,5 +70,7 @@ endconvert:
  	
  	ret		
  
 -
-+SECTION .note.GNU-stack
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
  
 diff -puriN SDL-1.2.9/src/hermes/mmxp2_32.asm newSDL-1.2.9/src/hermes/mmxp2_32.asm
 --- SDL-1.2.9/src/hermes/mmxp2_32.asm	2002-03-01 19:01:16 +0100
 +++ newSDL-1.2.9/src/hermes/mmxp2_32.asm	2006-03-01 12:13:42 +0100
-@@ -383,4 +383,5 @@ _convert_bgr555_cheat:
+@@ -383,4 +383,7 @@ _convert_bgr555_cheat:
  	jmp _mmxreturn
  
  
-+SECTION .note.GNU-stack
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
  
 diff -puriN SDL-1.2.9/src/hermes/x86_main.asm newSDL-1.2.9/src/hermes/x86_main.asm
 --- SDL-1.2.9/src/hermes/x86_main.asm	2001-04-26 18:45:45 +0200
 +++ newSDL-1.2.9/src/hermes/x86_main.asm	2006-03-01 12:14:13 +0100
-@@ -123,3 +123,5 @@ _Hermes_X86_CPU:
+@@ -123,3 +123,7 @@ _Hermes_X86_CPU:
  
  .L1:	
  	ret
 +
-+SECTION .note.GNU-stack
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
 diff -puriN SDL-1.2.9/src/hermes/x86p_16.asm newSDL-1.2.9/src/hermes/x86p_16.asm
 --- SDL-1.2.9/src/hermes/x86p_16.asm	2001-04-26 18:45:45 +0200
 +++ newSDL-1.2.9/src/hermes/x86p_16.asm	2006-03-01 12:14:23 +0100
-@@ -494,3 +494,4 @@ _ConvertX86p16_8RGB332:
+@@ -494,3 +494,6 @@ _ConvertX86p16_8RGB332:
  .L7 pop ebp
      jmp _x86return
  
-+SECTION .note.GNU-stack
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
 diff -puriN SDL-1.2.9/src/hermes/x86p_32.asm newSDL-1.2.9/src/hermes/x86p_32.asm
 --- SDL-1.2.9/src/hermes/x86p_32.asm	2001-04-26 18:45:45 +0200
 +++ newSDL-1.2.9/src/hermes/x86p_32.asm	2006-03-01 12:14:31 +0100
-@@ -1041,3 +1041,5 @@ _ConvertX86p32_8RGB332:
+@@ -1041,3 +1041,7 @@ _ConvertX86p32_8RGB332:
  	
  .L4:	
  	jmp _x86return
 +
-+SECTION .note.GNU-stack
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif