svn commit: r414495 - branches/2016Q2/net/wireshark

[Jason Unovitch]

Author: junovitch
Date: Tue May  3 00:01:22 2016
New Revision: 414495
URL: https://svnweb.freebsd.org/changeset/ports/414495

Log:
  MFH: r413652 r414124
  
  Merge the GnuTLS and libgcrypt OPTIONS into one as both are required
  for decryption support.
  
  PR:		208830
  
  Update to 2.0.3.
  
  See https://www.wireshark.org/docs/relnotes/wireshark-2.0.3.html for the
  list of changes in this release.
  
  Security:	https://vuxml.FreeBSD.org/freebsd/7e36c369-10c0-11e6-94fa-002590263bf5.html
  Approved by:	ports-secteam (with hat)

Modified:
  branches/2016Q2/net/wireshark/Makefile
  branches/2016Q2/net/wireshark/distinfo
  branches/2016Q2/net/wireshark/pkg-plist
Directory Properties:
  branches/2016Q2/   (props changed)

Modified: branches/2016Q2/net/wireshark/Makefile
==============================================================================
--- branches/2016Q2/net/wireshark/Makefile	Mon May  2 23:58:59 2016	(r414494)
+++ branches/2016Q2/net/wireshark/Makefile	Tue May  3 00:01:22 2016	(r414495)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	wireshark
-PORTVERSION=	2.0.2
-PORTREVISION?=	1
+PORTVERSION=	2.0.3
+PORTREVISION?=	0
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.wireshark.org/download/src/ \
 		http://ftp.uni-kl.de/pub/wireshark/src/ \
@@ -54,7 +54,7 @@ PLIST_SUB+=		${x:tu}=bin/$x \
 .endif
 .endfor
 
-OPTIONS_DEFINE=		RTP SNMP IPV6 GEOIP LUA GCRYPT GNUTLS
+OPTIONS_DEFINE=		RTP SNMP IPV6 GEOIP LUA DECRYPT
 
 OPTIONS_RADIO=		ASYNCDNS GUI
 OPTIONS_SINGLE=		KERBEROS
@@ -66,8 +66,7 @@ OPTIONS_SINGLE_KERBEROS=KRB_BASE KRB_HEI
 OPTIONS_DEFAULT?=	SNMP ADNS IPV6 GEOIP KRB_BASE GTK3
 
 RTP_DESC=		Enable support for playing back RTP streams
-GCRYPT_DESC=		IPsec decryption support
-GNUTLS_DESC=		SSL decryption support
+DECRYPT_DESC=		Decryption support for SSL and IPSec
 ASYNCDNS_DESC=		Asynchronous DNS lookup support
 ADNS_DESC=		Asynchronous DNS resolution via GNU adns
 KERBEROS_DESC=		Kerberos dissection support
@@ -90,8 +89,8 @@ SNMP_LIB_DEPENDS=	libsmi.so:net-mgmt/lib
 ADNS_LIB_DEPENDS=	libadns.so:dns/adns
 CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
 GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
-GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
-GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
+DECRYPT_LIB_DEPENDS=	libgnutls.so:security/gnutls \
+    			libgcrypt.so:security/libgcrypt
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
@@ -108,8 +107,7 @@ SNMP_CONFIGURE_WITH=	libsmi
 ADNS_CONFIGURE_WITH=	adns
 CARES_CONFIGURE_WITH=	c-ares
 GEOIP_CONFIGURE_WITH=	geoip
-GCRYPT_CONFIGURE_WITH=	gcrypt
-GNUTLS_CONFIGURE_WITH=	gnutls
+DECRYPT_CONFIGURE_WITH=	gnutls gcrypt
 
 LUA_CPPFLAGS=		-I${LUA_INCDIR}
 

Modified: branches/2016Q2/net/wireshark/distinfo
==============================================================================
--- branches/2016Q2/net/wireshark/distinfo	Mon May  2 23:58:59 2016	(r414494)
+++ branches/2016Q2/net/wireshark/distinfo	Tue May  3 00:01:22 2016	(r414495)
@@ -1,2 +1,2 @@
-SHA256 (wireshark-2.0.2.tar.bz2) = e921fb072085a5654d899949bb561d0687f4819f7b63ba35777bb949a9b6b9c1
-SIZE (wireshark-2.0.2.tar.bz2) = 31073440
+SHA256 (wireshark-2.0.3.tar.bz2) = e196376e75fe21fdef41b4eaa27ce2e1b2b561e7f7b20328a8e96657cc4465fc
+SIZE (wireshark-2.0.3.tar.bz2) = 31110988

Modified: branches/2016Q2/net/wireshark/pkg-plist
==============================================================================
--- branches/2016Q2/net/wireshark/pkg-plist	Mon May  2 23:58:59 2016	(r414494)
+++ branches/2016Q2/net/wireshark/pkg-plist	Tue May  3 00:01:22 2016	(r414495)
@@ -18,10 +18,10 @@ bin/tshark
 %%TEXT2PCAP%%
 lib/libwireshark.so
 lib/libwireshark.so.6
-lib/libwireshark.so.6.0.2
+lib/libwireshark.so.6.1.0
 lib/libwiretap.so
 lib/libwiretap.so.5
-lib/libwiretap.so.5.0.2
+lib/libwiretap.so.5.0.3
 lib/libwsutil.so
 lib/libwsutil.so.6
 lib/libwsutil.so.6.0.0
@@ -38,6 +38,7 @@ lib/wireshark/plugins/%%PORTVERSION%%/un
 lib/wireshark/plugins/%%PORTVERSION%%/wimax.so
 lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.so
 lib/wireshark/plugins/%%PORTVERSION%%/wimaxmacphy.so
+%%ANDROIDDUMP_MAN%%man/man1/androiddump.1.gz
 %%CAPINFOS_MAN%%man/man1/capinfos.1.gz
 man/man1/dumpcap.1.gz
 %%EDITCAP_MAN%%man/man1/editcap.1.gz