8 files changed, 169 insertions, 202 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index e855cd91ab16..abe26ee297c1 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	wireshark
-PORTVERSION=	2.6.6
-PORTREVISION?=	1
+PORTVERSION=	3.0.0
+PORTREVISION?=	0
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.wireshark.org/download/src/ \
 		http://ftp.uni-kl.de/pub/wireshark/src/ \
@@ -21,23 +21,14 @@ COMMENT?=	Powerful network analyzer/capture tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS?=	wireshark-qt5-[0-9]*
-
 DATADIR_NAME=	wireshark
 DATADIR=	${PREFIX}/share/${DATADIR_NAME}
 
-GNU_CONFIGURE=	yes
-USES=		alias cpe compiler:c++11-lang gettext-runtime gmake \
+USES=		alias cmake cpe compiler:c++11-lang gettext-runtime \
 		libtool localbase pathfix \
-		perl5 pkgconfig python:build ssl tar:xz
+		perl5 pkgconfig python:3.4+ ssl tar:xz
 USE_PERL5=	build
 USE_GNOME=	glib20 libxml2
-CONFIGURE_ARGS+=	--program-transform-name="" \
-			--with-ssl=${OPENSSLBASE} \
-			--with-lz4 \
-			--with-nghttp2 \
-			--with-snappy
-INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 LIB_DEPENDS+=	libgpg-error.so:security/libgpg-error \
@@ -46,7 +37,7 @@ LIB_DEPENDS+=	libgpg-error.so:security/libgpg-error \
 		libnghttp2.so:www/libnghttp2 \
 		libsnappy.so:archivers/snappy
 
-CFLAGS+=	-funit-at-a-time
+#CFLAGS+=	-funit-at-a-time
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \
@@ -56,8 +47,9 @@ PKGNAMESUFFIX=		-lite
 PLIST_SUB+=		${x:tu}="@comment $x not installed" \
 			${x:tu}_LIB="@comment $x not installed " \
 			${x:tu}_MAN="@comment $x not installed "
-CONFIGURE_ARGS+=	--enable-$x=no
-OPTIONS_EXCLUDE+=	RTP SNMP LUA CARES ANDROIDDUMP SSHDUMP
+CMAKE_ARGS+=		-DBUILD_$x=OFF
+EXTRA_PATCHES=		${FILESDIR}/extra-patch-doc_CMakeLists.txt
+OPTIONS_EXCLUDE+=	RTP SNMP LUA CARES ANDROIDDUMP CISCODUMP SSHDUMP
 .else
 PLIST_SUB+=		${x:tu}=bin/$x \
 			${x:tu}_MAN="" \
@@ -65,16 +57,15 @@ PLIST_SUB+=		${x:tu}=bin/$x \
 .endif
 .endfor
 
-OPTIONS_DEFINE=		RTP SNMP MAXMIND LUA DECRYPT ANDROIDDUMP CARES SSHDUMP CISCODUMP
+OPTIONS_DEFINE=		GUI RTP SNMP MAXMIND LUA DECRYPT ANDROIDDUMP CARES SSHDUMP CISCODUMP
 
-OPTIONS_RADIO=		GUI
 OPTIONS_SINGLE=		KERBEROS
 
-OPTIONS_RADIO_GUI=	GTK2 GTK3 QT5
 OPTIONS_SINGLE_KERBEROS=KRB_BASE KRB_HEIMDAL KRB_MIT KRB_NONE
 
-OPTIONS_DEFAULT?=	SNMP MAXMIND KRB_BASE GTK3 DECRYPT
+OPTIONS_DEFAULT?=	GUI SNMP MAXMIND KRB_BASE DECRYPT
 
+GUI_DESC=		Enable Qt 5 based Wireshark GUI
 RTP_DESC=		Enable support for playing back RTP streams
 DECRYPT_DESC=		Decryption support for SSL and IPSec
 ANDROIDDUMP_DESC=	Build androiddump extcap tool
@@ -88,18 +79,15 @@ KRB_NONE_DESC=		Disable Kerberos support
 SSHDUMP_DESC=		Build sshdump extcap tool
 CISCODUMP_DESC=		Build ciscodump extcap tool
 
-GTK2_USE=	GNOME=gtk20,cairo
-GTK3_USE=	GNOME=gtk30,cairo
-QT5_USES=		qt:5
-QT5_USE=	qt=core,gui,widgets,printsupport,buildtools_build,linguisttools_build
+GUI_USES=		qt:5
+GUI_USE=	qt=core,gui,multimedia,widgets,printsupport,svg,buildtools_build,linguisttools_build
 
 LUA_USES=		lua:5[1-2]
 KRB_BASE_USES=		gssapi
 KRB_HEIMDAL_USES=	gssapi:heimdal
 KRB_MIT_USES=		gssapi:mit
 
-RTP_LIB_DEPENDS=	libportaudio.so:audio/portaudio \
-    			libspandsp.so:comms/spandsp
+RTP_LIB_DEPENDS=	libspandsp.so:comms/spandsp
 RTP_CPPFLAGS=		-I${LOCALBASE}/include
 MAXMIND_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 SNMP_LIB_DEPENDS=	libsmi.so:net-mgmt/libsmi
@@ -109,43 +97,38 @@ DECRYPT_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 SSHDUMP_LIB_DEPENDS=	libssh.so:security/libssh
 CISCODUMP_LIB_DEPENDS=	libssh.so:security/libssh
 
-KRB_NONE_CONFIGURE_ON=	--without-krb5
-KRB_NONE_CONFIGURE_OFF=	--with-krb5 --with-krb5-crypto-openssl
+KRB_NONE_CMAKE_ON=	-DENABLE_KERBEROS=OFF
+KRB_NONE_CMAKE_OFF=	-DENABLE_KERBEROS=ON
 KRB_NONE_CONFIGURE_ENV_OFF=	KRB5_CONFIG=${KRB5CONFIG}
 
-GTK2_CONFIGURE_ON=	--with-gtk=2 --with-qt=no
-GTK3_CONFIGURE_ON=	--with-gtk=3 --with-qt=no
-QT5_CONFIGURE_ON=	--with-qt=5 --with-gtk=no
-LUA_CONFIGURE_WITH=	lua
-RTP_CONFIGURE_WITH=	portaudio spandsp
-SNMP_CONFIGURE_WITH=	libsmi
-CARES_CONFIGURE_WITH=	c-ares
-MAXMIND_CONFIGURE_WITH=maxminddb
-DECRYPT_CONFIGURE_WITH=	gnutls
-ANDROIDDUMP_CONFIGURE_ON=--enable-androiddump=yes
-ANDROIDDUMP_CONFIGURE_OFF=--enable-androiddump=no
-SSHDUMP_CONFIGURE_ON=--enable-sshdump=yes
-SSHDUMP_CONFIGURE_OFF=--enable-sshdump=no
-CISCODUMP_CONFIGURE_ON=--enable-sshdump=yes
-CISCODUMP_CONFIGURE_OFF=--enable-sshdump=no
+LUA_CMAKE_ON=	-DENABLE_LUA=ON
+LUA_CMAKE_OFF=	-DENABLE_LUA=OFF
+RTP_CMAKE_ON=	-DENABLE_SPANDSP=ON
+RTP_CMAKE_OFF=	-DENABLE_SPANDSP=OFF
+SNMP_CMAKE_ON=	-DENABLE_SMI=ON
+SNMP_CMAKE_OFF=	-DENABLE_SMI=OFF
+CARES_CMAKE_ON=	-DENABLE_CARES=ON
+CARES_CMAKE_OFF=	-DENABLE_CARES=OFF
+DECRYPT_CMAKE_ON=	-DENABLE_GNUTLS=ON
+DECRYPT_CMAKE_OFF=	-DENABLE_GNUTLS=OFF
+ANDROIDDUMP_CMAKE_ON=-DBUILD_androiddump=ON
+ANDROIDDUMP_CMAKE_OFF=-DBUILD_androiddump=OFF
+SSHDUMP_CMAKE_ON=-DBUILD_sshdump=ON
+SSHDUMP_CMAKE_OFF=-DBUILD_sshdump=OFF
+CISCODUMP_CMAKE_ON=-DBUILD_ciscodump=ON
+CISCODUMP_CMAKE_OFF=-DBUILD_ciscodump=OFF
 
 LUA_CPPFLAGS=		-I${LUA_INCDIR}
 
-QT5_CONFIGURE_ENV=	PATH="${PATH}:${QT_BINDIR}"
-QT5_EXTRA_PATCHES=	${FILESDIR}/extrapatch-configure-qt5
-QT5_MAKE_ENV=		PATH="${PATH}:${QT_BINDIR}"
-QT5_VARS=		PKGNAMESUFFIX=-qt5
-QT5_PLIST_SUB=		GUI_GTK="@comment "
-
-GTK2_PLIST_SUB=		GUI_GTK=""
-GTK3_PLIST_SUB=		GUI_GTK=""
+GUI_CONFIGURE_ENV=	PATH="${PATH}:${QT_BINDIR}"
+GUI_MAKE_ENV=		PATH="${PATH}:${QT_BINDIR}"
 
 OPTIONS_SUB=		yes
 
 .if defined(LITE)
-CONFIGURE_ARGS+=--enable-androiddump=no \
-		--enable-sshdump=no \
-		--enable-ciscodump=no
+CMAKE_ARGS+=	-DBUILD_androiddump=OFF \
+		-DBUILD_sshdump=OFF \
+		-DBUILD_ciscodump=OFF
 PLIST_SUB+=	ANDROIDDUMP_LIB="@comment " \
 		ANDROIDDUMP_MAN="@comment " \
 		SSHDUMP_LIB="@comment " \
@@ -156,14 +139,19 @@ PLIST_SUB+=	ANDROIDDUMP_LIB="@comment " \
 
 .include <bsd.port.options.mk>
 
-.if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MGTK3) && \
-    empty(PORT_OPTIONS:MQT5)
-CONFIGURE_ARGS+=	--disable-wireshark
-PLIST_SUB+=		GUI="@comment "
+.if empty(PORT_OPTIONS:MMAXMIND)
+CMAKE_ARGS+=	-DBUILD_mmdbresolve=OFF
+.else
+CMAKE_ARGS+=	-DBUILD_mmdbresolve=ON
+.endif
+
+.if empty(PORT_OPTIONS:MGUI)
+CMAKE_ARGS+=	-DBUILD_wireshark=OFF
+PLIST_SUB+=	GUI="@comment "
 .else
-USES+=			desktop-file-utils shared-mime-info
-INSTALLS_ICONS=		yes
-PLIST_SUB+=		GUI=""
+USES+=		desktop-file-utils shared-mime-info
+INSTALLS_ICONS=	yes
+PLIST_SUB+=	GUI=""
 .endif
 
 .if !defined(LITE)
@@ -195,28 +183,9 @@ IGNORE=			cannot build with base Kerberos if krb5 port is installed. \
 			Use ``make config'' to choose a different option
 .endif
 
-.if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MGTK3) && \
-	${PORT_OPTIONS:MRTP}
-IGNORE=			the RTP support requires GTK+ frontend
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|llua|llua-${LUA_VER}|g ; \
-		s|-DQT_GUI_LIB|-DQT_GUI_LIB $$CPPFLAGS| ' \
-		${WRKSRC}/configure
-	# XXX: Should be optional as to whether or not this flag works at runtime
-	@${REINPLACE_CMD} -e 's|-msse4.2||g' \
-		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/share/applications|${DESKTOPDIR}|g ; \
-		s|/usr/share|${LOCALBASE}/share|g ; \
-		s|{mime/packages,applications}|mime/packages| ; \
-		s|{apps,mimetypes}|apps $$(DESTDIR)${LOCALBASE}/share/icons/hicolor/$$$${size}x$$$${size}/mimetypes|' \
-		${WRKSRC}/Makefile.in
-
-.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3}
-post-install:
-	${MV} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-gtk \
-		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-.endif
+		s|/usr/share|${LOCALBASE}/share|g' \
+		${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index 3fa5ec59115f..8d87f9056733 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547339518
-SHA256 (wireshark-2.6.6.tar.xz) = 487933ea075bdbb25d8df06017d9c4f49fc20eb7f6ec80af086718ed5550e863
-SIZE (wireshark-2.6.6.tar.xz) = 28407404
+TIMESTAMP = 1551565540
+SHA256 (wireshark-3.0.0.tar.xz) = bc4f30f5b2e94f3a696fef9de44673cdf402db90aac5299966da647f708f009e
+SIZE (wireshark-3.0.0.tar.xz) = 30953760
diff --git a/net/wireshark/files/extra-patch-doc_CMakeLists.txt b/net/wireshark/files/extra-patch-doc_CMakeLists.txt
new file mode 100644
index 000000000000..ba86e1fd4bb5
--- /dev/null
+++ b/net/wireshark/files/extra-patch-doc_CMakeLists.txt
@@ -0,0 +1,26 @@
+--- doc/CMakeLists.txt.orig2	2019-03-04 18:52:33.373076000 -0500
++++ doc/CMakeLists.txt	2019-03-04 18:54:06.412930000 -0500
+@@ -100,23 +100,7 @@ if (BUILD_xxx2deb)
+ endif()
+ 
+ set(MAN1_INSTALL_FILES
+-	${CMAKE_CURRENT_BINARY_DIR}/androiddump.1
+-	${CMAKE_CURRENT_BINARY_DIR}/capinfos.1
+-	${CMAKE_CURRENT_BINARY_DIR}/captype.1
+-	${CMAKE_CURRENT_BINARY_DIR}/ciscodump.1
+-	${CMAKE_CURRENT_BINARY_DIR}/ciscodump.1
+-	${CMAKE_CURRENT_BINARY_DIR}/dftest.1
+-	${CMAKE_CURRENT_BINARY_DIR}/dumpcap.1
+-	${CMAKE_CURRENT_BINARY_DIR}/editcap.1
+-	${CMAKE_CURRENT_BINARY_DIR}/mergecap.1
+-	${CMAKE_CURRENT_BINARY_DIR}/randpkt.1
+-	${CMAKE_CURRENT_BINARY_DIR}/randpktdump.1
+-	${CMAKE_CURRENT_BINARY_DIR}/rawshark.1
+-	${CMAKE_CURRENT_BINARY_DIR}/reordercap.1
+-	${CMAKE_CURRENT_BINARY_DIR}/sshdump.1
+-	${CMAKE_CURRENT_BINARY_DIR}/text2pcap.1
+ 	${CMAKE_CURRENT_BINARY_DIR}/tshark.1
+-	${CMAKE_CURRENT_BINARY_DIR}/udpdump.1
+ 	${CMAKE_CURRENT_BINARY_DIR}/wireshark.1
+ )
+ 
diff --git a/net/wireshark/files/extrapatch-configure-qt5 b/net/wireshark/files/extrapatch-configure-qt5
deleted file mode 100644
index cfe84de16313..000000000000
--- a/net/wireshark/files/extrapatch-configure-qt5
+++ /dev/null
@@ -1,37 +0,0 @@
-Work around the buggy detection of the Qt tools via qtchooser, which adds the -qt=foo 
-flag even though the found tool is not qtchooser. 
-
---- configure.orig	2017-02-09 18:02:53 UTC
-+++ configure
-@@ -47562,7 +47562,6 @@ fi
- 		#
- 		# Add the -qt={version} argument to it.
- 		#
--		UIC="$UIC -qt=$qt_version"
- 	else
- 		#
- 		# Annoyingly, on some Linux distros (e.g. Debian)
-@@ -47740,7 +47739,6 @@ fi
- 		#
- 		# Add the -qt={version} argument to it.
- 		#
--		MOC="$MOC -qt=$qt_version"
- 	else
- 		#
- 		# Annoyingly, on some Linux distros (e.g. Debian)
-@@ -47918,7 +47916,6 @@ fi
- 		#
- 		# Add the -qt={version} argument to it.
- 		#
--		RCC="$RCC -qt=$qt_version"
- 	else
- 		#
- 		# Annoyingly, on some Linux distros (e.g. Debian)
-@@ -48097,7 +48094,6 @@ fi
- 		#
- 		# Add the -qt={version} argument to it.
- 		#
--		LRELEASE="$LRELEASE -qt=$qt_version"
- 	else
- 		#
- 		# Annoyingly, on some Linux distros (e.g. Debian)
diff --git a/net/wireshark/files/patch-doc_CMakeLists.txt b/net/wireshark/files/patch-doc_CMakeLists.txt
new file mode 100644
index 000000000000..c70bfddb548f
--- /dev/null
+++ b/net/wireshark/files/patch-doc_CMakeLists.txt
@@ -0,0 +1,21 @@
+--- doc/CMakeLists.txt.orig	2019-03-05 00:29:38 UTC
++++ doc/CMakeLists.txt
+@@ -225,12 +225,12 @@ install(
+ 		${CMAKE_INSTALL_MANDIR}/man4
+ )
+ 
+-install(
+-	FILES
+-		${HTML_INSTALL_FILES}
+-	DESTINATION
+-		${CMAKE_INSTALL_DOCDIR}
+-)
++#install(
++#	FILES
++#		${HTML_INSTALL_FILES}
++#	DESTINATION
++#		${CMAKE_INSTALL_DOCDIR}
++#)
+ 
+ #
+ # Editor modelines  -  http://www.wireshark.org/tools/modelines.html
diff --git a/net/wireshark/files/patch-extcap.c b/net/wireshark/files/patch-extcap.c
index 29c1f729f941..0833a6648f70 100644
--- a/net/wireshark/files/patch-extcap.c
+++ b/net/wireshark/files/patch-extcap.c
@@ -1,6 +1,6 @@
---- extcap.c.orig	2016-09-12 21:16:52 UTC
+--- extcap.c.orig	2019-02-28 17:56:38 UTC
 +++ extcap.c
-@@ -33,6 +33,7 @@
+@@ -21,6 +21,7 @@
  #include <process.h>
  #include <time.h>
  #else
diff --git a/net/wireshark/files/patch-wsutil_CMakeLists.txt b/net/wireshark/files/patch-wsutil_CMakeLists.txt
new file mode 100644
index 000000000000..f48883fa666e
--- /dev/null
+++ b/net/wireshark/files/patch-wsutil_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- wsutil/CMakeLists.txt.orig	2019-03-05 00:29:38 UTC
++++ wsutil/CMakeLists.txt
+@@ -261,6 +261,7 @@ add_custom_command(OUTPUT libwsutil.abi.
+ target_link_libraries(wsutil
+ 	PUBLIC
+ 	${CMAKE_DL_LIBS}
++	-lm
+ 	${APPLE_CORE_FOUNDATION_LIBRARY}
+ 	${GMODULE2_LIBRARIES}
+ 	${GLIB2_LIBRARIES}
diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist
index 64022fa210d9..cfaa6a9532c9 100644
--- a/net/wireshark/pkg-plist
+++ b/net/wireshark/pkg-plist
@@ -17,6 +17,7 @@ bin/idl2wrs
 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
@@ -52,7 +53,7 @@ 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/dissectors.h
+include/wireshark/epan/dissectors/file-rbm.h
 include/wireshark/epan/dissectors/packet-6lowpan.h
 include/wireshark/epan/dissectors/packet-a21.h
 include/wireshark/epan/dissectors/packet-acp133.h
@@ -96,7 +97,6 @@ include/wireshark/epan/dissectors/packet-charging_ase.h
 include/wireshark/epan/dissectors/packet-chdlc.h
 include/wireshark/epan/dissectors/packet-cip.h
 include/wireshark/epan/dissectors/packet-cipsafety.h
-include/wireshark/epan/dissectors/packet-clearcase.h
 include/wireshark/epan/dissectors/packet-cmip.h
 include/wireshark/epan/dissectors/packet-cmp.h
 include/wireshark/epan/dissectors/packet-cms.h
@@ -107,42 +107,22 @@ include/wireshark/epan/dissectors/packet-csn1.h
 include/wireshark/epan/dissectors/packet-dap.h
 include/wireshark/epan/dissectors/packet-dcc.h
 include/wireshark/epan/dissectors/packet-dccp.h
-include/wireshark/epan/dissectors/packet-dcerpc-atsvc.h
 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-clusapi.h
 include/wireshark/epan/dissectors/packet-dcerpc-dce122.h
 include/wireshark/epan/dissectors/packet-dcerpc-dcom.h
-include/wireshark/epan/dissectors/packet-dcerpc-dfs.h
 include/wireshark/epan/dissectors/packet-dcerpc-dnsserver.h
-include/wireshark/epan/dissectors/packet-dcerpc-drsuapi.h
-include/wireshark/epan/dissectors/packet-dcerpc-dssetup.h
-include/wireshark/epan/dissectors/packet-dcerpc-efs.h
-include/wireshark/epan/dissectors/packet-dcerpc-eventlog.h
 include/wireshark/epan/dissectors/packet-dcerpc-frsapi.h
 include/wireshark/epan/dissectors/packet-dcerpc-frsrpc.h
-include/wireshark/epan/dissectors/packet-dcerpc-frstrans.h
-include/wireshark/epan/dissectors/packet-dcerpc-initshutdown.h
-include/wireshark/epan/dissectors/packet-dcerpc-lsa.h
-include/wireshark/epan/dissectors/packet-dcerpc-mapi.h
-include/wireshark/epan/dissectors/packet-dcerpc-mdssvc.h
-include/wireshark/epan/dissectors/packet-dcerpc-misc.h
 include/wireshark/epan/dissectors/packet-dcerpc-netlogon.h
-include/wireshark/epan/dissectors/packet-dcerpc-nspi.h
 include/wireshark/epan/dissectors/packet-dcerpc-nt.h
 include/wireshark/epan/dissectors/packet-dcerpc-pnp.h
-include/wireshark/epan/dissectors/packet-dcerpc-rfr.h
 include/wireshark/epan/dissectors/packet-dcerpc-rras.h
 include/wireshark/epan/dissectors/packet-dcerpc-samr.h
 include/wireshark/epan/dissectors/packet-dcerpc-spoolss.h
-include/wireshark/epan/dissectors/packet-dcerpc-srvsvc.h
 include/wireshark/epan/dissectors/packet-dcerpc-svcctl.h
 include/wireshark/epan/dissectors/packet-dcerpc-tapi.h
-include/wireshark/epan/dissectors/packet-dcerpc-winreg.h
-include/wireshark/epan/dissectors/packet-dcerpc-witness.h
-include/wireshark/epan/dissectors/packet-dcerpc-wkssvc.h
-include/wireshark/epan/dissectors/packet-dcerpc-wzcsvc.h
 include/wireshark/epan/dissectors/packet-dcerpc.h
 include/wireshark/epan/dissectors/packet-dcom-dispatch.h
 include/wireshark/epan/dissectors/packet-dcom.h
@@ -176,7 +156,6 @@ include/wireshark/epan/dissectors/packet-fcels.h
 include/wireshark/epan/dissectors/packet-fcfcs.h
 include/wireshark/epan/dissectors/packet-fcfzs.h
 include/wireshark/epan/dissectors/packet-fclctl.h
-include/wireshark/epan/dissectors/packet-fcp.h
 include/wireshark/epan/dissectors/packet-fcsb3.h
 include/wireshark/epan/dissectors/packet-fcswils.h
 include/wireshark/epan/dissectors/packet-ff.h
@@ -184,11 +163,11 @@ include/wireshark/epan/dissectors/packet-fix.h
 include/wireshark/epan/dissectors/packet-fmp.h
 include/wireshark/epan/dissectors/packet-frame.h
 include/wireshark/epan/dissectors/packet-ftam.h
+include/wireshark/epan/dissectors/packet-geonw.h
 include/wireshark/epan/dissectors/packet-giop.h
 include/wireshark/epan/dissectors/packet-gluster.h
 include/wireshark/epan/dissectors/packet-gmr1_common.h
 include/wireshark/epan/dissectors/packet-gmr1_rr.h
-include/wireshark/epan/dissectors/packet-gnutella.h
 include/wireshark/epan/dissectors/packet-gprscdr.h
 include/wireshark/epan/dissectors/packet-gre.h
 include/wireshark/epan/dissectors/packet-gsm_a_common.h
@@ -207,6 +186,7 @@ include/wireshark/epan/dissectors/packet-h245.h
 include/wireshark/epan/dissectors/packet-h248.h
 include/wireshark/epan/dissectors/packet-h263.h
 include/wireshark/epan/dissectors/packet-h264.h
+include/wireshark/epan/dissectors/packet-h265.h
 include/wireshark/epan/dissectors/packet-h323.h
 include/wireshark/epan/dissectors/packet-h450-ros.h
 include/wireshark/epan/dissectors/packet-hpext.h
@@ -217,6 +197,7 @@ include/wireshark/epan/dissectors/packet-iax2.h
 include/wireshark/epan/dissectors/packet-icmp.h
 include/wireshark/epan/dissectors/packet-idmp.h
 include/wireshark/epan/dissectors/packet-idp.h
+include/wireshark/epan/dissectors/packet-ieee1609dot2.h
 include/wireshark/epan/dissectors/packet-ieee80211-radio.h
 include/wireshark/epan/dissectors/packet-ieee80211-radiotap-defs.h
 include/wireshark/epan/dissectors/packet-ieee80211-radiotap-iter.h
@@ -237,11 +218,13 @@ include/wireshark/epan/dissectors/packet-isis-clv.h
 include/wireshark/epan/dissectors/packet-isis.h
 include/wireshark/epan/dissectors/packet-isl.h
 include/wireshark/epan/dissectors/packet-isup.h
+include/wireshark/epan/dissectors/packet-its.h
 include/wireshark/epan/dissectors/packet-iwarp-ddp-rdmap.h
 include/wireshark/epan/dissectors/packet-juniper.h
 include/wireshark/epan/dissectors/packet-jxta.h
 include/wireshark/epan/dissectors/packet-kerberos.h
-include/wireshark/epan/dissectors/packet-klm.h
+include/wireshark/epan/dissectors/packet-knxip.h
+include/wireshark/epan/dissectors/packet-knxip_decrypt.h
 include/wireshark/epan/dissectors/packet-l2tp.h
 include/wireshark/epan/dissectors/packet-lapdm.h
 include/wireshark/epan/dissectors/packet-lbm.h
@@ -252,13 +235,13 @@ include/wireshark/epan/dissectors/packet-lcsap.h
 include/wireshark/epan/dissectors/packet-ldap.h
 include/wireshark/epan/dissectors/packet-ldp.h
 include/wireshark/epan/dissectors/packet-link16.h
+include/wireshark/epan/dissectors/packet-lisp.h
 include/wireshark/epan/dissectors/packet-llc.h
 include/wireshark/epan/dissectors/packet-lnet.h
 include/wireshark/epan/dissectors/packet-logotypecertextn.h
 include/wireshark/epan/dissectors/packet-lpp.h
 include/wireshark/epan/dissectors/packet-lte-rrc.h
 include/wireshark/epan/dissectors/packet-mac-lte.h
-include/wireshark/epan/dissectors/packet-mac-nr.h
 include/wireshark/epan/dissectors/packet-mausb.h
 include/wireshark/epan/dissectors/packet-mbim.h
 include/wireshark/epan/dissectors/packet-mbtcp.h
@@ -268,7 +251,6 @@ include/wireshark/epan/dissectors/packet-mms.h
 include/wireshark/epan/dissectors/packet-mount.h
 include/wireshark/epan/dissectors/packet-mp4ves.h
 include/wireshark/epan/dissectors/packet-mpeg-descriptor.h
-include/wireshark/epan/dissectors/packet-mpeg-pmt.h
 include/wireshark/epan/dissectors/packet-mpeg-sect.h
 include/wireshark/epan/dissectors/packet-mpls.h
 include/wireshark/epan/dissectors/packet-mq.h
@@ -283,8 +265,8 @@ include/wireshark/epan/dissectors/packet-ndmp.h
 include/wireshark/epan/dissectors/packet-ndps.h
 include/wireshark/epan/dissectors/packet-netbios.h
 include/wireshark/epan/dissectors/packet-netlink.h
-include/wireshark/epan/dissectors/packet-netmon.h
 include/wireshark/epan/dissectors/packet-nfs.h
+include/wireshark/epan/dissectors/packet-ngap.h
 include/wireshark/epan/dissectors/packet-nisplus.h
 include/wireshark/epan/dissectors/packet-nlm.h
 include/wireshark/epan/dissectors/packet-nr-rrc.h
@@ -293,6 +275,7 @@ include/wireshark/epan/dissectors/packet-ntlmssp.h
 include/wireshark/epan/dissectors/packet-ntp.h
 include/wireshark/epan/dissectors/packet-nvme.h
 include/wireshark/epan/dissectors/packet-ocsp.h
+include/wireshark/epan/dissectors/packet-oer.h
 include/wireshark/epan/dissectors/packet-opensafety.h
 include/wireshark/epan/dissectors/packet-oscore.h
 include/wireshark/epan/dissectors/packet-osi-options.h
@@ -304,6 +287,7 @@ include/wireshark/epan/dissectors/packet-p772.h
 include/wireshark/epan/dissectors/packet-pcap_pktdata.h
 include/wireshark/epan/dissectors/packet-pcnfsd.h
 include/wireshark/epan/dissectors/packet-pdcp-lte.h
+include/wireshark/epan/dissectors/packet-pdcp-nr.h
 include/wireshark/epan/dissectors/packet-per.h
 include/wireshark/epan/dissectors/packet-pkcs1.h
 include/wireshark/epan/dissectors/packet-pkcs12.h
@@ -314,12 +298,10 @@ include/wireshark/epan/dissectors/packet-pkixac.h
 include/wireshark/epan/dissectors/packet-pkixproxy.h
 include/wireshark/epan/dissectors/packet-pkixqualified.h
 include/wireshark/epan/dissectors/packet-pkixtsp.h
-include/wireshark/epan/dissectors/packet-pktc.h
 include/wireshark/epan/dissectors/packet-portmap.h
 include/wireshark/epan/dissectors/packet-ppi-geolocation-common.h
 include/wireshark/epan/dissectors/packet-ppp.h
 include/wireshark/epan/dissectors/packet-pres.h
-include/wireshark/epan/dissectors/packet-protobuf.h
 include/wireshark/epan/dissectors/packet-ptp.h
 include/wireshark/epan/dissectors/packet-ptpip.h
 include/wireshark/epan/dissectors/packet-pw-atm.h
@@ -342,7 +324,6 @@ include/wireshark/epan/dissectors/packet-rohc.h
 include/wireshark/epan/dissectors/packet-ros.h
 include/wireshark/epan/dissectors/packet-rpc.h
 include/wireshark/epan/dissectors/packet-rpcrdma.h
-include/wireshark/epan/dissectors/packet-rquota.h
 include/wireshark/epan/dissectors/packet-rrc.h
 include/wireshark/epan/dissectors/packet-rsvp.h
 include/wireshark/epan/dissectors/packet-rtcp.h
@@ -351,7 +332,6 @@ include/wireshark/epan/dissectors/packet-rtp.h
 include/wireshark/epan/dissectors/packet-rtps.h
 include/wireshark/epan/dissectors/packet-rtse.h
 include/wireshark/epan/dissectors/packet-rtsp.h
-include/wireshark/epan/dissectors/packet-rwall.h
 include/wireshark/epan/dissectors/packet-rx.h
 include/wireshark/epan/dissectors/packet-s1ap.h
 include/wireshark/epan/dissectors/packet-s5066sis.h
@@ -383,14 +363,12 @@ include/wireshark/epan/dissectors/packet-smrse.h
 include/wireshark/epan/dissectors/packet-snmp.h
 include/wireshark/epan/dissectors/packet-socketcan.h
 include/wireshark/epan/dissectors/packet-spice.h
-include/wireshark/epan/dissectors/packet-spray.h
 include/wireshark/epan/dissectors/packet-sprt.h
 include/wireshark/epan/dissectors/packet-sscop.h
-include/wireshark/epan/dissectors/packet-ssl-utils.h
-include/wireshark/epan/dissectors/packet-ssl.h
 include/wireshark/epan/dissectors/packet-stat-notify.h
 include/wireshark/epan/dissectors/packet-stat.h
 include/wireshark/epan/dissectors/packet-sv.h
+include/wireshark/epan/dissectors/packet-syslog.h
 include/wireshark/epan/dissectors/packet-t124.h
 include/wireshark/epan/dissectors/packet-t30.h
 include/wireshark/epan/dissectors/packet-t38.h
@@ -398,8 +376,8 @@ 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-tftp.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
 include/wireshark/epan/dissectors/packet-tn5250.h
 include/wireshark/epan/dissectors/packet-tpkt.h
@@ -450,15 +428,6 @@ include/wireshark/epan/dissectors/packet-zbee-zcl.h
 include/wireshark/epan/dissectors/packet-zbee-zdp.h
 include/wireshark/epan/dissectors/packet-zbee.h
 include/wireshark/epan/dissectors/packet-ziop.h
-include/wireshark/epan/dissectors/read_keytab_file.h
-include/wireshark/epan/dissectors/snort-config.h
-include/wireshark/epan/dissectors/x11-declarations.h
-include/wireshark/epan/dissectors/x11-enum.h
-include/wireshark/epan/dissectors/x11-extension-errors.h
-include/wireshark/epan/dissectors/x11-extension-implementation.h
-include/wireshark/epan/dissectors/x11-glx-render-enum.h
-include/wireshark/epan/dissectors/x11-keysym.h
-include/wireshark/epan/dissectors/x11-register-info.h
 include/wireshark/epan/dtd.h
 include/wireshark/epan/dtd_parse.h
 include/wireshark/epan/dvb_chartbl.h
@@ -519,7 +488,7 @@ include/wireshark/epan/req_resp_hdrs.h
 include/wireshark/epan/rtd_table.h
 include/wireshark/epan/rtp_pt.h
 include/wireshark/epan/sctpppids.h
-include/wireshark/epan/sequence_analysis.h
+include/wireshark/epan/secrets.h
 include/wireshark/epan/show_exception.h
 include/wireshark/epan/slow_protocol_subtypes.h
 include/wireshark/epan/sminmpec.h
@@ -564,25 +533,25 @@ include/wireshark/epan/xdlc.h
 include/wireshark/file.h
 include/wireshark/globals.h
 include/wireshark/log.h
+include/wireshark/version_info.h
 include/wireshark/wiretap/file_wrappers.h
 include/wireshark/wiretap/merge.h
 include/wireshark/wiretap/pcap-encap.h
 include/wireshark/wiretap/pcapng_module.h
+include/wireshark/wiretap/secrets-types.h
 include/wireshark/wiretap/wtap.h
 include/wireshark/wiretap/wtap_opttypes.h
 include/wireshark/ws_attributes.h
 include/wireshark/ws_compiler_tests.h
 include/wireshark/ws_diag_control.h
 include/wireshark/ws_symbol_export.h
+include/wireshark/ws_version.h
 include/wireshark/wsutil/adler32.h
 include/wireshark/wsutil/base32.h
-include/wireshark/wsutil/base64.h
 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/clopts_common.h
-include/wireshark/wsutil/cmdarg_err.h
 include/wireshark/wsutil/color.h
 include/wireshark/wsutil/copyright_info.h
 include/wireshark/wsutil/cpu_info.h
@@ -595,17 +564,19 @@ include/wireshark/wsutil/crc32.h
 include/wireshark/wsutil/crc6.h
 include/wireshark/wsutil/crc7.h
 include/wireshark/wsutil/crc8.h
+include/wireshark/wsutil/curve25519.h
 include/wireshark/wsutil/eax.h
 include/wireshark/wsutil/filesystem.h
 include/wireshark/wsutil/frequency-utils.h
 include/wireshark/wsutil/g711.h
-include/wireshark/wsutil/glib-compat.h
 include/wireshark/wsutil/inet_addr.h
 include/wireshark/wsutil/inet_ipv4.h
 include/wireshark/wsutil/inet_ipv6.h
 include/wireshark/wsutil/interface.h
 include/wireshark/wsutil/jsmn.h
+include/wireshark/wsutil/json_dumper.h
 include/wireshark/wsutil/mpeg-audio.h
+include/wireshark/wsutil/netlink.h
 include/wireshark/wsutil/nstime.h
 include/wireshark/wsutil/os_version_info.h
 include/wireshark/wsutil/pint.h
@@ -614,7 +585,6 @@ include/wireshark/wsutil/pow2.h
 include/wireshark/wsutil/privileges.h
 include/wireshark/wsutil/processes.h
 include/wireshark/wsutil/report_message.h
-include/wireshark/wsutil/rsa.h
 include/wireshark/wsutil/sign_ext.h
 include/wireshark/wsutil/sober128.h
 include/wireshark/wsutil/socket.h
@@ -627,46 +597,52 @@ include/wireshark/wsutil/type_util.h
 include/wireshark/wsutil/unicode-utils.h
 include/wireshark/wsutil/utf8_entities.h
 include/wireshark/wsutil/ws_cpuid.h
+include/wireshark/wsutil/wsjson.h
 include/wireshark/wsutil/ws_mempbrk.h
 include/wireshark/wsutil/ws_mempbrk_int.h
 include/wireshark/wsutil/ws_pipe.h
 include/wireshark/wsutil/ws_printf.h
-include/wireshark/wsutil/wsgcrypt.h
-include/wireshark/wsutil/wsgetopt.h
-include/wireshark/wsutil/wsjsmn.h
-include/wireshark/wsutil/wspcap.h
 include/wireshark/wsutil/xtea.h
 lib/libwireshark.so
-lib/libwireshark.so.10
-lib/libwireshark.so.10.1.6
+lib/libwireshark.so.12
+lib/libwireshark.so.12.0.0
 lib/libwiretap.so
-lib/libwiretap.so.8
-lib/libwiretap.so.8.0.6
+lib/libwiretap.so.9
+lib/libwiretap.so.9.0.0
 %%GUI%%lib/libwscodecs.so
 %%GUI%%lib/libwscodecs.so.2
 %%GUI%%lib/libwscodecs.so.2.0.0
 lib/libwsutil.so
-lib/libwsutil.so.9
-lib/libwsutil.so.9.0.0
+lib/libwsutil.so.10
+lib/libwsutil.so.10.0.0
+lib/wireshark/cmake/FindGLIB2.cmake
+lib/wireshark/cmake/FindWSWinLibs.cmake
+lib/wireshark/cmake/LocatePythonModule.cmake
+lib/wireshark/cmake/UseAsn2Wrs.cmake
+lib/wireshark/cmake/UseMakePluginReg.cmake
+lib/wireshark/cmake/WiresharkConfig.cmake
+lib/wireshark/cmake/WiresharkConfigVersion.cmake
+lib/wireshark/cmake/WiresharkTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/wireshark/cmake/WiresharkTargets.cmake
 %%ANDROIDDUMP_LIB%%lib/wireshark/extcap/androiddump
 %%CISCODUMP_LIB%%lib/wireshark/extcap/ciscodump
 %%RANDPKTDUMP_LIB%%lib/wireshark/extcap/randpktdump
 %%SSHDUMP_LIB%%lib/wireshark/extcap/sshdump
 %%UDPDUMP_LIB%%lib/wireshark/extcap/udpdump
-lib/wireshark/plugins/2.6/codecs/l16mono.so
-lib/wireshark/plugins/2.6/epan/ethercat.so
-lib/wireshark/plugins/2.6/epan/gryphon.so
-lib/wireshark/plugins/2.6/epan/irda.so
-lib/wireshark/plugins/2.6/epan/mate.so
-lib/wireshark/plugins/2.6/epan/opcua.so
-lib/wireshark/plugins/2.6/epan/profinet.so
-lib/wireshark/plugins/2.6/epan/stats_tree.so
-lib/wireshark/plugins/2.6/epan/transum.so
-lib/wireshark/plugins/2.6/epan/unistim.so
-lib/wireshark/plugins/2.6/epan/wimax.so
-lib/wireshark/plugins/2.6/epan/wimaxasncp.so
-lib/wireshark/plugins/2.6/epan/wimaxmacphy.so
-lib/wireshark/plugins/2.6/wiretap/usbdump.so
+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
 libdata/pkgconfig/wireshark.pc
 %%ANDROIDDUMP_MAN%%man/man1/androiddump.1.gz
 %%CAPINFOS_MAN%%man/man1/capinfos.1.gz
@@ -689,7 +665,6 @@ man/man1/tshark.1.gz
 man/man4/extcap.4.gz
 man/man4/wireshark-filter.4.gz
 %%GUI%%share/appdata/wireshark.appdata.xml
-%%GUI%%%%GUI_GTK%%share/applications/wireshark-gtk.desktop
 %%GUI%%share/applications/wireshark.desktop
 %%GUI%%share/icons/hicolor/128x128/apps/wireshark.png
 %%GUI%%share/icons/hicolor/128x128/mimetypes/application-wireshark-doc.png
@@ -765,11 +740,12 @@ man/man4/wireshark-filter.4.gz
 %%DATADIR%%/help/capture_filters.txt
 %%DATADIR%%/help/capturing.txt
 %%DATADIR%%/help/display_filters.txt
-%%DATADIR%%/help/faq.txt
+%%DATADIR%%/help/faq.py
 %%DATADIR%%/help/getting_started.txt
 %%DATADIR%%/help/overview.txt
 %%DATADIR%%/help/toc
 %%LUA%%%%DATADIR%%/init.lua
+%%DATADIR%%/ipmap.html
 %%DATADIR%%/manuf
 %%DATADIR%%/mergecap.html
 %%DATADIR%%/mmdbresolve.html
@@ -777,6 +753,7 @@ man/man4/wireshark-filter.4.gz
 %%DATADIR%%/profiles/Bluetooth/colorfilters
 %%DATADIR%%/profiles/Bluetooth/preferences
 %%DATADIR%%/profiles/Classic/colorfilters
+%%DATADIR%%/profiles/No Reassembly/preferences
 %%DATADIR%%/radius/README.radius_dictionary
 %%DATADIR%%/radius/custom.includes
 %%DATADIR%%/radius/dictionary
@@ -966,6 +943,7 @@ man/man4/wireshark-filter.4.gz
 %%DATADIR%%/radius/dictionary.usr
 %%DATADIR%%/radius/dictionary.utstarcom
 %%DATADIR%%/radius/dictionary.valemount
+%%DATADIR%%/radius/dictionary.verizon
 %%DATADIR%%/radius/dictionary.versanet
 %%DATADIR%%/radius/dictionary.vqp
 %%DATADIR%%/radius/dictionary.walabi