net/wireshark: Update to 4.0.0

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

3 files changed, 51 insertions, 35 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 6bef9b1c4a59..51dca2c698cc 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,5 +1,5 @@
 PORTNAME?=	wireshark
-DISTVERSION=	3.6.8
+DISTVERSION=	4.0.0
 CATEGORIES=	net
 MASTER_SITES=	https://1.na.dl.wireshark.org/src/ \
 		https://1.eu.dl.wireshark.org/src/ \
@@ -42,7 +42,7 @@ LIB_DEPENDS+=	libgpg-error.so:security/libgpg-error \
 #CFLAGS+=	-funit-at-a-time
 
 .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \
-    reordercap captype randpktdump udpdump sharkd etwdump
+    reordercap captype randpktdump udpdump sharkd etwdump wifidump
 .if defined(LITE)
 PKGNAMESUFFIX=		-lite
 PLIST_SUB+=		${x:tu}="@comment $x not installed" \
@@ -81,7 +81,7 @@ CISCODUMP_DESC=		Build ciscodump extcap tool
 OPUS_DESC=		Build opus decoder plugin
 
 GUI_USES=		qt:5
-GUI_USE=	qt=core,gui,multimedia,widgets,printsupport,svg,buildtools:build,linguisttools:build,qmake:build
+GUI_USE=	qt=core,concurrent,gui,multimedia,widgets,printsupport,svg,buildtools:build,linguisttools:build,qmake:build
 
 LTO_CMAKE_BOOL=		ENABLE_LTO
 LUA_USES=		lua:51-52
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index 7ef222b988d8..8106adf259f4 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1663077868
-SHA256 (wireshark-3.6.8.tar.xz) = 67ab23ee09a646ab8cc0ddcc985209f24f253337461e3d9644c6cfe1c097260c
-SIZE (wireshark-3.6.8.tar.xz) = 39942580
+TIMESTAMP = 1665334637
+SHA256 (wireshark-4.0.0.tar.xz) = 3dc125ef85e85c2a756a74cc739b3eb11ce38e30a08e085e77d378ee7fdcaded
+SIZE (wireshark-4.0.0.tar.xz) = 41323336
diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist
index dec88209fb6f..729dd1827c50 100644
--- a/net/wireshark/pkg-plist
+++ b/net/wireshark/pkg-plist
@@ -56,6 +56,7 @@ 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/file-pcapng.h
 include/wireshark/epan/dissectors/packet-6lowpan.h
 include/wireshark/epan/dissectors/packet-a21.h
 include/wireshark/epan/dissectors/packet-acdr.h
@@ -74,8 +75,10 @@ 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
+include/wireshark/epan/dissectors/packet-autosar-ipdu-multiplexer.h
 include/wireshark/epan/dissectors/packet-bacapp.h
 include/wireshark/epan/dissectors/packet-bacnet.h
+include/wireshark/epan/dissectors/packet-bblog.h
 include/wireshark/epan/dissectors/packet-ber.h
 include/wireshark/epan/dissectors/packet-bfd.h
 include/wireshark/epan/dissectors/packet-bgp.h
@@ -141,6 +144,7 @@ include/wireshark/epan/dissectors/packet-diameter.h
 include/wireshark/epan/dissectors/packet-diameter_3gpp.h
 include/wireshark/epan/dissectors/packet-diffserv-mpls-common.h
 include/wireshark/epan/dissectors/packet-disp.h
+include/wireshark/epan/dissectors/packet-dlt.h
 include/wireshark/epan/dissectors/packet-dns.h
 include/wireshark/epan/dissectors/packet-docsis-tlv.h
 include/wireshark/epan/dissectors/packet-doip.h
@@ -178,6 +182,7 @@ 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-ftdi-ft.h
+include/wireshark/epan/dissectors/packet-gdt.h
 include/wireshark/epan/dissectors/packet-geonw.h
 include/wireshark/epan/dissectors/packet-giop.h
 include/wireshark/epan/dissectors/packet-gluster.h
@@ -396,8 +401,9 @@ 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-tcpcl.h
 include/wireshark/epan/dissectors/packet-tcp.h
+include/wireshark/epan/dissectors/packet-tecmp.h
 include/wireshark/epan/dissectors/packet-tetra.h
 include/wireshark/epan/dissectors/packet-thrift.h
 include/wireshark/epan/dissectors/packet-tls-utils.h
@@ -412,6 +418,7 @@ 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-uds.h
 include/wireshark/epan/dissectors/packet-umts_fp.h
 include/wireshark/epan/dissectors/packet-umts_mac.h
 include/wireshark/epan/dissectors/packet-umts_rlc.h
@@ -474,11 +481,11 @@ include/wireshark/epan/frame_data.h
 include/wireshark/epan/frame_data_sequence.h
 include/wireshark/epan/ftypes/ftypes.h
 include/wireshark/epan/funnel.h
-include/wireshark/epan/garrayfix.h
 include/wireshark/epan/golay.h
 include/wireshark/epan/guid-utils.h
 include/wireshark/epan/iana_charsets.h
 include/wireshark/epan/iax2_codec_type.h
+include/wireshark/epan/introspection.h
 include/wireshark/epan/in_cksum.h
 include/wireshark/epan/ip_opts.h
 include/wireshark/epan/ipproto.h
@@ -530,7 +537,6 @@ include/wireshark/epan/t35.h
 include/wireshark/epan/tap-voip.h
 include/wireshark/epan/tap.h
 include/wireshark/epan/tfs.h
-include/wireshark/epan/time_fmt.h
 include/wireshark/epan/timestamp.h
 include/wireshark/epan/timestats.h
 include/wireshark/epan/to_str.h
@@ -546,7 +552,7 @@ 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/wireshark.h
 include/wireshark/wiretap/file_wrappers.h
 include/wireshark/wiretap/merge.h
 include/wireshark/wiretap/pcap-encap.h
@@ -559,6 +565,7 @@ 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_posix_compat.h
 include/wireshark/ws_symbol_export.h
 include/wireshark/ws_version.h
 include/wireshark/wsutil/802_11-utils.h
@@ -570,7 +577,6 @@ 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
 include/wireshark/wsutil/crash_info.h
 include/wireshark/wsutil/crc10.h
@@ -586,6 +592,7 @@ 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/feature_list.h
 include/wireshark/wsutil/filesystem.h
 include/wireshark/wsutil/g711.h
 include/wireshark/wsutil/glib-compat.h
@@ -604,6 +611,7 @@ include/wireshark/wsutil/please_report_bug.h
 include/wireshark/wsutil/pow2.h
 include/wireshark/wsutil/privileges.h
 include/wireshark/wsutil/processes.h
+include/wireshark/wsutil/regex.h
 include/wireshark/wsutil/report_message.h
 include/wireshark/wsutil/sign_ext.h
 include/wireshark/wsutil/sober128.h
@@ -624,6 +632,7 @@ 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_multimap.h
 include/wireshark/wsutil/wmem/wmem_queue.h
 include/wireshark/wsutil/wmem/wmem_stack.h
 include/wireshark/wsutil/wmem/wmem_strbuf.h
@@ -637,18 +646,20 @@ 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_return.h
 include/wireshark/wsutil/ws_roundup.h
+include/wireshark/wsutil/wsgcrypt.h
 include/wireshark/wsutil/wslog.h
 include/wireshark/wsutil/xtea.h
 lib/libwireshark.so
-lib/libwireshark.so.15
-lib/libwireshark.so.15.0.8
+lib/libwireshark.so.16
+lib/libwireshark.so.16.0.0
 lib/libwiretap.so
-lib/libwiretap.so.12
-lib/libwiretap.so.12.0.8
+lib/libwiretap.so.13
+lib/libwiretap.so.13.0.0
 lib/libwsutil.so
-lib/libwsutil.so.13
-lib/libwsutil.so.13.1.0
+lib/libwsutil.so.14
+lib/libwsutil.so.14.0.0
 lib/wireshark/cmake/FindGLIB2.cmake
 lib/wireshark/cmake/FindWSLibrary.cmake
 lib/wireshark/cmake/FindWSWinLibs.cmake
@@ -664,24 +675,25 @@ 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.6/codecs/g711.so
-%%RTP%%lib/wireshark/plugins/3.6/codecs/g722.so
-%%RTP%%lib/wireshark/plugins/3.6/codecs/g726.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
+%%WIFIDUMP_LIB%%lib/wireshark/extcap/wifidump
+lib/wireshark/plugins/4.0/codecs/g711.so
+%%RTP%%lib/wireshark/plugins/4.0/codecs/g722.so
+%%RTP%%lib/wireshark/plugins/4.0/codecs/g726.so
+lib/wireshark/plugins/4.0/codecs/l16mono.so
+%%OPUS%%lib/wireshark/plugins/4.0/codecs/opus_dec.so
+lib/wireshark/plugins/4.0/epan/ethercat.so
+lib/wireshark/plugins/4.0/epan/gryphon.so
+lib/wireshark/plugins/4.0/epan/irda.so
+lib/wireshark/plugins/4.0/epan/mate.so
+lib/wireshark/plugins/4.0/epan/opcua.so
+lib/wireshark/plugins/4.0/epan/profinet.so
+lib/wireshark/plugins/4.0/epan/stats_tree.so
+lib/wireshark/plugins/4.0/epan/transum.so
+lib/wireshark/plugins/4.0/epan/unistim.so
+lib/wireshark/plugins/4.0/epan/wimax.so
+lib/wireshark/plugins/4.0/epan/wimaxasncp.so
+lib/wireshark/plugins/4.0/epan/wimaxmacphy.so
+lib/wireshark/plugins/4.0/wiretap/usbdump.so
 libdata/pkgconfig/wireshark.pc
 %%ANDROIDDUMP_MAN%%share/man/man1/androiddump.1.gz
 %%CAPINFOS_MAN%%share/man/man1/capinfos.1.gz
@@ -700,6 +712,7 @@ share/man/man1/dumpcap.1.gz
 %%TEXT2PCAP_MAN%%share/man/man1/text2pcap.1.gz
 share/man/man1/tshark.1.gz
 %%UDPDUMP_MAN%%share/man/man1/udpdump.1.gz
+%%WIFIDUMP_MAN%%share/man/man1/wifidump.1.gz
 %%GUI%%share/man/man1/wireshark.1.gz
 %%ETWDUMP_MAN%%share/man/man1/etwdump.1.gz
 share/man/man4/extcap.4.gz
@@ -723,6 +736,7 @@ share/man/man4/wireshark-filter.4.gz
 %%GUI%%share/metainfo/org.wireshark.Wireshark.metainfo.xml
 %%GUI%%share/mime/packages/org.wireshark.Wireshark.xml
 %%DATADIR%%/AUTHORS-SHORT
+%%DATADIR%%/Acknowledgements.md
 %%DATADIR%%/COPYING
 %%DATADIR%%/androiddump.html
 %%DATADIR%%/capinfos.html
@@ -783,6 +797,7 @@ share/man/man4/wireshark-filter.4.gz
 %%DATADIR%%/enterprises.tsv
 %%DATADIR%%/etwdump.html
 %%DATADIR%%/extcap.html
+%%DATADIR%%/gpl-2.0-standalone.html
 %%LUA%%%%DATADIR%%/init.lua
 %%DATADIR%%/ipmap.html
 %%DATADIR%%/manuf
@@ -1013,6 +1028,7 @@ share/man/man4/wireshark-filter.4.gz
 %%DATADIR%%/tpncp/tpncp.dat
 %%DATADIR%%/tshark.html
 %%DATADIR%%/udpdump.html
+%%DATADIR%%/wifidump.html
 %%DATADIR%%/wimaxasncp/dictionary.dtd
 %%DATADIR%%/wimaxasncp/dictionary.xml
 %%DATADIR%%/wireshark-filter.html