rpms/flac/devel flac-1.2.0-gnu-stack.patch, NONE, 1.1 flac.spec, 1.30, 1.31 flac-1.1.3-gnu-stack.patch, 1.1, NONE

[Bastien Nocera (hadess)]

Author: hadess

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

Modified Files:
	flac.spec 
Added Files:
	flac-1.2.0-gnu-stack.patch 
Removed Files:
	flac-1.1.3-gnu-stack.patch 
Log Message:
* Tue Sep 11 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0-2
- Update GNU stack patch to cover all the NASM sources used


flac-1.2.0-gnu-stack.patch:

--- NEW FILE flac-1.2.0-gnu-stack.patch ---
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_
 
 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
 
 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
 
 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
 
 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
 
 end
 
-section .note.GNU-stack progbits noalloc noexec nowrite align=1
+%ifdef OBJ_FORMAT_elf
+	section .note.GNU-stack noalloc
+%endif


Index: flac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/flac.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- flac.spec	10 Sep 2007 21:59:47 -0000	1.30
+++ flac.spec	11 Sep 2007 14:25:48 -0000	1.31
@@ -1,11 +1,11 @@
 Summary: An encoder/decoder for the Free Lossless Audio Codec
 Name: flac
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL/GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz
-Patch1: flac-1.1.3-gnu-stack.patch
+Patch1: flac-1.2.0-gnu-stack.patch
 URL: http://flac.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel, libogg-devel, doxygen, nasm
@@ -72,7 +72,10 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
-* Mon Sep 10 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0
+* Tue Sep 11 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0-2
+- Update GNU stack patch to cover all the NASM sources used
+
+* Mon Sep 10 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0-1
 - Update for 1.20 and drop obsolete patches (#285161)
 
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 1.1.4-5


--- flac-1.1.3-gnu-stack.patch DELETED ---