[mingw-flac] Update to 1.3.1 (#1168768)

[František Dvořák]

commit cde08830db578cafc377da86ae2d82aa8f47a49a
Author: David King <amigadave at amigadave.com>
Date:   Thu Nov 27 21:37:42 2014 +0000

    Update to 1.3.1 (#1168768)
    
    Fixes CVE-2014-8962 and CVE-2014-9028.

 .gitignore                 |    1 +
 flac-cflags.patch          |   32 ++++++++++++++++++++++++++++++++
 flac-metaflac_strcat.patch |   29 -----------------------------
 flac-no_rice_asm.patch     |   27 ---------------------------
 mingw-flac.spec            |   17 +++++++++--------
 sources                    |    2 +-
 6 files changed, 43 insertions(+), 65 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 19eae18..4da2f1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /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/mingw-flac.spec b/mingw-flac.spec
index 21f8aa7..48299db 100644
--- a/mingw-flac.spec
+++ b/mingw-flac.spec
@@ -1,18 +1,16 @@
 %{?mingw_package_header}
 
 Name:           mingw-flac
-Version:        1.3.0
-Release:        3%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Encoder/decoder for the Free Lossless Audio Codec
 
 # BSD: libraries, GPLv2+: tools and examples
 License:        BSD and GPLv2+
 URL:            http://xiph.org/flac/
 Source0:        http://downloads.xiph.org/releases/flac/flac-%{version}.tar.xz
-# https://git.xiph.org/?p=flac.git;a=commitdiff;h=606fdfcaece19d3e05434bde57c289102a369069
-Patch1:         flac-metaflac_strcat.patch
-# https://git.xiph.org/?p=flac.git;a=commitdiff;h=4eab6313cd2198b5647d925bdb3847590505fa21
-Patch2:         flac-no_rice_asm.patch
+# Copied from the native Fedora package.
+Patch0:         flac-cflags.patch
 
 BuildArch:      noarch
 
@@ -103,8 +101,7 @@ This package is MinGW compiled flac tools for the Win64 target.
 
 %prep
 %setup -q -n flac-%{version}
-%patch1 -p1 -b .metaflac-strcat
-%patch2 -p1 -b .no_rice_asm
+%patch0 -p1 -b .cflags
 
 
 %build
@@ -166,6 +163,10 @@ rm %{buildroot}%{mingw64_libdir}/*.la
 
 
 %changelog
+* Thu Nov 27 2014 David King <amigadave at amigadave.com> - 1.3.1-1
+- Update to 1.3.1 (#1168768)
+- Fixes CVE-2014-8962 and CVE-2014-9028
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
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