[flac] update to 1.3.1 (CVE-2014-8962, CVE-2014-9028)

[Miroslav Lichvar]

commit f353dfe66fd169f34061bb0fa690402141063e0b
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Thu Nov 27 13:52:49 2014 +0100

    update to 1.3.1 (CVE-2014-8962, CVE-2014-9028)

 .gitignore                 |    2 +-
 flac-cflags.patch          |   32 ++++++++++++++++++++++++++++++++
 flac-metaflac_strcat.patch |   29 -----------------------------
 flac-no_rice_asm.patch     |   27 ---------------------------
 flac.spec                  |   11 +++++------
 sources                    |    2 +-
 6 files changed, 39 insertions(+), 64 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 19eae18..dd97021 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/flac-1.3.0.tar.xz
+/flac-1.3.1.tar.xz
diff --git a/flac-cflags.patch b/flac-cflags.patch
new file mode 100644
index 0000000..6648e76
--- /dev/null
+++ b/flac-cflags.patch
@@ -0,0 +1,32 @@
+diff -up flac-1.3.1/configure.ac.cflags flac-1.3.1/configure.ac
+--- flac-1.3.1/configure.ac.cflags	2014-11-27 03:45:33.598155763 +0100
++++ flac-1.3.1/configure.ac	2014-11-27 13:45:18.092749862 +0100
+@@ -352,8 +352,7 @@ if test "x$debug" = xtrue; then
+ 	CFLAGS="-g $CFLAGS"
+ else
+ 	CPPFLAGS="-DNDEBUG $CPPFLAGS"
+-	CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
+-	CFLAGS="-O3 -funroll-loops $CFLAGS"
++	CFLAGS="$user_cflags"
+ fi
+ 
+ XIPH_GCC_VERSION
+@@ -363,7 +362,6 @@ if test x$ac_cv_c_compiler_gnu = xyes ;
+ 	CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wcast-align -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wsign-promo -Wundef -Wunreachable-code " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Woverloaded-virtual -Wmissing-declarations
+ 
+ 	XIPH_ADD_CFLAGS([-Wdeclaration-after-statement])
+-	XIPH_ADD_CFLAGS([-D_FORTIFY_SOURCE=2])
+ 
+ 	AC_LANG_PUSH([C++])
+ 	XIPH_ADD_CXXFLAGS([-Weffc++])
+@@ -385,10 +383,6 @@ if test x$ac_cv_c_compiler_gnu = xyes ;
+ 		XIPH_ADD_CFLAGS([-fgnu89-inline])
+ 		fi
+ 
+-	if test "x$asm_optimisation$sse_os" = "xyesyes" ; then
+-		XIPH_ADD_CFLAGS([-msse2])
+-		fi
+-
+ 	fi
+ 
+ XIPH_ADD_CFLAGS([-Wextra])
diff --git a/flac.spec b/flac.spec
index 667ea6b..5130181 100644
--- a/flac.spec
+++ b/flac.spec
@@ -1,6 +1,6 @@
 Summary: An encoder/decoder for the Free Lossless Audio Codec
 Name: flac
-Version: 1.3.0
+Version: 1.3.1
 Release: 5%{?dist}
 License: BSD and GPLv2+ and GFDL
 Group: Applications/Multimedia
@@ -8,6 +8,9 @@ Group: Applications/Multimedia
 Source0: http://downloads.xiph.org/releases/flac/flac-%{version}.tar.xz
 URL: http://www.xiph.org/flac/
 
+# use our CFLAGS and don't force SSE intrinsics
+Patch1: flac-cflags.patch
+
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 BuildRequires: libogg-devel
@@ -17,9 +20,6 @@ BuildRequires: automake autoconf libtool gettext-devel doxygen
 BuildRequires: nasm >= 2.0
 %endif
 
-Patch1: flac-metaflac_strcat.patch
-Patch2: flac-no_rice_asm.patch
-
 %description
 FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, FLAC
 is similar to Ogg Vorbis, but lossless. The FLAC project consists of
@@ -57,8 +57,7 @@ will use the Free Lossless Audio Codec.
 
 %prep
 %setup -q
-%patch1 -p1 -b .metaflac-strcat
-%patch2 -p1 -b .no_rice_asm
+%patch1 -p1 -b .cflags
 
 %build
 # use our libtool to avoid problems with RPATH
diff --git a/sources b/sources
index b80377a..b070d16 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13b5c214cee8373464d3d65dee362cdd  flac-1.3.0.tar.xz
+b9922c9a0378c88d3e901b234f852698  flac-1.3.1.tar.xz