rpms/flac/F-7 flac-1.2.0-gnu-stack.patch, NONE, 1.1 flac-disable-opts.patch, NONE, 1.1 flac.spec, 1.28, 1.29 flac-1.1.3-gnu-stack.patch, 1.1, NONE flac-1.1.3-noxmms.patch, 1.1, NONE flac-1.1.4-hide-byteswap.patch, 1.1, NONE flac-1.1.4-link-ogg.patch, 1.1, NONE

Bastien Nocera (hadess) fedora-extras-commits at redhat.com
Wed Oct 17 12:19:16 UTC 2007 

Author: hadess

Update of /cvs/pkgs/rpms/flac/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19206

Modified Files:
	flac.spec 
Added Files:
	flac-1.2.0-gnu-stack.patch flac-disable-opts.patch 
Removed Files:
	flac-1.1.3-gnu-stack.patch flac-1.1.3-noxmms.patch 
	flac-1.1.4-hide-byteswap.patch flac-1.1.4-link-ogg.patch 
Log Message:
* Wed Oct 17 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.1-1
- Update to 1.2.1 to fix CVE-2007-4619 (#332571)


flac-1.2.0-gnu-stack.patch:

--- NEW FILE flac-1.2.0-gnu-stack.patch ---
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
 
-%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
 
-%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
 
-%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
 
-%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
 
-%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/src/libFLAC/bitreader.c flac-1.2.0.new/src/libFLAC/bitreader.c
--- flac-1.2.0/src/libFLAC/bitreader.c	2007-07-23 17:14:35.000000000 +0100
+++ flac-1.2.0.new/src/libFLAC/bitreader.c	2007-09-12 18:15:30.000000000 +0100
@@ -203,6 +203,7 @@ static FLaC__INLINE void crc16_update_wo
 }
 
 /* would be static except it needs to be called by asm routines */
+ __attribute__((__visibility__("hidden")))
 FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br)
 {
 	unsigned start, end;
diff -upr flac-1.2.0/src/libFLAC/crc.c flac-1.2.0.new/src/libFLAC/crc.c
--- flac-1.2.0/src/libFLAC/crc.c	2007-02-02 06:58:22.000000000 +0000
+++ flac-1.2.0.new/src/libFLAC/crc.c	2007-09-12 18:13:44.000000000 +0100
@@ -73,7 +73,7 @@ FLAC__byte const FLAC__crc8_table[256] =
 };
 
 /* CRC-16, poly = x^16 + x^15 + x^2 + x^0, init = 0 */
-
+__attribute__((__visibility__("hidden")))
 unsigned FLAC__crc16_table[256] = {
 	0x0000,  0x8005,  0x800f,  0x000a,  0x801b,  0x001e,  0x0014,  0x8011,
 	0x8033,  0x0036,  0x003c,  0x8039,  0x0028,  0x802d,  0x8027,  0x0022,
diff -upr flac-1.2.0/src/libFLAC/bitreader.c flac-1.2.0.new/src/libFLAC/bitreader.c
--- flac-1.2.0/src/libFLAC/bitreader.c	2007-09-12 18:17:56.000000000 +0100
+++ flac-1.2.0.new/src/libFLAC/bitreader.c	2007-09-12 19:09:00.000000000 +0100
@@ -774,6 +774,7 @@ FLaC__INLINE FLAC__bool FLAC__bitreader_
 }
 #endif
 
+ __attribute__((__visibility__("hidden")))
 FLAC__bool FLAC__bitreader_read_rice_signed(FLAC__BitReader *br, int *val, unsigned parameter)
 {
 	FLAC__uint32 lsbs = 0, msbs = 0;


flac-disable-opts.patch:

--- NEW FILE flac-disable-opts.patch ---
? .build-1.2.0-2.fc8.log
? .build-1.2.0-3.fc8.log
? flac-1.2.0
? flac-1.2.0-2.fc8.src.rpm
? flac-1.2.0-3.fc8.src.rpm
? flac-1.2.0-gnu-stack-2.patch
? flac-1.2.0-gnu-stack-3.patch
? flac-1.2.0.new
? flac-disable-opts.patch
? i686
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.2
diff -u -p -r1.2 flac-1.2.0-gnu-stack.patch
--- flac-1.2.0-gnu-stack.patch	11 Sep 2007 14:33:53 -0000	1.2
+++ flac-1.2.0-gnu-stack.patch	12 Sep 2007 19:54:06 -0000
@@ -53,3 +53,38 @@ diff -upr flac-1.2.0.orig/src/libFLAC/ia
 -	section .note.GNU-stack noalloc
 -%endif
 +section .note.GNU-stack progbits noalloc noexec nowrite align=1
+diff -upr flac-1.2.0/src/libFLAC/bitreader.c flac-1.2.0.new/src/libFLAC/bitreader.c
+--- flac-1.2.0/src/libFLAC/bitreader.c	2007-07-23 17:14:35.000000000 +0100
++++ flac-1.2.0.new/src/libFLAC/bitreader.c	2007-09-12 18:15:30.000000000 +0100
+@@ -203,6 +203,7 @@ static FLaC__INLINE void crc16_update_wo
+ }
+ 
+ /* would be static except it needs to be called by asm routines */
++ __attribute__((__visibility__("hidden")))
+ FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br)
+ {
+ 	unsigned start, end;
+diff -upr flac-1.2.0/src/libFLAC/crc.c flac-1.2.0.new/src/libFLAC/crc.c
+--- flac-1.2.0/src/libFLAC/crc.c	2007-02-02 06:58:22.000000000 +0000
++++ flac-1.2.0.new/src/libFLAC/crc.c	2007-09-12 18:13:44.000000000 +0100
+@@ -73,7 +73,7 @@ FLAC__byte const FLAC__crc8_table[256] =
+ };
+ 
+ /* CRC-16, poly = x^16 + x^15 + x^2 + x^0, init = 0 */
+-
++__attribute__((__visibility__("hidden")))
+ unsigned FLAC__crc16_table[256] = {
+ 	0x0000,  0x8005,  0x800f,  0x000a,  0x801b,  0x001e,  0x0014,  0x8011,
+ 	0x8033,  0x0036,  0x003c,  0x8039,  0x0028,  0x802d,  0x8027,  0x0022,
+diff -upr flac-1.2.0/src/libFLAC/bitreader.c flac-1.2.0.new/src/libFLAC/bitreader.c
+--- flac-1.2.0/src/libFLAC/bitreader.c	2007-09-12 18:17:56.000000000 +0100
++++ flac-1.2.0.new/src/libFLAC/bitreader.c	2007-09-12 19:09:00.000000000 +0100
+@@ -774,6 +774,7 @@ FLaC__INLINE FLAC__bool FLAC__bitreader_
+ }
+ #endif
+ 
++ __attribute__((__visibility__("hidden")))
+ FLAC__bool FLAC__bitreader_read_rice_signed(FLAC__BitReader *br, int *val, unsigned parameter)
+ {
+ 	FLAC__uint32 lsbs = 0, msbs = 0;
+
Index: flac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/flac.spec,v
retrieving revision 1.31
diff -u -p -r1.31 flac.spec
--- flac.spec	11 Sep 2007 14:25:48 -0000	1.31
+++ flac.spec	12 Sep 2007 19:54:07 -0000
@@ -1,7 +1,7 @@
 Summary: An encoder/decoder for the Free Lossless Audio Codec
 Name: flac
 Version: 1.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL/GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz
@@ -36,8 +36,11 @@ will use the Free Lossless Audio Codec.
 %patch1 -p1 -b .gnu-stack
 
 %build
-export XMMS_CONFIG=no # Disable XMMS
+%ifarch %{ix86}
+%configure --with-pic --disable-xmms-plugin --disable-asm-optimizations
+%else
 %configure --with-pic --disable-xmms-plugin
+%endif
 
 make %{?_smp_mflags}
 
@@ -72,6 +75,11 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Wed Sep 12 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0-3
+- Make a few functions hidden, to try and avoid textrels
+- Disable optimisations on x86 for the same reason
+  (#285961)
+
 * 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
 


Index: flac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flac/F-7/flac.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- flac.spec	12 Apr 2007 12:51:25 -0000	1.28
+++ flac.spec	17 Oct 2007 12:18:43 -0000	1.29
@@ -1,18 +1,15 @@
 Summary: An encoder/decoder for the Free Lossless Audio Codec
 Name: flac
-Version: 1.1.4
-Release: 4%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 License: LGPL/GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz
-Patch2: flac-1.1.4-hide-byteswap.patch
-Patch3: flac-1.1.3-gnu-stack.patch
-Patch4: flac-1.1.3-noxmms.patch
-Patch5: flac-1.1.4-link-ogg.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
-BuildRequires: libtool, gettext-devel
+BuildRequires: gettext-devel
 Obsoletes: flac-libs
 Provides: flac-libs
 
@@ -36,16 +33,14 @@
 
 %prep
 %setup -q
-%patch2 -p1 -b .extra-sym
-%patch3 -p1 -b .gnu-stack
-%patch4 -p1 -b .noxmms
-%patch5 -p1 -b .link-ogg
-
-autoreconf -i -f
+%patch1 -p1 -b .gnu-stack
 
 %build
-export XMMS_CONFIG=no # Disable XMMS
-%configure --with-pic
+%ifarch %{ix86}
+%configure --with-pic --disable-xmms-plugin --disable-asm-optimizations
+%else
+%configure --with-pic --disable-xmms-plugin
+%endif
 
 make %{?_smp_mflags}
 
@@ -80,6 +75,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Wed Oct 17 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.1-1
+- Update to 1.2.1 to fix CVE-2007-4619 (#332571)
+
 * Thu Apr 12 2007 - Bastien Nocera <bnocera at redhat.com> - 1.1.4-4
 - The byteSwap symbol shouldn't be global, reported by Joe Orton
   <jorton at redhat.com> (#215920)


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


--- flac-1.1.3-noxmms.patch DELETED ---


--- flac-1.1.4-hide-byteswap.patch DELETED ---


--- flac-1.1.4-link-ogg.patch DELETED ---

More information about the fedora-extras-commits mailing list