CVS commit: pkgsrc/net/wireshark

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Dec 10 08:37:17 UTC 2021

Modified Files:
        pkgsrc/net/wireshark: Makefile PLIST distinfo

Log Message:
wireshark: updated to 3.6.0

Wireshark 3.6.0 Release Notes

 What’s New

  Many improvements have been made. See the “New and Updated Features”
  section below for more details. You might want to pay particular
  attention to the display filter syntax updates.

  New and Updated Features

   The following features are new (or have been significantly updated)
   since version 3.6.0rc3:

     • The macOS Intel packages now ship with Qt 5.15.3 and require
       macOS 10.13 or later.

   The following features are new (or have been significantly updated)
   since version 3.6.0rc2:

     • Display filter set elements must now be comma-separated. See
       below for more details.

   The following features are new (or have been significantly updated)
   since version 3.6.0rc1:

     • The display filter expression “a != b” now has the same meaning
       as “!(a == b)”.

   The following features are new (or have been significantly updated)
   since version 3.5.0:

     • Nothing of note.

   The following features are new (or have been significantly updated)
   since version 3.4.0:

     • Several changes have been made to the display filter syntax:

        • The expression “a != b” now always has the same meaning as
       “!(a == b)”. In particular this means filter expressions with
       multi-value fields like “ip.addr != 1.1.1.1” will work as
       expected (the result is the same as typing “ip.src != 1.1.1.1 and
       ip.dst != 1.1.1.1”). This avoids the contradiction (a == b and a
       != b) being true.

        • It is possible to use the syntax “a ~= b” or “a any_ne b” to
       recover the previous (inconsistent with "==") logic for not
       equal.

        • Literal strings can now be specified using raw string syntax,
       identical to raw strings in the Python programming language. This
       can be used to avoid the complexity of using two levels of
       character escapes with regular expressions.

        • Set elements must now be separated using a comma. A filter
       such as http.request.method in {"GET" "HEAD"} must be written as
       …<U+200B> in {"GET", "HEAD"}. Whitespace is not significant. The
       previous use of whitespace as separator is deprecated and will be
       removed in a future version.

        • Support for the syntax "a not in b" with the same meaning as
       "not a in b" has been added.

     • Packaging updates:

        • A macOS Arm 64 (Apple Silicon) package is now available.

        • The macOS Intel packages now ship with Qt 5.15.3 and require
       macOS 10.13 or later.

        • The Windows installers now ship with Npcap 1.55.

        • A 64-bit Windows PortableApps package is now available.

     • TCP conversations now support a completeness criteria, which
       facilitates the identification of TCP streams having any of
       opening or closing handshakes, a payload, in any combination. It
       can be accessed with the new tcp.completeness filter.

     • Protobuf fields that are not serialized on the wire or otherwise
       missing in capture files can now be displayed with default values
       by setting the new “add_default_value” preference. The default
       values might be explicitly declared in “proto2” files, or false
       for bools, first value for enums, zero for numeric types.

     • Wireshark now supports reading Event Tracing for Windows (ETW). A
       new extcap named ETW reader is created that now can open an etl
       file, convert all events in the file to DLT_ETW packets and write
       to a specified FIFO destination. Also, a new packet_etw dissector
       is created to dissect DLT_ETW packets so Wireshark can display
       the DLT_ETW packet header, its message and packet_etw dissector
       calls packet_mbim sub_dissector if its provider matches the MBIM
       provider GUID.

     • “Follow DCCP stream” feature to filter for and extract the
       contents of DCCP streams.

     • Wireshark now supports dissecting RTP packets with OPUS payloads.

     • Importing captures from text files based on regular expressions
       is now possible. By specifying a regex capturing a single packet
       including capturing groups for relevant fields a textfile can be
       converted to a libpcap capture file. Supported data encodings are
       plain-hexadecimal, -octal, -binary and base64. Also the timestamp
       format now allows the second-fractions to be placed anywhere in
       the timestamp and it will be stored with nanosecond instead of
       microsecond precision.

     • The RTP Player has been significatnly redesigned and improved.
       See Playing VoIP Calls[1] and RTP Player Window[2] in the User’s
       Guide for more details.

        • The RTP Player can play many streams in row.

        • The UI is more responsive.

        • The RTP Player maintains playlist and other tools can add and
       remove streams to and from it.

        • Every stream can be muted or routed to the left or right
       channel for replay.

        • The option to save audio has been moved from the RTP Analysis
       dialog to the RTP Player. The RTP Player also saves what was
       played, and it can save in multichannel .au or .wav.

        • The RTP Player is now accessible from the Telephony › RTP ›
       RTP Player menu.

     • The VoIP dialogs (VoIP Calls, RTP Streams, RTP Analysis, RTP
       Player, SIP Flows) are non-modal and can stay opened on
       background.

        • The same tools are provided across all dialogs (Prepare
       Filter, Analyse, RTP Player …<U+200B>)

     • The “Follow Stream” dialog is now able to follow SIP calls based
       on their Call-ID value.

     • The “Follow Stream” dialog’s YAML output format has been updated
       to add timestamps and peers information For more details see
       Following Protocol Streams[3] in the User’s Guide.

     • IP fragments between public IPv4 addresses are now reassembled
       even if they have different VLAN IDs. Reassembly of IP fragments
       where one endpoint is a private (RFC 1918 section 3) or
       link-local (RFC 3927) IPv4 address continues to take the VLAN ID
       into account, as those addresses can be reused. To revert to the
       previous behavior and not reassemble fragments with different
       VLAN IDs, turn on the “Enable stricter conversation tracking
       heuristics” top level protocol preference.

     • USB Link Layer reassembly has been added, which allows hardware
       captures to be analyzed at the same level as software captures.

     • TShark can now export TLS session keys with the
       --export-tls-session-keys option.

     • Wireshark participated in the Google Season of Docs 2020 and the
       User’s Guide has been extensively updated.

     • The “RTP Stream Analysis” dialog CSV export format was slightly
       changed. The first line of the export contains column titles as
       in other CSV exports.

     • Wireshark now supports the Turkish language.

     • The settings in the “Import from Hex Dump” dialog is now stored
       in a profile import_hexdump.json file.

     • Analyze › Reload Lua Plugins has been improved to properly
       support FileHandler.

     • The “RTP Stream Analysis” and “IAX2 Stream Analysis” dialogs now
       show correct calculation mean jitter calculations.

     • RTP streams are now created based on Skinny protocol messages in
       addition to other types of messages.

     • The “VoIP Calls Flow Sequence” window shows more information
       about various Skinny messages.

     • Initial support for building Wireshark on Windows using GCC and
       MinGW-w64 has been added. See README.msys2 in the sources for
       more information.

  New File Format Decoding Support

   Vector Informatik Binary Log File (BLF)

  New Protocol Support

   5G Lawful Interception (5GLI), Bluetooth Link Manager Protocol (BT
   LMP), Bundle Protocol version 7 (BPv7), Bundle Protocol version 7
   Security (BPSec), CBOR Object Signing and Encryption (COSE), E2
   Application Protocol (E2AP), Event Tracing for Windows (ETW), EXtreme
   extra Eth Header (EXEH), High-Performance Connectivity Tracer
   (HiPerConTracer), ISO 10681, Kerberos SPAKE, Linux psample protocol,
   Local Interconnect Network (LIN), Microsoft Task Scheduler Service,
   O-RAN E2AP, O-RAN fronthaul UC-plane (O-RAN), Opus Interactive Audio
   Codec (OPUS), PDU Transport Protocol, R09.x (R09), RDP Dynamic
   Channel Protocol (DRDYNVC), RDP Graphic pipeline channel Protocol
   (EGFX), RDP Multi-transport (RDPMT), Real-Time Publish-Subscribe
   Virtual Transport (RTPS-VT), Real-Time Publish-Subscribe Wire
   Protocol (processed) (RTPS-PROC), Shared Memory Communications (SMC),
   Signal PDU, SparkplugB, State Synchronization Protocol (SSyncP),
   Tagged Image File Format (TIFF), TP-Link Smart Home Protocol, UAVCAN
   DSDL, UAVCAN/CAN, UDP Remote Desktop Protocol (RDPUDP), Van Jacobson
   PPP compression (VJC), World of Warcraft World (WOWW), and X2 xIRI
   payload (xIRI)

  Updated Protocol Support

   Too many protocols have been updated to list here.

  New and Updated Capture File Support

   Vector Informatik Binary Log File (BLF)


To generate a diff of this commit:
cvs rdiff -u -r1.262 -r1.263 pkgsrc/net/wireshark/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/net/wireshark/PLIST
cvs rdiff -u -r1.150 -r1.151 pkgsrc/net/wireshark/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/wireshark/Makefile
diff -u pkgsrc/net/wireshark/Makefile:1.262 pkgsrc/net/wireshark/Makefile:1.263
--- pkgsrc/net/wireshark/Makefile:1.262 Wed Dec  8 16:06:09 2021
+++ pkgsrc/net/wireshark/Makefile       Fri Dec 10 08:37:17 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.262 2021/12/08 16:06:09 adam Exp $
+# $NetBSD: Makefile,v 1.263 2021/12/10 08:37:17 adam Exp $
 
-DISTNAME=      wireshark-3.4.10
-PKGREVISION=   1
+DISTNAME=      wireshark-3.6.0
 CATEGORIES=    net
 MASTER_SITES=  https://www.wireshark.org/download/src/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/net/wireshark/PLIST
diff -u pkgsrc/net/wireshark/PLIST:1.65 pkgsrc/net/wireshark/PLIST:1.66
--- pkgsrc/net/wireshark/PLIST:1.65     Tue Nov 23 22:12:01 2021
+++ pkgsrc/net/wireshark/PLIST  Fri Dec 10 08:37:17 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.65 2021/11/23 22:12:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.66 2021/12/10 08:37:17 adam Exp $
 bin/capinfos
 bin/captype
 bin/dumpcap
@@ -45,11 +45,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
@@ -60,10 +62,12 @@ include/wireshark/epan/dissectors/packet
 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
@@ -74,12 +78,16 @@ include/wireshark/epan/dissectors/packet
 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
@@ -101,6 +109,7 @@ include/wireshark/epan/dissectors/packet
 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
@@ -131,10 +140,10 @@ include/wireshark/epan/dissectors/packet
 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
@@ -161,6 +170,7 @@ include/wireshark/epan/dissectors/packet
 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
@@ -219,6 +229,8 @@ include/wireshark/epan/dissectors/packet
 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
@@ -236,6 +248,7 @@ include/wireshark/epan/dissectors/packet
 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-lin.h
 include/wireshark/epan/dissectors/packet-link16.h
 include/wireshark/epan/dissectors/packet-lisp.h
 include/wireshark/epan/dissectors/packet-llc.h
@@ -273,6 +286,7 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-nisplus.h
 include/wireshark/epan/dissectors/packet-nlm.h
 include/wireshark/epan/dissectors/packet-nr-rrc.h
+include/wireshark/epan/dissectors/packet-nrppa.h
 include/wireshark/epan/dissectors/packet-nsh.h
 include/wireshark/epan/dissectors/packet-ntlmssp.h
 include/wireshark/epan/dissectors/packet-ntp.h
@@ -291,6 +305,7 @@ include/wireshark/epan/dissectors/packet
 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
@@ -333,7 +348,6 @@ include/wireshark/epan/dissectors/packet
 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
@@ -366,6 +380,7 @@ include/wireshark/epan/dissectors/packet
 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
@@ -379,6 +394,7 @@ include/wireshark/epan/dissectors/packet
 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-tcpclv3.h
 include/wireshark/epan/dissectors/packet-tetra.h
 include/wireshark/epan/dissectors/packet-thrift.h
 include/wireshark/epan/dissectors/packet-tls-utils.h
@@ -390,6 +406,7 @@ include/wireshark/epan/dissectors/packet
 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
@@ -476,6 +493,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
@@ -520,38 +538,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
@@ -575,9 +582,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
@@ -590,7 +598,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
@@ -603,25 +610,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/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/wsjson.h
+include/wireshark/wsutil/wslog.h
 include/wireshark/wsutil/xtea.h
 lib/libwireshark.so
-lib/libwireshark.so.14
-lib/libwireshark.so.14.0.10
+lib/libwireshark.so.15
+lib/libwireshark.so.15.0.0
 lib/libwiretap.so
-lib/libwiretap.so.11
-lib/libwiretap.so.11.0.10
+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/pkgconfig/wireshark.pc
 lib/wireshark/cmake/FindGLIB2.cmake
 lib/wireshark/cmake/FindWSLibrary.cmake
@@ -638,101 +662,56 @@ lib/wireshark/extcap/ciscodump
 lib/wireshark/extcap/randpktdump
 lib/wireshark/extcap/sshdump
 lib/wireshark/extcap/udpdump
-lib/wireshark/plugins/3.4/codecs/g711.so
-${PLIST.spandsp}lib/wireshark/plugins/3.4/codecs/g722.so
-${PLIST.spandsp}lib/wireshark/plugins/3.4/codecs/g726.so
-lib/wireshark/plugins/3.4/codecs/l16mono.so
-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
-man/man1/androiddump.1
-man/man1/capinfos.1
-man/man1/captype.1
-man/man1/ciscodump.1
-man/man1/dftest.1
-man/man1/dumpcap.1
-man/man1/editcap.1
-man/man1/mergecap.1
-man/man1/mmdbresolve.1
-man/man1/randpkt.1
-man/man1/randpktdump.1
-man/man1/rawshark.1
-man/man1/reordercap.1
-man/man1/sshdump.1
-man/man1/text2pcap.1
-man/man1/tshark.1
-man/man1/udpdump.1
-man/man1/wireshark.1
-man/man4/extcap.4
-man/man4/wireshark-filter.4
-${PLIST.icons}share/appdata/wireshark.appdata.xml
-${PLIST.icons}share/applications/wireshark.desktop
-share/doc/wireshark/androiddump.html
-share/doc/wireshark/capinfos.html
-share/doc/wireshark/captype.html
-share/doc/wireshark/ciscodump.html
-share/doc/wireshark/dftest.html
-share/doc/wireshark/dumpcap.html
-share/doc/wireshark/editcap.html
-share/doc/wireshark/extcap.html
-share/doc/wireshark/mergecap.html
-share/doc/wireshark/mmdbresolve.html
-share/doc/wireshark/randpkt.html
-share/doc/wireshark/randpktdump.html
-share/doc/wireshark/rawshark.html
-share/doc/wireshark/reordercap.html
-share/doc/wireshark/sshdump.html
-share/doc/wireshark/text2pcap.html
-share/doc/wireshark/tshark.html
-share/doc/wireshark/udpdump.html
-share/doc/wireshark/wireshark-filter.html
-share/doc/wireshark/wireshark.html
-${PLIST.icons}share/icons/hicolor/128x128/apps/wireshark.png
+lib/wireshark/plugins/3.6/codecs/g711.so
+lib/wireshark/plugins/3.6/codecs/g722.so
+lib/wireshark/plugins/3.6/codecs/g726.so
+lib/wireshark/plugins/3.6/codecs/l16mono.so
+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
+${PLIST.icons}share/applications/org.wireshark.Wireshark.desktop
+${PLIST.icons}share/icons/hicolor/128x128/apps/org.wireshark.Wireshark.png
 ${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-vnd.tcpdump.pcap.png
-${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-wireshark-doc.png
-${PLIST.icons}share/icons/hicolor/16x16/apps/wireshark.png
+${PLIST.icons}share/icons/hicolor/128x128/mimetypes/org.wireshark.Wireshark-mimetype.png
+${PLIST.icons}share/icons/hicolor/16x16/apps/org.wireshark.Wireshark.png
 ${PLIST.icons}share/icons/hicolor/16x16/mimetypes/application-vnd.tcpdump.pcap.png
-${PLIST.icons}share/icons/hicolor/16x16/mimetypes/application-wireshark-doc.png
-${PLIST.icons}share/icons/hicolor/24x24/apps/wireshark.png
+${PLIST.icons}share/icons/hicolor/16x16/mimetypes/org.wireshark.Wireshark-mimetype.png
+${PLIST.icons}share/icons/hicolor/24x24/apps/org.wireshark.Wireshark.png
 ${PLIST.icons}share/icons/hicolor/24x24/mimetypes/application-vnd.tcpdump.pcap.png
-${PLIST.icons}share/icons/hicolor/24x24/mimetypes/application-wireshark-doc.png
-${PLIST.icons}share/icons/hicolor/256x256/apps/wireshark.png
+${PLIST.icons}share/icons/hicolor/24x24/mimetypes/org.wireshark.Wireshark-mimetype.png
+${PLIST.icons}share/icons/hicolor/256x256/apps/org.wireshark.Wireshark.png
 ${PLIST.icons}share/icons/hicolor/256x256/mimetypes/application-vnd.tcpdump.pcap.png
-${PLIST.icons}share/icons/hicolor/256x256/mimetypes/application-wireshark-doc.png
-${PLIST.icons}share/icons/hicolor/32x32/apps/wireshark.png
+${PLIST.icons}share/icons/hicolor/256x256/mimetypes/org.wireshark.Wireshark-mimetype.png
+${PLIST.icons}share/icons/hicolor/32x32/apps/org.wireshark.Wireshark.png
 ${PLIST.icons}share/icons/hicolor/32x32/mimetypes/application-vnd.tcpdump.pcap.png
-${PLIST.icons}share/icons/hicolor/32x32/mimetypes/application-wireshark-doc.png
-${PLIST.icons}share/icons/hicolor/48x48/apps/wireshark.png
+${PLIST.icons}share/icons/hicolor/32x32/mimetypes/org.wireshark.Wireshark-mimetype.png
+${PLIST.icons}share/icons/hicolor/48x48/apps/org.wireshark.Wireshark.png
 ${PLIST.icons}share/icons/hicolor/48x48/mimetypes/application-vnd.tcpdump.pcap.png
-${PLIST.icons}share/icons/hicolor/48x48/mimetypes/application-wireshark-doc.png
-${PLIST.icons}share/icons/hicolor/64x64/apps/wireshark.png
+${PLIST.icons}share/icons/hicolor/48x48/mimetypes/org.wireshark.Wireshark-mimetype.png
+${PLIST.icons}share/icons/hicolor/64x64/apps/org.wireshark.Wireshark.png
 ${PLIST.icons}share/icons/hicolor/64x64/mimetypes/application-vnd.tcpdump.pcap.png
-${PLIST.icons}share/icons/hicolor/64x64/mimetypes/application-wireshark-doc.png
+${PLIST.icons}share/icons/hicolor/64x64/mimetypes/org.wireshark.Wireshark-mimetype.png
+${PLIST.icons}share/icons/hicolor/scalable/apps/org.wireshark.Wireshark.svg
 ${PLIST.icons}share/icons/hicolor/scalable/apps/wireshark.svg
-${PLIST.icons}share/mime/packages/wireshark.xml
-share/wireshark/AUTHORS-SHORT
+${PLIST.icons}share/metainfo/org.wireshark.Wireshark.metainfo.xml
+${PLIST.icons}share/mime/packages/org.wireshark.Wireshark.xml
 share/wireshark/COPYING
-share/wireshark/androiddump.html
-share/wireshark/capinfos.html
-share/wireshark/captype.html
 share/wireshark/cfilters
-share/wireshark/ciscodump.html
 share/wireshark/colorfilters
 ${PLIST.lua}share/wireshark/console.lua
 share/wireshark/dfilter_macros
 share/wireshark/dfilters
-share/wireshark/dftest.html
 share/wireshark/diameter/AlcatelLucent.xml
 share/wireshark/diameter/Cisco.xml
 share/wireshark/diameter/CiscoSystems.xml
@@ -777,15 +756,10 @@ share/wireshark/dtds/smil.dtd
 share/wireshark/dtds/watcherinfo.dtd
 share/wireshark/dtds/xcap-caps.dtd
 share/wireshark/dtds/xcap-error.dtd
-share/wireshark/dumpcap.html
-share/wireshark/editcap.html
 share/wireshark/enterprises.tsv
-share/wireshark/extcap.html
 ${PLIST.lua}share/wireshark/init.lua
 share/wireshark/ipmap.html
 share/wireshark/manuf
-share/wireshark/mergecap.html
-share/wireshark/mmdbresolve.html
 share/wireshark/pdml2html.xsl
 share/wireshark/profiles/Bluetooth/colorfilters
 share/wireshark/profiles/Bluetooth/preferences
@@ -1000,20 +974,10 @@ share/wireshark/radius/dictionary.yubico
 share/wireshark/radius/dictionary.zeus
 share/wireshark/radius/dictionary.zte
 share/wireshark/radius/dictionary.zyxel
-share/wireshark/randpkt.html
-share/wireshark/randpktdump.html
-share/wireshark/rawshark.html
-share/wireshark/reordercap.html
 share/wireshark/services
 share/wireshark/smi_modules
-share/wireshark/sshdump.html
-share/wireshark/text2pcap.html
 share/wireshark/tpncp/tpncp.dat
-share/wireshark/tshark.html
-share/wireshark/udpdump.html
 share/wireshark/wimaxasncp/dictionary.dtd
 share/wireshark/wimaxasncp/dictionary.xml
-share/wireshark/wireshark-filter.html
-share/wireshark/wireshark.html
 share/wireshark/wka
 share/wireshark/ws.css

Index: pkgsrc/net/wireshark/distinfo
diff -u pkgsrc/net/wireshark/distinfo:1.150 pkgsrc/net/wireshark/distinfo:1.151
--- pkgsrc/net/wireshark/distinfo:1.150 Tue Nov 23 22:12:01 2021
+++ pkgsrc/net/wireshark/distinfo       Fri Dec 10 08:37:17 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.150 2021/11/23 22:12:01 wiz Exp $
+$NetBSD: distinfo,v 1.151 2021/12/10 08:37:17 adam Exp $
 
-BLAKE2s (wireshark-3.4.10.tar.xz) = f00837db4505983895738b8a5642af2873bd6bef1b9f144ae5813f1bac36c080
-SHA512 (wireshark-3.4.10.tar.xz) = 8a57d5279e9f3821b6ba3dceba89ad77fa8d0cf8cf421eab4d32e039497b429444c147b31abebd65b11b0b3ff73cf10d484480bcf0aedb206011819df8ab0257
-Size (wireshark-3.4.10.tar.xz) = 32344804 bytes
+BLAKE2s (wireshark-3.6.0.tar.xz) = 97678817cc7e6ccbeb6766fd8ad1d6fa96e29ae55e0da54424980c002c0ebf25
+SHA512 (wireshark-3.6.0.tar.xz) = 7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094
+Size (wireshark-3.6.0.tar.xz) = 39687684 bytes
 SHA1 (patch-CMakeLists.txt) = 371f16d57fd6d33c2c1c8cb4f54cf3c16ca2afce