rpms/flac/devel flac-1.2.0-gnu-stack.patch,1.1,1.2

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/flac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4800

Modified Files:
	flac-1.2.0-gnu-stack.patch 
Log Message:
And the same patch in the right direction...


flac-1.2.0-gnu-stack.patch:

Index: flac-1.2.0-gnu-stack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/flac-1.2.0-gnu-stack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- flac-1.2.0-gnu-stack.patch	11 Sep 2007 14:25:48 -0000	1.1
+++ flac-1.2.0-gnu-stack.patch	11 Sep 2007 14:33:53 -0000	1.2
@@ -1,55 +1,55 @@
-diff -upr flac-1.2.0/src/libFLAC/ia32/bitreader_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/bitreader_asm.nasm
---- flac-1.2.0/src/libFLAC/ia32/bitreader_asm.nasm	2007-09-11 15:21:48.000000000 +0100
-+++ flac-1.2.0.orig/src/libFLAC/ia32/bitreader_asm.nasm	2007-03-30 01:54:17.000000000 +0100
-@@ -563,4 +563,6 @@ cident FLAC__bitreader_read_rice_signed_
+diff -upr flac-1.2.0.orig/src/libFLAC/ia32/bitreader_asm.nasm flac-1.2.0/src/libFLAC/ia32/bitreader_asm.nasm
+--- flac-1.2.0.orig/src/libFLAC/ia32/bitreader_asm.nasm	2007-03-30 01:54:17.000000000 +0100
++++ flac-1.2.0/src/libFLAC/ia32/bitreader_asm.nasm	2007-09-11 15:21:48.000000000 +0100
+@@ -563,6 +563,4 @@ cident FLAC__bitreader_read_rice_signed_
  
  end
  
--section .note.GNU-stack progbits noalloc noexec nowrite align=1
-+%ifdef OBJ_FORMAT_elf
-+	section .note.GNU-stack noalloc
-+%endif
-diff -upr flac-1.2.0/src/libFLAC/ia32/cpu_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/cpu_asm.nasm
---- flac-1.2.0/src/libFLAC/ia32/cpu_asm.nasm	2007-09-11 15:21:59.000000000 +0100
-+++ flac-1.2.0.orig/src/libFLAC/ia32/cpu_asm.nasm	2007-03-22 03:13:11.000000000 +0000
-@@ -116,4 +116,6 @@ cident FLAC__cpu_info_extended_amd_asm_i
+-%ifdef OBJ_FORMAT_elf
+-	section .note.GNU-stack noalloc
+-%endif
++section .note.GNU-stack progbits noalloc noexec nowrite align=1
+diff -upr flac-1.2.0.orig/src/libFLAC/ia32/cpu_asm.nasm flac-1.2.0/src/libFLAC/ia32/cpu_asm.nasm
+--- flac-1.2.0.orig/src/libFLAC/ia32/cpu_asm.nasm	2007-03-22 03:13:11.000000000 +0000
++++ flac-1.2.0/src/libFLAC/ia32/cpu_asm.nasm	2007-09-11 15:21:59.000000000 +0100
+@@ -116,6 +116,4 @@ cident FLAC__cpu_info_extended_amd_asm_i
  
  end
  
--section .note.GNU-stack progbits noalloc noexec nowrite align=1
-+%ifdef OBJ_FORMAT_elf
-+       section .note.GNU-stack noalloc
-+%endif
-diff -upr flac-1.2.0/src/libFLAC/ia32/fixed_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/fixed_asm.nasm
---- flac-1.2.0/src/libFLAC/ia32/fixed_asm.nasm	2007-09-11 15:22:06.000000000 +0100
-+++ flac-1.2.0.orig/src/libFLAC/ia32/fixed_asm.nasm	2007-03-22 03:13:11.000000000 +0000
-@@ -307,4 +307,6 @@ cident FLAC__fixed_compute_best_predicto
+-%ifdef OBJ_FORMAT_elf
+-       section .note.GNU-stack noalloc
+-%endif
++section .note.GNU-stack progbits noalloc noexec nowrite align=1
+diff -upr flac-1.2.0.orig/src/libFLAC/ia32/fixed_asm.nasm flac-1.2.0/src/libFLAC/ia32/fixed_asm.nasm
+--- flac-1.2.0.orig/src/libFLAC/ia32/fixed_asm.nasm	2007-03-22 03:13:11.000000000 +0000
++++ flac-1.2.0/src/libFLAC/ia32/fixed_asm.nasm	2007-09-11 15:22:06.000000000 +0100
+@@ -307,6 +307,4 @@ cident FLAC__fixed_compute_best_predicto
  
  end
  
--section .note.GNU-stack progbits noalloc noexec nowrite align=1
-+%ifdef OBJ_FORMAT_elf
-+       section .note.GNU-stack noalloc
-+%endif
-diff -upr flac-1.2.0/src/libFLAC/ia32/lpc_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/lpc_asm.nasm
---- flac-1.2.0/src/libFLAC/ia32/lpc_asm.nasm	2007-09-11 15:22:13.000000000 +0100
-+++ flac-1.2.0.orig/src/libFLAC/ia32/lpc_asm.nasm	2007-03-22 03:13:11.000000000 +0000
-@@ -1506,4 +1506,6 @@ cident FLAC__lpc_restore_signal_asm_ia32
+-%ifdef OBJ_FORMAT_elf
+-       section .note.GNU-stack noalloc
+-%endif
++section .note.GNU-stack progbits noalloc noexec nowrite align=1
+diff -upr flac-1.2.0.orig/src/libFLAC/ia32/lpc_asm.nasm flac-1.2.0/src/libFLAC/ia32/lpc_asm.nasm
+--- flac-1.2.0.orig/src/libFLAC/ia32/lpc_asm.nasm	2007-03-22 03:13:11.000000000 +0000
++++ flac-1.2.0/src/libFLAC/ia32/lpc_asm.nasm	2007-09-11 15:22:13.000000000 +0100
+@@ -1506,6 +1506,4 @@ cident FLAC__lpc_restore_signal_asm_ia32
  
  end
  
--section .note.GNU-stack progbits noalloc noexec nowrite align=1
-+%ifdef OBJ_FORMAT_elf
-+       section .note.GNU-stack noalloc
-+%endif
-diff -upr flac-1.2.0/src/libFLAC/ia32/stream_encoder_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/stream_encoder_asm.nasm
---- flac-1.2.0/src/libFLAC/ia32/stream_encoder_asm.nasm	2007-09-11 15:22:21.000000000 +0100
-+++ flac-1.2.0.orig/src/libFLAC/ia32/stream_encoder_asm.nasm	2007-06-20 02:23:49.000000000 +0100
-@@ -154,4 +154,6 @@ cident precompute_partition_info_sums_32
+-%ifdef OBJ_FORMAT_elf
+-       section .note.GNU-stack noalloc
+-%endif
++section .note.GNU-stack progbits noalloc noexec nowrite align=1
+diff -upr flac-1.2.0.orig/src/libFLAC/ia32/stream_encoder_asm.nasm flac-1.2.0/src/libFLAC/ia32/stream_encoder_asm.nasm
+--- flac-1.2.0.orig/src/libFLAC/ia32/stream_encoder_asm.nasm	2007-06-20 02:23:49.000000000 +0100
++++ flac-1.2.0/src/libFLAC/ia32/stream_encoder_asm.nasm	2007-09-11 15:22:21.000000000 +0100
+@@ -154,6 +154,4 @@ cident precompute_partition_info_sums_32
  
  end
  
--section .note.GNU-stack progbits noalloc noexec nowrite align=1
-+%ifdef OBJ_FORMAT_elf
-+	section .note.GNU-stack noalloc
-+%endif
+-%ifdef OBJ_FORMAT_elf
+-	section .note.GNU-stack noalloc
+-%endif
++section .note.GNU-stack progbits noalloc noexec nowrite align=1