CVS commit: pkgsrc/net/wireshark

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Apr 29 12:15:37 UTC 2018

Modified Files:
        pkgsrc/net/wireshark: Makefile PLIST distinfo options.mk

Log Message:
wireshark: update to 2.6.0.

Switch default GUI from gtk3 to qt5. See What's New below for "why".

 What’s New

  Wireshark 2.6 is the last release that will support the legacy (GTK+)
  user interface. It will not be supported or available in Wireshark
  3.0.

  Many user interface improvements have been made. See the “New and
  Updated Features” section below for more details.

  Bug Fixes

   The following bugs have been fixed:

   Dumpcap might not quit if Wireshark or TShark crashes. (Bug 1419[1])

  New and Updated Features

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

     • HTTP Request sequences are now supported.

     • Wireshark now supports MaxMind DB files. Support for GeoIP and
       GeoLite Legacy databases has been removed.

     • The Windows packages are now built using Microsoft Visual Studio
       2017.

     • The IP map feature (the “Map” button in the “Endpoints” dialog)
       has been removed.

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

     • Display filter buttons can now be edited, disabled, and removed
       via a context menu directly from the toolbar

     • Drag & Drop filter fields to the display filter toolbar or edit
       to create a button on the fly or apply the filter as a display
       filter.

     • Application startup time has been reduced.

     • Some keyboard shortcut mix-ups have been resolved by assigning
       new shortcuts to Edit → Copy methods.

     • TShark now supports color using the --color option.

     • The "matches" display filter operator is now case-insensitive.

     • Display expression (button) preferences have been converted to a
       UAT. This puts the display expressions in their own file.
       Wireshark still supports preference files that contain the old
       preferences, but new preference files will be written without the
       old fields.

     • SMI private enterprise numbers are now read from the
       “enterprises.tsv” configuration file.

     • The QUIC dissector has been renamed to Google QUIC (quic →
       gquic).

     • The selected packet number can now be shown in the Status Bar by
       enabling Preferences → Appearance → Layout → Show selected packet
       number.

     • File load time in the Status Bar is now disabled by default and
       can be enabled in Preferences → Appearance → Layout → Show file
       load time.

     • Support for the G.729A codec in the RTP Player is now added via
       the bcg729 library.

     • Support for hardware-timestamping of packets has been added.

     • Improved NetMon .cap support with comments, event tracing,
       network filter, network info types and some Message Analyzer
       exported types.

     • The personal plugins folder on Linux/Unix is now
       ~/.local/lib/wireshark/plugins.

     • TShark can print flow graphs using -z flow…

     • Capinfos now prints SHA256 hashes in addition to RIPEMD160 and
       SHA1. MD5 output has been removed.

     • The packet editor has been removed. (This was a GTK+ only
       experimental feature.)

     • Support BBC micro:bit Bluetooth profile

     • The Linux and UNIX installation step for Wireshark will now
       install headers required to build plugins. A pkg-config file is
       provided to help with this (see “doc/plugins.example” for
       details). Note you must still rebuild all plugins between minor
       releases (X.Y).

     • The Windows installers and packages now ship with Qt 5.9.4.

     • The generic data dissector can now uncompress zlib compressed
       data.

     • DNS Stats now supports service level statistics.

     • DNS filters for retransmissions and unsolicited responses have
       been added.

     • The “tcptrace” TCP Stream graph now shows duplicate ACKS and zero
       window advertisements.

     • The membership operator now supports ranges, allowing display
       filters such as tcp.port in {4430..4434} to be expressed. See the
       User’s Guide, chapter Building display filter expressions for
       details.

  New Protocol Support

   ActiveMQ Artemis Core Protocol, AMT (Automatic Multicast Tunneling),
   AVSP (Arista Vendor Specific Protocol), Bluetooth Mesh, Broadcom tags
   (Broadcom Ethernet switch management frames), CAN-ETH, CVS password
   server, Excentis DOCSIS31 XRA header, F1 Application Protocol,
   F5ethtrailer, FP Mux, GRPC (gRPC), IEEE 1905.1a, IEEE 802.11ax (High
   Efficiency WLAN (HEW)), IEEE 802.15.9 IEEE Recommended Practice for
   Transport of Key Management Protocol (KMP) Datagrams, IEEE 802.3br
   Frame Preemption Protocol, ISOBUS, LoRaTap, LoRaWAN, Lustre
   Filesystem, Lustre Network, Nano / RaiBlocks Cryptocurrency Protocol
   (UDP), Network Functional Application Platform Interface (NFAPI)
   Protocol, New Radio Radio Link Control protocol, New Radio Radio
   Resource Control protocol, NR (5G) MAC protocol, NXP 802.15.4 Sniffer
   Protocol, Object Security for Constrained RESTful Environments
   (OSCORE), PFCP (Packet Forwarding Control Protocol), Protobuf
   (Protocol Buffers), QUIC (IETF), RFC 4108 Using CMS to Protect
   Firmware Packages, Session Multiplex Protocol, SolarEdge monitoring
   protocol, Steam In-Home Streaming Discovery Protocol, Tibia, TWAMP
   and OWAMP, Wi-Fi Device Provisioning Protocol, and Wi-SUN FAN
   Protocol

  Updated Protocol Support

   Too many protocols have been updated to list here.

  New and Updated Capture File Support

   Microsoft Network Monitor

  New and Updated Capture Interfaces support

   LoRaTap


To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 pkgsrc/net/wireshark/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/net/wireshark/PLIST
cvs rdiff -u -r1.109 -r1.110 pkgsrc/net/wireshark/distinfo
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/wireshark/options.mk

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.186 pkgsrc/net/wireshark/Makefile:1.187
--- pkgsrc/net/wireshark/Makefile:1.186 Tue Apr 17 22:29:47 2018
+++ pkgsrc/net/wireshark/Makefile       Sun Apr 29 12:15:37 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.186 2018/04/17 22:29:47 wiz Exp $
+# $NetBSD: Makefile,v 1.187 2018/04/29 12:15:37 wiz Exp $
 
-DISTNAME=      wireshark-2.4.6
-PKGREVISION=   1
+DISTNAME=      wireshark-2.6.0
 CATEGORIES=    net
 MASTER_SITES=  https://www.wireshark.org/download/src/
 EXTRACT_SUFX=  .tar.xz
@@ -42,8 +41,6 @@ REPLACE_PYTHON+=              tools/ftsanity.py
 REPLACE_PYTHON+=               tools/html2text.py
 REPLACE_PYTHON+=               tools/idl2deb
 REPLACE_PYTHON+=               tools/indexcap.py
-REPLACE_PYTHON+=               tools/make-dissector-reg.py
-REPLACE_PYTHON+=               tools/make-tap-reg.py
 REPLACE_PYTHON+=               tools/msnchat
 REPLACE_PYTHON+=               tools/ncp2222.py
 REPLACE_PYTHON+=               tools/netscreen2dump.py

Index: pkgsrc/net/wireshark/PLIST
diff -u pkgsrc/net/wireshark/PLIST:1.34 pkgsrc/net/wireshark/PLIST:1.35
--- pkgsrc/net/wireshark/PLIST:1.34     Sat Jan 13 22:32:53 2018
+++ pkgsrc/net/wireshark/PLIST  Sun Apr 29 12:15:37 2018
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.34 2018/01/13 22:32:53 rillig Exp $
+@comment $NetBSD: PLIST,v 1.35 2018/04/29 12:15:37 wiz Exp $
 bin/capinfos
 bin/captype
-bin/dftest
 bin/dumpcap
 bin/editcap
 bin/idl2wrs
@@ -14,6 +13,626 @@ bin/text2pcap
 bin/tshark
 ${PLIST.qt}bin/wireshark
 ${PLIST.gtk3}bin/wireshark-gtk
+include/wireshark/cfile.h
+include/wireshark/codecs/codecs.h
+include/wireshark/epan/addr_and_mask.h
+include/wireshark/epan/addr_resolv.h
+include/wireshark/epan/address.h
+include/wireshark/epan/address_types.h
+include/wireshark/epan/afn.h
+include/wireshark/epan/aftypes.h
+include/wireshark/epan/app_mem_usage.h
+include/wireshark/epan/arcnet_pids.h
+include/wireshark/epan/arptypes.h
+include/wireshark/epan/asn1.h
+include/wireshark/epan/ax25_pids.h
+include/wireshark/epan/bridged_pids.h
+include/wireshark/epan/capture_dissectors.h
+include/wireshark/epan/charsets.h
+include/wireshark/epan/chdlctypes.h
+include/wireshark/epan/color_filters.h
+include/wireshark/epan/column-info.h
+include/wireshark/epan/column-utils.h
+include/wireshark/epan/column.h
+include/wireshark/epan/conv_id.h
+include/wireshark/epan/conversation.h
+include/wireshark/epan/conversation_debug.h
+include/wireshark/epan/conversation_table.h
+include/wireshark/epan/crc10-tvb.h
+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/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/dissector_filters.h
+include/wireshark/epan/dissectors/dissectors.h
+include/wireshark/epan/dissectors/packet-6lowpan.h
+include/wireshark/epan/dissectors/packet-a21.h
+include/wireshark/epan/dissectors/packet-acp133.h
+include/wireshark/epan/dissectors/packet-acse.h
+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-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-atalk.h
+include/wireshark/epan/dissectors/packet-atm.h
+include/wireshark/epan/dissectors/packet-atn-ulcs.h
+include/wireshark/epan/dissectors/packet-bacapp.h
+include/wireshark/epan/dissectors/packet-bacnet.h
+include/wireshark/epan/dissectors/packet-ber.h
+include/wireshark/epan/dissectors/packet-bfd.h
+include/wireshark/epan/dissectors/packet-bgp.h
+include/wireshark/epan/dissectors/packet-bluetooth.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-bthci_acl.h
+include/wireshark/epan/dissectors/packet-bthci_cmd.h
+include/wireshark/epan/dissectors/packet-bthci_evt.h
+include/wireshark/epan/dissectors/packet-bthci_sco.h
+include/wireshark/epan/dissectors/packet-btl2cap.h
+include/wireshark/epan/dissectors/packet-btle.h
+include/wireshark/epan/dissectors/packet-btrfcomm.h
+include/wireshark/epan/dissectors/packet-btsdp.h
+include/wireshark/epan/dissectors/packet-c1222.h
+include/wireshark/epan/dissectors/packet-camel.h
+include/wireshark/epan/dissectors/packet-cdt.h
+include/wireshark/epan/dissectors/packet-cell_broadcast.h
+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
+include/wireshark/epan/dissectors/packet-coap.h
+include/wireshark/epan/dissectors/packet-credssp.h
+include/wireshark/epan/dissectors/packet-crmf.h
+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
+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-dns.h
+include/wireshark/epan/dissectors/packet-docsis-tlv.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-e212.h
+include/wireshark/epan/dissectors/packet-eapol.h
+include/wireshark/epan/dissectors/packet-edonkey.h
+include/wireshark/epan/dissectors/packet-eigrp.h
+include/wireshark/epan/dissectors/packet-enip.h
+include/wireshark/epan/dissectors/packet-epl.h
+include/wireshark/epan/dissectors/packet-epmd.h
+include/wireshark/epan/dissectors/packet-erf.h
+include/wireshark/epan/dissectors/packet-ess.h
+include/wireshark/epan/dissectors/packet-eth.h
+include/wireshark/epan/dissectors/packet-f5ethtrailer.h
+include/wireshark/epan/dissectors/packet-fc.h
+include/wireshark/epan/dissectors/packet-fcbls.h
+include/wireshark/epan/dissectors/packet-fcct.h
+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
+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-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
+include/wireshark/epan/dissectors/packet-gsm_a_rr.h
+include/wireshark/epan/dissectors/packet-gsm_map.h
+include/wireshark/epan/dissectors/packet-gsm_rlcmac.h
+include/wireshark/epan/dissectors/packet-gsm_sms.h
+include/wireshark/epan/dissectors/packet-gsmtap.h
+include/wireshark/epan/dissectors/packet-gssapi.h
+include/wireshark/epan/dissectors/packet-gtp.h
+include/wireshark/epan/dissectors/packet-gtpv2.h
+include/wireshark/epan/dissectors/packet-h223.h
+include/wireshark/epan/dissectors/packet-h225.h
+include/wireshark/epan/dissectors/packet-h235.h
+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-h323.h
+include/wireshark/epan/dissectors/packet-h450-ros.h
+include/wireshark/epan/dissectors/packet-hpext.h
+include/wireshark/epan/dissectors/packet-http.h
+include/wireshark/epan/dissectors/packet-http2.h
+include/wireshark/epan/dissectors/packet-iana-oui.h
+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-ieee80211-radio.h
+include/wireshark/epan/dissectors/packet-ieee80211-radiotap-defs.h
+include/wireshark/epan/dissectors/packet-ieee80211-radiotap-iter.h
+include/wireshark/epan/dissectors/packet-ieee80211.h
+include/wireshark/epan/dissectors/packet-ieee802154.h
+include/wireshark/epan/dissectors/packet-ieee8023.h
+include/wireshark/epan/dissectors/packet-ieee802a.h
+include/wireshark/epan/dissectors/packet-igmp.h
+include/wireshark/epan/dissectors/packet-imf.h
+include/wireshark/epan/dissectors/packet-inap.h
+include/wireshark/epan/dissectors/packet-infiniband.h
+include/wireshark/epan/dissectors/packet-ip.h
+include/wireshark/epan/dissectors/packet-ipmi.h
+include/wireshark/epan/dissectors/packet-ipsec.h
+include/wireshark/epan/dissectors/packet-ipx.h
+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-isup.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-l2tp.h
+include/wireshark/epan/dissectors/packet-lapdm.h
+include/wireshark/epan/dissectors/packet-lbm.h
+include/wireshark/epan/dissectors/packet-lbtrm.h
+include/wireshark/epan/dissectors/packet-lbtru.h
+include/wireshark/epan/dissectors/packet-lbttcp.h
+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-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
+include/wireshark/epan/dissectors/packet-mgcp.h
+include/wireshark/epan/dissectors/packet-mle.h
+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
+include/wireshark/epan/dissectors/packet-msrp.h
+include/wireshark/epan/dissectors/packet-mstp.h
+include/wireshark/epan/dissectors/packet-mtp3.h
+include/wireshark/epan/dissectors/packet-nbap.h
+include/wireshark/epan/dissectors/packet-ncp-int.h
+include/wireshark/epan/dissectors/packet-ncp-nmas.h
+include/wireshark/epan/dissectors/packet-ncp-sss.h
+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-nisplus.h
+include/wireshark/epan/dissectors/packet-nlm.h
+include/wireshark/epan/dissectors/packet-nr-rrc.h
+include/wireshark/epan/dissectors/packet-nsh.h
+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-opensafety.h
+include/wireshark/epan/dissectors/packet-oscore.h
+include/wireshark/epan/dissectors/packet-osi-options.h
+include/wireshark/epan/dissectors/packet-osi.h
+include/wireshark/epan/dissectors/packet-p1.h
+include/wireshark/epan/dissectors/packet-p22.h
+include/wireshark/epan/dissectors/packet-p7.h
+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-per.h
+include/wireshark/epan/dissectors/packet-pkcs1.h
+include/wireshark/epan/dissectors/packet-pkcs12.h
+include/wireshark/epan/dissectors/packet-pkinit.h
+include/wireshark/epan/dissectors/packet-pkix1explicit.h
+include/wireshark/epan/dissectors/packet-pkix1implicit.h
+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
+include/wireshark/epan/dissectors/packet-pw-common.h
+include/wireshark/epan/dissectors/packet-q708.h
+include/wireshark/epan/dissectors/packet-q931.h
+include/wireshark/epan/dissectors/packet-q932.h
+include/wireshark/epan/dissectors/packet-qsig.h
+include/wireshark/epan/dissectors/packet-radius.h
+include/wireshark/epan/dissectors/packet-raknet.h
+include/wireshark/epan/dissectors/packet-ranap.h
+include/wireshark/epan/dissectors/packet-rdm.h
+include/wireshark/epan/dissectors/packet-rdt.h
+include/wireshark/epan/dissectors/packet-reload.h
+include/wireshark/epan/dissectors/packet-rlc-lte.h
+include/wireshark/epan/dissectors/packet-rlc-nr.h
+include/wireshark/epan/dissectors/packet-rmi.h
+include/wireshark/epan/dissectors/packet-rmt-common.h
+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
+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-rwall.h
+include/wireshark/epan/dissectors/packet-rx.h
+include/wireshark/epan/dissectors/packet-s1ap.h
+include/wireshark/epan/dissectors/packet-s5066sis.h
+include/wireshark/epan/dissectors/packet-s7comm.h
+include/wireshark/epan/dissectors/packet-s7comm_szl_ids.h
+include/wireshark/epan/dissectors/packet-sccp.h
+include/wireshark/epan/dissectors/packet-scsi-mmc.h
+include/wireshark/epan/dissectors/packet-scsi-osd.h
+include/wireshark/epan/dissectors/packet-scsi-sbc.h
+include/wireshark/epan/dissectors/packet-scsi-smc.h
+include/wireshark/epan/dissectors/packet-scsi-ssc.h
+include/wireshark/epan/dissectors/packet-scsi.h
+include/wireshark/epan/dissectors/packet-sctp.h
+include/wireshark/epan/dissectors/packet-sdp.h
+include/wireshark/epan/dissectors/packet-ses.h
+include/wireshark/epan/dissectors/packet-sflow.h
+include/wireshark/epan/dissectors/packet-sip.h
+include/wireshark/epan/dissectors/packet-skinny.h
+include/wireshark/epan/dissectors/packet-sll.h
+include/wireshark/epan/dissectors/packet-smb-browse.h
+include/wireshark/epan/dissectors/packet-smb-common.h
+include/wireshark/epan/dissectors/packet-smb-mailslot.h
+include/wireshark/epan/dissectors/packet-smb-pipe.h
+include/wireshark/epan/dissectors/packet-smb-sidsnooping.h
+include/wireshark/epan/dissectors/packet-smb.h
+include/wireshark/epan/dissectors/packet-smb2.h
+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-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-t124.h
+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-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-tn3270.h
+include/wireshark/epan/dissectors/packet-tn5250.h
+include/wireshark/epan/dissectors/packet-tpkt.h
+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-ubertooth.h
+include/wireshark/epan/dissectors/packet-udp.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
+include/wireshark/epan/dissectors/packet-usb-hid.h
+include/wireshark/epan/dissectors/packet-usb.h
+include/wireshark/epan/dissectors/packet-usbip.h
+include/wireshark/epan/dissectors/packet-vxlan.h
+include/wireshark/epan/dissectors/packet-wap.h
+include/wireshark/epan/dissectors/packet-wccp.h
+include/wireshark/epan/dissectors/packet-windows-common.h
+include/wireshark/epan/dissectors/packet-wlancertextn.h
+include/wireshark/epan/dissectors/packet-wps.h
+include/wireshark/epan/dissectors/packet-wsp.h
+include/wireshark/epan/dissectors/packet-wtls.h
+include/wireshark/epan/dissectors/packet-wtp.h
+include/wireshark/epan/dissectors/packet-x11-keysymdef.h
+include/wireshark/epan/dissectors/packet-x11.h
+include/wireshark/epan/dissectors/packet-x2ap.h
+include/wireshark/epan/dissectors/packet-x509af.h
+include/wireshark/epan/dissectors/packet-x509ce.h
+include/wireshark/epan/dissectors/packet-x509if.h
+include/wireshark/epan/dissectors/packet-x509sat.h
+include/wireshark/epan/dissectors/packet-xml.h
+include/wireshark/epan/dissectors/packet-xmpp-conference.h
+include/wireshark/epan/dissectors/packet-xmpp-core.h
+include/wireshark/epan/dissectors/packet-xmpp-gtalk.h
+include/wireshark/epan/dissectors/packet-xmpp-jingle.h
+include/wireshark/epan/dissectors/packet-xmpp-other.h
+include/wireshark/epan/dissectors/packet-xmpp-utils.h
+include/wireshark/epan/dissectors/packet-xmpp.h
+include/wireshark/epan/dissectors/packet-ypbind.h
+include/wireshark/epan/dissectors/packet-yppasswd.h
+include/wireshark/epan/dissectors/packet-ypserv.h
+include/wireshark/epan/dissectors/packet-ypxfr.h
+include/wireshark/epan/dissectors/packet-zbee-aps.h
+include/wireshark/epan/dissectors/packet-zbee-nwk.h
+include/wireshark/epan/dissectors/packet-zbee-security.h
+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
+include/wireshark/epan/eap.h
+include/wireshark/epan/eapol_keydes_types.h
+include/wireshark/epan/epan.h
+include/wireshark/epan/epan_dissect.h
+include/wireshark/epan/etypes.h
+include/wireshark/epan/ex-opt.h
+include/wireshark/epan/except.h
+include/wireshark/epan/exceptions.h
+include/wireshark/epan/expert.h
+include/wireshark/epan/export_object.h
+include/wireshark/epan/exported_pdu.h
+include/wireshark/epan/filter_expressions.h
+include/wireshark/epan/follow.h
+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/in_cksum.h
+include/wireshark/epan/ip_opts.h
+include/wireshark/epan/ipproto.h
+include/wireshark/epan/ipv4.h
+include/wireshark/epan/ipv6.h
+include/wireshark/epan/lapd_sapi.h
+include/wireshark/epan/llcsaps.h
+include/wireshark/epan/maxmind_db.h
+include/wireshark/epan/media_params.h
+include/wireshark/epan/next_tvb.h
+include/wireshark/epan/nlpid.h
+include/wireshark/epan/oids.h
+include/wireshark/epan/osi-utils.h
+include/wireshark/epan/oui.h
+include/wireshark/epan/packet.h
+include/wireshark/epan/packet_info.h
+include/wireshark/epan/params.h
+include/wireshark/epan/plugin_if.h
+include/wireshark/epan/ppptypes.h
+include/wireshark/epan/prefs-int.h
+include/wireshark/epan/prefs.h
+include/wireshark/epan/print.h
+include/wireshark/epan/print_stream.h
+include/wireshark/epan/proto.h
+include/wireshark/epan/proto_data.h
+include/wireshark/epan/ps.h
+include/wireshark/epan/ptvcursor.h
+include/wireshark/epan/range.h
+include/wireshark/epan/reassemble.h
+include/wireshark/epan/reedsolomon.h
+include/wireshark/epan/register.h
+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/show_exception.h
+include/wireshark/epan/slow_protocol_subtypes.h
+include/wireshark/epan/sminmpec.h
+include/wireshark/epan/srt_table.h
+include/wireshark/epan/stat_groups.h
+include/wireshark/epan/stat_tap_ui.h
+include/wireshark/epan/stats_tree.h
+include/wireshark/epan/stats_tree_priv.h
+include/wireshark/epan/stream.h
+include/wireshark/epan/strutil.h
+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
+include/wireshark/epan/tvbparse.h
+include/wireshark/epan/tvbuff-int.h
+include/wireshark/epan/tvbuff.h
+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/x264_prt_id.h
+include/wireshark/epan/xdlc.h
+include/wireshark/file.h
+include/wireshark/globals.h
+include/wireshark/log.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/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/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
+include/wireshark/wsutil/crash_info.h
+include/wireshark/wsutil/crc10.h
+include/wireshark/wsutil/crc11.h
+include/wireshark/wsutil/crc16-plain.h
+include/wireshark/wsutil/crc16.h
+include/wireshark/wsutil/crc32.h
+include/wireshark/wsutil/crc6.h
+include/wireshark/wsutil/crc7.h
+include/wireshark/wsutil/crc8.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/mpeg-audio.h
+include/wireshark/wsutil/nstime.h
+include/wireshark/wsutil/os_version_info.h
+include/wireshark/wsutil/pint.h
+include/wireshark/wsutil/plugins.h
+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
+include/wireshark/wsutil/str_util.h
+include/wireshark/wsutil/strnatcmp.h
+include/wireshark/wsutil/strtoi.h
+include/wireshark/wsutil/tempfile.h
+include/wireshark/wsutil/time_util.h
+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/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.la
 lib/libwiretap.la
 lib/libwscodecs.la
@@ -22,22 +641,23 @@ lib/pkgconfig/wireshark.pc
 lib/wireshark/extcap/androiddump
 lib/wireshark/extcap/randpktdump
 lib/wireshark/extcap/udpdump
-lib/wireshark/plugins/${PKGVERSION}/docsis.la
-lib/wireshark/plugins/${PKGVERSION}/ethercat.la
-lib/wireshark/plugins/${PKGVERSION}/gryphon.la
-lib/wireshark/plugins/${PKGVERSION}/irda.la
-lib/wireshark/plugins/${PKGVERSION}/m2m.la
-lib/wireshark/plugins/${PKGVERSION}/mate.la
-lib/wireshark/plugins/${PKGVERSION}/opcua.la
-lib/wireshark/plugins/${PKGVERSION}/profinet.la
-lib/wireshark/plugins/${PKGVERSION}/stats_tree.la
-lib/wireshark/plugins/${PKGVERSION}/transum.la
-lib/wireshark/plugins/${PKGVERSION}/unistim.la
-lib/wireshark/plugins/${PKGVERSION}/wimax.la
-lib/wireshark/plugins/${PKGVERSION}/wimaxasncp.la
-lib/wireshark/plugins/${PKGVERSION}/wimaxmacphy.la
+lib/wireshark/plugins/2.6/epan/ethercat.la
+lib/wireshark/plugins/2.6/epan/gryphon.la
+lib/wireshark/plugins/2.6/epan/irda.la
+lib/wireshark/plugins/2.6/epan/mate.la
+lib/wireshark/plugins/2.6/epan/opcua.la
+lib/wireshark/plugins/2.6/epan/profinet.la
+lib/wireshark/plugins/2.6/epan/stats_tree.la
+lib/wireshark/plugins/2.6/epan/transum.la
+lib/wireshark/plugins/2.6/epan/unistim.la
+lib/wireshark/plugins/2.6/epan/wimax.la
+lib/wireshark/plugins/2.6/epan/wimaxasncp.la
+lib/wireshark/plugins/2.6/epan/wimaxmacphy.la
+lib/wireshark/plugins/2.6/wiretap/l16mono.la
+lib/wireshark/plugins/2.6/wiretap/usbdump.la
 man/man1/androiddump.1
 man/man1/capinfos.1
+man/man1/captype.1
 man/man1/dftest.1
 man/man1/dumpcap.1
 man/man1/editcap.1
@@ -54,7 +674,7 @@ man/man4/extcap.4
 man/man4/wireshark-filter.4
 ${PLIST.icons}share/appdata/wireshark.appdata.xml
 ${PLIST.icons}share/applications/wireshark-gtk.desktop
-${PLIST.gtk3}share/applications/wireshark.desktop
+${PLIST.icons}share/applications/wireshark.desktop
 ${PLIST.icons}share/icons/hicolor/128x128/apps/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
@@ -77,14 +697,12 @@ ${PLIST.icons}share/icons/hicolor/64x64/
 ${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/scalable/apps/wireshark.svg
-${PLIST.icons}share/icons/locolor/16x16/apps/wireshark.png
-${PLIST.icons}share/icons/locolor/32x32/apps/wireshark.png
-${PLIST.icons}share/icons/locolor/48x48/apps/wireshark.png
 ${PLIST.icons}share/mime/packages/wireshark.xml
 share/wireshark/AUTHORS-SHORT
 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
@@ -97,6 +715,7 @@ share/wireshark/diameter/CiscoSystems.xm
 share/wireshark/diameter/Custom.xml
 share/wireshark/diameter/Ericsson.xml
 share/wireshark/diameter/HP.xml
+share/wireshark/diameter/Huawei.xml
 share/wireshark/diameter/Inovar.xml
 share/wireshark/diameter/Juniper.xml
 share/wireshark/diameter/Nokia.xml
@@ -105,6 +724,7 @@ share/wireshark/diameter/Oracle.xml
 share/wireshark/diameter/Starent.xml
 share/wireshark/diameter/TGPP.xml
 share/wireshark/diameter/TGPP2.xml
+share/wireshark/diameter/VerizonWireless.xml
 share/wireshark/diameter/Vodafone.xml
 share/wireshark/diameter/chargecontrol.xml
 share/wireshark/diameter/dictionary.dtd
@@ -131,6 +751,7 @@ 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
 share/wireshark/help/capture_filters.txt
 share/wireshark/help/capturing.txt
@@ -140,11 +761,12 @@ share/wireshark/help/getting_started.txt
 share/wireshark/help/overview.txt
 share/wireshark/help/toc
 ${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
 share/wireshark/profiles/Classic/colorfilters
 share/wireshark/radius/README.radius_dictionary
 share/wireshark/radius/custom.includes
@@ -365,4 +987,5 @@ share/wireshark/wimaxasncp/dictionary.dt
 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.109 pkgsrc/net/wireshark/distinfo:1.110
--- pkgsrc/net/wireshark/distinfo:1.109 Tue Apr 17 10:29:06 2018
+++ pkgsrc/net/wireshark/distinfo       Sun Apr 29 12:15:37 2018
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.109 2018/04/17 10:29:06 wiz Exp $
+$NetBSD: distinfo,v 1.110 2018/04/29 12:15:37 wiz Exp $
 
-SHA1 (wireshark-2.4.6.tar.xz) = 25ba24628acfc12d7541298255f50e8034e694b7
-RMD160 (wireshark-2.4.6.tar.xz) = 4d58798dfbb5a6567a731e0d6308e1dca3c859ee
-SHA512 (wireshark-2.4.6.tar.xz) = 171047fa36a6cb29d1edb8e28086e24075f8b77581d9f3142fa39af8ae3d6dfe0c2e41a9335ca5d9851578b54ac9e6e74ff5bd92a96af262a5cc7a73857b8b81
-Size (wireshark-2.4.6.tar.xz) = 28851192 bytes
+SHA1 (wireshark-2.6.0.tar.xz) = d1f53751c5b24d6b1695117fb396a6b202e88451
+RMD160 (wireshark-2.6.0.tar.xz) = 4eb1a446dabff8f452737ea22bfc341a3be89a3f
+SHA512 (wireshark-2.6.0.tar.xz) = a419ed32caeb9f25fc26e345c7baf7d847fee35730c64efad66870a786b26b9f8d5a8665b8b99be88f9cf504f6d9e640584d9849558ff09efc83400588dc6da8
+Size (wireshark-2.6.0.tar.xz) = 28314868 bytes

Index: pkgsrc/net/wireshark/options.mk
diff -u pkgsrc/net/wireshark/options.mk:1.16 pkgsrc/net/wireshark/options.mk:1.17
--- pkgsrc/net/wireshark/options.mk:1.16        Wed Jan  3 11:09:41 2018
+++ pkgsrc/net/wireshark/options.mk     Sun Apr 29 12:15:37 2018
@@ -1,10 +1,11 @@
-# $NetBSD: options.mk,v 1.16 2018/01/03 11:09:41 ryoon Exp $
+# $NetBSD: options.mk,v 1.17 2018/04/29 12:15:37 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.wireshark
 PKG_SUPPORTED_OPTIONS=         gtk3 lua
 PKG_OPTIONS_OPTIONAL_GROUPS=   qt
 PKG_OPTIONS_GROUP.qt=          qt4 qt5
-PKG_SUGGESTED_OPTIONS=         gtk3 lua
+PKG_SUGGESTED_OPTIONS=         qt5 lua
+
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=           gtk3 icons lua mans qt
@@ -14,6 +15,7 @@ CONFIGURE_ARGS+=      --without-qt
 .else
 .  if !empty(PKG_OPTIONS:Mqt4)
 CONFIGURE_ARGS+=       --with-qt=4
+BUILDLINK_API_DEPENDS.qt4-tools+=      qt4-tools>=4.8
 .    include "../../x11/qt4-tools/buildlink3.mk"
 .  elif !empty(PKG_OPTIONS:Mqt5)
 CONFIGURE_ARGS+=       --with-qt=5
@@ -60,15 +62,12 @@ INSTALLATION_DIRS+= share/applications
 PLIST.icons=           yes
 POST_INSTALL_TARGETS+= install-icons
 INSTALLATION_DIRS+=    share/icons/hicolor/scalable/apps
-ICON_COLORS=           hi lo
 ICON_SIZES=            16 32 48
 MIMEICON_SIZES=                16 24 32 48 64 128 256
 
-.    for c in ${ICON_COLORS}
 .      for d in ${ICON_SIZES}
-INSTALLATION_DIRS+=    share/icons/${c}color/${d}x${d}/apps
+INSTALLATION_DIRS+=    share/icons/hicolor/${d}x${d}/apps
 .      endfor
-.    endfor
 
 .    for d in ${MIMEICON_SIZES}
 INSTALLATION_DIRS+=    share/icons/hicolor/${d}x${d}/mimetypes
@@ -81,13 +80,6 @@ INSTALLATION_DIRS+=  share/icons/hicolor/
 install-icons:
        ${INSTALL_DATA} ${WRKSRC}/image/wsicon.svg \
                ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wireshark.svg
-.    for c in ${ICON_COLORS}
-.      for d in ${ICON_SIZES}
-       ${INSTALL_DATA} ${WRKSRC}/image/${c}${d}-app-wireshark.png \
-               ${DESTDIR}${PREFIX}/share/icons/${c}color/${d}x${d}/apps/wireshark.png
-.      endfor
-.    endfor
-
 .    for d in ${MIMEICON_SIZES}
        ${INSTALL_DATA} ${WRKSRC}/image/WiresharkDoc-${d}.png \
                ${DESTDIR}${PREFIX}/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png