[pkgsrc/trunk]: pkgsrc/audio/sox Add patches to prevent a segfault when playi...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f9ec3e6100f6
branches:  trunk
changeset: 652140:f9ec3e6100f6
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Mon May 25 19:06:24 2015 +0000

description:
Add patches to prevent a segfault when playing certain WAV files. From
Onno van der Linden in PR pkg/49929. Also submitted upstream.
Bump PKGREVISION.

diffstat:

 audio/sox/Makefile                     |   3 ++-
 audio/sox/distinfo                     |   4 +++-
 audio/sox/patches/patch-src_oss.c      |  14 ++++++++++++++
 audio/sox/patches/patch-src_sunaudio.c |  14 ++++++++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)

diffs (62 lines):

diff -r 7bb9be34a223 -r f9ec3e6100f6 audio/sox/Makefile
--- a/audio/sox/Makefile        Mon May 25 17:53:11 2015 +0000
+++ b/audio/sox/Makefile        Mon May 25 19:06:24 2015 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2015/03/14 22:56:00 tnn Exp $
+# $NetBSD: Makefile,v 1.62 2015/05/25 19:06:24 bsiegert Exp $
 
 DISTNAME=      sox-14.4.2
+PKGREVISION=   1
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=sox/}
 
diff -r 7bb9be34a223 -r f9ec3e6100f6 audio/sox/distinfo
--- a/audio/sox/distinfo        Mon May 25 17:53:11 2015 +0000
+++ b/audio/sox/distinfo        Mon May 25 19:06:24 2015 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.25 2015/03/14 22:56:00 tnn Exp $
+$NetBSD: distinfo,v 1.26 2015/05/25 19:06:24 bsiegert Exp $
 
 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) = 28675f56a0e2969d0facd98282667c53eb10c0ed
+SHA1 (patch-src_oss.c) = dca4dcf55d4bfa1da80b789cbddb48a9302e694b
+SHA1 (patch-src_sunaudio.c) = 286ad890a32d69d499f76faa255473889b091d56
diff -r 7bb9be34a223 -r f9ec3e6100f6 audio/sox/patches/patch-src_oss.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/sox/patches/patch-src_oss.c Mon May 25 19:06:24 2015 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_oss.c,v 1.1 2015/05/25 19:06:24 bsiegert Exp $
+
+Fix segfault when playing (PR pkg/49929).
+--- src/oss.c.orig     2015-05-25 18:58:54.000000000 +0000
++++ src/oss.c
+@@ -369,7 +369,7 @@ static size_t osswrite(
+         size_t cbStride;
+         int cbWritten;
+ 
+-        cStride = cInput;
++        cStride = cInputRemaining;
+         if (cStride > pPriv->cOutput) {
+             cStride = pPriv->cOutput;
+         }
diff -r 7bb9be34a223 -r f9ec3e6100f6 audio/sox/patches/patch-src_sunaudio.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/sox/patches/patch-src_sunaudio.c    Mon May 25 19:06:24 2015 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_sunaudio.c,v 1.1 2015/05/25 19:06:24 bsiegert Exp $
+
+Fix segfault when playing (PR pkg/49929).
+--- src/sunaudio.c.orig        2015-05-25 19:00:39.000000000 +0000
++++ src/sunaudio.c
+@@ -443,7 +443,7 @@ static size_t sunwrite(
+         size_t cbStride;
+         int cbWritten;
+ 
+-        cStride = cInput;
++        cStride = cInputRemaining;
+         if (cStride > pPriv->cOutput) {
+             cStride = pPriv->cOutput;
+         }