3 files changed, 54 insertions, 52 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 34f37e1e824e..9752e9250800 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	wireshark
-PORTVERSION=	3.0.6
+PORTVERSION=	3.2.0
 PORTREVISION?=	0
 CATEGORIES=	net
 MASTER_SITES=	http://www.wireshark.org/download/src/ \
@@ -61,11 +61,11 @@ PLIST_SUB+=		${x:tu}=bin/$x \
 
 OPTIONS_DEFINE=		GUI RTP SNMP MAXMIND LUA DECRYPT ANDROIDDUMP CARES SSHDUMP CISCODUMP
 
-OPTIONS_SINGLE=		KERBEROS
+OPTIONS_SINGLE=		GSSAPI
 
-OPTIONS_SINGLE_KERBEROS=KRB_BASE KRB_HEIMDAL KRB_MIT KRB_NONE
+OPTIONS_SINGLE_GSSAPI=GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 
-OPTIONS_DEFAULT?=	GUI SNMP MAXMIND KRB_BASE DECRYPT
+OPTIONS_DEFAULT?=	GUI SNMP MAXMIND GSSAPI_BASE DECRYPT
 
 GUI_DESC=		Enable Qt 5 based Wireshark GUI
 RTP_DESC=		Enable support for playing back RTP streams
@@ -73,11 +73,11 @@ DECRYPT_DESC=		Decryption support for SSL and IPSec
 ANDROIDDUMP_DESC=	Build androiddump extcap tool
 MAXMIND_DESC=		Enable MaxMindDB-based GeoIP geolocation support
 CARES_DESC=		Enable support for asynchronous DNS via c-ares
-KERBEROS_DESC=		Kerberos dissection support
-KRB_BASE_DESC=		Kerberos support via base system
-KRB_HEIMDAL_DESC=	Kerberos support via security/heimdal
-KRB_MIT_DESC=		Kerberos support via security/krb5
-KRB_NONE_DESC=		Disable Kerberos support
+GSSAPI_DESC=		Kerberos dissection support
+GSSAPI_BASE_DESC=		Kerberos support via base system
+GSSAPI_HEIMDAL_DESC=	Kerberos support via security/heimdal
+GSSAPI_MIT_DESC=		Kerberos support via security/krb5
+GSSAPI_NONE_DESC=		Disable Kerberos support
 SSHDUMP_DESC=		Build sshdump extcap tool
 CISCODUMP_DESC=		Build ciscodump extcap tool
 
@@ -85,9 +85,9 @@ GUI_USES=		qt:5
 GUI_USE=	qt=core,gui,multimedia,widgets,printsupport,svg,buildtools_build,linguisttools_build,qmake_build
 
 LUA_USES=		lua:5[1-2]
-KRB_BASE_USES=		gssapi
-KRB_HEIMDAL_USES=	gssapi:heimdal
-KRB_MIT_USES=		gssapi:mit
+GSSAPI_BASE_USES=		gssapi
+GSSAPI_HEIMDAL_USES=	gssapi:heimdal
+GSSAPI_MIT_USES=		gssapi:mit
 
 RTP_LIB_DEPENDS=	libspandsp.so:comms/spandsp
 RTP_CPPFLAGS=		-I${LOCALBASE}/include
@@ -99,9 +99,9 @@ DECRYPT_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 SSHDUMP_LIB_DEPENDS=	libssh.so:security/libssh
 CISCODUMP_LIB_DEPENDS=	libssh.so:security/libssh
 
-KRB_NONE_CMAKE_ON=	-DENABLE_KERBEROS=OFF
-KRB_NONE_CMAKE_OFF=	-DENABLE_KERBEROS=ON
-KRB_NONE_CONFIGURE_ENV_OFF=	KRB5_CONFIG=${KRB5CONFIG}
+GSSAPI_NONE_CMAKE_ON=	-DENABLE_KERBEROS=OFF
+GSSAPI_NONE_CMAKE_OFF=	-DENABLE_KERBEROS=ON
+GSSAPI_NONE_CONFIGURE_ENV_OFF=	KRB5_CONFIG=${KRB5CONFIG}
 
 LUA_CMAKE_ON=	-DENABLE_LUA=ON
 LUA_CMAKE_OFF=	-DENABLE_LUA=OFF
@@ -180,7 +180,7 @@ PLIST_SUB+=	CISCODUMP_LIB="@comment " \
 .endif
 .endif
 
-.if ${PORT_OPTIONS:MKRB_BASE} && exists(${LOCALBASE}/include/krb5.h)
+.if ${PORT_OPTIONS:MGSSAPI_BASE} && exists(${LOCALBASE}/include/krb5.h)
 IGNORE=			cannot build with base Kerberos if krb5 port is installed. \
 			Use ``make config'' to choose a different option
 .endif
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index d9d53499d4d9..b9b3cf1a48a0 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1572205338
-SHA256 (wireshark-3.0.6.tar.xz) = a87f4022a0c15ddbf1730bf1acafce9e75a4e657ce9fa494ceda0324c0c3e33e
-SIZE (wireshark-3.0.6.tar.xz) = 30846672
+TIMESTAMP = 1577531630
+SHA256 (wireshark-3.2.0.tar.xz) = 4cfd33a19a454ff4002243e9d04d6afd64280a109a21ae652a192f2be2b1b66c
+SIZE (wireshark-3.2.0.tar.xz) = 31550972
diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist
index a36c7bcc0c10..4f73c0e23610 100644
--- a/net/wireshark/pkg-plist
+++ b/net/wireshark/pkg-plist
@@ -18,7 +18,6 @@ bin/tshark
 %%GUI%%bin/wireshark
 include/wireshark/cfile.h
 include/wireshark/cli_main.h
-include/wireshark/codecs/codecs.h
 include/wireshark/epan/addr_and_mask.h
 include/wireshark/epan/addr_resolv.h
 include/wireshark/epan/address.h
@@ -41,6 +40,7 @@ include/wireshark/epan/column.h
 include/wireshark/epan/conv_id.h
 include/wireshark/epan/conversation.h
 include/wireshark/epan/conversation_debug.h
+include/wireshark/epan/conversation_filter.h
 include/wireshark/epan/conversation_table.h
 include/wireshark/epan/crc10-tvb.h
 include/wireshark/epan/crc16-tvb.h
@@ -52,7 +52,6 @@ include/wireshark/epan/dfilter/dfilter.h
 include/wireshark/epan/dfilter/drange.h
 include/wireshark/epan/diam_dict.h
 include/wireshark/epan/disabled_protos.h
-include/wireshark/epan/dissector_filters.h
 include/wireshark/epan/dissectors/file-rbm.h
 include/wireshark/epan/dissectors/packet-6lowpan.h
 include/wireshark/epan/dissectors/packet-a21.h
@@ -74,6 +73,7 @@ include/wireshark/epan/dissectors/packet-bacnet.h
 include/wireshark/epan/dissectors/packet-ber.h
 include/wireshark/epan/dissectors/packet-bfd.h
 include/wireshark/epan/dissectors/packet-bgp.h
+include/wireshark/epan/dissectors/packet-bicc_mst.h
 include/wireshark/epan/dissectors/packet-bluetooth.h
 include/wireshark/epan/dissectors/packet-bssap.h
 include/wireshark/epan/dissectors/packet-bssgp.h
@@ -111,7 +111,6 @@ include/wireshark/epan/dissectors/packet-dcerpc-browser.h
 include/wireshark/epan/dissectors/packet-dcerpc-budb.h
 include/wireshark/epan/dissectors/packet-dcerpc-butc.h
 include/wireshark/epan/dissectors/packet-dcerpc-dce122.h
-include/wireshark/epan/dissectors/packet-dcerpc-dcom.h
 include/wireshark/epan/dissectors/packet-dcerpc-dnsserver.h
 include/wireshark/epan/dissectors/packet-dcerpc-frsapi.h
 include/wireshark/epan/dissectors/packet-dcerpc-frsrpc.h
@@ -138,6 +137,7 @@ include/wireshark/epan/dissectors/packet-dtls.h
 include/wireshark/epan/dissectors/packet-dtn.h
 include/wireshark/epan/dissectors/packet-dvbci.h
 include/wireshark/epan/dissectors/packet-e164.h
+include/wireshark/epan/dissectors/packet-e1ap.h
 include/wireshark/epan/dissectors/packet-e212.h
 include/wireshark/epan/dissectors/packet-eapol.h
 include/wireshark/epan/dissectors/packet-edonkey.h
@@ -310,6 +310,7 @@ include/wireshark/epan/dissectors/packet-q708.h
 include/wireshark/epan/dissectors/packet-q931.h
 include/wireshark/epan/dissectors/packet-q932.h
 include/wireshark/epan/dissectors/packet-qsig.h
+include/wireshark/epan/dissectors/packet-quic.h
 include/wireshark/epan/dissectors/packet-radius.h
 include/wireshark/epan/dissectors/packet-raknet.h
 include/wireshark/epan/dissectors/packet-ranap.h
@@ -376,6 +377,7 @@ include/wireshark/epan/dissectors/packet-tacacs.h
 include/wireshark/epan/dissectors/packet-tcap.h
 include/wireshark/epan/dissectors/packet-tcp.h
 include/wireshark/epan/dissectors/packet-tetra.h
+include/wireshark/epan/dissectors/packet-thrift.h
 include/wireshark/epan/dissectors/packet-tls-utils.h
 include/wireshark/epan/dissectors/packet-tls.h
 include/wireshark/epan/dissectors/packet-tn3270.h
@@ -552,6 +554,7 @@ include/wireshark/wsutil/bits_count_ones.h
 include/wireshark/wsutil/bits_ctz.h
 include/wireshark/wsutil/bitswap.h
 include/wireshark/wsutil/buffer.h
+include/wireshark/wsutil/codecs.h
 include/wireshark/wsutil/color.h
 include/wireshark/wsutil/copyright_info.h
 include/wireshark/wsutil/cpu_info.h
@@ -561,6 +564,7 @@ include/wireshark/wsutil/crc11.h
 include/wireshark/wsutil/crc16-plain.h
 include/wireshark/wsutil/crc16.h
 include/wireshark/wsutil/crc32.h
+include/wireshark/wsutil/crc5.h
 include/wireshark/wsutil/crc6.h
 include/wireshark/wsutil/crc7.h
 include/wireshark/wsutil/crc8.h
@@ -580,6 +584,7 @@ include/wireshark/wsutil/netlink.h
 include/wireshark/wsutil/nstime.h
 include/wireshark/wsutil/os_version_info.h
 include/wireshark/wsutil/pint.h
+include/wireshark/wsutil/please_report_bug.h
 include/wireshark/wsutil/plugins.h
 include/wireshark/wsutil/pow2.h
 include/wireshark/wsutil/privileges.h
@@ -604,17 +609,14 @@ include/wireshark/wsutil/ws_pipe.h
 include/wireshark/wsutil/ws_printf.h
 include/wireshark/wsutil/xtea.h
 lib/libwireshark.so
-lib/libwireshark.so.12
-lib/libwireshark.so.12.0.6
+lib/libwireshark.so.13
+lib/libwireshark.so.13.0.0
 lib/libwiretap.so
-lib/libwiretap.so.9
-lib/libwiretap.so.9.0.6
-lib/libwscodecs.so
-lib/libwscodecs.so.2
-lib/libwscodecs.so.2.0.0
+lib/libwiretap.so.10
+lib/libwiretap.so.10.0.0
 lib/libwsutil.so
-lib/libwsutil.so.10
-lib/libwsutil.so.10.0.0
+lib/libwsutil.so.11
+lib/libwsutil.so.11.0.0
 lib/wireshark/cmake/FindGLIB2.cmake
 lib/wireshark/cmake/FindWSWinLibs.cmake
 lib/wireshark/cmake/LocatePythonModule.cmake
@@ -629,20 +631,21 @@ lib/wireshark/cmake/WiresharkTargets.cmake
 %%RANDPKTDUMP_LIB%%lib/wireshark/extcap/randpktdump
 %%SSHDUMP_LIB%%lib/wireshark/extcap/sshdump
 %%UDPDUMP_LIB%%lib/wireshark/extcap/udpdump
-lib/wireshark/plugins/3.0/codecs/l16mono.so
-lib/wireshark/plugins/3.0/epan/ethercat.so
-lib/wireshark/plugins/3.0/epan/gryphon.so
-lib/wireshark/plugins/3.0/epan/irda.so
-lib/wireshark/plugins/3.0/epan/mate.so
-lib/wireshark/plugins/3.0/epan/opcua.so
-lib/wireshark/plugins/3.0/epan/profinet.so
-lib/wireshark/plugins/3.0/epan/stats_tree.so
-lib/wireshark/plugins/3.0/epan/transum.so
-lib/wireshark/plugins/3.0/epan/unistim.so
-lib/wireshark/plugins/3.0/epan/wimax.so
-lib/wireshark/plugins/3.0/epan/wimaxasncp.so
-lib/wireshark/plugins/3.0/epan/wimaxmacphy.so
-lib/wireshark/plugins/3.0/wiretap/usbdump.so
+lib/wireshark/plugins/3.2/codecs/g711.so
+lib/wireshark/plugins/3.2/codecs/l16mono.so
+lib/wireshark/plugins/3.2/epan/ethercat.so
+lib/wireshark/plugins/3.2/epan/gryphon.so
+lib/wireshark/plugins/3.2/epan/irda.so
+lib/wireshark/plugins/3.2/epan/mate.so
+lib/wireshark/plugins/3.2/epan/opcua.so
+lib/wireshark/plugins/3.2/epan/profinet.so
+lib/wireshark/plugins/3.2/epan/stats_tree.so
+lib/wireshark/plugins/3.2/epan/transum.so
+lib/wireshark/plugins/3.2/epan/unistim.so
+lib/wireshark/plugins/3.2/epan/wimax.so
+lib/wireshark/plugins/3.2/epan/wimaxasncp.so
+lib/wireshark/plugins/3.2/epan/wimaxmacphy.so
+lib/wireshark/plugins/3.2/wiretap/usbdump.so
 libdata/pkgconfig/wireshark.pc
 %%ANDROIDDUMP_MAN%%man/man1/androiddump.1.gz
 %%CAPINFOS_MAN%%man/man1/capinfos.1.gz
@@ -692,6 +695,7 @@ man/man4/wireshark-filter.4.gz
 %%DATADIR%%/colorfilters
 %%LUA%%%%DATADIR%%/console.lua
 %%DATADIR%%/dfilters
+%%DATADIR%%/dfilter_macros
 %%DATADIR%%/dftest.html
 %%LUA%%%%DATADIR%%/dtd_gen.lua
 %%DATADIR%%/diameter/AlcatelLucent.xml
@@ -703,12 +707,15 @@ man/man4/wireshark-filter.4.gz
 %%DATADIR%%/diameter/Huawei.xml
 %%DATADIR%%/diameter/Inovar.xml
 %%DATADIR%%/diameter/Juniper.xml
+%%DATADIR%%/diameter/Microsoft.xml
 %%DATADIR%%/diameter/Nokia.xml
 %%DATADIR%%/diameter/NokiaSolutionsAndNetworks.xml
 %%DATADIR%%/diameter/Oracle.xml
+%%DATADIR%%/diameter/Siemens.xml
 %%DATADIR%%/diameter/Starent.xml
 %%DATADIR%%/diameter/TGPP.xml
 %%DATADIR%%/diameter/TGPP2.xml
+%%DATADIR%%/diameter/Telefonica.xml
 %%DATADIR%%/diameter/VerizonWireless.xml
 %%DATADIR%%/diameter/Vodafone.xml
 %%DATADIR%%/diameter/chargecontrol.xml
@@ -737,13 +744,6 @@ man/man4/wireshark-filter.4.gz
 %%DATADIR%%/editcap.html
 %%DATADIR%%/enterprises.tsv
 %%DATADIR%%/extcap.html
-%%DATADIR%%/help/capture_filters.txt
-%%DATADIR%%/help/capturing.txt
-%%DATADIR%%/help/display_filters.txt
-%%DATADIR%%/help/faq.txt
-%%DATADIR%%/help/getting_started.txt
-%%DATADIR%%/help/overview.txt
-%%DATADIR%%/help/toc
 %%LUA%%%%DATADIR%%/init.lua
 %%DATADIR%%/ipmap.html
 %%DATADIR%%/manuf
@@ -774,6 +774,7 @@ man/man4/wireshark-filter.4.gz
 %%DATADIR%%/radius/dictionary.alvarion
 %%DATADIR%%/radius/dictionary.alvarion.wimax.v2_2
 %%DATADIR%%/radius/dictionary.apc
+%%DATADIR%%/radius/dictionary.aptilo
 %%DATADIR%%/radius/dictionary.aptis
 %%DATADIR%%/radius/dictionary.arbor
 %%DATADIR%%/radius/dictionary.aruba
@@ -852,6 +853,7 @@ man/man4/wireshark-filter.4.gz
 %%DATADIR%%/radius/dictionary.lucent
 %%DATADIR%%/radius/dictionary.manzara
 %%DATADIR%%/radius/dictionary.meinberg
+%%DATADIR%%/radius/dictionary.meraki
 %%DATADIR%%/radius/dictionary.merit
 %%DATADIR%%/radius/dictionary.meru
 %%DATADIR%%/radius/dictionary.microsemi