[arch-commits] Commit in flac/trunk (PKGBUILD flac-realloc.patch)

[Eric Bélanger]

    Date: Thursday, June 26, 2014 @ 02:18:03
  Author: eric
Revision: 215464

upgpkg: flac 1.3.0-3

Fix metaflac (close FS#40832)

Added:
  flac/trunk/flac-realloc.patch
Modified:
  flac/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   12 +++++++++---
 flac-realloc.patch |   15 +++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-25 23:03:43 UTC (rev 215463)
+++ PKGBUILD	2014-06-26 00:18:03 UTC (rev 215464)
@@ -4,7 +4,7 @@
 pkgbase=flac
 pkgname=('flac' 'flac-doc')
 pkgver=1.3.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://flac.sourceforge.net/"
 license=('BSD' 'GPL')
@@ -11,9 +11,15 @@
 depends=('gcc-libs' 'libogg')
 makedepends=('nasm' 'doxygen')
 options=('!makeflags')
-source=(http://downloads.xiph.org/releases/flac/${pkgbase}-${pkgver}.tar.xz)
-sha1sums=('a136e5748f8fb1e6c524c75000a765fc63bb7b1b')
+source=(http://downloads.xiph.org/releases/flac/${pkgbase}-${pkgver}.tar.xz flac-realloc.patch)
+sha1sums=('a136e5748f8fb1e6c524c75000a765fc63bb7b1b'
+          '22bf08219c289d747f399e351c701d0f195d3ce0')
 
+prepare() {
+  cd ${pkgbase}-${pkgver}
+  patch -p1 -i "${srcdir}/flac-realloc.patch"
+}
+
 build() {
   cd ${pkgbase}-${pkgver}
   ./configure --prefix=/usr --disable-sse

Added: flac-realloc.patch
===================================================================
--- flac-realloc.patch	                        (rev 0)
+++ flac-realloc.patch	2014-06-26 00:18:03 UTC (rev 215464)
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.xiph.org/?p=flac.git;a=blobdiff_plain;f=src%2Fmetaflac%2Futils.c;h=8a31daaddd47f8ea2d7b1e66445d180b4151e0db;hp=097537b2d39ea302269a16e7da9bc413e02ffb6e;hb=606fdfcaece19d3e05434bde57c289102a369069;hpb=d42c04260bf9e27cbb8c61a5529ecab3b20e25ff
+
+diff --git a/src/metaflac/utils.c b/src/metaflac/utils.c
+index 097537b..8a31daa 100644
+--- a/src/metaflac/utils.c
++++ b/src/metaflac/utils.c
+@@ -75,7 +75,7 @@ void local_strcat(char **dest, const char *source)
+ 	*dest = safe_realloc_add_3op_(*dest, ndest, /*+*/nsource, /*+*/1);
+ 	if(0 == *dest)
+ 		die("out of memory growing string");
+-	safe_strncpy((*dest)+ndest, source, ndest + nsource + 1);
++	safe_strncpy((*dest)+ndest, source, nsource + 1);
+ }
+ 
+ static inline int local_isprint(int c)