fixes from chromium (rather minor one in md5.c)

diff --git a/crbug-111390.patch b/crbug-111390.patch
new file mode 100644 (file)
index 0000000..5886772
--- /dev/null
+++ b/crbug-111390.patch
@@ -0,0 +1,22 @@
+chrome fixes
+https://code.google.com/p/chromium/issues/detail?id=111390
+
+also in upstream:c
+http://git.xiph.org/?p=flac.git;a=commitdiff;h=6c8d740c1a0bf01605bdd05fe6765ff841dd082a
+http://git.xiph.org/?p=flac.git;a=commitdiff;h=19e3918d4e35f4ab99e7fcc58c169025c576dd16
+--- flac-1.2.1/src/libFLAC/md5.c       2007-09-10 23:49:47.000000000 +0000
++++ ../chromium-browser-23.0.1271.64/src/third_party/flac/src/libFLAC/md5.c    2012-10-31 19:03:12.000000000 +0000
+@@ -263,12 +263,12 @@
+ 
+       byteSwap(ctx->buf, 4);
+       memcpy(digest, ctx->buf, 16);
+-      memset(ctx, 0, sizeof(ctx));    /* In case it's sensitive */
+       if(0 != ctx->internal_buf) {
+               free(ctx->internal_buf);
+               ctx->internal_buf = 0;
+               ctx->capacity = 0;
+       }
++      memset(ctx, 0, sizeof(*ctx));   /* In case it's sensitive */
+ }
+ 
+ /*

diff --git a/flac.spec b/flac.spec
index 7e9ed42747ef199bd29f598d79602a37f4e07a4a..42410f5641cdf93447f17a76faf0fd6ed8f0b72b 100644 (file)
--- a/flac.spec
+++ b/flac.spec
@@ -2,12 +2,12 @@
 # Conditional build:
 %bcond_without static_libs     # don't build static library
 %bcond_without xmms            # don't build XMMS plugin
 # Conditional build:
 %bcond_without static_libs     # don't build static library
 %bcond_without xmms            # don't build XMMS plugin

-#
+

 Summary:       Free Lossless Audio Codec
 Summary(pl.UTF-8):     Free Lossless Audio Codec - Wolnodostępny bezstratny kodek audio
 Name:          flac
 Version:       1.2.1
 Summary:       Free Lossless Audio Codec
 Summary(pl.UTF-8):     Free Lossless Audio Codec - Wolnodostępny bezstratny kodek audio
 Name:          flac
 Version:       1.2.1

-Release:       6
+Release:       7

 License:       BSD (libFLAC/libFLAC++), GPL (programs and plugins)
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/flac/%{name}-%{version}.tar.gz
 License:       BSD (libFLAC/libFLAC++), GPL (programs and plugins)
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/flac/%{name}-%{version}.tar.gz


@@ -15,6 +15,7 @@ Source0:      http://dl.sourceforge.net/flac/%{name}-%{version}.tar.gz
 Patch0:                %{name}-without_xmms.patch
 Patch1:                %{name}-lt.patch
 Patch2:                %{name}-gcc44.patch
 Patch0:                %{name}-without_xmms.patch
 Patch1:                %{name}-lt.patch
 Patch2:                %{name}-gcc44.patch

+Patch3:                crbug-111390.patch

 URL:           http://flac.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake >= 1:1.7
 URL:           http://flac.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake >= 1:1.7


@@ -119,8 +120,9 @@ Wtyczka dla XMMS umożliwiająca odtwarzanie plików w formacie FLAC.
 %{!?with_xmms:%patch0 -p1}
 %patch1 -p1
 %patch2 -p1
 %{!?with_xmms:%patch0 -p1}
 %patch1 -p1
 %patch2 -p1

+%patch3 -p1

 
 

-rm m4/ogg.m4
+%{__rm} m4/ogg.m4

 
 %build
 %{__libtoolize}
 
 %build
 %{__libtoolize}