summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authortnn <tnn>2015-03-14 22:56:00 +0000
committertnn <tnn>2015-03-14 22:56:00 +0000
commit0c28888b8098a69576fe581b53e8ed92407891b7 (patch)
tree05abd3202fd5cd6d2e226cccbc95e98e19daf05f /audio
parenta6e189c7d8e720f96503b640121d01d07e5440e7 (diff)
downloadpkgsrc-0c28888b8098a69576fe581b53e8ed92407891b7.tar.gz
Update to sox-14.4.2 to fix CVE-2014-8145.
SoX 14.4.2 (February 22, 2015): Read support for Ogg Opus files. Read support for RF64 WAV files. Deemph can now be used at 48kHz sample rates. Rate is now much faster in many cases. Support multi-channel LADSPA plugins and optional latency compensation. Many other bug fixes.
Diffstat (limited to 'audio')
-rw-r--r--audio/sox/Makefile4
-rw-r--r--audio/sox/distinfo10
-rw-r--r--audio/sox/patches/patch-ak11
3 files changed, 13 insertions, 12 deletions
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index acd7c828401..8ea63f87f4b 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2014/10/09 14:05:58 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2015/03/14 22:56:00 tnn Exp $
-DISTNAME= sox-14.4.1
+DISTNAME= sox-14.4.2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sox/}
diff --git a/audio/sox/distinfo b/audio/sox/distinfo
index d1797b8de3d..c001fca918f 100644
--- a/audio/sox/distinfo
+++ b/audio/sox/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.24 2013/10/02 14:21:27 drochner Exp $
+$NetBSD: distinfo,v 1.25 2015/03/14 22:56:00 tnn Exp $
-SHA1 (sox-14.4.1.tar.gz) = 71f05afc51e3d9b03376b2f98fd452d3a274d595
-RMD160 (sox-14.4.1.tar.gz) = 2f3890ef1a2a7fe3ee8d819912b3b529e58986fe
-Size (sox-14.4.1.tar.gz) = 1111653 bytes
+SHA1 (sox-14.4.2.tar.gz) = f69f38f8a7ad6a88ecab3862d74db4edcd796695
+RMD160 (sox-14.4.2.tar.gz) = 2fd48904a7d8c7d85e194a001020901d061ced98
+Size (sox-14.4.2.tar.gz) = 1134299 bytes
SHA1 (patch-aa) = e6f3d06450862795648622a017b2c696328872f5
-SHA1 (patch-ak) = 46e2e23f7688201c1e4bcdce42982c7583fa0e5e
+SHA1 (patch-ak) = 28675f56a0e2969d0facd98282667c53eb10c0ed
diff --git a/audio/sox/patches/patch-ak b/audio/sox/patches/patch-ak
index a9e9ece55cb..29a88d83a68 100644
--- a/audio/sox/patches/patch-ak
+++ b/audio/sox/patches/patch-ak
@@ -1,12 +1,12 @@
-$NetBSD: patch-ak,v 1.3 2013/10/02 14:21:27 drochner Exp $
+$NetBSD: patch-ak,v 1.4 2015/03/14 22:56:00 tnn Exp $
* On DragonFly, FILE is hidden, only allowed to modify in __FILE_public.
* Disable file-type pipe detection on 64-bit Solaris.
---- src/formats.c.orig 2013-01-13 19:57:39.000000000 +0000
+--- src/formats.c.orig 2014-10-27 02:55:50.000000000 +0000
+++ src/formats.c
-@@ -407,17 +407,22 @@ static void UNUSED rewind_pipe(FILE * fp
+@@ -411,18 +411,23 @@ static void UNUSED rewind_pipe(FILE * fp
/* _FSTDIO is for Torek stdio (i.e. most BSD-derived libc's)
* In theory, we no longer need to check _NEWLIB_VERSION or __APPLE__ */
#if defined _FSTDIO || defined _NEWLIB_VERSION || defined __APPLE__
@@ -20,8 +20,9 @@ $NetBSD: patch-ak,v 1.3 2013/10/02 14:21:27 drochner Exp $
+# endif
#elif defined __GLIBC__
fp->_IO_read_ptr = fp->_IO_read_base;
--#elif defined _MSC_VER || defined _WIN32 || defined _WIN64 || defined _ISO_STDIO_ISO_H
-+#elif defined _MSC_VER || defined _WIN32 || defined _WIN64 || (defined _ISO_STDIO_ISO_H && !(defined(__sun) && defined(_LP64)))
+ #elif defined _MSC_VER || defined _WIN32 || defined _WIN64 || \
+- defined _ISO_STDIO_ISO_H || defined __sgi
++ (defined _ISO_STDIO_ISO_H && !(defined(__sun) && defined(_LP64))) || defined __sgi
fp->_ptr = fp->_base;
#else
/* To fix this #error, either simply remove the #error line and live without