CVS commit: pkgsrc/net/wireshark

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/wireshark
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Mon, 6 May 2019 09:36:47 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon May  6 09:36:47 UTC 2019

Modified Files:
        pkgsrc/net/wireshark: DESCR Makefile PLIST distinfo options.mk
Added Files:
        pkgsrc/net/wireshark/patches: patch-CMakeLists.txt

Log Message:
wireshark: updated to 3.0.1

3.0.1:
The Windows installers now ship with Npcap 0.992. They previously shipped with Npcap 0.99-r9.

Bug Fixes
The following vulnerabilities have been fixed:
wnpa-sec-2019-09 NetScaler file parser crash. Bug 15497. CVE-2019-10895.
wnpa-sec-2019-10 SRVLOC dissector crash. Bug 15546. CVE-2019-10899.
wnpa-sec-2019-11 IEEE 802.11 dissector infinite loop. Bug 15553. CVE-2019-10897.
wnpa-sec-2019-12 GSUP dissector infinite loop. Bug 15585. CVE-2019-10898.
wnpa-sec-2019-13 Rbm dissector infinite loop. Bug 15612. CVE-2019-10900.
wnpa-sec-2019-14 GSS-API dissector crash. Bug 15613. CVE-2019-10894.
wnpa-sec-2019-15 DOF dissector crash. Bug 15617. CVE-2019-10896.
wnpa-sec-2019-16 TSDNS dissector crash. Bug 15619. CVE-2019-10902.
wnpa-sec-2019-17 LDSS dissector crash. Bug 15620. CVE-2019-10901.
wnpa-sec-2019-18 DCERPC SPOOLSS dissector crash. Bug 15568. CVE-2019-10903.

The following bugs have been fixed:
[oss-fuzz] UBSAN: shift exponent 34 is too large for 32-bit type 'guint32' (aka 'unsigned int') in packet-ieee80211.c:15534:49. Bug 14770.
[oss-fuzz] UBSAN: shift exponent 35 is too large for 32-bit type 'int' in packet-couchbase.c:1674:37. Bug 15439.
Duplicated TCP SEQ field in ICMP packets. Bug 15533.
Wrong length in dhcpv6 NTP Server suboption results in "Malformed Packet" and breaks further dissection. Bug 15542.
Wireshark’s speaker-to-MaxMind is burning up the CPU. Bug 15545.
GSM-A-RR variable bitmap decoding may report ARFCNs > 1023. Bug 15549.
Import hexdump dummy Ethernet header generation ignores direction indication. Bug 15561.
%T not supported for timestamps. Bug 15565.
LWM2M: resource with \r\n badly shown. Bug 15572.
When selecting BSSAP in 'Decode As' for a SCCP payload, it uses BSSAP+ which is not the same protocol. Bug 15578.
Possible buffer overflow in function ssl_md_final for crafted SSL 3.0 sessions. Bug 15599.
Windows console log output delay. Bug 15605.
Syslog dissector processes the UTF-8 BOM incorrectly. Bug 15607.
NFS/NLM: Wrong lock byte range in the "Info" column. Bug 15608.
randpkt -r causes segfault when count > 1. Bug 15627.
Tshark export to ElasticSearch (-Tek) fails with Bad json_dumper state: illegal transition. Bug 15628.
Packets with metadata but no data get the Protocol Info column overwritten. Bug 15630.
BGP MP_REACH_NLRI AFI: Layer-2 VPN, SAFI: EVPN - Label stack not decoded. Bug 15631.
Buildbot crash output: fuzz-2019-03-23-1789.pcap. Bug 15634.
Typo: broli → brotli. Bug 15647.
Wrong dissection of GTPv2 MM Context Used NAS integrity protection algorithm. Bug 15648.
Windows CHM (help file) title displays quoted HTML characters. Bug 15656.
Unable to load 3rd party plugins not signed by Wireshark’s codesigning certificate. Bug 15667.

3.0.0:

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

Support for a number of legacy features and libraries has been removed. See the “Removed Features and Support” section below for more details.

Bug Fixes

The following bugs have been fixed:
Data following a TCP ZeroWindowProbe is marked as retransmission and not passed to subdissectors (Bug 15427)
Lua Error on startup: init.lua: dofile has been disabled due to running Wireshark as superuser (Bug 15489).
Text and Image columns were handled incorrectly for TDS 7.0 and 7.1. (Bug 3098)
Dumpcap might not quit if Wireshark or TShark crashes. (Bug 1419)

The following features are new (or have been significantly updated) since version 3.0.0rc1:
The IP map feature (the “Map” button in the “Endpoints” dialog) has been added back in a modernized form (Bug 14693).
The macOS package now ships with Qt 5.12.1. Previously it shipped with Qt 5.9.7.
The macOS package requires version 10.12 or later. If you’re running an older version of macOS, please use Wireshark 2.6.

The following features are new (or have been significantly updated) since version 2.9.0:
Wireshark now supports the Swedish and Ukrainian languages.
Initial support for using PKCS #11 tokens for RSA decryption in TLS. This can be configured at Preferences, RSA Keys.
The build system now produces reproducible builds (Bug 15163).
The Windows installers now ship with Qt 5.12.1. Previously they shipped with Qt 5.12.0.

The following features are new (or have been significantly updated) since version 2.6.0:
The Windows .exe installers now ship with Npcap instead of WinPcap. Besides being actively maintained (by the nmap project), Npcap brings support for loopback capture and 802.11 WiFi monitor mode 
capture (if supported by the NIC driver).
Conversation timestamps are supported for UDP/UDP-Lite protocols
TShark now supports the -G elastic-mapping option which generates an ElasticSearch mapping file.
The “Capture Information” dialog has been added back (Bug 12004).
The Ethernet and IEEE 802.11 dissectors no longer validate the frame check sequence (checksum) by default.
The TCP dissector gained a new “Reassemble out-of-order segments” preference to fix dissection and decryption issues in case TCP segments are received out-of-order. See the User’s Guide, chapter TCP 
Reassembly for details.
Decryption support for the new WireGuard dissector (Bug 15011, requires Libgcrypt 1.8).
The BOOTP dissector has been renamed to DHCP. With the exception of “bootp.dhcp”, the old “bootp.*” display filter fields are still supported but may be removed in a future release.
The SSL dissector has been renamed to TLS. As with BOOTP the old “ssl.*” display filter fields are supported but may be removed in a future release.
Coloring rules, IO graphs, Filter Buttons and protocol preference tables can now be copied from other profiles using a button in the corresponding configuration dialogs.
APT-X has been renamed to aptX.
When importing from hex dump, it’s now possible to add an ExportPDU header with a payload name. This calls the specific dissector directly without lower protocols.
The sshdump and ciscodump extcap interfaces can now use a proxy for the SSH connection.
Dumpcap now supports the -a packets:NUM and -b packets:NUM options.
Wireshark now includes a “No Reassembly” configuration profile.
Wireshark now supports the Russian language.
The build system now supports AppImage packages.
The Windows installers now ship with Qt 5.12.0. Previously they shipped with Qt 5.9.7.
Support for DTLS and TLS decryption using pcapng files that embed a Decryption Secrets Block (DSB) containing a TLS Key Log (Bug 15252).
The editcap utility gained a new --inject-secrets option to inject an existing TLS Key Log file into a pcapng file.
A new dfilter function string() has been added. It allows the conversion of non-string fields to strings so string functions (as contains and matches) can be used on them.
The Bash test suite has been replaced by one based on Python unittest/pytest.
The custom window title can now show file path of the capture file and it has a conditional separator.

Removed Features and Support
The legacy (GTK+) user interface has been removed and is no longer supported.
The portaudio library is no longer needed due to the removal of GTK+.
Wireshark requires Qt 5.2 or later. Qt 4 is no longer supported.
Wireshark requires GLib 2.32 or later.
Wireshark requires GnuTLS 3.2 or later as optional dependency.
Building Wireshark requires Python 3.4 or newer, Python 2.7 is unsupported.
Building Wireshark requires CMake. Autotools is no longer supported.
TShark’s -z compare option was removed.
Building with Cygwin is no longer supported on Windows.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/wireshark/DESCR
cvs rdiff -u -r1.208 -r1.209 pkgsrc/net/wireshark/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/net/wireshark/PLIST
cvs rdiff -u -r1.118 -r1.119 pkgsrc/net/wireshark/distinfo
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/wireshark/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/net/wireshark/patches/patch-CMakeLists.txt

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/DESCR
diff -u pkgsrc/net/wireshark/DESCR:1.5 pkgsrc/net/wireshark/DESCR:1.6
--- pkgsrc/net/wireshark/DESCR:1.5      Thu Mar  3 13:33:14 2016
+++ pkgsrc/net/wireshark/DESCR  Mon May  6 09:36:47 2019
@@ -9,5 +9,3 @@ code as Wireshark, and with editcap, whi
 files and write the packets from that capture file, possibly in a
 different capture file format, and with some packets possibly removed
 from the capture.
-
-This package tracks version 2 stable branch.

Index: pkgsrc/net/wireshark/Makefile
diff -u pkgsrc/net/wireshark/Makefile:1.208 pkgsrc/net/wireshark/Makefile:1.209
--- pkgsrc/net/wireshark/Makefile:1.208 Sun May  5 16:44:05 2019
+++ pkgsrc/net/wireshark/Makefile       Mon May  6 09:36:47 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.208 2019/05/05 16:44:05 rhialto Exp $
+# $NetBSD: Makefile,v 1.209 2019/05/06 09:36:47 adam Exp $
 
-DISTNAME=      wireshark-2.6.7
-PKGREVISION=   2
+DISTNAME=      wireshark-3.0.1
 CATEGORIES=    net
 MASTER_SITES=  https://www.wireshark.org/download/src/
 EXTRACT_SUFX=  .tar.xz
@@ -11,31 +10,27 @@ HOMEPAGE=   https://www.wireshark.org/
 COMMENT=       Network protocol analyzer
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=            ethereal-[0-9]*
+CONFLICTS+=    ethereal-[0-9]*
+
+USE_CMAKE=             yes
+CMAKE_ARGS+=           -DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+=           -DENABLE_APPLICATION_BUNDLE=OFF
+CMAKE_ARG_PATH=                ..
+CONFIGURE_DIRS=                build
 
 USE_LANGUAGES=         c c++
-USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake perl pkg-config yacc lex
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --enable-static=no
-CONFIGURE_ARGS+=       --disable-guides
-CONFIGURE_ARGS+=       --with-pcap=${BUILDLINK_PREFIX.libpcap}
-CONFIGURE_ARGS+=       --with-zlib=${BUILDLINK_PREFIX.zlib}
-CONFIGURE_ENV+=                ac_cv_path_YACCDUMMY=${TOOLS_PATH.yacc}
-CONFIGURE_ENV+=                ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex}
 PKGCONFIG_OVERRIDE+=   wireshark.pc.in
-SHLIBTOOL_OVERRIDE=    # empty
 
 CHECK_PORTABILITY_SKIP+=       packaging/macosx/*/*
 
 PTHREAD_OPTS+=         require
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27 # Python 2.7 is not supported
 PYTHON_FOR_BUILD_ONLY=         yes
 REPLACE_PYTHON+=               help/faq.py
 REPLACE_PYTHON+=               tools/asn2deb
 REPLACE_PYTHON+=               tools/asn2wrs.py
-REPLACE_PYTHON+=               tools/dfilter-test.py
-REPLACE_PYTHON+=               tools/ftsanity.py
 REPLACE_PYTHON+=               tools/html2text.py
 REPLACE_PYTHON+=               tools/idl2deb
 REPLACE_PYTHON+=               tools/indexcap.py
@@ -45,6 +40,9 @@ REPLACE_PYTHON+=              tools/netscreen2dump.p
 REPLACE_PYTHON+=               tools/pkt-from-core.py
 REPLACE_PYTHON+=               tools/rdps.py
 
+pre-configure:
+       ${MKDIR} ${WRKSRC}/build
+
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
@@ -71,6 +69,7 @@ BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DI
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/snappy/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../geography/libmaxminddb/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../net/libcares/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"

Index: pkgsrc/net/wireshark/PLIST
diff -u pkgsrc/net/wireshark/PLIST:1.39 pkgsrc/net/wireshark/PLIST:1.40
--- pkgsrc/net/wireshark/PLIST:1.39     Mon Dec  3 15:35:15 2018
+++ pkgsrc/net/wireshark/PLIST  Mon May  6 09:36:47 2019
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.39 2018/12/03 15:35:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.40 2019/05/06 09:36:47 adam Exp $
 bin/capinfos
 bin/captype
 bin/dumpcap
 bin/editcap
 bin/idl2wrs
 bin/mergecap
+bin/mmdbresolve
 bin/randpkt
 bin/rawshark
 bin/reordercap
@@ -12,8 +13,8 @@ bin/sharkd
 bin/text2pcap
 bin/tshark
 ${PLIST.qt}bin/wireshark
-${PLIST.gtk3}bin/wireshark-gtk
 include/wireshark/cfile.h
+include/wireshark/cli_main.h
 include/wireshark/codecs/codecs.h
 include/wireshark/epan/addr_and_mask.h
 include/wireshark/epan/addr_resolv.h
@@ -49,7 +50,7 @@ include/wireshark/epan/dfilter/drange.h
 include/wireshark/epan/diam_dict.h
 include/wireshark/epan/disabled_protos.h
 include/wireshark/epan/dissector_filters.h
-include/wireshark/epan/dissectors/dissectors.h
+include/wireshark/epan/dissectors/file-rbm.h
 include/wireshark/epan/dissectors/packet-6lowpan.h
 include/wireshark/epan/dissectors/packet-a21.h
 include/wireshark/epan/dissectors/packet-acp133.h
@@ -93,7 +94,6 @@ include/wireshark/epan/dissectors/packet
 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
@@ -104,42 +104,22 @@ include/wireshark/epan/dissectors/packet
 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
@@ -173,7 +153,6 @@ include/wireshark/epan/dissectors/packet
 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
@@ -181,11 +160,11 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-fmp.h
 include/wireshark/epan/dissectors/packet-frame.h
 include/wireshark/epan/dissectors/packet-ftam.h
+include/wireshark/epan/dissectors/packet-geonw.h
 include/wireshark/epan/dissectors/packet-giop.h
 include/wireshark/epan/dissectors/packet-gluster.h
 include/wireshark/epan/dissectors/packet-gmr1_common.h
 include/wireshark/epan/dissectors/packet-gmr1_rr.h
-include/wireshark/epan/dissectors/packet-gnutella.h
 include/wireshark/epan/dissectors/packet-gprscdr.h
 include/wireshark/epan/dissectors/packet-gre.h
 include/wireshark/epan/dissectors/packet-gsm_a_common.h
@@ -204,6 +183,7 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-h248.h
 include/wireshark/epan/dissectors/packet-h263.h
 include/wireshark/epan/dissectors/packet-h264.h
+include/wireshark/epan/dissectors/packet-h265.h
 include/wireshark/epan/dissectors/packet-h323.h
 include/wireshark/epan/dissectors/packet-h450-ros.h
 include/wireshark/epan/dissectors/packet-hpext.h
@@ -214,6 +194,7 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-icmp.h
 include/wireshark/epan/dissectors/packet-idmp.h
 include/wireshark/epan/dissectors/packet-idp.h
+include/wireshark/epan/dissectors/packet-ieee1609dot2.h
 include/wireshark/epan/dissectors/packet-ieee80211-radio.h
 include/wireshark/epan/dissectors/packet-ieee80211-radiotap-defs.h
 include/wireshark/epan/dissectors/packet-ieee80211-radiotap-iter.h
@@ -234,11 +215,13 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-isis.h
 include/wireshark/epan/dissectors/packet-isl.h
 include/wireshark/epan/dissectors/packet-isup.h
+include/wireshark/epan/dissectors/packet-its.h
 include/wireshark/epan/dissectors/packet-iwarp-ddp-rdmap.h
 include/wireshark/epan/dissectors/packet-juniper.h
 include/wireshark/epan/dissectors/packet-jxta.h
 include/wireshark/epan/dissectors/packet-kerberos.h
-include/wireshark/epan/dissectors/packet-klm.h
+include/wireshark/epan/dissectors/packet-knxip.h
+include/wireshark/epan/dissectors/packet-knxip_decrypt.h
 include/wireshark/epan/dissectors/packet-l2tp.h
 include/wireshark/epan/dissectors/packet-lapdm.h
 include/wireshark/epan/dissectors/packet-lbm.h
@@ -249,13 +232,13 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-ldap.h
 include/wireshark/epan/dissectors/packet-ldp.h
 include/wireshark/epan/dissectors/packet-link16.h
+include/wireshark/epan/dissectors/packet-lisp.h
 include/wireshark/epan/dissectors/packet-llc.h
 include/wireshark/epan/dissectors/packet-lnet.h
 include/wireshark/epan/dissectors/packet-logotypecertextn.h
 include/wireshark/epan/dissectors/packet-lpp.h
 include/wireshark/epan/dissectors/packet-lte-rrc.h
 include/wireshark/epan/dissectors/packet-mac-lte.h
-include/wireshark/epan/dissectors/packet-mac-nr.h
 include/wireshark/epan/dissectors/packet-mausb.h
 include/wireshark/epan/dissectors/packet-mbim.h
 include/wireshark/epan/dissectors/packet-mbtcp.h
@@ -265,7 +248,6 @@ include/wireshark/epan/dissectors/packet
 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
@@ -280,8 +262,8 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-ndps.h
 include/wireshark/epan/dissectors/packet-netbios.h
 include/wireshark/epan/dissectors/packet-netlink.h
-include/wireshark/epan/dissectors/packet-netmon.h
 include/wireshark/epan/dissectors/packet-nfs.h
+include/wireshark/epan/dissectors/packet-ngap.h
 include/wireshark/epan/dissectors/packet-nisplus.h
 include/wireshark/epan/dissectors/packet-nlm.h
 include/wireshark/epan/dissectors/packet-nr-rrc.h
@@ -290,6 +272,7 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-ntp.h
 include/wireshark/epan/dissectors/packet-nvme.h
 include/wireshark/epan/dissectors/packet-ocsp.h
+include/wireshark/epan/dissectors/packet-oer.h
 include/wireshark/epan/dissectors/packet-opensafety.h
 include/wireshark/epan/dissectors/packet-oscore.h
 include/wireshark/epan/dissectors/packet-osi-options.h
@@ -301,6 +284,7 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-pcap_pktdata.h
 include/wireshark/epan/dissectors/packet-pcnfsd.h
 include/wireshark/epan/dissectors/packet-pdcp-lte.h
+include/wireshark/epan/dissectors/packet-pdcp-nr.h
 include/wireshark/epan/dissectors/packet-per.h
 include/wireshark/epan/dissectors/packet-pkcs1.h
 include/wireshark/epan/dissectors/packet-pkcs12.h
@@ -311,12 +295,10 @@ include/wireshark/epan/dissectors/packet
 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
@@ -339,7 +321,6 @@ include/wireshark/epan/dissectors/packet
 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
@@ -348,7 +329,6 @@ include/wireshark/epan/dissectors/packet
 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
@@ -380,14 +360,12 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-snmp.h
 include/wireshark/epan/dissectors/packet-socketcan.h
 include/wireshark/epan/dissectors/packet-spice.h
-include/wireshark/epan/dissectors/packet-spray.h
 include/wireshark/epan/dissectors/packet-sprt.h
 include/wireshark/epan/dissectors/packet-sscop.h
-include/wireshark/epan/dissectors/packet-ssl-utils.h
-include/wireshark/epan/dissectors/packet-ssl.h
 include/wireshark/epan/dissectors/packet-stat-notify.h
 include/wireshark/epan/dissectors/packet-stat.h
 include/wireshark/epan/dissectors/packet-sv.h
+include/wireshark/epan/dissectors/packet-syslog.h
 include/wireshark/epan/dissectors/packet-t124.h
 include/wireshark/epan/dissectors/packet-t30.h
 include/wireshark/epan/dissectors/packet-t38.h
@@ -395,8 +373,8 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-tcap.h
 include/wireshark/epan/dissectors/packet-tcp.h
 include/wireshark/epan/dissectors/packet-tetra.h
-include/wireshark/epan/dissectors/packet-tftp.h
-include/wireshark/epan/dissectors/packet-thrift.h
+include/wireshark/epan/dissectors/packet-tls-utils.h
+include/wireshark/epan/dissectors/packet-tls.h
 include/wireshark/epan/dissectors/packet-tn3270.h
 include/wireshark/epan/dissectors/packet-tn5250.h
 include/wireshark/epan/dissectors/packet-tpkt.h
@@ -447,15 +425,6 @@ include/wireshark/epan/dissectors/packet
 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
@@ -516,7 +485,7 @@ include/wireshark/epan/req_resp_hdrs.h
 include/wireshark/epan/rtd_table.h
 include/wireshark/epan/rtp_pt.h
 include/wireshark/epan/sctpppids.h
-include/wireshark/epan/sequence_analysis.h
+include/wireshark/epan/secrets.h
 include/wireshark/epan/show_exception.h
 include/wireshark/epan/slow_protocol_subtypes.h
 include/wireshark/epan/sminmpec.h
@@ -561,25 +530,25 @@ include/wireshark/epan/xdlc.h
 include/wireshark/file.h
 include/wireshark/globals.h
 include/wireshark/log.h
+include/wireshark/version_info.h
 include/wireshark/wiretap/file_wrappers.h
 include/wireshark/wiretap/merge.h
 include/wireshark/wiretap/pcap-encap.h
 include/wireshark/wiretap/pcapng_module.h
+include/wireshark/wiretap/secrets-types.h
 include/wireshark/wiretap/wtap.h
 include/wireshark/wiretap/wtap_opttypes.h
 include/wireshark/ws_attributes.h
 include/wireshark/ws_compiler_tests.h
 include/wireshark/ws_diag_control.h
 include/wireshark/ws_symbol_export.h
+include/wireshark/ws_version.h
 include/wireshark/wsutil/adler32.h
 include/wireshark/wsutil/base32.h
-include/wireshark/wsutil/base64.h
 include/wireshark/wsutil/bits_count_ones.h
 include/wireshark/wsutil/bits_ctz.h
 include/wireshark/wsutil/bitswap.h
 include/wireshark/wsutil/buffer.h
-include/wireshark/wsutil/clopts_common.h
-include/wireshark/wsutil/cmdarg_err.h
 include/wireshark/wsutil/color.h
 include/wireshark/wsutil/copyright_info.h
 include/wireshark/wsutil/cpu_info.h
@@ -592,17 +561,19 @@ include/wireshark/wsutil/crc32.h
 include/wireshark/wsutil/crc6.h
 include/wireshark/wsutil/crc7.h
 include/wireshark/wsutil/crc8.h
+include/wireshark/wsutil/curve25519.h
 include/wireshark/wsutil/eax.h
 include/wireshark/wsutil/filesystem.h
 include/wireshark/wsutil/frequency-utils.h
 include/wireshark/wsutil/g711.h
-include/wireshark/wsutil/glib-compat.h
 include/wireshark/wsutil/inet_addr.h
 include/wireshark/wsutil/inet_ipv4.h
 include/wireshark/wsutil/inet_ipv6.h
 include/wireshark/wsutil/interface.h
 include/wireshark/wsutil/jsmn.h
+include/wireshark/wsutil/json_dumper.h
 include/wireshark/wsutil/mpeg-audio.h
+include/wireshark/wsutil/netlink.h
 include/wireshark/wsutil/nstime.h
 include/wireshark/wsutil/os_version_info.h
 include/wireshark/wsutil/pint.h
@@ -611,7 +582,6 @@ include/wireshark/wsutil/pow2.h
 include/wireshark/wsutil/privileges.h
 include/wireshark/wsutil/processes.h
 include/wireshark/wsutil/report_message.h
-include/wireshark/wsutil/rsa.h
 include/wireshark/wsutil/sign_ext.h
 include/wireshark/wsutil/sober128.h
 include/wireshark/wsutil/socket.h
@@ -628,35 +598,49 @@ 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/wsjson.h
 include/wireshark/wsutil/xtea.h
-lib/libwireshark.la
-lib/libwiretap.la
-lib/libwscodecs.la
-lib/libwsutil.la
+lib/libwireshark.so
+lib/libwireshark.so.12
+lib/libwireshark.so.12.0.1
+lib/libwiretap.so
+lib/libwiretap.so.9
+lib/libwiretap.so.9.0.1
+lib/libwscodecs.so
+lib/libwscodecs.so.2
+lib/libwscodecs.so.2.0.0
+lib/libwsutil.so
+lib/libwsutil.so.10
+lib/libwsutil.so.10.0.0
 lib/pkgconfig/wireshark.pc
+lib/wireshark/cmake/FindGLIB2.cmake
+lib/wireshark/cmake/FindWSWinLibs.cmake
+lib/wireshark/cmake/LocatePythonModule.cmake
+lib/wireshark/cmake/UseAsn2Wrs.cmake
+lib/wireshark/cmake/UseMakePluginReg.cmake
+lib/wireshark/cmake/WiresharkConfig.cmake
+lib/wireshark/cmake/WiresharkConfigVersion.cmake
+lib/wireshark/cmake/WiresharkTargets-release.cmake
+lib/wireshark/cmake/WiresharkTargets.cmake
 lib/wireshark/extcap/androiddump
 lib/wireshark/extcap/ciscodump
 lib/wireshark/extcap/randpktdump
 lib/wireshark/extcap/sshdump
 lib/wireshark/extcap/udpdump
-lib/wireshark/plugins/2.6/codecs/l16mono.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/usbdump.la
+lib/wireshark/plugins/3.0/codecs/l16mono.so
+lib/wireshark/plugins/3.0/epan/ethercat.so
+lib/wireshark/plugins/3.0/epan/gryphon.so
+lib/wireshark/plugins/3.0/epan/irda.so
+lib/wireshark/plugins/3.0/epan/mate.so
+lib/wireshark/plugins/3.0/epan/opcua.so
+lib/wireshark/plugins/3.0/epan/profinet.so
+lib/wireshark/plugins/3.0/epan/stats_tree.so
+lib/wireshark/plugins/3.0/epan/transum.so
+lib/wireshark/plugins/3.0/epan/unistim.so
+lib/wireshark/plugins/3.0/epan/wimax.so
+lib/wireshark/plugins/3.0/epan/wimaxasncp.so
+lib/wireshark/plugins/3.0/epan/wimaxmacphy.so
+lib/wireshark/plugins/3.0/wiretap/usbdump.so
 man/man1/androiddump.1
 man/man1/capinfos.1
 man/man1/captype.1
@@ -665,6 +649,7 @@ 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
@@ -673,12 +658,31 @@ man/man1/sshdump.1
 man/man1/text2pcap.1
 man/man1/tshark.1
 man/man1/udpdump.1
-${PLIST.mans}man/man1/wireshark.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-gtk.desktop
 ${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
 ${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-vnd.tcpdump.pcap.png
 ${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-wireshark-doc.png
@@ -760,11 +764,12 @@ share/wireshark/extcap.html
 share/wireshark/help/capture_filters.txt
 share/wireshark/help/capturing.txt
 share/wireshark/help/display_filters.txt
-share/wireshark/help/faq.txt
+share/wireshark/help/faq.py
 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
@@ -772,6 +777,7 @@ share/wireshark/pdml2html.xsl
 share/wireshark/profiles/Bluetooth/colorfilters
 share/wireshark/profiles/Bluetooth/preferences
 share/wireshark/profiles/Classic/colorfilters
+share/wireshark/profiles/No Reassembly/preferences
 share/wireshark/radius/README.radius_dictionary
 share/wireshark/radius/custom.includes
 share/wireshark/radius/dictionary
@@ -961,6 +967,7 @@ share/wireshark/radius/dictionary.unix
 share/wireshark/radius/dictionary.usr
 share/wireshark/radius/dictionary.utstarcom
 share/wireshark/radius/dictionary.valemount
+share/wireshark/radius/dictionary.verizon
 share/wireshark/radius/dictionary.versanet
 share/wireshark/radius/dictionary.vqp
 share/wireshark/radius/dictionary.walabi

Index: pkgsrc/net/wireshark/distinfo
diff -u pkgsrc/net/wireshark/distinfo:1.118 pkgsrc/net/wireshark/distinfo:1.119
--- pkgsrc/net/wireshark/distinfo:1.118 Thu Mar  7 10:39:52 2019
+++ pkgsrc/net/wireshark/distinfo       Mon May  6 09:36:47 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.118 2019/03/07 10:39:52 adam Exp $
+$NetBSD: distinfo,v 1.119 2019/05/06 09:36:47 adam Exp $
 
-SHA1 (wireshark-2.6.7.tar.xz) = 6d601a140b369618e5ac3acab736a1b8de8d5432
-RMD160 (wireshark-2.6.7.tar.xz) = 4d27f7d67a9b8d11270c6fcf135eb5ad7648d462
-SHA512 (wireshark-2.6.7.tar.xz) = bd0f87debd8bd8947f386aaec9fc843148e3cdfbffc28ba499526c4053732becea606061deae6799da0cf52458fba840ba0ff8e4a034a671fa876b8a0ff25677
-Size (wireshark-2.6.7.tar.xz) = 28420060 bytes
+SHA1 (wireshark-3.0.1.tar.xz) = 33b880fb76b356dce4713a207c0bb9624f9b2c43
+RMD160 (wireshark-3.0.1.tar.xz) = 27ed3498a1e9a89706c1461736219c4ae4b08085
+SHA512 (wireshark-3.0.1.tar.xz) = 59c3f36e4e7a1a7ea8f926dbf8ca495f83346396e1df5edf6a1bb34823c84308f52a1b6d46be9675d3af9ce8718da4a574f63a4fb210d8fc52131f4534d8670d
+Size (wireshark-3.0.1.tar.xz) = 30903792 bytes
+SHA1 (patch-CMakeLists.txt) = c78289d6ded796674b947d6bddd0ba9749ab4569

Index: pkgsrc/net/wireshark/options.mk
diff -u pkgsrc/net/wireshark/options.mk:1.22 pkgsrc/net/wireshark/options.mk:1.23
--- pkgsrc/net/wireshark/options.mk:1.22        Mon Dec  3 15:35:15 2018
+++ pkgsrc/net/wireshark/options.mk     Mon May  6 09:36:47 2019
@@ -1,99 +1,62 @@
-# $NetBSD: options.mk,v 1.22 2018/12/03 15:35:15 adam Exp $
+# $NetBSD: options.mk,v 1.23 2019/05/06 09:36:47 adam Exp $
 
-PKG_OPTIONS_VAR=               PKG_OPTIONS.wireshark
-PKG_SUPPORTED_OPTIONS=         gtk3 http2 lua
-PKG_OPTIONS_OPTIONAL_GROUPS=   qt
-PKG_OPTIONS_GROUP.qt=          qt4 qt5
-PKG_SUGGESTED_OPTIONS=         qt5 lua
+PKG_OPTIONS_VAR=       PKG_OPTIONS.wireshark
+PKG_SUPPORTED_OPTIONS= http2 lua qt5
+PKG_SUGGESTED_OPTIONS= qt5 lua
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           gtk3 icons lua mans qt
+PLIST_VARS+=           icons lua qt
 
-.if empty(PKG_OPTIONS:Mqt4) && empty(PKG_OPTIONS:Mqt5)
-CONFIGURE_ARGS+=       --without-qt
+.if !empty(PKG_OPTIONS:Mhttp2)
+.  include "../../www/nghttp2/buildlink3.mk"
 .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
-.    include "../../x11/qt5-qttools/buildlink3.mk"
-.    if ${OPSYS} == "Darwin"
-.      include "../../x11/qt5-qtmacextras/buildlink3.mk"
-.    else
-.      include "../../x11/qt5-qtx11extras/buildlink3.mk"
-.    endif
-.  endif
-CONFIGURE_ENV+=                LRELEASE=${QTDIR}/bin/lrelease
-CONFIGURE_ENV+=                MOC=${QTDIR}/bin/moc
-CONFIGURE_ENV+=                RCC=${QTDIR}/bin/rcc
-CONFIGURE_ENV+=                UIC=${QTDIR}/bin/uic
-PLIST.qt=              yes
+CMAKE_ARGS+=           -DENABLE_NGHTTP2=OFF
 .endif
 
-.if !empty(PKG_OPTIONS:Mgtk3)
-CONFIGURE_ARGS+=       --with-gtk=3
-PLIST.gtk3=            yes
-POST_INSTALL_TARGETS+= install-gtk-desktop
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../graphics/adwaita-icon-theme/buildlink3.mk"
-
-.PHONY: install-gtk-desktop
-install-gtk-desktop:
-       ${INSTALL_DATA} ${WRKSRC}/wireshark.desktop \
-               ${DESTDIR}${PREFIX}/share/applications/
-
+.if !empty(PKG_OPTIONS:Mlua)
+LUA_VERSIONS_INCOMPATIBLE=     53
+.  include "../../lang/lua/buildlink3.mk"
+PLIST.lua=             yes
 .else
-CONFIGURE_ARGS+=       --without-gtk
+CMAKE_ARGS+=           -DENABLE_LUA=OFF
 .endif
 
-.if empty(PKG_OPTIONS:Mgtk3) && empty(PKG_OPTIONS:Mqt4) && empty(PKG_OPTIONS:Mqt5)
-CONFIGURE_ARGS+=       --disable-wireshark
-.else
-CONFIGURE_ARGS+=       --enable-wireshark
-PLIST.mans=            yes
-INSTALLATION_DIRS+=    share/applications
+.if !empty(PKG_OPTIONS:Mqt5)
+.  include "../../x11/qt5-qtsvg/buildlink3.mk"
+.  include "../../x11/qt5-qttools/buildlink3.mk"
+PLIST.qt=              yes
+.  if ${OPSYS} == "Darwin"
+.    include "../../x11/qt5-qtmacextras/buildlink3.mk"
+.  else
 PLIST.icons=           yes
+.    include "../../x11/qt5-qtx11extras/buildlink3.mk"
 POST_INSTALL_TARGETS+= install-icons
+INSTALLATION_DIRS+=    share/applications
 INSTALLATION_DIRS+=    share/icons/hicolor/scalable/apps
 ICON_SIZES=            16 32 48
 MIMEICON_SIZES=                16 24 32 48 64 128 256
 
-.  for d in ${ICON_SIZES}
+.    for d in ${ICON_SIZES}
 INSTALLATION_DIRS+=    share/icons/hicolor/${d}x${d}/apps
-.  endfor
+.    endfor
 
-.  for d in ${MIMEICON_SIZES}
+.    for d in ${MIMEICON_SIZES}
 INSTALLATION_DIRS+=    share/icons/hicolor/${d}x${d}/mimetypes
-.  endfor
+.    endfor
 
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.    include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.    include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 
 .PHONY: install-icons
 install-icons:
        ${INSTALL_DATA} ${WRKSRC}/image/wsicon.svg \
                ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wireshark.svg
-.  for d in ${MIMEICON_SIZES}
+.    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
-.  endfor
-.endif
-
-.if !empty(PKG_OPTIONS:Mlua)
-LUA_VERSIONS_INCOMPATIBLE=     53
-.include "../../lang/lua/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-lua=yes
-PLIST.lua=             yes
-.else
-CONFIGURE_ARGS+=       --with-lua=no
-.endif
-
-.if !empty(PKG_OPTIONS:Mhttp2)
-.include "../../www/nghttp2/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-nghttp2
+.    endfor
+.  endif
 .else
-CONFIGURE_ARGS+=       --without-nghttp2
+CMAKE_ARGS+=           -DBUILD_wireshark=OFF
 .endif

Added files:

Index: pkgsrc/net/wireshark/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/net/wireshark/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Mon May  6 09:36:47 2019
+++ pkgsrc/net/wireshark/patches/patch-CMakeLists.txt   Mon May  6 09:36:47 2019
@@ -0,0 +1,61 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2019/05/06 09:36:47 adam Exp $
+
+Do not make application bundle on Darwin.
+Store correct version number in version.h.
+Avoid
+       CMake Error at CMakeLists.txt:3021 (install):
+       install FILES given directory
+       "${WRKDIR}/.buildlink/cmake-Modules" to install.
+
+--- CMakeLists.txt.orig        2019-04-08 18:39:58.000000000 +0000
++++ CMakeLists.txt
+@@ -1319,7 +1319,7 @@ else ()
+       set(EXTCAP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/extcap" CACHE INTERNAL "The extcap dir")
+ endif()
+ 
+-if(APPLE)
++if(APPLE AND ENABLE_APPLICATION_BUNDLE)
+       #
+       # As https://developer.apple.com/library/archive/technotes/tn2206/_index.html
+       # says,
+@@ -1462,9 +1462,7 @@ gmx_test_large_files(GMX_LARGEFILES)
+ set( VERSION ${PROJECT_VERSION} )
+ add_custom_target(version
+       BYPRODUCTS version.h
+-      COMMAND ${PERL_EXECUTABLE}
+-              ${CMAKE_SOURCE_DIR}/tools/make-version.pl
+-              ${CMAKE_SOURCE_DIR}
++      COMMAND ${CMAKE_COMMAND} -E echo '\#define VCSVERSION \"${VERSION}\"' > ${CMAKE_BINARY_DIR}/version.h
+ )
+ set_target_properties(version PROPERTIES FOLDER "Auxiliary")
+ 
+@@ -2229,7 +2227,11 @@ if(BUILD_wireshark AND QT_FOUND)
+               $<$<BOOL:${WIN32}>:UxTheme.lib>
+       )
+ 
+-      add_executable(wireshark WIN32 MACOSX_BUNDLE ${wireshark_FILES} ${EXTRA_BUNDLE_FILES})
++      if(ENABLE_APPLICATION_BUNDLE)
++              add_executable(wireshark WIN32 MACOSX_BUNDLE ${wireshark_FILES} ${EXTRA_BUNDLE_FILES})
++      else()
++              add_executable(wireshark WIN32 ${wireshark_FILES} ${EXTRA_BUNDLE_FILES})
++      endif()
+       set(PROGLIST ${PROGLIST} wireshark)
+       set_target_properties(wireshark PROPERTIES
+               LINK_FLAGS "${WS_LINK_FLAGS}"
+@@ -3022,11 +3024,11 @@ endif()
+ 
+ install(
+       FILES
+-              ${CMAKE_MODULE_PATH}/FindGLIB2.cmake
+-              ${CMAKE_MODULE_PATH}/FindWSWinLibs.cmake
+-              ${CMAKE_MODULE_PATH}/UseAsn2Wrs.cmake
+-              ${CMAKE_MODULE_PATH}/LocatePythonModule.cmake
+-              ${CMAKE_MODULE_PATH}/UseMakePluginReg.cmake
++              cmake/modules/FindGLIB2.cmake
++              cmake/modules/FindWSWinLibs.cmake
++              cmake/modules/UseAsn2Wrs.cmake
++              cmake/modules/LocatePythonModule.cmake
++              cmake/modules/UseMakePluginReg.cmake
+       DESTINATION
+               ${WIRESHARK_INSTALL_CMAKEDIR}
+ )

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/www/nginx
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/www/nginx
Indexes:

Home | Main Index | Thread Index | Old Index