svn commit: r434397 - in branches/2017Q1/audio/wavpack: . files

[Thomas Zander]

Author: riggs
Date: Sun Feb 19 08:22:19 2017
New Revision: 434397
URL: https://svnweb.freebsd.org/changeset/ports/434397

Log:
  MFH: r434356
  
  Update to upstream release 5.1.0; fix several invalid memory reads
  
  PR:		216847
  Submitted by:	pkubaj at anongoth.pl
  Reviewed by:	riggs
  Security:	CVE-2016-10169
  		CVE-2016-10170
  		CVE-2016-10171
  		CVE-2016-10172
  
  Approved by:	ports-secteam (junovitch)

Added:
  branches/2017Q1/audio/wavpack/files/patch-configure
     - copied unchanged from r434356, head/audio/wavpack/files/patch-configure
Deleted:
  branches/2017Q1/audio/wavpack/files/patch-src_wavpack__local.h
Modified:
  branches/2017Q1/audio/wavpack/Makefile
  branches/2017Q1/audio/wavpack/distinfo
  branches/2017Q1/audio/wavpack/pkg-plist
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/audio/wavpack/Makefile
==============================================================================
--- branches/2017Q1/audio/wavpack/Makefile	Sun Feb 19 06:57:06 2017	(r434396)
+++ branches/2017Q1/audio/wavpack/Makefile	Sun Feb 19 08:22:19 2017	(r434397)
@@ -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 at 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>

Modified: branches/2017Q1/audio/wavpack/distinfo
==============================================================================
--- branches/2017Q1/audio/wavpack/distinfo	Sun Feb 19 06:57:06 2017	(r434396)
+++ branches/2017Q1/audio/wavpack/distinfo	Sun Feb 19 08:22:19 2017	(r434397)
@@ -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

Copied: branches/2017Q1/audio/wavpack/files/patch-configure (from r434356, head/audio/wavpack/files/patch-configure)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/audio/wavpack/files/patch-configure	Sun Feb 19 08:22:19 2017	(r434397, copy of r434356, head/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*) :

Modified: branches/2017Q1/audio/wavpack/pkg-plist
==============================================================================
--- branches/2017Q1/audio/wavpack/pkg-plist	Sun Feb 19 06:57:06 2017	(r434396)
+++ branches/2017Q1/audio/wavpack/pkg-plist	Sun Feb 19 08:22:19 2017	(r434397)
@@ -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