Update to upstream release 5.1.0; fix several invalid memory reads

PR:		216847
Submitted by:	pkubaj@anongoth.pl
Reviewed by:	riggs
MFH:		2017Q1
Security:	CVE-2016-10169
		CVE-2016-10170
		CVE-2016-10171
		CVE-2016-10172

5 files changed, 33 insertions, 30 deletions

diff --git a/audio/wavpack/Makefile b/audio/wavpack/Makefile
index 4022b4ffbfa5..51ce05abdad3 100644
--- a/audio/wavpack/Makefile
+++ b/audio/wavpack/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wavpack
-PORTVERSION=	4.60.1
-PORTREVISION=	3
+PORTVERSION=	5.1.0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.wavpack.com/
 
@@ -11,7 +10,7 @@ MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Audio codec for lossless, lossy, and hybrid compression
 
 LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/license.txt
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		iconv libtool pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
@@ -20,8 +19,20 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
-.if ${MACHINE_CPU:Mmmx}
-CONFIGURE_ARGS=	--enable-mmx
+OPTIONS_DEFINE=	ASM
+OPTIONS_DEFAULT_amd64=	ASM
+OPTIONS_DEFAULT_armv6=	ASM
+
+ASM_CONFIGURE_OFF=	--disable-asm
+ASM_DESC=	Optimized assembler routines (requires MMX on x86)
+
+.include <bsd.port.options.mk>
+
+# ASM needs clang 3.8+
+# depend on llvm39 since it's more likely to be installed already than 3.8
+.if ${OSVERSION} < 1100101 && ${PORT_OPTIONS:MASM}
+BUILD_DEPENDS+=	clang39:devel/llvm39
+CC=		clang39
 .endif
 
 .include <bsd.port.mk>
diff --git a/audio/wavpack/distinfo b/audio/wavpack/distinfo
index 4f998a8220d9..bf08b1bcd10c 100644
--- a/audio/wavpack/distinfo
+++ b/audio/wavpack/distinfo
@@ -1,2 +1,3 @@
-SHA256 (wavpack-4.60.1.tar.bz2) = 175ee4f2effd6f51e6ec487956f41177256bf892c2e8e07de5d27ed4ee6888c5
-SIZE (wavpack-4.60.1.tar.bz2) = 394434
+TIMESTAMP = 1486392068
+SHA256 (wavpack-5.1.0.tar.bz2) = 1939627d5358d1da62bc6158d63f7ed12905552f3a799c799ee90296a7612944
+SIZE (wavpack-5.1.0.tar.bz2) = 824331
diff --git a/audio/wavpack/files/patch-configure b/audio/wavpack/files/patch-configure
new file mode 100644
index 000000000000..0f1d66781dd8
--- /dev/null
+++ b/audio/wavpack/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2017-01-17 04:32:28 UTC
++++ configure
+@@ -13715,7 +13715,7 @@ $as_echo_n "checking if assembly optimiz
+   i386|i486|i586|i686|i786) :
+     $as_echo "#define OPT_ASM_X86 1" >>confdefs.h
+  asm_selected=x86 ;; #(
+-  x86_64) :
++  x86_64|amd64) :
+     $as_echo "#define OPT_ASM_X64 1" >>confdefs.h
+  asm_selected=x64 ;; #(
+   arm*) :
diff --git a/audio/wavpack/files/patch-src_wavpack__local.h b/audio/wavpack/files/patch-src_wavpack__local.h
deleted file mode 100644
index fb3e9cb4991a..000000000000
--- a/audio/wavpack/files/patch-src_wavpack__local.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/wavpack_local.h.orig	2009-12-01 04:24:50 UTC
-+++ src/wavpack_local.h
-@@ -11,6 +11,10 @@
- #ifndef WAVPACK_LOCAL_H
- #define WAVPACK_LOCAL_H
- 
-+#ifndef __has_builtin
-+#define __has_builtin(x) 0
-+#endif
-+
- #if defined(WIN32)
- #define FASTCALL __fastcall
- #else
-@@ -768,7 +772,7 @@ typedef short __m64_16 __attribute__ ((_
- #define _m_paddd(m1, m2) __builtin_ia32_paddd (m1, m2)
- #define _m_pcmpeqd(m1, m2) __builtin_ia32_pcmpeqd (m1, m2)
- 
--#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) || __GNUC__ > 4
-+#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) || __GNUC__ > 4 || __has_builtin(__builtin_ia32_pslldi)
- #	define _m_pslldi(m1, m2) __builtin_ia32_pslldi ((__m64)m1, m2)
- #	define _m_psradi(m1, m2) __builtin_ia32_psradi ((__m64)m1, m2)
- #	define _m_psrldi(m1, m2) __builtin_ia32_psrldi ((__m64)m1, m2)
diff --git a/audio/wavpack/pkg-plist b/audio/wavpack/pkg-plist
index 5137a1f514fe..974106ae9607 100644
--- a/audio/wavpack/pkg-plist
+++ b/audio/wavpack/pkg-plist
@@ -1,12 +1,14 @@
 bin/wavpack
 bin/wvgain
+bin/wvtag
 bin/wvunpack
 include/wavpack/wavpack.h
 lib/libwavpack.a
 lib/libwavpack.so
 lib/libwavpack.so.1
-lib/libwavpack.so.1.1.4
+lib/libwavpack.so.1.2.0
 libdata/pkgconfig/wavpack.pc
 man/man1/wavpack.1.gz
 man/man1/wvgain.1.gz
+man/man1/wvtag.1.gz
 man/man1/wvunpack.1.gz