net/wireshark: Update to 3.6.0

See https://www.wireshark.org/docs/relnotes/wireshark-3.6.0.html for a
list of changes in this release.

6 files changed, 147 insertions, 122 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 9a78160ce281..9026beab3158 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,8 +1,7 @@
 # Created by: Bill Fumerola <billf@chc-chimes.com>
 
 PORTNAME?=	wireshark
-PORTVERSION=	3.4.9
-PORTREVISION=	1
+PORTVERSION=	3.6.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.wireshark.org/download/src/ \
 		http://ftp.uni-kl.de/pub/wireshark/src/ \
@@ -43,7 +42,7 @@ LIB_DEPENDS+=	libgpg-error.so:security/libgpg-error \
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \
-    reordercap captype randpktdump udpdump sharkd
+    reordercap captype randpktdump udpdump sharkd etwdump
 .if defined(LITE)
 PKGNAMESUFFIX=		-lite
 PLIST_SUB+=		${x:tu}="@comment $x not installed" \
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index e1e64eeabc27..c84a6fa44c66 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633619056
-SHA256 (wireshark-3.4.9.tar.xz) = c6525e829bd24525ee699aa207ecd27c50646d64263a669671badfb71cd99620
-SIZE (wireshark-3.4.9.tar.xz) = 32335284
+TIMESTAMP = 1637838462
+SHA256 (wireshark-3.6.0.tar.xz) = 9cc8f7fc5bb1d66fbdfdf95cde6e1c98633c303f9af9b33ae9f1fcf022fedf06
+SIZE (wireshark-3.6.0.tar.xz) = 39687684
diff --git a/net/wireshark/files/extra-patch-doc_CMakeLists.txt b/net/wireshark/files/extra-patch-doc_CMakeLists.txt
index 99cdd0b81768..e38b0b77bd57 100644
--- a/net/wireshark/files/extra-patch-doc_CMakeLists.txt
+++ b/net/wireshark/files/extra-patch-doc_CMakeLists.txt
@@ -1,26 +1,57 @@
---- doc/CMakeLists.txt.orig	2019-08-05 13:37:15 UTC
-+++ doc/CMakeLists.txt
-@@ -100,23 +100,8 @@ if (BUILD_xxx2deb)
- endif()
+--- doc/CMakeLists.txt.orig	2021-11-25 07:35:42.282939000 -0500
++++ doc/CMakeLists.txt	2021-11-25 07:38:48.263204000 -0500
+@@ -42,24 +42,39 @@ macro (ADD_MAN_PAGE _page_name _man_section)
+ 	endif()
+ endmacro()
  
- 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
- )
++macro (ADD_MAN_PAGE_NO_INSTALL _page_name _man_section)
++	if(ASCIIDOCTOR_FOUND)
++		list(APPEND HTML_INSTALL_FILES ${CMAKE_CURRENT_BINARY_DIR}/${_page_name}.html)
++
++		if (${_man_section} EQUAL 1)
++			list(APPEND MAN1_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${_page_name}.adoc)
++		elseif (${_man_section} EQUAL 4)
++			list(APPEND MAN4_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${_page_name}.adoc)
++		else()
++			message(FATAL_ERROR "Unsupported manual page section ${_man_section} for ${_page_name}")
++		endif()
++	endif()
++endmacro()
++
++
+ ADD_MAN_PAGE(wireshark   1)
+-ADD_MAN_PAGE(androiddump 1)
+-ADD_MAN_PAGE(capinfos    1)
+-ADD_MAN_PAGE(captype     1)
+-ADD_MAN_PAGE(ciscodump   1)
+-ADD_MAN_PAGE(dftest      1)
++ADD_MAN_PAGE_NO_INSTALL(androiddump 1)
++ADD_MAN_PAGE_NO_INSTALL(capinfos    1)
++ADD_MAN_PAGE_NO_INSTALL(captype     1)
++ADD_MAN_PAGE_NO_INSTALL(ciscodump   1)
++ADD_MAN_PAGE_NO_INSTALL(dftest      1)
+ ADD_MAN_PAGE(dumpcap     1)
+-ADD_MAN_PAGE(editcap     1)
+-ADD_MAN_PAGE(mergecap    1)
+-ADD_MAN_PAGE(randpkt     1)
+-ADD_MAN_PAGE(randpktdump 1)
+-ADD_MAN_PAGE(etwdump     1)
+-ADD_MAN_PAGE(rawshark    1)
+-ADD_MAN_PAGE(reordercap  1)
+-ADD_MAN_PAGE(sshdump     1)
+-ADD_MAN_PAGE(text2pcap   1)
++ADD_MAN_PAGE_NO_INSTALL(editcap     1)
++ADD_MAN_PAGE_NO_INSTALL(mergecap    1)
++ADD_MAN_PAGE_NO_INSTALL(randpkt     1)
++ADD_MAN_PAGE_NO_INSTALL(randpktdump 1)
++ADD_MAN_PAGE_NO_INSTALL(etwdump     1)
++ADD_MAN_PAGE_NO_INSTALL(rawshark    1)
++ADD_MAN_PAGE_NO_INSTALL(reordercap  1)
++ADD_MAN_PAGE_NO_INSTALL(sshdump     1)
++ADD_MAN_PAGE_NO_INSTALL(text2pcap   1)
+ ADD_MAN_PAGE(tshark      1)
+-ADD_MAN_PAGE(udpdump     1)
++ADD_MAN_PAGE_NO_INSTALL(udpdump     1)
  
+ ADD_MAN_PAGE(extcap           4)
+ ADD_MAN_PAGE(wireshark-filter 4)
diff --git a/net/wireshark/files/patch-doc_CMakeLists.txt b/net/wireshark/files/patch-doc_CMakeLists.txt
deleted file mode 100644
index fc2e52b1d1f6..000000000000
--- a/net/wireshark/files/patch-doc_CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
---- doc/CMakeLists.txt.orig	2021-04-15 19:26:54 UTC
-+++ doc/CMakeLists.txt
-@@ -221,12 +221,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  -  https://www.wireshark.org/tools/modelines.html
diff --git a/net/wireshark/files/patch-wsutil_CMakeLists.txt b/net/wireshark/files/patch-wsutil_CMakeLists.txt
deleted file mode 100644
index f48883fa666e..000000000000
--- a/net/wireshark/files/patch-wsutil_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 2ce0ffe15ceb..b971b14537e7 100644
--- a/net/wireshark/pkg-plist
+++ b/net/wireshark/pkg-plist
@@ -48,11 +48,13 @@ include/wireshark/epan/crc16-tvb.h
 include/wireshark/epan/crc32-tvb.h
 include/wireshark/epan/crc6-tvb.h
 include/wireshark/epan/crc8-tvb.h
+include/wireshark/epan/dccpservicecodes.h
 include/wireshark/epan/decode_as.h
 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/dissectors/cond_ace_token_enum.h
 include/wireshark/epan/dissectors/file-rbm.h
 include/wireshark/epan/dissectors/packet-6lowpan.h
 include/wireshark/epan/dissectors/packet-a21.h
@@ -63,10 +65,12 @@ include/wireshark/epan/dissectors/packet-actrace.h
 include/wireshark/epan/dissectors/packet-adb_service.h
 include/wireshark/epan/dissectors/packet-afp.h
 include/wireshark/epan/dissectors/packet-alcap.h
+include/wireshark/epan/dissectors/packet-amp.h
 include/wireshark/epan/dissectors/packet-ansi_a.h
 include/wireshark/epan/dissectors/packet-ansi_map.h
 include/wireshark/epan/dissectors/packet-ansi_tcap.h
 include/wireshark/epan/dissectors/packet-arp.h
+include/wireshark/epan/dissectors/packet-asap+enrp-common.h
 include/wireshark/epan/dissectors/packet-atalk.h
 include/wireshark/epan/dissectors/packet-atm.h
 include/wireshark/epan/dissectors/packet-atn-ulcs.h
@@ -77,12 +81,16 @@ 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-bpsec.h
+include/wireshark/epan/dissectors/packet-bpv6.h
+include/wireshark/epan/dissectors/packet-bpv7.h
 include/wireshark/epan/dissectors/packet-bssap.h
 include/wireshark/epan/dissectors/packet-bssgp.h
 include/wireshark/epan/dissectors/packet-btatt.h
 include/wireshark/epan/dissectors/packet-btavctp.h
 include/wireshark/epan/dissectors/packet-btavdtp.h
 include/wireshark/epan/dissectors/packet-btavrcp.h
+include/wireshark/epan/dissectors/packet-btbredr_rf.h
 include/wireshark/epan/dissectors/packet-bthci_acl.h
 include/wireshark/epan/dissectors/packet-bthci_cmd.h
 include/wireshark/epan/dissectors/packet-bthci_evt.h
@@ -104,6 +112,7 @@ include/wireshark/epan/dissectors/packet-cmip.h
 include/wireshark/epan/dissectors/packet-cmp.h
 include/wireshark/epan/dissectors/packet-cms.h
 include/wireshark/epan/dissectors/packet-coap.h
+include/wireshark/epan/dissectors/packet-cose.h
 include/wireshark/epan/dissectors/packet-credssp.h
 include/wireshark/epan/dissectors/packet-crmf.h
 include/wireshark/epan/dissectors/packet-csn1.h
@@ -134,10 +143,10 @@ include/wireshark/epan/dissectors/packet-diffserv-mpls-common.h
 include/wireshark/epan/dissectors/packet-disp.h
 include/wireshark/epan/dissectors/packet-dns.h
 include/wireshark/epan/dissectors/packet-docsis-tlv.h
+include/wireshark/epan/dissectors/packet-doip.h
 include/wireshark/epan/dissectors/packet-dop.h
 include/wireshark/epan/dissectors/packet-dsp.h
 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
@@ -164,6 +173,7 @@ include/wireshark/epan/dissectors/packet-fcsb3.h
 include/wireshark/epan/dissectors/packet-fcswils.h
 include/wireshark/epan/dissectors/packet-ff.h
 include/wireshark/epan/dissectors/packet-fix.h
+include/wireshark/epan/dissectors/packet-flexray.h
 include/wireshark/epan/dissectors/packet-fmp.h
 include/wireshark/epan/dissectors/packet-frame.h
 include/wireshark/epan/dissectors/packet-ftam.h
@@ -222,6 +232,8 @@ include/wireshark/epan/dissectors/packet-isakmp.h
 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-iso10681.h
+include/wireshark/epan/dissectors/packet-iso15765.h
 include/wireshark/epan/dissectors/packet-isup.h
 include/wireshark/epan/dissectors/packet-its.h
 include/wireshark/epan/dissectors/packet-iwarp-ddp-rdmap.h
@@ -240,6 +252,7 @@ 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-lin.h
 include/wireshark/epan/dissectors/packet-lisp.h
 include/wireshark/epan/dissectors/packet-llc.h
 include/wireshark/epan/dissectors/packet-lnet.h
@@ -275,6 +288,7 @@ 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-nrppa.h
 include/wireshark/epan/dissectors/packet-nr-rrc.h
 include/wireshark/epan/dissectors/packet-nsh.h
 include/wireshark/epan/dissectors/packet-ntlmssp.h
@@ -294,6 +308,7 @@ 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-pdu-transport.h
 include/wireshark/epan/dissectors/packet-per.h
 include/wireshark/epan/dissectors/packet-pkcs1.h
 include/wireshark/epan/dissectors/packet-pkcs12.h
@@ -336,7 +351,6 @@ include/wireshark/epan/dissectors/packet-rsvp.h
 include/wireshark/epan/dissectors/packet-rtcp.h
 include/wireshark/epan/dissectors/packet-rtp-events.h
 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-rx.h
@@ -369,6 +383,7 @@ include/wireshark/epan/dissectors/packet-smpp.h
 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-someip.h
 include/wireshark/epan/dissectors/packet-spice.h
 include/wireshark/epan/dissectors/packet-sprt.h
 include/wireshark/epan/dissectors/packet-sscop.h
@@ -381,6 +396,7 @@ include/wireshark/epan/dissectors/packet-t30.h
 include/wireshark/epan/dissectors/packet-t38.h
 include/wireshark/epan/dissectors/packet-tacacs.h
 include/wireshark/epan/dissectors/packet-tcap.h
+include/wireshark/epan/dissectors/packet-tcpclv3.h
 include/wireshark/epan/dissectors/packet-tcp.h
 include/wireshark/epan/dissectors/packet-tetra.h
 include/wireshark/epan/dissectors/packet-thrift.h
@@ -393,6 +409,7 @@ include/wireshark/epan/dissectors/packet-tr.h
 include/wireshark/epan/dissectors/packet-tte.h
 include/wireshark/epan/dissectors/packet-ua.h
 include/wireshark/epan/dissectors/packet-uaudp.h
+include/wireshark/epan/dissectors/packet-uavcan-dsdl.h
 include/wireshark/epan/dissectors/packet-ubertooth.h
 include/wireshark/epan/dissectors/packet-udp.h
 include/wireshark/epan/dissectors/packet-umts_fp.h
@@ -479,6 +496,7 @@ include/wireshark/epan/oui.h
 include/wireshark/epan/packet.h
 include/wireshark/epan/packet_info.h
 include/wireshark/epan/params.h
+include/wireshark/epan/pci-ids.h
 include/wireshark/epan/plugin_if.h
 include/wireshark/epan/ppptypes.h
 include/wireshark/epan/prefs-int.h
@@ -523,38 +541,27 @@ include/wireshark/epan/uat-int.h
 include/wireshark/epan/uat.h
 include/wireshark/epan/unit_strings.h
 include/wireshark/epan/value_string.h
-include/wireshark/epan/wmem/wmem.h
-include/wireshark/epan/wmem/wmem_array.h
-include/wireshark/epan/wmem/wmem_core.h
-include/wireshark/epan/wmem/wmem_interval_tree.h
-include/wireshark/epan/wmem/wmem_list.h
-include/wireshark/epan/wmem/wmem_map.h
-include/wireshark/epan/wmem/wmem_miscutl.h
-include/wireshark/epan/wmem/wmem_queue.h
-include/wireshark/epan/wmem/wmem_scopes.h
-include/wireshark/epan/wmem/wmem_stack.h
-include/wireshark/epan/wmem/wmem_strbuf.h
-include/wireshark/epan/wmem/wmem_strutl.h
-include/wireshark/epan/wmem/wmem_tree.h
-include/wireshark/epan/wmem/wmem_user_cb.h
+include/wireshark/epan/wmem_scopes.h
+include/wireshark/epan/wscbor.h
 include/wireshark/epan/x264_prt_id.h
 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_modules.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_log_defs.h
 include/wireshark/ws_symbol_export.h
 include/wireshark/ws_version.h
+include/wireshark/wsutil/802_11-utils.h
 include/wireshark/wsutil/adler32.h
 include/wireshark/wsutil/base32.h
 include/wireshark/wsutil/bits_count_ones.h
@@ -578,9 +585,10 @@ include/wireshark/wsutil/crc8.h
 include/wireshark/wsutil/curve25519.h
 include/wireshark/wsutil/eax.h
 include/wireshark/wsutil/epochs.h
+include/wireshark/wsutil/exported_pdu_tlvs.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
@@ -593,7 +601,6 @@ 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
 include/wireshark/wsutil/processes.h
@@ -606,25 +613,42 @@ include/wireshark/wsutil/strnatcmp.h
 include/wireshark/wsutil/strtoi.h
 include/wireshark/wsutil/tempfile.h
 include/wireshark/wsutil/time_util.h
+include/wireshark/wsutil/to_str.h
 include/wireshark/wsutil/type_util.h
 include/wireshark/wsutil/unicode-utils.h
 include/wireshark/wsutil/utf8_entities.h
+include/wireshark/wsutil/wmem/wmem.h
+include/wireshark/wsutil/wmem/wmem_array.h
+include/wireshark/wsutil/wmem/wmem_core.h
+include/wireshark/wsutil/wmem/wmem_interval_tree.h
+include/wireshark/wsutil/wmem/wmem_list.h
+include/wireshark/wsutil/wmem/wmem_map.h
+include/wireshark/wsutil/wmem/wmem_miscutl.h
+include/wireshark/wsutil/wmem/wmem_queue.h
+include/wireshark/wsutil/wmem/wmem_stack.h
+include/wireshark/wsutil/wmem/wmem_strbuf.h
+include/wireshark/wsutil/wmem/wmem_strutl.h
+include/wireshark/wsutil/wmem/wmem_tree.h
+include/wireshark/wsutil/wmem/wmem_user_cb.h
+include/wireshark/wsutil/ws_assert.h
 include/wireshark/wsutil/ws_cpuid.h
+include/wireshark/wsutil/ws_getopt.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/ws_roundup.h
+include/wireshark/wsutil/wslog.h
 include/wireshark/wsutil/xtea.h
 lib/libwireshark.so
-lib/libwireshark.so.14
-lib/libwireshark.so.14.0.9
+lib/libwireshark.so.15
+lib/libwireshark.so.15.0.0
 lib/libwiretap.so
-lib/libwiretap.so.11
-lib/libwiretap.so.11.0.9
+lib/libwiretap.so.12
+lib/libwiretap.so.12.0.0
 lib/libwsutil.so
-lib/libwsutil.so.12
-lib/libwsutil.so.12.0.0
+lib/libwsutil.so.13
+lib/libwsutil.so.13.0.0
 lib/wireshark/cmake/FindGLIB2.cmake
 lib/wireshark/cmake/FindWSLibrary.cmake
 lib/wireshark/cmake/FindWSWinLibs.cmake
@@ -640,22 +664,22 @@ 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.4/codecs/g711.so
-lib/wireshark/plugins/3.4/codecs/l16mono.so
-%%OPUS%%lib/wireshark/plugins/3.4/codecs/opus_dec.so
-lib/wireshark/plugins/3.4/epan/ethercat.so
-lib/wireshark/plugins/3.4/epan/gryphon.so
-lib/wireshark/plugins/3.4/epan/irda.so
-lib/wireshark/plugins/3.4/epan/mate.so
-lib/wireshark/plugins/3.4/epan/opcua.so
-lib/wireshark/plugins/3.4/epan/profinet.so
-lib/wireshark/plugins/3.4/epan/stats_tree.so
-lib/wireshark/plugins/3.4/epan/transum.so
-lib/wireshark/plugins/3.4/epan/unistim.so
-lib/wireshark/plugins/3.4/epan/wimax.so
-lib/wireshark/plugins/3.4/epan/wimaxasncp.so
-lib/wireshark/plugins/3.4/epan/wimaxmacphy.so
-lib/wireshark/plugins/3.4/wiretap/usbdump.so
+lib/wireshark/plugins/3.6/codecs/g711.so
+lib/wireshark/plugins/3.6/codecs/l16mono.so
+%%OPUS%%lib/wireshark/plugins/3.6/codecs/opus_dec.so
+lib/wireshark/plugins/3.6/epan/ethercat.so
+lib/wireshark/plugins/3.6/epan/gryphon.so
+lib/wireshark/plugins/3.6/epan/irda.so
+lib/wireshark/plugins/3.6/epan/mate.so
+lib/wireshark/plugins/3.6/epan/opcua.so
+lib/wireshark/plugins/3.6/epan/profinet.so
+lib/wireshark/plugins/3.6/epan/stats_tree.so
+lib/wireshark/plugins/3.6/epan/transum.so
+lib/wireshark/plugins/3.6/epan/unistim.so
+lib/wireshark/plugins/3.6/epan/wimax.so
+lib/wireshark/plugins/3.6/epan/wimaxasncp.so
+lib/wireshark/plugins/3.6/epan/wimaxmacphy.so
+lib/wireshark/plugins/3.6/wiretap/usbdump.so
 libdata/pkgconfig/wireshark.pc
 %%ANDROIDDUMP_MAN%%man/man1/androiddump.1.gz
 %%CAPINFOS_MAN%%man/man1/capinfos.1.gz
@@ -675,26 +699,27 @@ man/man1/dumpcap.1.gz
 man/man1/tshark.1.gz
 %%UDPDUMP_MAN%%man/man1/udpdump.1.gz
 %%GUI%%man/man1/wireshark.1.gz
+%%ETWDUMP_MAN%%man/man1/etwdump.1.gz
 man/man4/extcap.4.gz
 man/man4/wireshark-filter.4.gz
-%%GUI%%share/appdata/wireshark.appdata.xml
-%%GUI%%share/applications/wireshark.desktop
-%%GUI%%share/icons/hicolor/128x128/apps/wireshark.png
-%%GUI%%share/icons/hicolor/128x128/mimetypes/application-wireshark-doc.png
-%%GUI%%share/icons/hicolor/16x16/apps/wireshark.png
-%%GUI%%share/icons/hicolor/16x16/mimetypes/application-wireshark-doc.png
-%%GUI%%share/icons/hicolor/24x24/apps/wireshark.png
-%%GUI%%share/icons/hicolor/24x24/mimetypes/application-wireshark-doc.png
-%%GUI%%share/icons/hicolor/256x256/apps/wireshark.png
-%%GUI%%share/icons/hicolor/256x256/mimetypes/application-wireshark-doc.png
-%%GUI%%share/icons/hicolor/32x32/apps/wireshark.png
-%%GUI%%share/icons/hicolor/32x32/mimetypes/application-wireshark-doc.png
-%%GUI%%share/icons/hicolor/48x48/apps/wireshark.png
-%%GUI%%share/icons/hicolor/48x48/mimetypes/application-wireshark-doc.png
-%%GUI%%share/icons/hicolor/64x64/apps/wireshark.png
-%%GUI%%share/icons/hicolor/64x64/mimetypes/application-wireshark-doc.png
-%%GUI%%share/icons/hicolor/scalable/apps/wireshark.svg
-%%GUI%%share/mime/packages/wireshark.xml
+%%GUI%%share/applications/org.wireshark.Wireshark.desktop
+%%GUI%%share/icons/hicolor/128x128/apps/org.wireshark.Wireshark.png
+%%GUI%%share/icons/hicolor/128x128/mimetypes/org.wireshark.Wireshark-mimetype.png
+%%GUI%%share/icons/hicolor/16x16/apps/org.wireshark.Wireshark.png
+%%GUI%%share/icons/hicolor/16x16/mimetypes/org.wireshark.Wireshark-mimetype.png
+%%GUI%%share/icons/hicolor/24x24/apps/org.wireshark.Wireshark.png
+%%GUI%%share/icons/hicolor/24x24/mimetypes/org.wireshark.Wireshark-mimetype.png
+%%GUI%%share/icons/hicolor/256x256/apps/org.wireshark.Wireshark.png
+%%GUI%%share/icons/hicolor/256x256/mimetypes/org.wireshark.Wireshark-mimetype.png
+%%GUI%%share/icons/hicolor/32x32/apps/org.wireshark.Wireshark.png
+%%GUI%%share/icons/hicolor/32x32/mimetypes/org.wireshark.Wireshark-mimetype.png
+%%GUI%%share/icons/hicolor/48x48/apps/org.wireshark.Wireshark.png
+%%GUI%%share/icons/hicolor/48x48/mimetypes/org.wireshark.Wireshark-mimetype.png
+%%GUI%%share/icons/hicolor/64x64/apps/org.wireshark.Wireshark.png
+%%GUI%%share/icons/hicolor/64x64/mimetypes/org.wireshark.Wireshark-mimetype.png
+%%GUI%%share/icons/hicolor/scalable/apps/org.wireshark.Wireshark.svg
+%%GUI%%share/metainfo/org.wireshark.Wireshark.metainfo.xml
+%%GUI%%share/mime/packages/org.wireshark.Wireshark.xml
 %%DATADIR%%/AUTHORS-SHORT
 %%DATADIR%%/COPYING
 %%DATADIR%%/androiddump.html
@@ -754,6 +779,7 @@ man/man4/wireshark-filter.4.gz
 %%DATADIR%%/dumpcap.html
 %%DATADIR%%/editcap.html
 %%DATADIR%%/enterprises.tsv
+%%DATADIR%%/etwdump.html
 %%DATADIR%%/extcap.html
 %%LUA%%%%DATADIR%%/init.lua
 %%DATADIR%%/ipmap.html