From 77e17406b8d81f8f90fb9736ac782a2e61dda14c Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 11 Sep 2007 14:25:48 +0000 Subject: [PATCH] - Update GNU stack patch to cover all the NASM sources used --- flac-1.1.3-gnu-stack.patch | 30 --------------------- flac-1.2.0-gnu-stack.patch | 55 ++++++++++++++++++++++++++++++++++++++ flac.spec | 9 ++++--- 3 files changed, 61 insertions(+), 33 deletions(-) delete mode 100644 flac-1.1.3-gnu-stack.patch create mode 100644 flac-1.2.0-gnu-stack.patch diff --git a/flac-1.1.3-gnu-stack.patch b/flac-1.1.3-gnu-stack.patch deleted file mode 100644 index abe2f68..0000000 --- a/flac-1.1.3-gnu-stack.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- flac-1.1.3/src/libFLAC/ia32/lpc_asm.nasm.gnu-stack 2006-11-10 02:51:37.000000000 -0500 -+++ flac-1.1.3/src/libFLAC/ia32/lpc_asm.nasm 2007-02-01 18:43:23.000000000 -0500 -@@ -1502,6 +1502,4 @@ - - end - --%ifdef OBJ_FORMAT_elf -- section .note.GNU-stack noalloc --%endif -+section .note.GNU-stack progbits noalloc noexec nowrite align=1 ---- flac-1.1.3/src/libFLAC/ia32/fixed_asm.nasm.gnu-stack 2006-11-10 02:51:37.000000000 -0500 -+++ flac-1.1.3/src/libFLAC/ia32/fixed_asm.nasm 2007-02-01 18:42:28.000000000 -0500 -@@ -305,6 +305,4 @@ - - end - --%ifdef OBJ_FORMAT_elf -- section .note.GNU-stack noalloc --%endif -+section .note.GNU-stack progbits noalloc noexec nowrwite align=1 ---- flac-1.1.3/src/libFLAC/ia32/cpu_asm.nasm.gnu-stack 2006-11-10 02:51:37.000000000 -0500 -+++ flac-1.1.3/src/libFLAC/ia32/cpu_asm.nasm 2007-02-01 18:43:06.000000000 -0500 -@@ -99,6 +99,4 @@ - - end - --%ifdef OBJ_FORMAT_elf -- section .note.GNU-stack noalloc --%endif -+section .note.GNU-stack progbits noalloc noexec nowrite align=1 diff --git a/flac-1.2.0-gnu-stack.patch b/flac-1.2.0-gnu-stack.patch new file mode 100644 index 0000000..7969572 --- /dev/null +++ b/flac-1.2.0-gnu-stack.patch @@ -0,0 +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_ + + 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 diff --git a/flac.spec b/flac.spec index f7a1dcc..0b22d56 100644 --- a/flac.spec +++ b/flac.spec @@ -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 @@ rm -rf %{buildroot} %{_datadir}/aclocal/*.m4 %changelog -* Mon Sep 10 2007 - Bastien Nocera - 1.2.0 +* Tue Sep 11 2007 - Bastien Nocera - 1.2.0-2 +- Update GNU stack patch to cover all the NASM sources used + +* Mon Sep 10 2007 - Bastien Nocera - 1.2.0-1 - Update for 1.20 and drop obsolete patches (#285161) * Fri Aug 24 2007 Adam Jackson - 1.1.4-5