Mon May 6 09:36:47 2019 UTC ()
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窶冱 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窶冱 codesigning certificate. Bug 15667.

3.0.0:

Many user interface improvements have been made. See the 窶廸ew and Updated Features窶� section below for more details.

Support for a number of legacy features and libraries has been removed. See the 窶彝emoved 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 窶廴ap窶� button in the 窶廢ndpoints窶� 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窶决e 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 窶廚apture 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 窶彝eassemble out-of-order segments窶� preference to fix dissection and decryption issues in case TCP segments are received out-of-order. See the User窶冱 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 窶彙ootp.dhcp窶�, the old 窶彙ootp.*窶� 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 窶徭sl.*窶� 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窶冱 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 窶廸o 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窶冱 -z compare option was removed.
Building with Cygwin is no longer supported on Windows.


(adam)
diff -r1.5 -r1.6 pkgsrc/net/wireshark/DESCR
diff -r1.208 -r1.209 pkgsrc/net/wireshark/Makefile
diff -r1.39 -r1.40 pkgsrc/net/wireshark/PLIST
diff -r1.118 -r1.119 pkgsrc/net/wireshark/distinfo
diff -r1.22 -r1.23 pkgsrc/net/wireshark/options.mk
diff -r0 -r1.1 pkgsrc/net/wireshark/patches/patch-CMakeLists.txt

cvs diff -r1.5 -r1.6 pkgsrc/net/wireshark/DESCR (expand / switch to unified diff)

--- pkgsrc/net/wireshark/DESCR 2016/03/03 13:33:14 1.5
+++ pkgsrc/net/wireshark/DESCR 2019/05/06 09:36:47 1.6
@@ -1,13 +1,11 @@ @@ -1,13 +1,11 @@
1Wireshark is a network traffic analyzer, or "sniffer", for Unix and 1Wireshark is a network traffic analyzer, or "sniffer", for Unix and
2Unix-like operating systems. It uses GTK+, a graphical user interface 2Unix-like operating systems. It uses GTK+, a graphical user interface
3library, and libpcap, a packet capture and filtering library. 3library, and libpcap, a packet capture and filtering library.
4 4
5The Wireshark distribution also comes with TShark, which is a 5The Wireshark distribution also comes with TShark, which is a
6line-oriented sniffer (similar to Sun's snoop, or tcpdump) that uses the 6line-oriented sniffer (similar to Sun's snoop, or tcpdump) that uses the
7same dissection, capture-file reading and writing, and packet filtering 7same dissection, capture-file reading and writing, and packet filtering
8code as Wireshark, and with editcap, which is a program to read capture 8code as Wireshark, and with editcap, which is a program to read capture
9files and write the packets from that capture file, possibly in a 9files and write the packets from that capture file, possibly in a
10different capture file format, and with some packets possibly removed 10different capture file format, and with some packets possibly removed
11from the capture. 11from the capture.
12 
13This package tracks version 2 stable branch. 

cvs diff -r1.208 -r1.209 pkgsrc/net/wireshark/Makefile (expand / switch to unified diff)

--- pkgsrc/net/wireshark/Makefile 2019/05/05 16:44:05 1.208
+++ pkgsrc/net/wireshark/Makefile 2019/05/06 09:36:47 1.209
@@ -1,83 +1,82 @@ @@ -1,83 +1,82 @@
1# $NetBSD: Makefile,v 1.208 2019/05/05 16:44:05 rhialto Exp $ 1# $NetBSD: Makefile,v 1.209 2019/05/06 09:36:47 adam Exp $
2 2
3DISTNAME= wireshark-2.6.7 3DISTNAME= wireshark-3.0.1
4PKGREVISION= 2 
5CATEGORIES= net 4CATEGORIES= net
6MASTER_SITES= https://www.wireshark.org/download/src/ 5MASTER_SITES= https://www.wireshark.org/download/src/
7EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.wireshark.org/ 9HOMEPAGE= https://www.wireshark.org/
11COMMENT= Network protocol analyzer 10COMMENT= Network protocol analyzer
12LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
13 12
14CONFLICTS+= ethereal-[0-9]* 13CONFLICTS+= ethereal-[0-9]*
 14
 15USE_CMAKE= yes
 16CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
 17CMAKE_ARGS+= -DENABLE_APPLICATION_BUNDLE=OFF
 18CMAKE_ARG_PATH= ..
 19CONFIGURE_DIRS= build
15 20
16USE_LANGUAGES= c c++ 21USE_LANGUAGES= c c++
17USE_LIBTOOL= yes 
18USE_TOOLS+= gmake perl pkg-config yacc lex 22USE_TOOLS+= gmake perl pkg-config yacc lex
19GNU_CONFIGURE= yes 
20CONFIGURE_ARGS+= --enable-static=no 
21CONFIGURE_ARGS+= --disable-guides 
22CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap} 
23CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 
24CONFIGURE_ENV+= ac_cv_path_YACCDUMMY=${TOOLS_PATH.yacc} 
25CONFIGURE_ENV+= ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex} 
26PKGCONFIG_OVERRIDE+= wireshark.pc.in 23PKGCONFIG_OVERRIDE+= wireshark.pc.in
27SHLIBTOOL_OVERRIDE= # empty 
28 24
29CHECK_PORTABILITY_SKIP+= packaging/macosx/*/* 25CHECK_PORTABILITY_SKIP+= packaging/macosx/*/*
30 26
31PTHREAD_OPTS+= require 27PTHREAD_OPTS+= require
32 28
 29PYTHON_VERSIONS_INCOMPATIBLE= 27 # Python 2.7 is not supported
33PYTHON_FOR_BUILD_ONLY= yes 30PYTHON_FOR_BUILD_ONLY= yes
34REPLACE_PYTHON+= help/faq.py 31REPLACE_PYTHON+= help/faq.py
35REPLACE_PYTHON+= tools/asn2deb 32REPLACE_PYTHON+= tools/asn2deb
36REPLACE_PYTHON+= tools/asn2wrs.py 33REPLACE_PYTHON+= tools/asn2wrs.py
37REPLACE_PYTHON+= tools/dfilter-test.py 
38REPLACE_PYTHON+= tools/ftsanity.py 
39REPLACE_PYTHON+= tools/html2text.py 34REPLACE_PYTHON+= tools/html2text.py
40REPLACE_PYTHON+= tools/idl2deb 35REPLACE_PYTHON+= tools/idl2deb
41REPLACE_PYTHON+= tools/indexcap.py 36REPLACE_PYTHON+= tools/indexcap.py
42REPLACE_PYTHON+= tools/msnchat 37REPLACE_PYTHON+= tools/msnchat
43REPLACE_PYTHON+= tools/ncp2222.py 38REPLACE_PYTHON+= tools/ncp2222.py
44REPLACE_PYTHON+= tools/netscreen2dump.py 39REPLACE_PYTHON+= tools/netscreen2dump.py
45REPLACE_PYTHON+= tools/pkt-from-core.py 40REPLACE_PYTHON+= tools/pkt-from-core.py
46REPLACE_PYTHON+= tools/rdps.py 41REPLACE_PYTHON+= tools/rdps.py
47 42
 43pre-configure:
 44 ${MKDIR} ${WRKSRC}/build
 45
48.include "../../mk/bsd.prefs.mk" 46.include "../../mk/bsd.prefs.mk"
49.include "options.mk" 47.include "options.mk"
50 48
51.if !empty(MACHINE_PLATFORM:MDarwin-[567].*-*) 49.if !empty(MACHINE_PLATFORM:MDarwin-[567].*-*)
52USE_BUILTIN.libpcap= no 50USE_BUILTIN.libpcap= no
53.endif 51.endif
54 52
55# Extra post install targets are in options.mk 53# Extra post install targets are in options.mk
56post-install: ${POST_INSTALL_TARGETS} 54post-install: ${POST_INSTALL_TARGETS}
57 55
58# wireshark no longer builds with NetBSD 3.x provided zlib 56# wireshark no longer builds with NetBSD 3.x provided zlib
59BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.1 57BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.1
60 58
61# wireshark uses gdk_pixbuf_new_from_inline which is deprecated, but asks 59# wireshark uses gdk_pixbuf_new_from_inline which is deprecated, but asks
62# to hide deprecated prototypes. This leads to pointer truncation. 60# to hide deprecated prototypes. This leads to pointer truncation.
63# gui_utils.c:514:12: warning: incompatible integer to pointer conversion 61# gui_utils.c:514:12: warning: incompatible integer to pointer conversion
64# assigning to 'GdkPixbuf *' (aka 'struct _GdkPixbuf *') from 'int' 62# assigning to 'GdkPixbuf *' (aka 'struct _GdkPixbuf *') from 'int'
65# [-Wint-conversion] 63# [-Wint-conversion]
66BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DISABLE_DEPRECATED 64BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
67 65
68.include "../../archivers/lz4/buildlink3.mk" 66.include "../../archivers/lz4/buildlink3.mk"
69.include "../../devel/glib2/buildlink3.mk" 67.include "../../devel/glib2/buildlink3.mk"
70.include "../../devel/libsmi/buildlink3.mk" 68.include "../../devel/libsmi/buildlink3.mk"
71.include "../../devel/pcre/buildlink3.mk" 69.include "../../devel/pcre/buildlink3.mk"
72.include "../../devel/snappy/buildlink3.mk" 70.include "../../devel/snappy/buildlink3.mk"
73.include "../../devel/zlib/buildlink3.mk" 71.include "../../devel/zlib/buildlink3.mk"
 72.include "../../geography/libmaxminddb/buildlink3.mk"
74.include "../../lang/python/application.mk" 73.include "../../lang/python/application.mk"
75.include "../../net/libcares/buildlink3.mk" 74.include "../../net/libcares/buildlink3.mk"
76.include "../../net/libpcap/buildlink3.mk" 75.include "../../net/libpcap/buildlink3.mk"
77.include "../../security/gnutls/buildlink3.mk" 76.include "../../security/gnutls/buildlink3.mk"
78.include "../../security/libgcrypt/buildlink3.mk" 77.include "../../security/libgcrypt/buildlink3.mk"
79.include "../../security/libssh/buildlink3.mk" 78.include "../../security/libssh/buildlink3.mk"
80.include "../../textproc/libxml2/buildlink3.mk" 79.include "../../textproc/libxml2/buildlink3.mk"
81.include "../../mk/krb5.buildlink3.mk" 80.include "../../mk/krb5.buildlink3.mk"
82.include "../../mk/pthread.buildlink3.mk" 81.include "../../mk/pthread.buildlink3.mk"
83.include "../../mk/bsd.pkg.mk" 82.include "../../mk/bsd.pkg.mk"

cvs diff -r1.39 -r1.40 pkgsrc/net/wireshark/PLIST (expand / switch to unified diff)

--- pkgsrc/net/wireshark/PLIST 2018/12/03 15:35:15 1.39
+++ pkgsrc/net/wireshark/PLIST 2019/05/06 09:36:47 1.40
@@ -1,29 +1,30 @@ @@ -1,29 +1,30 @@
1@comment $NetBSD: PLIST,v 1.39 2018/12/03 15:35:15 adam Exp $ 1@comment $NetBSD: PLIST,v 1.40 2019/05/06 09:36:47 adam Exp $
2bin/capinfos 2bin/capinfos
3bin/captype 3bin/captype
4bin/dumpcap 4bin/dumpcap
5bin/editcap 5bin/editcap
6bin/idl2wrs 6bin/idl2wrs
7bin/mergecap 7bin/mergecap
 8bin/mmdbresolve
8bin/randpkt 9bin/randpkt
9bin/rawshark 10bin/rawshark
10bin/reordercap 11bin/reordercap
11bin/sharkd 12bin/sharkd
12bin/text2pcap 13bin/text2pcap
13bin/tshark 14bin/tshark
14${PLIST.qt}bin/wireshark 15${PLIST.qt}bin/wireshark
15${PLIST.gtk3}bin/wireshark-gtk 
16include/wireshark/cfile.h 16include/wireshark/cfile.h
 17include/wireshark/cli_main.h
17include/wireshark/codecs/codecs.h 18include/wireshark/codecs/codecs.h
18include/wireshark/epan/addr_and_mask.h 19include/wireshark/epan/addr_and_mask.h
19include/wireshark/epan/addr_resolv.h 20include/wireshark/epan/addr_resolv.h
20include/wireshark/epan/address.h 21include/wireshark/epan/address.h
21include/wireshark/epan/address_types.h 22include/wireshark/epan/address_types.h
22include/wireshark/epan/afn.h 23include/wireshark/epan/afn.h
23include/wireshark/epan/aftypes.h 24include/wireshark/epan/aftypes.h
24include/wireshark/epan/app_mem_usage.h 25include/wireshark/epan/app_mem_usage.h
25include/wireshark/epan/arcnet_pids.h 26include/wireshark/epan/arcnet_pids.h
26include/wireshark/epan/arptypes.h 27include/wireshark/epan/arptypes.h
27include/wireshark/epan/asn1.h 28include/wireshark/epan/asn1.h
28include/wireshark/epan/ax25_pids.h 29include/wireshark/epan/ax25_pids.h
29include/wireshark/epan/bridged_pids.h 30include/wireshark/epan/bridged_pids.h
@@ -39,27 +40,27 @@ include/wireshark/epan/conversation.h @@ -39,27 +40,27 @@ include/wireshark/epan/conversation.h
39include/wireshark/epan/conversation_debug.h 40include/wireshark/epan/conversation_debug.h
40include/wireshark/epan/conversation_table.h 41include/wireshark/epan/conversation_table.h
41include/wireshark/epan/crc10-tvb.h 42include/wireshark/epan/crc10-tvb.h
42include/wireshark/epan/crc16-tvb.h 43include/wireshark/epan/crc16-tvb.h
43include/wireshark/epan/crc32-tvb.h 44include/wireshark/epan/crc32-tvb.h
44include/wireshark/epan/crc6-tvb.h 45include/wireshark/epan/crc6-tvb.h
45include/wireshark/epan/crc8-tvb.h 46include/wireshark/epan/crc8-tvb.h
46include/wireshark/epan/decode_as.h 47include/wireshark/epan/decode_as.h
47include/wireshark/epan/dfilter/dfilter.h 48include/wireshark/epan/dfilter/dfilter.h
48include/wireshark/epan/dfilter/drange.h 49include/wireshark/epan/dfilter/drange.h
49include/wireshark/epan/diam_dict.h 50include/wireshark/epan/diam_dict.h
50include/wireshark/epan/disabled_protos.h 51include/wireshark/epan/disabled_protos.h
51include/wireshark/epan/dissector_filters.h 52include/wireshark/epan/dissector_filters.h
52include/wireshark/epan/dissectors/dissectors.h 53include/wireshark/epan/dissectors/file-rbm.h
53include/wireshark/epan/dissectors/packet-6lowpan.h 54include/wireshark/epan/dissectors/packet-6lowpan.h
54include/wireshark/epan/dissectors/packet-a21.h 55include/wireshark/epan/dissectors/packet-a21.h
55include/wireshark/epan/dissectors/packet-acp133.h 56include/wireshark/epan/dissectors/packet-acp133.h
56include/wireshark/epan/dissectors/packet-acse.h 57include/wireshark/epan/dissectors/packet-acse.h
57include/wireshark/epan/dissectors/packet-actrace.h 58include/wireshark/epan/dissectors/packet-actrace.h
58include/wireshark/epan/dissectors/packet-adb_service.h 59include/wireshark/epan/dissectors/packet-adb_service.h
59include/wireshark/epan/dissectors/packet-afp.h 60include/wireshark/epan/dissectors/packet-afp.h
60include/wireshark/epan/dissectors/packet-alcap.h 61include/wireshark/epan/dissectors/packet-alcap.h
61include/wireshark/epan/dissectors/packet-ansi_a.h 62include/wireshark/epan/dissectors/packet-ansi_a.h
62include/wireshark/epan/dissectors/packet-ansi_map.h 63include/wireshark/epan/dissectors/packet-ansi_map.h
63include/wireshark/epan/dissectors/packet-ansi_tcap.h 64include/wireshark/epan/dissectors/packet-ansi_tcap.h
64include/wireshark/epan/dissectors/packet-arp.h 65include/wireshark/epan/dissectors/packet-arp.h
65include/wireshark/epan/dissectors/packet-atalk.h 66include/wireshark/epan/dissectors/packet-atalk.h
@@ -83,73 +84,52 @@ include/wireshark/epan/dissectors/packet @@ -83,73 +84,52 @@ include/wireshark/epan/dissectors/packet
83include/wireshark/epan/dissectors/packet-bthci_sco.h 84include/wireshark/epan/dissectors/packet-bthci_sco.h
84include/wireshark/epan/dissectors/packet-btl2cap.h 85include/wireshark/epan/dissectors/packet-btl2cap.h
85include/wireshark/epan/dissectors/packet-btle.h 86include/wireshark/epan/dissectors/packet-btle.h
86include/wireshark/epan/dissectors/packet-btrfcomm.h 87include/wireshark/epan/dissectors/packet-btrfcomm.h
87include/wireshark/epan/dissectors/packet-btsdp.h 88include/wireshark/epan/dissectors/packet-btsdp.h
88include/wireshark/epan/dissectors/packet-c1222.h 89include/wireshark/epan/dissectors/packet-c1222.h
89include/wireshark/epan/dissectors/packet-camel.h 90include/wireshark/epan/dissectors/packet-camel.h
90include/wireshark/epan/dissectors/packet-cdt.h 91include/wireshark/epan/dissectors/packet-cdt.h
91include/wireshark/epan/dissectors/packet-cell_broadcast.h 92include/wireshark/epan/dissectors/packet-cell_broadcast.h
92include/wireshark/epan/dissectors/packet-charging_ase.h 93include/wireshark/epan/dissectors/packet-charging_ase.h
93include/wireshark/epan/dissectors/packet-chdlc.h 94include/wireshark/epan/dissectors/packet-chdlc.h
94include/wireshark/epan/dissectors/packet-cip.h 95include/wireshark/epan/dissectors/packet-cip.h
95include/wireshark/epan/dissectors/packet-cipsafety.h 96include/wireshark/epan/dissectors/packet-cipsafety.h
96include/wireshark/epan/dissectors/packet-clearcase.h 
97include/wireshark/epan/dissectors/packet-cmip.h 97include/wireshark/epan/dissectors/packet-cmip.h
98include/wireshark/epan/dissectors/packet-cmp.h 98include/wireshark/epan/dissectors/packet-cmp.h
99include/wireshark/epan/dissectors/packet-cms.h 99include/wireshark/epan/dissectors/packet-cms.h
100include/wireshark/epan/dissectors/packet-coap.h 100include/wireshark/epan/dissectors/packet-coap.h
101include/wireshark/epan/dissectors/packet-credssp.h 101include/wireshark/epan/dissectors/packet-credssp.h
102include/wireshark/epan/dissectors/packet-crmf.h 102include/wireshark/epan/dissectors/packet-crmf.h
103include/wireshark/epan/dissectors/packet-csn1.h 103include/wireshark/epan/dissectors/packet-csn1.h
104include/wireshark/epan/dissectors/packet-dap.h 104include/wireshark/epan/dissectors/packet-dap.h
105include/wireshark/epan/dissectors/packet-dcc.h 105include/wireshark/epan/dissectors/packet-dcc.h
106include/wireshark/epan/dissectors/packet-dccp.h 106include/wireshark/epan/dissectors/packet-dccp.h
107include/wireshark/epan/dissectors/packet-dcerpc-atsvc.h 
108include/wireshark/epan/dissectors/packet-dcerpc-browser.h 107include/wireshark/epan/dissectors/packet-dcerpc-browser.h
109include/wireshark/epan/dissectors/packet-dcerpc-budb.h 108include/wireshark/epan/dissectors/packet-dcerpc-budb.h
110include/wireshark/epan/dissectors/packet-dcerpc-butc.h 109include/wireshark/epan/dissectors/packet-dcerpc-butc.h
111include/wireshark/epan/dissectors/packet-dcerpc-clusapi.h 
112include/wireshark/epan/dissectors/packet-dcerpc-dce122.h 110include/wireshark/epan/dissectors/packet-dcerpc-dce122.h
113include/wireshark/epan/dissectors/packet-dcerpc-dcom.h 111include/wireshark/epan/dissectors/packet-dcerpc-dcom.h
114include/wireshark/epan/dissectors/packet-dcerpc-dfs.h 
115include/wireshark/epan/dissectors/packet-dcerpc-dnsserver.h 112include/wireshark/epan/dissectors/packet-dcerpc-dnsserver.h
116include/wireshark/epan/dissectors/packet-dcerpc-drsuapi.h 
117include/wireshark/epan/dissectors/packet-dcerpc-dssetup.h 
118include/wireshark/epan/dissectors/packet-dcerpc-efs.h 
119include/wireshark/epan/dissectors/packet-dcerpc-eventlog.h 
120include/wireshark/epan/dissectors/packet-dcerpc-frsapi.h 113include/wireshark/epan/dissectors/packet-dcerpc-frsapi.h
121include/wireshark/epan/dissectors/packet-dcerpc-frsrpc.h 114include/wireshark/epan/dissectors/packet-dcerpc-frsrpc.h
122include/wireshark/epan/dissectors/packet-dcerpc-frstrans.h 
123include/wireshark/epan/dissectors/packet-dcerpc-initshutdown.h 
124include/wireshark/epan/dissectors/packet-dcerpc-lsa.h 
125include/wireshark/epan/dissectors/packet-dcerpc-mapi.h 
126include/wireshark/epan/dissectors/packet-dcerpc-mdssvc.h 
127include/wireshark/epan/dissectors/packet-dcerpc-misc.h 
128include/wireshark/epan/dissectors/packet-dcerpc-netlogon.h 115include/wireshark/epan/dissectors/packet-dcerpc-netlogon.h
129include/wireshark/epan/dissectors/packet-dcerpc-nspi.h 
130include/wireshark/epan/dissectors/packet-dcerpc-nt.h 116include/wireshark/epan/dissectors/packet-dcerpc-nt.h
131include/wireshark/epan/dissectors/packet-dcerpc-pnp.h 117include/wireshark/epan/dissectors/packet-dcerpc-pnp.h
132include/wireshark/epan/dissectors/packet-dcerpc-rfr.h 
133include/wireshark/epan/dissectors/packet-dcerpc-rras.h 118include/wireshark/epan/dissectors/packet-dcerpc-rras.h
134include/wireshark/epan/dissectors/packet-dcerpc-samr.h 119include/wireshark/epan/dissectors/packet-dcerpc-samr.h
135include/wireshark/epan/dissectors/packet-dcerpc-spoolss.h 120include/wireshark/epan/dissectors/packet-dcerpc-spoolss.h
136include/wireshark/epan/dissectors/packet-dcerpc-srvsvc.h 
137include/wireshark/epan/dissectors/packet-dcerpc-svcctl.h 121include/wireshark/epan/dissectors/packet-dcerpc-svcctl.h
138include/wireshark/epan/dissectors/packet-dcerpc-tapi.h 122include/wireshark/epan/dissectors/packet-dcerpc-tapi.h
139include/wireshark/epan/dissectors/packet-dcerpc-winreg.h 
140include/wireshark/epan/dissectors/packet-dcerpc-witness.h 
141include/wireshark/epan/dissectors/packet-dcerpc-wkssvc.h 
142include/wireshark/epan/dissectors/packet-dcerpc-wzcsvc.h 
143include/wireshark/epan/dissectors/packet-dcerpc.h 123include/wireshark/epan/dissectors/packet-dcerpc.h
144include/wireshark/epan/dissectors/packet-dcom-dispatch.h 124include/wireshark/epan/dissectors/packet-dcom-dispatch.h
145include/wireshark/epan/dissectors/packet-dcom.h 125include/wireshark/epan/dissectors/packet-dcom.h
146include/wireshark/epan/dissectors/packet-diameter.h 126include/wireshark/epan/dissectors/packet-diameter.h
147include/wireshark/epan/dissectors/packet-diameter_3gpp.h 127include/wireshark/epan/dissectors/packet-diameter_3gpp.h
148include/wireshark/epan/dissectors/packet-diffserv-mpls-common.h 128include/wireshark/epan/dissectors/packet-diffserv-mpls-common.h
149include/wireshark/epan/dissectors/packet-disp.h 129include/wireshark/epan/dissectors/packet-disp.h
150include/wireshark/epan/dissectors/packet-dns.h 130include/wireshark/epan/dissectors/packet-dns.h
151include/wireshark/epan/dissectors/packet-docsis-tlv.h 131include/wireshark/epan/dissectors/packet-docsis-tlv.h
152include/wireshark/epan/dissectors/packet-dop.h 132include/wireshark/epan/dissectors/packet-dop.h
153include/wireshark/epan/dissectors/packet-dsp.h 133include/wireshark/epan/dissectors/packet-dsp.h
154include/wireshark/epan/dissectors/packet-dtls.h 134include/wireshark/epan/dissectors/packet-dtls.h
155include/wireshark/epan/dissectors/packet-dtn.h 135include/wireshark/epan/dissectors/packet-dtn.h
@@ -163,202 +143,202 @@ include/wireshark/epan/dissectors/packet @@ -163,202 +143,202 @@ include/wireshark/epan/dissectors/packet
163include/wireshark/epan/dissectors/packet-epl.h 143include/wireshark/epan/dissectors/packet-epl.h
164include/wireshark/epan/dissectors/packet-epmd.h 144include/wireshark/epan/dissectors/packet-epmd.h
165include/wireshark/epan/dissectors/packet-erf.h 145include/wireshark/epan/dissectors/packet-erf.h
166include/wireshark/epan/dissectors/packet-ess.h 146include/wireshark/epan/dissectors/packet-ess.h
167include/wireshark/epan/dissectors/packet-eth.h 147include/wireshark/epan/dissectors/packet-eth.h
168include/wireshark/epan/dissectors/packet-f5ethtrailer.h 148include/wireshark/epan/dissectors/packet-f5ethtrailer.h
169include/wireshark/epan/dissectors/packet-fc.h 149include/wireshark/epan/dissectors/packet-fc.h
170include/wireshark/epan/dissectors/packet-fcbls.h 150include/wireshark/epan/dissectors/packet-fcbls.h
171include/wireshark/epan/dissectors/packet-fcct.h 151include/wireshark/epan/dissectors/packet-fcct.h
172include/wireshark/epan/dissectors/packet-fcels.h 152include/wireshark/epan/dissectors/packet-fcels.h
173include/wireshark/epan/dissectors/packet-fcfcs.h 153include/wireshark/epan/dissectors/packet-fcfcs.h
174include/wireshark/epan/dissectors/packet-fcfzs.h 154include/wireshark/epan/dissectors/packet-fcfzs.h
175include/wireshark/epan/dissectors/packet-fclctl.h 155include/wireshark/epan/dissectors/packet-fclctl.h
176include/wireshark/epan/dissectors/packet-fcp.h 
177include/wireshark/epan/dissectors/packet-fcsb3.h 156include/wireshark/epan/dissectors/packet-fcsb3.h
178include/wireshark/epan/dissectors/packet-fcswils.h 157include/wireshark/epan/dissectors/packet-fcswils.h
179include/wireshark/epan/dissectors/packet-ff.h 158include/wireshark/epan/dissectors/packet-ff.h
180include/wireshark/epan/dissectors/packet-fix.h 159include/wireshark/epan/dissectors/packet-fix.h
181include/wireshark/epan/dissectors/packet-fmp.h 160include/wireshark/epan/dissectors/packet-fmp.h
182include/wireshark/epan/dissectors/packet-frame.h 161include/wireshark/epan/dissectors/packet-frame.h
183include/wireshark/epan/dissectors/packet-ftam.h 162include/wireshark/epan/dissectors/packet-ftam.h
 163include/wireshark/epan/dissectors/packet-geonw.h
184include/wireshark/epan/dissectors/packet-giop.h 164include/wireshark/epan/dissectors/packet-giop.h
185include/wireshark/epan/dissectors/packet-gluster.h 165include/wireshark/epan/dissectors/packet-gluster.h
186include/wireshark/epan/dissectors/packet-gmr1_common.h 166include/wireshark/epan/dissectors/packet-gmr1_common.h
187include/wireshark/epan/dissectors/packet-gmr1_rr.h 167include/wireshark/epan/dissectors/packet-gmr1_rr.h
188include/wireshark/epan/dissectors/packet-gnutella.h 
189include/wireshark/epan/dissectors/packet-gprscdr.h 168include/wireshark/epan/dissectors/packet-gprscdr.h
190include/wireshark/epan/dissectors/packet-gre.h 169include/wireshark/epan/dissectors/packet-gre.h
191include/wireshark/epan/dissectors/packet-gsm_a_common.h 170include/wireshark/epan/dissectors/packet-gsm_a_common.h
192include/wireshark/epan/dissectors/packet-gsm_a_rr.h 171include/wireshark/epan/dissectors/packet-gsm_a_rr.h
193include/wireshark/epan/dissectors/packet-gsm_map.h 172include/wireshark/epan/dissectors/packet-gsm_map.h
194include/wireshark/epan/dissectors/packet-gsm_rlcmac.h 173include/wireshark/epan/dissectors/packet-gsm_rlcmac.h
195include/wireshark/epan/dissectors/packet-gsm_sms.h 174include/wireshark/epan/dissectors/packet-gsm_sms.h
196include/wireshark/epan/dissectors/packet-gsmtap.h 175include/wireshark/epan/dissectors/packet-gsmtap.h
197include/wireshark/epan/dissectors/packet-gssapi.h 176include/wireshark/epan/dissectors/packet-gssapi.h
198include/wireshark/epan/dissectors/packet-gtp.h 177include/wireshark/epan/dissectors/packet-gtp.h
199include/wireshark/epan/dissectors/packet-gtpv2.h 178include/wireshark/epan/dissectors/packet-gtpv2.h
200include/wireshark/epan/dissectors/packet-h223.h 179include/wireshark/epan/dissectors/packet-h223.h
201include/wireshark/epan/dissectors/packet-h225.h 180include/wireshark/epan/dissectors/packet-h225.h
202include/wireshark/epan/dissectors/packet-h235.h 181include/wireshark/epan/dissectors/packet-h235.h
203include/wireshark/epan/dissectors/packet-h245.h 182include/wireshark/epan/dissectors/packet-h245.h
204include/wireshark/epan/dissectors/packet-h248.h 183include/wireshark/epan/dissectors/packet-h248.h
205include/wireshark/epan/dissectors/packet-h263.h 184include/wireshark/epan/dissectors/packet-h263.h
206include/wireshark/epan/dissectors/packet-h264.h 185include/wireshark/epan/dissectors/packet-h264.h
 186include/wireshark/epan/dissectors/packet-h265.h
207include/wireshark/epan/dissectors/packet-h323.h 187include/wireshark/epan/dissectors/packet-h323.h
208include/wireshark/epan/dissectors/packet-h450-ros.h 188include/wireshark/epan/dissectors/packet-h450-ros.h
209include/wireshark/epan/dissectors/packet-hpext.h 189include/wireshark/epan/dissectors/packet-hpext.h
210include/wireshark/epan/dissectors/packet-http.h 190include/wireshark/epan/dissectors/packet-http.h
211include/wireshark/epan/dissectors/packet-http2.h 191include/wireshark/epan/dissectors/packet-http2.h
212include/wireshark/epan/dissectors/packet-iana-oui.h 192include/wireshark/epan/dissectors/packet-iana-oui.h
213include/wireshark/epan/dissectors/packet-iax2.h 193include/wireshark/epan/dissectors/packet-iax2.h
214include/wireshark/epan/dissectors/packet-icmp.h 194include/wireshark/epan/dissectors/packet-icmp.h
215include/wireshark/epan/dissectors/packet-idmp.h 195include/wireshark/epan/dissectors/packet-idmp.h
216include/wireshark/epan/dissectors/packet-idp.h 196include/wireshark/epan/dissectors/packet-idp.h
 197include/wireshark/epan/dissectors/packet-ieee1609dot2.h
217include/wireshark/epan/dissectors/packet-ieee80211-radio.h 198include/wireshark/epan/dissectors/packet-ieee80211-radio.h
218include/wireshark/epan/dissectors/packet-ieee80211-radiotap-defs.h 199include/wireshark/epan/dissectors/packet-ieee80211-radiotap-defs.h
219include/wireshark/epan/dissectors/packet-ieee80211-radiotap-iter.h 200include/wireshark/epan/dissectors/packet-ieee80211-radiotap-iter.h
220include/wireshark/epan/dissectors/packet-ieee80211.h 201include/wireshark/epan/dissectors/packet-ieee80211.h
221include/wireshark/epan/dissectors/packet-ieee802154.h 202include/wireshark/epan/dissectors/packet-ieee802154.h
222include/wireshark/epan/dissectors/packet-ieee8023.h 203include/wireshark/epan/dissectors/packet-ieee8023.h
223include/wireshark/epan/dissectors/packet-ieee802a.h 204include/wireshark/epan/dissectors/packet-ieee802a.h
224include/wireshark/epan/dissectors/packet-igmp.h 205include/wireshark/epan/dissectors/packet-igmp.h
225include/wireshark/epan/dissectors/packet-imf.h 206include/wireshark/epan/dissectors/packet-imf.h
226include/wireshark/epan/dissectors/packet-inap.h 207include/wireshark/epan/dissectors/packet-inap.h
227include/wireshark/epan/dissectors/packet-infiniband.h 208include/wireshark/epan/dissectors/packet-infiniband.h
228include/wireshark/epan/dissectors/packet-ip.h 209include/wireshark/epan/dissectors/packet-ip.h
229include/wireshark/epan/dissectors/packet-ipmi.h 210include/wireshark/epan/dissectors/packet-ipmi.h
230include/wireshark/epan/dissectors/packet-ipsec.h 211include/wireshark/epan/dissectors/packet-ipsec.h
231include/wireshark/epan/dissectors/packet-ipx.h 212include/wireshark/epan/dissectors/packet-ipx.h
232include/wireshark/epan/dissectors/packet-isakmp.h 213include/wireshark/epan/dissectors/packet-isakmp.h
233include/wireshark/epan/dissectors/packet-isis-clv.h 214include/wireshark/epan/dissectors/packet-isis-clv.h
234include/wireshark/epan/dissectors/packet-isis.h 215include/wireshark/epan/dissectors/packet-isis.h
235include/wireshark/epan/dissectors/packet-isl.h 216include/wireshark/epan/dissectors/packet-isl.h
236include/wireshark/epan/dissectors/packet-isup.h 217include/wireshark/epan/dissectors/packet-isup.h
 218include/wireshark/epan/dissectors/packet-its.h
237include/wireshark/epan/dissectors/packet-iwarp-ddp-rdmap.h 219include/wireshark/epan/dissectors/packet-iwarp-ddp-rdmap.h
238include/wireshark/epan/dissectors/packet-juniper.h 220include/wireshark/epan/dissectors/packet-juniper.h
239include/wireshark/epan/dissectors/packet-jxta.h 221include/wireshark/epan/dissectors/packet-jxta.h
240include/wireshark/epan/dissectors/packet-kerberos.h 222include/wireshark/epan/dissectors/packet-kerberos.h
241include/wireshark/epan/dissectors/packet-klm.h 223include/wireshark/epan/dissectors/packet-knxip.h
 224include/wireshark/epan/dissectors/packet-knxip_decrypt.h
242include/wireshark/epan/dissectors/packet-l2tp.h 225include/wireshark/epan/dissectors/packet-l2tp.h
243include/wireshark/epan/dissectors/packet-lapdm.h 226include/wireshark/epan/dissectors/packet-lapdm.h
244include/wireshark/epan/dissectors/packet-lbm.h 227include/wireshark/epan/dissectors/packet-lbm.h
245include/wireshark/epan/dissectors/packet-lbtrm.h 228include/wireshark/epan/dissectors/packet-lbtrm.h
246include/wireshark/epan/dissectors/packet-lbtru.h 229include/wireshark/epan/dissectors/packet-lbtru.h
247include/wireshark/epan/dissectors/packet-lbttcp.h 230include/wireshark/epan/dissectors/packet-lbttcp.h
248include/wireshark/epan/dissectors/packet-lcsap.h 231include/wireshark/epan/dissectors/packet-lcsap.h
249include/wireshark/epan/dissectors/packet-ldap.h 232include/wireshark/epan/dissectors/packet-ldap.h
250include/wireshark/epan/dissectors/packet-ldp.h 233include/wireshark/epan/dissectors/packet-ldp.h
251include/wireshark/epan/dissectors/packet-link16.h 234include/wireshark/epan/dissectors/packet-link16.h
 235include/wireshark/epan/dissectors/packet-lisp.h
252include/wireshark/epan/dissectors/packet-llc.h 236include/wireshark/epan/dissectors/packet-llc.h
253include/wireshark/epan/dissectors/packet-lnet.h 237include/wireshark/epan/dissectors/packet-lnet.h
254include/wireshark/epan/dissectors/packet-logotypecertextn.h 238include/wireshark/epan/dissectors/packet-logotypecertextn.h
255include/wireshark/epan/dissectors/packet-lpp.h 239include/wireshark/epan/dissectors/packet-lpp.h
256include/wireshark/epan/dissectors/packet-lte-rrc.h 240include/wireshark/epan/dissectors/packet-lte-rrc.h
257include/wireshark/epan/dissectors/packet-mac-lte.h 241include/wireshark/epan/dissectors/packet-mac-lte.h
258include/wireshark/epan/dissectors/packet-mac-nr.h 
259include/wireshark/epan/dissectors/packet-mausb.h 242include/wireshark/epan/dissectors/packet-mausb.h
260include/wireshark/epan/dissectors/packet-mbim.h 243include/wireshark/epan/dissectors/packet-mbim.h
261include/wireshark/epan/dissectors/packet-mbtcp.h 244include/wireshark/epan/dissectors/packet-mbtcp.h
262include/wireshark/epan/dissectors/packet-mgcp.h 245include/wireshark/epan/dissectors/packet-mgcp.h
263include/wireshark/epan/dissectors/packet-mle.h 246include/wireshark/epan/dissectors/packet-mle.h
264include/wireshark/epan/dissectors/packet-mms.h 247include/wireshark/epan/dissectors/packet-mms.h
265include/wireshark/epan/dissectors/packet-mount.h 248include/wireshark/epan/dissectors/packet-mount.h
266include/wireshark/epan/dissectors/packet-mp4ves.h 249include/wireshark/epan/dissectors/packet-mp4ves.h
267include/wireshark/epan/dissectors/packet-mpeg-descriptor.h 250include/wireshark/epan/dissectors/packet-mpeg-descriptor.h
268include/wireshark/epan/dissectors/packet-mpeg-pmt.h 
269include/wireshark/epan/dissectors/packet-mpeg-sect.h 251include/wireshark/epan/dissectors/packet-mpeg-sect.h
270include/wireshark/epan/dissectors/packet-mpls.h 252include/wireshark/epan/dissectors/packet-mpls.h
271include/wireshark/epan/dissectors/packet-mq.h 253include/wireshark/epan/dissectors/packet-mq.h
272include/wireshark/epan/dissectors/packet-msrp.h 254include/wireshark/epan/dissectors/packet-msrp.h
273include/wireshark/epan/dissectors/packet-mstp.h 255include/wireshark/epan/dissectors/packet-mstp.h
274include/wireshark/epan/dissectors/packet-mtp3.h 256include/wireshark/epan/dissectors/packet-mtp3.h
275include/wireshark/epan/dissectors/packet-nbap.h 257include/wireshark/epan/dissectors/packet-nbap.h
276include/wireshark/epan/dissectors/packet-ncp-int.h 258include/wireshark/epan/dissectors/packet-ncp-int.h
277include/wireshark/epan/dissectors/packet-ncp-nmas.h 259include/wireshark/epan/dissectors/packet-ncp-nmas.h
278include/wireshark/epan/dissectors/packet-ncp-sss.h 260include/wireshark/epan/dissectors/packet-ncp-sss.h
279include/wireshark/epan/dissectors/packet-ndmp.h 261include/wireshark/epan/dissectors/packet-ndmp.h
280include/wireshark/epan/dissectors/packet-ndps.h 262include/wireshark/epan/dissectors/packet-ndps.h
281include/wireshark/epan/dissectors/packet-netbios.h 263include/wireshark/epan/dissectors/packet-netbios.h
282include/wireshark/epan/dissectors/packet-netlink.h 264include/wireshark/epan/dissectors/packet-netlink.h
283include/wireshark/epan/dissectors/packet-netmon.h 
284include/wireshark/epan/dissectors/packet-nfs.h 265include/wireshark/epan/dissectors/packet-nfs.h
 266include/wireshark/epan/dissectors/packet-ngap.h
285include/wireshark/epan/dissectors/packet-nisplus.h 267include/wireshark/epan/dissectors/packet-nisplus.h
286include/wireshark/epan/dissectors/packet-nlm.h 268include/wireshark/epan/dissectors/packet-nlm.h
287include/wireshark/epan/dissectors/packet-nr-rrc.h 269include/wireshark/epan/dissectors/packet-nr-rrc.h
288include/wireshark/epan/dissectors/packet-nsh.h 270include/wireshark/epan/dissectors/packet-nsh.h
289include/wireshark/epan/dissectors/packet-ntlmssp.h 271include/wireshark/epan/dissectors/packet-ntlmssp.h
290include/wireshark/epan/dissectors/packet-ntp.h 272include/wireshark/epan/dissectors/packet-ntp.h
291include/wireshark/epan/dissectors/packet-nvme.h 273include/wireshark/epan/dissectors/packet-nvme.h
292include/wireshark/epan/dissectors/packet-ocsp.h 274include/wireshark/epan/dissectors/packet-ocsp.h
 275include/wireshark/epan/dissectors/packet-oer.h
293include/wireshark/epan/dissectors/packet-opensafety.h 276include/wireshark/epan/dissectors/packet-opensafety.h
294include/wireshark/epan/dissectors/packet-oscore.h 277include/wireshark/epan/dissectors/packet-oscore.h
295include/wireshark/epan/dissectors/packet-osi-options.h 278include/wireshark/epan/dissectors/packet-osi-options.h
296include/wireshark/epan/dissectors/packet-osi.h 279include/wireshark/epan/dissectors/packet-osi.h
297include/wireshark/epan/dissectors/packet-p1.h 280include/wireshark/epan/dissectors/packet-p1.h
298include/wireshark/epan/dissectors/packet-p22.h 281include/wireshark/epan/dissectors/packet-p22.h
299include/wireshark/epan/dissectors/packet-p7.h 282include/wireshark/epan/dissectors/packet-p7.h
300include/wireshark/epan/dissectors/packet-p772.h 283include/wireshark/epan/dissectors/packet-p772.h
301include/wireshark/epan/dissectors/packet-pcap_pktdata.h 284include/wireshark/epan/dissectors/packet-pcap_pktdata.h
302include/wireshark/epan/dissectors/packet-pcnfsd.h 285include/wireshark/epan/dissectors/packet-pcnfsd.h
303include/wireshark/epan/dissectors/packet-pdcp-lte.h 286include/wireshark/epan/dissectors/packet-pdcp-lte.h
 287include/wireshark/epan/dissectors/packet-pdcp-nr.h
304include/wireshark/epan/dissectors/packet-per.h 288include/wireshark/epan/dissectors/packet-per.h
305include/wireshark/epan/dissectors/packet-pkcs1.h 289include/wireshark/epan/dissectors/packet-pkcs1.h
306include/wireshark/epan/dissectors/packet-pkcs12.h 290include/wireshark/epan/dissectors/packet-pkcs12.h
307include/wireshark/epan/dissectors/packet-pkinit.h 291include/wireshark/epan/dissectors/packet-pkinit.h
308include/wireshark/epan/dissectors/packet-pkix1explicit.h 292include/wireshark/epan/dissectors/packet-pkix1explicit.h
309include/wireshark/epan/dissectors/packet-pkix1implicit.h 293include/wireshark/epan/dissectors/packet-pkix1implicit.h
310include/wireshark/epan/dissectors/packet-pkixac.h 294include/wireshark/epan/dissectors/packet-pkixac.h
311include/wireshark/epan/dissectors/packet-pkixproxy.h 295include/wireshark/epan/dissectors/packet-pkixproxy.h
312include/wireshark/epan/dissectors/packet-pkixqualified.h 296include/wireshark/epan/dissectors/packet-pkixqualified.h
313include/wireshark/epan/dissectors/packet-pkixtsp.h 297include/wireshark/epan/dissectors/packet-pkixtsp.h
314include/wireshark/epan/dissectors/packet-pktc.h 
315include/wireshark/epan/dissectors/packet-portmap.h 298include/wireshark/epan/dissectors/packet-portmap.h
316include/wireshark/epan/dissectors/packet-ppi-geolocation-common.h 299include/wireshark/epan/dissectors/packet-ppi-geolocation-common.h
317include/wireshark/epan/dissectors/packet-ppp.h 300include/wireshark/epan/dissectors/packet-ppp.h
318include/wireshark/epan/dissectors/packet-pres.h 301include/wireshark/epan/dissectors/packet-pres.h
319include/wireshark/epan/dissectors/packet-protobuf.h 
320include/wireshark/epan/dissectors/packet-ptp.h 302include/wireshark/epan/dissectors/packet-ptp.h
321include/wireshark/epan/dissectors/packet-ptpip.h 303include/wireshark/epan/dissectors/packet-ptpip.h
322include/wireshark/epan/dissectors/packet-pw-atm.h 304include/wireshark/epan/dissectors/packet-pw-atm.h
323include/wireshark/epan/dissectors/packet-pw-common.h 305include/wireshark/epan/dissectors/packet-pw-common.h
324include/wireshark/epan/dissectors/packet-q708.h 306include/wireshark/epan/dissectors/packet-q708.h
325include/wireshark/epan/dissectors/packet-q931.h 307include/wireshark/epan/dissectors/packet-q931.h
326include/wireshark/epan/dissectors/packet-q932.h 308include/wireshark/epan/dissectors/packet-q932.h
327include/wireshark/epan/dissectors/packet-qsig.h 309include/wireshark/epan/dissectors/packet-qsig.h
328include/wireshark/epan/dissectors/packet-radius.h 310include/wireshark/epan/dissectors/packet-radius.h
329include/wireshark/epan/dissectors/packet-raknet.h 311include/wireshark/epan/dissectors/packet-raknet.h
330include/wireshark/epan/dissectors/packet-ranap.h 312include/wireshark/epan/dissectors/packet-ranap.h
331include/wireshark/epan/dissectors/packet-rdm.h 313include/wireshark/epan/dissectors/packet-rdm.h
332include/wireshark/epan/dissectors/packet-rdt.h 314include/wireshark/epan/dissectors/packet-rdt.h
333include/wireshark/epan/dissectors/packet-reload.h 315include/wireshark/epan/dissectors/packet-reload.h
334include/wireshark/epan/dissectors/packet-rlc-lte.h 316include/wireshark/epan/dissectors/packet-rlc-lte.h
335include/wireshark/epan/dissectors/packet-rlc-nr.h 317include/wireshark/epan/dissectors/packet-rlc-nr.h
336include/wireshark/epan/dissectors/packet-rmi.h 318include/wireshark/epan/dissectors/packet-rmi.h
337include/wireshark/epan/dissectors/packet-rmt-common.h 319include/wireshark/epan/dissectors/packet-rmt-common.h
338include/wireshark/epan/dissectors/packet-rohc.h 320include/wireshark/epan/dissectors/packet-rohc.h
339include/wireshark/epan/dissectors/packet-ros.h 321include/wireshark/epan/dissectors/packet-ros.h
340include/wireshark/epan/dissectors/packet-rpc.h 322include/wireshark/epan/dissectors/packet-rpc.h
341include/wireshark/epan/dissectors/packet-rpcrdma.h 323include/wireshark/epan/dissectors/packet-rpcrdma.h
342include/wireshark/epan/dissectors/packet-rquota.h 
343include/wireshark/epan/dissectors/packet-rrc.h 324include/wireshark/epan/dissectors/packet-rrc.h
344include/wireshark/epan/dissectors/packet-rsvp.h 325include/wireshark/epan/dissectors/packet-rsvp.h
345include/wireshark/epan/dissectors/packet-rtcp.h 326include/wireshark/epan/dissectors/packet-rtcp.h
346include/wireshark/epan/dissectors/packet-rtp-events.h 327include/wireshark/epan/dissectors/packet-rtp-events.h
347include/wireshark/epan/dissectors/packet-rtp.h 328include/wireshark/epan/dissectors/packet-rtp.h
348include/wireshark/epan/dissectors/packet-rtps.h 329include/wireshark/epan/dissectors/packet-rtps.h
349include/wireshark/epan/dissectors/packet-rtse.h 330include/wireshark/epan/dissectors/packet-rtse.h
350include/wireshark/epan/dissectors/packet-rtsp.h 331include/wireshark/epan/dissectors/packet-rtsp.h
351include/wireshark/epan/dissectors/packet-rwall.h 
352include/wireshark/epan/dissectors/packet-rx.h 332include/wireshark/epan/dissectors/packet-rx.h
353include/wireshark/epan/dissectors/packet-s1ap.h 333include/wireshark/epan/dissectors/packet-s1ap.h
354include/wireshark/epan/dissectors/packet-s5066sis.h 334include/wireshark/epan/dissectors/packet-s5066sis.h
355include/wireshark/epan/dissectors/packet-s7comm.h 335include/wireshark/epan/dissectors/packet-s7comm.h
356include/wireshark/epan/dissectors/packet-s7comm_szl_ids.h 336include/wireshark/epan/dissectors/packet-s7comm_szl_ids.h
357include/wireshark/epan/dissectors/packet-sccp.h 337include/wireshark/epan/dissectors/packet-sccp.h
358include/wireshark/epan/dissectors/packet-scsi-mmc.h 338include/wireshark/epan/dissectors/packet-scsi-mmc.h
359include/wireshark/epan/dissectors/packet-scsi-osd.h 339include/wireshark/epan/dissectors/packet-scsi-osd.h
360include/wireshark/epan/dissectors/packet-scsi-sbc.h 340include/wireshark/epan/dissectors/packet-scsi-sbc.h
361include/wireshark/epan/dissectors/packet-scsi-smc.h 341include/wireshark/epan/dissectors/packet-scsi-smc.h
362include/wireshark/epan/dissectors/packet-scsi-ssc.h 342include/wireshark/epan/dissectors/packet-scsi-ssc.h
363include/wireshark/epan/dissectors/packet-scsi.h 343include/wireshark/epan/dissectors/packet-scsi.h
364include/wireshark/epan/dissectors/packet-sctp.h 344include/wireshark/epan/dissectors/packet-sctp.h
@@ -370,43 +350,41 @@ include/wireshark/epan/dissectors/packet @@ -370,43 +350,41 @@ include/wireshark/epan/dissectors/packet
370include/wireshark/epan/dissectors/packet-sll.h 350include/wireshark/epan/dissectors/packet-sll.h
371include/wireshark/epan/dissectors/packet-smb-browse.h 351include/wireshark/epan/dissectors/packet-smb-browse.h
372include/wireshark/epan/dissectors/packet-smb-common.h 352include/wireshark/epan/dissectors/packet-smb-common.h
373include/wireshark/epan/dissectors/packet-smb-mailslot.h 353include/wireshark/epan/dissectors/packet-smb-mailslot.h
374include/wireshark/epan/dissectors/packet-smb-pipe.h 354include/wireshark/epan/dissectors/packet-smb-pipe.h
375include/wireshark/epan/dissectors/packet-smb-sidsnooping.h 355include/wireshark/epan/dissectors/packet-smb-sidsnooping.h
376include/wireshark/epan/dissectors/packet-smb.h 356include/wireshark/epan/dissectors/packet-smb.h
377include/wireshark/epan/dissectors/packet-smb2.h 357include/wireshark/epan/dissectors/packet-smb2.h
378include/wireshark/epan/dissectors/packet-smpp.h 358include/wireshark/epan/dissectors/packet-smpp.h
379include/wireshark/epan/dissectors/packet-smrse.h 359include/wireshark/epan/dissectors/packet-smrse.h
380include/wireshark/epan/dissectors/packet-snmp.h 360include/wireshark/epan/dissectors/packet-snmp.h
381include/wireshark/epan/dissectors/packet-socketcan.h 361include/wireshark/epan/dissectors/packet-socketcan.h
382include/wireshark/epan/dissectors/packet-spice.h 362include/wireshark/epan/dissectors/packet-spice.h
383include/wireshark/epan/dissectors/packet-spray.h 
384include/wireshark/epan/dissectors/packet-sprt.h 363include/wireshark/epan/dissectors/packet-sprt.h
385include/wireshark/epan/dissectors/packet-sscop.h 364include/wireshark/epan/dissectors/packet-sscop.h
386include/wireshark/epan/dissectors/packet-ssl-utils.h 
387include/wireshark/epan/dissectors/packet-ssl.h 
388include/wireshark/epan/dissectors/packet-stat-notify.h 365include/wireshark/epan/dissectors/packet-stat-notify.h
389include/wireshark/epan/dissectors/packet-stat.h 366include/wireshark/epan/dissectors/packet-stat.h
390include/wireshark/epan/dissectors/packet-sv.h 367include/wireshark/epan/dissectors/packet-sv.h
 368include/wireshark/epan/dissectors/packet-syslog.h
391include/wireshark/epan/dissectors/packet-t124.h 369include/wireshark/epan/dissectors/packet-t124.h
392include/wireshark/epan/dissectors/packet-t30.h 370include/wireshark/epan/dissectors/packet-t30.h
393include/wireshark/epan/dissectors/packet-t38.h 371include/wireshark/epan/dissectors/packet-t38.h
394include/wireshark/epan/dissectors/packet-tacacs.h 372include/wireshark/epan/dissectors/packet-tacacs.h
395include/wireshark/epan/dissectors/packet-tcap.h 373include/wireshark/epan/dissectors/packet-tcap.h
396include/wireshark/epan/dissectors/packet-tcp.h 374include/wireshark/epan/dissectors/packet-tcp.h
397include/wireshark/epan/dissectors/packet-tetra.h 375include/wireshark/epan/dissectors/packet-tetra.h
398include/wireshark/epan/dissectors/packet-tftp.h 376include/wireshark/epan/dissectors/packet-tls-utils.h
399include/wireshark/epan/dissectors/packet-thrift.h 377include/wireshark/epan/dissectors/packet-tls.h
400include/wireshark/epan/dissectors/packet-tn3270.h 378include/wireshark/epan/dissectors/packet-tn3270.h
401include/wireshark/epan/dissectors/packet-tn5250.h 379include/wireshark/epan/dissectors/packet-tn5250.h
402include/wireshark/epan/dissectors/packet-tpkt.h 380include/wireshark/epan/dissectors/packet-tpkt.h
403include/wireshark/epan/dissectors/packet-tr.h 381include/wireshark/epan/dissectors/packet-tr.h
404include/wireshark/epan/dissectors/packet-tte.h 382include/wireshark/epan/dissectors/packet-tte.h
405include/wireshark/epan/dissectors/packet-ua.h 383include/wireshark/epan/dissectors/packet-ua.h
406include/wireshark/epan/dissectors/packet-uaudp.h 384include/wireshark/epan/dissectors/packet-uaudp.h
407include/wireshark/epan/dissectors/packet-ubertooth.h 385include/wireshark/epan/dissectors/packet-ubertooth.h
408include/wireshark/epan/dissectors/packet-udp.h 386include/wireshark/epan/dissectors/packet-udp.h
409include/wireshark/epan/dissectors/packet-umts_fp.h 387include/wireshark/epan/dissectors/packet-umts_fp.h
410include/wireshark/epan/dissectors/packet-umts_mac.h 388include/wireshark/epan/dissectors/packet-umts_mac.h
411include/wireshark/epan/dissectors/packet-umts_rlc.h 389include/wireshark/epan/dissectors/packet-umts_rlc.h
412include/wireshark/epan/dissectors/packet-usb-hid.h 390include/wireshark/epan/dissectors/packet-usb-hid.h
@@ -437,35 +415,26 @@ include/wireshark/epan/dissectors/packet @@ -437,35 +415,26 @@ include/wireshark/epan/dissectors/packet
437include/wireshark/epan/dissectors/packet-xmpp-utils.h 415include/wireshark/epan/dissectors/packet-xmpp-utils.h
438include/wireshark/epan/dissectors/packet-xmpp.h 416include/wireshark/epan/dissectors/packet-xmpp.h
439include/wireshark/epan/dissectors/packet-ypbind.h 417include/wireshark/epan/dissectors/packet-ypbind.h
440include/wireshark/epan/dissectors/packet-yppasswd.h 418include/wireshark/epan/dissectors/packet-yppasswd.h
441include/wireshark/epan/dissectors/packet-ypserv.h 419include/wireshark/epan/dissectors/packet-ypserv.h
442include/wireshark/epan/dissectors/packet-ypxfr.h 420include/wireshark/epan/dissectors/packet-ypxfr.h
443include/wireshark/epan/dissectors/packet-zbee-aps.h 421include/wireshark/epan/dissectors/packet-zbee-aps.h
444include/wireshark/epan/dissectors/packet-zbee-nwk.h 422include/wireshark/epan/dissectors/packet-zbee-nwk.h
445include/wireshark/epan/dissectors/packet-zbee-security.h 423include/wireshark/epan/dissectors/packet-zbee-security.h
446include/wireshark/epan/dissectors/packet-zbee-zcl.h 424include/wireshark/epan/dissectors/packet-zbee-zcl.h
447include/wireshark/epan/dissectors/packet-zbee-zdp.h 425include/wireshark/epan/dissectors/packet-zbee-zdp.h
448include/wireshark/epan/dissectors/packet-zbee.h 426include/wireshark/epan/dissectors/packet-zbee.h
449include/wireshark/epan/dissectors/packet-ziop.h 427include/wireshark/epan/dissectors/packet-ziop.h
450include/wireshark/epan/dissectors/read_keytab_file.h 
451include/wireshark/epan/dissectors/snort-config.h 
452include/wireshark/epan/dissectors/x11-declarations.h 
453include/wireshark/epan/dissectors/x11-enum.h 
454include/wireshark/epan/dissectors/x11-extension-errors.h 
455include/wireshark/epan/dissectors/x11-extension-implementation.h 
456include/wireshark/epan/dissectors/x11-glx-render-enum.h 
457include/wireshark/epan/dissectors/x11-keysym.h 
458include/wireshark/epan/dissectors/x11-register-info.h 
459include/wireshark/epan/dtd.h 428include/wireshark/epan/dtd.h
460include/wireshark/epan/dtd_parse.h 429include/wireshark/epan/dtd_parse.h
461include/wireshark/epan/dvb_chartbl.h 430include/wireshark/epan/dvb_chartbl.h
462include/wireshark/epan/eap.h 431include/wireshark/epan/eap.h
463include/wireshark/epan/eapol_keydes_types.h 432include/wireshark/epan/eapol_keydes_types.h
464include/wireshark/epan/epan.h 433include/wireshark/epan/epan.h
465include/wireshark/epan/epan_dissect.h 434include/wireshark/epan/epan_dissect.h
466include/wireshark/epan/etypes.h 435include/wireshark/epan/etypes.h
467include/wireshark/epan/ex-opt.h 436include/wireshark/epan/ex-opt.h
468include/wireshark/epan/except.h 437include/wireshark/epan/except.h
469include/wireshark/epan/exceptions.h 438include/wireshark/epan/exceptions.h
470include/wireshark/epan/expert.h 439include/wireshark/epan/expert.h
471include/wireshark/epan/export_object.h 440include/wireshark/epan/export_object.h
@@ -506,27 +475,27 @@ include/wireshark/epan/print.h @@ -506,27 +475,27 @@ include/wireshark/epan/print.h
506include/wireshark/epan/print_stream.h 475include/wireshark/epan/print_stream.h
507include/wireshark/epan/proto.h 476include/wireshark/epan/proto.h
508include/wireshark/epan/proto_data.h 477include/wireshark/epan/proto_data.h
509include/wireshark/epan/ps.h 478include/wireshark/epan/ps.h
510include/wireshark/epan/ptvcursor.h 479include/wireshark/epan/ptvcursor.h
511include/wireshark/epan/range.h 480include/wireshark/epan/range.h
512include/wireshark/epan/reassemble.h 481include/wireshark/epan/reassemble.h
513include/wireshark/epan/reedsolomon.h 482include/wireshark/epan/reedsolomon.h
514include/wireshark/epan/register.h 483include/wireshark/epan/register.h
515include/wireshark/epan/req_resp_hdrs.h 484include/wireshark/epan/req_resp_hdrs.h
516include/wireshark/epan/rtd_table.h 485include/wireshark/epan/rtd_table.h
517include/wireshark/epan/rtp_pt.h 486include/wireshark/epan/rtp_pt.h
518include/wireshark/epan/sctpppids.h 487include/wireshark/epan/sctpppids.h
519include/wireshark/epan/sequence_analysis.h 488include/wireshark/epan/secrets.h
520include/wireshark/epan/show_exception.h 489include/wireshark/epan/show_exception.h
521include/wireshark/epan/slow_protocol_subtypes.h 490include/wireshark/epan/slow_protocol_subtypes.h
522include/wireshark/epan/sminmpec.h 491include/wireshark/epan/sminmpec.h
523include/wireshark/epan/srt_table.h 492include/wireshark/epan/srt_table.h
524include/wireshark/epan/stat_groups.h 493include/wireshark/epan/stat_groups.h
525include/wireshark/epan/stat_tap_ui.h 494include/wireshark/epan/stat_tap_ui.h
526include/wireshark/epan/stats_tree.h 495include/wireshark/epan/stats_tree.h
527include/wireshark/epan/stats_tree_priv.h 496include/wireshark/epan/stats_tree_priv.h
528include/wireshark/epan/stream.h 497include/wireshark/epan/stream.h
529include/wireshark/epan/strutil.h 498include/wireshark/epan/strutil.h
530include/wireshark/epan/t35.h 499include/wireshark/epan/t35.h
531include/wireshark/epan/tap-voip.h 500include/wireshark/epan/tap-voip.h
532include/wireshark/epan/tap.h 501include/wireshark/epan/tap.h
@@ -551,144 +520,179 @@ include/wireshark/epan/wmem/wmem_map.h @@ -551,144 +520,179 @@ include/wireshark/epan/wmem/wmem_map.h
551include/wireshark/epan/wmem/wmem_miscutl.h 520include/wireshark/epan/wmem/wmem_miscutl.h
552include/wireshark/epan/wmem/wmem_queue.h 521include/wireshark/epan/wmem/wmem_queue.h
553include/wireshark/epan/wmem/wmem_scopes.h 522include/wireshark/epan/wmem/wmem_scopes.h
554include/wireshark/epan/wmem/wmem_stack.h 523include/wireshark/epan/wmem/wmem_stack.h
555include/wireshark/epan/wmem/wmem_strbuf.h 524include/wireshark/epan/wmem/wmem_strbuf.h
556include/wireshark/epan/wmem/wmem_strutl.h 525include/wireshark/epan/wmem/wmem_strutl.h
557include/wireshark/epan/wmem/wmem_tree.h 526include/wireshark/epan/wmem/wmem_tree.h
558include/wireshark/epan/wmem/wmem_user_cb.h 527include/wireshark/epan/wmem/wmem_user_cb.h
559include/wireshark/epan/x264_prt_id.h 528include/wireshark/epan/x264_prt_id.h
560include/wireshark/epan/xdlc.h 529include/wireshark/epan/xdlc.h
561include/wireshark/file.h 530include/wireshark/file.h
562include/wireshark/globals.h 531include/wireshark/globals.h
563include/wireshark/log.h 532include/wireshark/log.h
 533include/wireshark/version_info.h
564include/wireshark/wiretap/file_wrappers.h 534include/wireshark/wiretap/file_wrappers.h
565include/wireshark/wiretap/merge.h 535include/wireshark/wiretap/merge.h
566include/wireshark/wiretap/pcap-encap.h 536include/wireshark/wiretap/pcap-encap.h
567include/wireshark/wiretap/pcapng_module.h 537include/wireshark/wiretap/pcapng_module.h
 538include/wireshark/wiretap/secrets-types.h
568include/wireshark/wiretap/wtap.h 539include/wireshark/wiretap/wtap.h
569include/wireshark/wiretap/wtap_opttypes.h 540include/wireshark/wiretap/wtap_opttypes.h
570include/wireshark/ws_attributes.h 541include/wireshark/ws_attributes.h
571include/wireshark/ws_compiler_tests.h 542include/wireshark/ws_compiler_tests.h
572include/wireshark/ws_diag_control.h 543include/wireshark/ws_diag_control.h
573include/wireshark/ws_symbol_export.h 544include/wireshark/ws_symbol_export.h
 545include/wireshark/ws_version.h
574include/wireshark/wsutil/adler32.h 546include/wireshark/wsutil/adler32.h
575include/wireshark/wsutil/base32.h 547include/wireshark/wsutil/base32.h
576include/wireshark/wsutil/base64.h 
577include/wireshark/wsutil/bits_count_ones.h 548include/wireshark/wsutil/bits_count_ones.h
578include/wireshark/wsutil/bits_ctz.h 549include/wireshark/wsutil/bits_ctz.h
579include/wireshark/wsutil/bitswap.h 550include/wireshark/wsutil/bitswap.h
580include/wireshark/wsutil/buffer.h 551include/wireshark/wsutil/buffer.h
581include/wireshark/wsutil/clopts_common.h 
582include/wireshark/wsutil/cmdarg_err.h 
583include/wireshark/wsutil/color.h 552include/wireshark/wsutil/color.h
584include/wireshark/wsutil/copyright_info.h 553include/wireshark/wsutil/copyright_info.h
585include/wireshark/wsutil/cpu_info.h 554include/wireshark/wsutil/cpu_info.h
586include/wireshark/wsutil/crash_info.h 555include/wireshark/wsutil/crash_info.h
587include/wireshark/wsutil/crc10.h 556include/wireshark/wsutil/crc10.h
588include/wireshark/wsutil/crc11.h 557include/wireshark/wsutil/crc11.h
589include/wireshark/wsutil/crc16-plain.h 558include/wireshark/wsutil/crc16-plain.h
590include/wireshark/wsutil/crc16.h 559include/wireshark/wsutil/crc16.h
591include/wireshark/wsutil/crc32.h 560include/wireshark/wsutil/crc32.h
592include/wireshark/wsutil/crc6.h 561include/wireshark/wsutil/crc6.h
593include/wireshark/wsutil/crc7.h 562include/wireshark/wsutil/crc7.h
594include/wireshark/wsutil/crc8.h 563include/wireshark/wsutil/crc8.h
 564include/wireshark/wsutil/curve25519.h
595include/wireshark/wsutil/eax.h 565include/wireshark/wsutil/eax.h
596include/wireshark/wsutil/filesystem.h 566include/wireshark/wsutil/filesystem.h
597include/wireshark/wsutil/frequency-utils.h 567include/wireshark/wsutil/frequency-utils.h
598include/wireshark/wsutil/g711.h 568include/wireshark/wsutil/g711.h
599include/wireshark/wsutil/glib-compat.h 
600include/wireshark/wsutil/inet_addr.h 569include/wireshark/wsutil/inet_addr.h
601include/wireshark/wsutil/inet_ipv4.h 570include/wireshark/wsutil/inet_ipv4.h
602include/wireshark/wsutil/inet_ipv6.h 571include/wireshark/wsutil/inet_ipv6.h
603include/wireshark/wsutil/interface.h 572include/wireshark/wsutil/interface.h
604include/wireshark/wsutil/jsmn.h 573include/wireshark/wsutil/jsmn.h
 574include/wireshark/wsutil/json_dumper.h
605include/wireshark/wsutil/mpeg-audio.h 575include/wireshark/wsutil/mpeg-audio.h
 576include/wireshark/wsutil/netlink.h
606include/wireshark/wsutil/nstime.h 577include/wireshark/wsutil/nstime.h
607include/wireshark/wsutil/os_version_info.h 578include/wireshark/wsutil/os_version_info.h
608include/wireshark/wsutil/pint.h 579include/wireshark/wsutil/pint.h
609include/wireshark/wsutil/plugins.h 580include/wireshark/wsutil/plugins.h
610include/wireshark/wsutil/pow2.h 581include/wireshark/wsutil/pow2.h
611include/wireshark/wsutil/privileges.h 582include/wireshark/wsutil/privileges.h
612include/wireshark/wsutil/processes.h 583include/wireshark/wsutil/processes.h
613include/wireshark/wsutil/report_message.h 584include/wireshark/wsutil/report_message.h
614include/wireshark/wsutil/rsa.h 
615include/wireshark/wsutil/sign_ext.h 585include/wireshark/wsutil/sign_ext.h
616include/wireshark/wsutil/sober128.h 586include/wireshark/wsutil/sober128.h
617include/wireshark/wsutil/socket.h 587include/wireshark/wsutil/socket.h
618include/wireshark/wsutil/str_util.h 588include/wireshark/wsutil/str_util.h
619include/wireshark/wsutil/strnatcmp.h 589include/wireshark/wsutil/strnatcmp.h
620include/wireshark/wsutil/strtoi.h 590include/wireshark/wsutil/strtoi.h
621include/wireshark/wsutil/tempfile.h 591include/wireshark/wsutil/tempfile.h
622include/wireshark/wsutil/time_util.h 592include/wireshark/wsutil/time_util.h
623include/wireshark/wsutil/type_util.h 593include/wireshark/wsutil/type_util.h
624include/wireshark/wsutil/unicode-utils.h 594include/wireshark/wsutil/unicode-utils.h
625include/wireshark/wsutil/utf8_entities.h 595include/wireshark/wsutil/utf8_entities.h
626include/wireshark/wsutil/ws_cpuid.h 596include/wireshark/wsutil/ws_cpuid.h
627include/wireshark/wsutil/ws_mempbrk.h 597include/wireshark/wsutil/ws_mempbrk.h
628include/wireshark/wsutil/ws_mempbrk_int.h 598include/wireshark/wsutil/ws_mempbrk_int.h
629include/wireshark/wsutil/ws_pipe.h 599include/wireshark/wsutil/ws_pipe.h
630include/wireshark/wsutil/ws_printf.h 600include/wireshark/wsutil/ws_printf.h
631include/wireshark/wsutil/wsgcrypt.h 601include/wireshark/wsutil/wsjson.h
632include/wireshark/wsutil/wsgetopt.h 
633include/wireshark/wsutil/wsjsmn.h 
634include/wireshark/wsutil/wspcap.h 
635include/wireshark/wsutil/xtea.h 602include/wireshark/wsutil/xtea.h
636lib/libwireshark.la 603lib/libwireshark.so
637lib/libwiretap.la 604lib/libwireshark.so.12
638lib/libwscodecs.la 605lib/libwireshark.so.12.0.1
639lib/libwsutil.la 606lib/libwiretap.so
 607lib/libwiretap.so.9
 608lib/libwiretap.so.9.0.1
 609lib/libwscodecs.so
 610lib/libwscodecs.so.2
 611lib/libwscodecs.so.2.0.0
 612lib/libwsutil.so
 613lib/libwsutil.so.10
 614lib/libwsutil.so.10.0.0
640lib/pkgconfig/wireshark.pc 615lib/pkgconfig/wireshark.pc
 616lib/wireshark/cmake/FindGLIB2.cmake
 617lib/wireshark/cmake/FindWSWinLibs.cmake
 618lib/wireshark/cmake/LocatePythonModule.cmake
 619lib/wireshark/cmake/UseAsn2Wrs.cmake
 620lib/wireshark/cmake/UseMakePluginReg.cmake
 621lib/wireshark/cmake/WiresharkConfig.cmake
 622lib/wireshark/cmake/WiresharkConfigVersion.cmake
 623lib/wireshark/cmake/WiresharkTargets-release.cmake
 624lib/wireshark/cmake/WiresharkTargets.cmake
641lib/wireshark/extcap/androiddump 625lib/wireshark/extcap/androiddump
642lib/wireshark/extcap/ciscodump 626lib/wireshark/extcap/ciscodump
643lib/wireshark/extcap/randpktdump 627lib/wireshark/extcap/randpktdump
644lib/wireshark/extcap/sshdump 628lib/wireshark/extcap/sshdump
645lib/wireshark/extcap/udpdump 629lib/wireshark/extcap/udpdump
646lib/wireshark/plugins/2.6/codecs/l16mono.la 630lib/wireshark/plugins/3.0/codecs/l16mono.so
647lib/wireshark/plugins/2.6/epan/ethercat.la 631lib/wireshark/plugins/3.0/epan/ethercat.so
648lib/wireshark/plugins/2.6/epan/gryphon.la 632lib/wireshark/plugins/3.0/epan/gryphon.so
649lib/wireshark/plugins/2.6/epan/irda.la 633lib/wireshark/plugins/3.0/epan/irda.so
650lib/wireshark/plugins/2.6/epan/mate.la 634lib/wireshark/plugins/3.0/epan/mate.so
651lib/wireshark/plugins/2.6/epan/opcua.la 635lib/wireshark/plugins/3.0/epan/opcua.so
652lib/wireshark/plugins/2.6/epan/profinet.la 636lib/wireshark/plugins/3.0/epan/profinet.so
653lib/wireshark/plugins/2.6/epan/stats_tree.la 637lib/wireshark/plugins/3.0/epan/stats_tree.so
654lib/wireshark/plugins/2.6/epan/transum.la 638lib/wireshark/plugins/3.0/epan/transum.so
655lib/wireshark/plugins/2.6/epan/unistim.la 639lib/wireshark/plugins/3.0/epan/unistim.so
656lib/wireshark/plugins/2.6/epan/wimax.la 640lib/wireshark/plugins/3.0/epan/wimax.so
657lib/wireshark/plugins/2.6/epan/wimaxasncp.la 641lib/wireshark/plugins/3.0/epan/wimaxasncp.so
658lib/wireshark/plugins/2.6/epan/wimaxmacphy.la 642lib/wireshark/plugins/3.0/epan/wimaxmacphy.so
659lib/wireshark/plugins/2.6/wiretap/usbdump.la 643lib/wireshark/plugins/3.0/wiretap/usbdump.so
660man/man1/androiddump.1 644man/man1/androiddump.1
661man/man1/capinfos.1 645man/man1/capinfos.1
662man/man1/captype.1 646man/man1/captype.1
663man/man1/ciscodump.1 647man/man1/ciscodump.1
664man/man1/dftest.1 648man/man1/dftest.1
665man/man1/dumpcap.1 649man/man1/dumpcap.1
666man/man1/editcap.1 650man/man1/editcap.1
667man/man1/mergecap.1 651man/man1/mergecap.1
 652man/man1/mmdbresolve.1
668man/man1/randpkt.1 653man/man1/randpkt.1
669man/man1/randpktdump.1 654man/man1/randpktdump.1
670man/man1/rawshark.1 655man/man1/rawshark.1
671man/man1/reordercap.1 656man/man1/reordercap.1
672man/man1/sshdump.1 657man/man1/sshdump.1
673man/man1/text2pcap.1 658man/man1/text2pcap.1
674man/man1/tshark.1 659man/man1/tshark.1
675man/man1/udpdump.1 660man/man1/udpdump.1
676${PLIST.mans}man/man1/wireshark.1 661man/man1/wireshark.1
677man/man4/extcap.4 662man/man4/extcap.4
678man/man4/wireshark-filter.4 663man/man4/wireshark-filter.4
679${PLIST.icons}share/appdata/wireshark.appdata.xml 664${PLIST.icons}share/appdata/wireshark.appdata.xml
680${PLIST.icons}share/applications/wireshark-gtk.desktop 
681${PLIST.icons}share/applications/wireshark.desktop 665${PLIST.icons}share/applications/wireshark.desktop
 666share/doc/wireshark/androiddump.html
 667share/doc/wireshark/capinfos.html
 668share/doc/wireshark/captype.html
 669share/doc/wireshark/ciscodump.html
 670share/doc/wireshark/dftest.html
 671share/doc/wireshark/dumpcap.html
 672share/doc/wireshark/editcap.html
 673share/doc/wireshark/extcap.html
 674share/doc/wireshark/mergecap.html
 675share/doc/wireshark/mmdbresolve.html
 676share/doc/wireshark/randpkt.html
 677share/doc/wireshark/randpktdump.html
 678share/doc/wireshark/rawshark.html
 679share/doc/wireshark/reordercap.html
 680share/doc/wireshark/sshdump.html
 681share/doc/wireshark/text2pcap.html
 682share/doc/wireshark/tshark.html
 683share/doc/wireshark/udpdump.html
 684share/doc/wireshark/wireshark-filter.html
 685share/doc/wireshark/wireshark.html
682${PLIST.icons}share/icons/hicolor/128x128/apps/wireshark.png 686${PLIST.icons}share/icons/hicolor/128x128/apps/wireshark.png
683${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-vnd.tcpdump.pcap.png 687${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-vnd.tcpdump.pcap.png
684${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-wireshark-doc.png 688${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-wireshark-doc.png
685${PLIST.icons}share/icons/hicolor/16x16/apps/wireshark.png 689${PLIST.icons}share/icons/hicolor/16x16/apps/wireshark.png
686${PLIST.icons}share/icons/hicolor/16x16/mimetypes/application-vnd.tcpdump.pcap.png 690${PLIST.icons}share/icons/hicolor/16x16/mimetypes/application-vnd.tcpdump.pcap.png
687${PLIST.icons}share/icons/hicolor/16x16/mimetypes/application-wireshark-doc.png 691${PLIST.icons}share/icons/hicolor/16x16/mimetypes/application-wireshark-doc.png
688${PLIST.icons}share/icons/hicolor/24x24/apps/wireshark.png 692${PLIST.icons}share/icons/hicolor/24x24/apps/wireshark.png
689${PLIST.icons}share/icons/hicolor/24x24/mimetypes/application-vnd.tcpdump.pcap.png 693${PLIST.icons}share/icons/hicolor/24x24/mimetypes/application-vnd.tcpdump.pcap.png
690${PLIST.icons}share/icons/hicolor/24x24/mimetypes/application-wireshark-doc.png 694${PLIST.icons}share/icons/hicolor/24x24/mimetypes/application-wireshark-doc.png
691${PLIST.icons}share/icons/hicolor/256x256/apps/wireshark.png 695${PLIST.icons}share/icons/hicolor/256x256/apps/wireshark.png
692${PLIST.icons}share/icons/hicolor/256x256/mimetypes/application-vnd.tcpdump.pcap.png 696${PLIST.icons}share/icons/hicolor/256x256/mimetypes/application-vnd.tcpdump.pcap.png
693${PLIST.icons}share/icons/hicolor/256x256/mimetypes/application-wireshark-doc.png 697${PLIST.icons}share/icons/hicolor/256x256/mimetypes/application-wireshark-doc.png
694${PLIST.icons}share/icons/hicolor/32x32/apps/wireshark.png 698${PLIST.icons}share/icons/hicolor/32x32/apps/wireshark.png
@@ -750,38 +754,40 @@ share/wireshark/dtds/reginfo.dtd @@ -750,38 +754,40 @@ share/wireshark/dtds/reginfo.dtd
750share/wireshark/dtds/rlmi.dtd 754share/wireshark/dtds/rlmi.dtd
751share/wireshark/dtds/rss.dtd 755share/wireshark/dtds/rss.dtd
752share/wireshark/dtds/smil.dtd 756share/wireshark/dtds/smil.dtd
753share/wireshark/dtds/watcherinfo.dtd 757share/wireshark/dtds/watcherinfo.dtd
754share/wireshark/dtds/xcap-caps.dtd 758share/wireshark/dtds/xcap-caps.dtd
755share/wireshark/dtds/xcap-error.dtd 759share/wireshark/dtds/xcap-error.dtd
756share/wireshark/dumpcap.html 760share/wireshark/dumpcap.html
757share/wireshark/editcap.html 761share/wireshark/editcap.html
758share/wireshark/enterprises.tsv 762share/wireshark/enterprises.tsv
759share/wireshark/extcap.html 763share/wireshark/extcap.html
760share/wireshark/help/capture_filters.txt 764share/wireshark/help/capture_filters.txt
761share/wireshark/help/capturing.txt 765share/wireshark/help/capturing.txt
762share/wireshark/help/display_filters.txt 766share/wireshark/help/display_filters.txt
763share/wireshark/help/faq.txt 767share/wireshark/help/faq.py
764share/wireshark/help/getting_started.txt 768share/wireshark/help/getting_started.txt
765share/wireshark/help/overview.txt 769share/wireshark/help/overview.txt
766share/wireshark/help/toc 770share/wireshark/help/toc
767${PLIST.lua}share/wireshark/init.lua 771${PLIST.lua}share/wireshark/init.lua
 772share/wireshark/ipmap.html
768share/wireshark/manuf 773share/wireshark/manuf
769share/wireshark/mergecap.html 774share/wireshark/mergecap.html
770share/wireshark/mmdbresolve.html 775share/wireshark/mmdbresolve.html
771share/wireshark/pdml2html.xsl 776share/wireshark/pdml2html.xsl
772share/wireshark/profiles/Bluetooth/colorfilters 777share/wireshark/profiles/Bluetooth/colorfilters
773share/wireshark/profiles/Bluetooth/preferences 778share/wireshark/profiles/Bluetooth/preferences
774share/wireshark/profiles/Classic/colorfilters 779share/wireshark/profiles/Classic/colorfilters
 780share/wireshark/profiles/No Reassembly/preferences
775share/wireshark/radius/README.radius_dictionary 781share/wireshark/radius/README.radius_dictionary
776share/wireshark/radius/custom.includes 782share/wireshark/radius/custom.includes
777share/wireshark/radius/dictionary 783share/wireshark/radius/dictionary
778share/wireshark/radius/dictionary.3com 784share/wireshark/radius/dictionary.3com
779share/wireshark/radius/dictionary.3gpp 785share/wireshark/radius/dictionary.3gpp
780share/wireshark/radius/dictionary.3gpp2 786share/wireshark/radius/dictionary.3gpp2
781share/wireshark/radius/dictionary.acc 787share/wireshark/radius/dictionary.acc
782share/wireshark/radius/dictionary.acme 788share/wireshark/radius/dictionary.acme
783share/wireshark/radius/dictionary.actelis 789share/wireshark/radius/dictionary.actelis
784share/wireshark/radius/dictionary.aerohive 790share/wireshark/radius/dictionary.aerohive
785share/wireshark/radius/dictionary.airespace 791share/wireshark/radius/dictionary.airespace
786share/wireshark/radius/dictionary.alcatel 792share/wireshark/radius/dictionary.alcatel
787share/wireshark/radius/dictionary.alcatel-lucent.aaa 793share/wireshark/radius/dictionary.alcatel-lucent.aaa
@@ -951,26 +957,27 @@ share/wireshark/radius/dictionary.symbol @@ -951,26 +957,27 @@ share/wireshark/radius/dictionary.symbol
951share/wireshark/radius/dictionary.t_systems_nova 957share/wireshark/radius/dictionary.t_systems_nova
952share/wireshark/radius/dictionary.telebit 958share/wireshark/radius/dictionary.telebit
953share/wireshark/radius/dictionary.telkom 959share/wireshark/radius/dictionary.telkom
954share/wireshark/radius/dictionary.terena 960share/wireshark/radius/dictionary.terena
955share/wireshark/radius/dictionary.trapeze 961share/wireshark/radius/dictionary.trapeze
956share/wireshark/radius/dictionary.travelping 962share/wireshark/radius/dictionary.travelping
957share/wireshark/radius/dictionary.tropos 963share/wireshark/radius/dictionary.tropos
958share/wireshark/radius/dictionary.ukerna 964share/wireshark/radius/dictionary.ukerna
959share/wireshark/radius/dictionary.unisphere 965share/wireshark/radius/dictionary.unisphere
960share/wireshark/radius/dictionary.unix 966share/wireshark/radius/dictionary.unix
961share/wireshark/radius/dictionary.usr 967share/wireshark/radius/dictionary.usr
962share/wireshark/radius/dictionary.utstarcom 968share/wireshark/radius/dictionary.utstarcom
963share/wireshark/radius/dictionary.valemount 969share/wireshark/radius/dictionary.valemount
 970share/wireshark/radius/dictionary.verizon
964share/wireshark/radius/dictionary.versanet 971share/wireshark/radius/dictionary.versanet
965share/wireshark/radius/dictionary.vqp 972share/wireshark/radius/dictionary.vqp
966share/wireshark/radius/dictionary.walabi 973share/wireshark/radius/dictionary.walabi
967share/wireshark/radius/dictionary.waverider 974share/wireshark/radius/dictionary.waverider
968share/wireshark/radius/dictionary.wichorus 975share/wireshark/radius/dictionary.wichorus
969share/wireshark/radius/dictionary.wimax 976share/wireshark/radius/dictionary.wimax
970share/wireshark/radius/dictionary.wimax.alvarion 977share/wireshark/radius/dictionary.wimax.alvarion
971share/wireshark/radius/dictionary.wimax.wichorus 978share/wireshark/radius/dictionary.wimax.wichorus
972share/wireshark/radius/dictionary.wispr 979share/wireshark/radius/dictionary.wispr
973share/wireshark/radius/dictionary.xedia 980share/wireshark/radius/dictionary.xedia
974share/wireshark/radius/dictionary.xylan 981share/wireshark/radius/dictionary.xylan
975share/wireshark/radius/dictionary.yubico 982share/wireshark/radius/dictionary.yubico
976share/wireshark/radius/dictionary.zeus 983share/wireshark/radius/dictionary.zeus

cvs diff -r1.118 -r1.119 pkgsrc/net/wireshark/distinfo (expand / switch to unified diff)

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

cvs diff -r1.22 -r1.23 pkgsrc/net/wireshark/options.mk (expand / switch to unified diff)

--- pkgsrc/net/wireshark/options.mk 2018/12/03 15:35:15 1.22
+++ pkgsrc/net/wireshark/options.mk 2019/05/06 09:36:47 1.23
@@ -1,99 +1,62 @@ @@ -1,99 +1,62 @@
1# $NetBSD: options.mk,v 1.22 2018/12/03 15:35:15 adam Exp $ 1# $NetBSD: options.mk,v 1.23 2019/05/06 09:36:47 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark 3PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark
4PKG_SUPPORTED_OPTIONS= gtk3 http2 lua 4PKG_SUPPORTED_OPTIONS= http2 lua qt5
5PKG_OPTIONS_OPTIONAL_GROUPS= qt 5PKG_SUGGESTED_OPTIONS= qt5 lua
6PKG_OPTIONS_GROUP.qt= qt4 qt5 
7PKG_SUGGESTED_OPTIONS= qt5 lua 
8 6
9.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
10 8
11PLIST_VARS+= gtk3 icons lua mans qt 9PLIST_VARS+= icons lua qt
12 10
13.if empty(PKG_OPTIONS:Mqt4) && empty(PKG_OPTIONS:Mqt5) 11.if !empty(PKG_OPTIONS:Mhttp2)
14CONFIGURE_ARGS+= --without-qt 12. include "../../www/nghttp2/buildlink3.mk"
15.else 13.else
16. if !empty(PKG_OPTIONS:Mqt4) 14CMAKE_ARGS+= -DENABLE_NGHTTP2=OFF
17CONFIGURE_ARGS+= --with-qt=4 
18BUILDLINK_API_DEPENDS.qt4-tools+= qt4-tools>=4.8 
19. include "../../x11/qt4-tools/buildlink3.mk" 
20. elif !empty(PKG_OPTIONS:Mqt5) 
21CONFIGURE_ARGS+= --with-qt=5 
22. include "../../x11/qt5-qttools/buildlink3.mk" 
23. if ${OPSYS} == "Darwin" 
24. include "../../x11/qt5-qtmacextras/buildlink3.mk" 
25. else 
26. include "../../x11/qt5-qtx11extras/buildlink3.mk" 
27. endif 
28. endif 
29CONFIGURE_ENV+= LRELEASE=${QTDIR}/bin/lrelease 
30CONFIGURE_ENV+= MOC=${QTDIR}/bin/moc 
31CONFIGURE_ENV+= RCC=${QTDIR}/bin/rcc 
32CONFIGURE_ENV+= UIC=${QTDIR}/bin/uic 
33PLIST.qt= yes 
34.endif 15.endif
35 16
36.if !empty(PKG_OPTIONS:Mgtk3) 17.if !empty(PKG_OPTIONS:Mlua)
37CONFIGURE_ARGS+= --with-gtk=3 18LUA_VERSIONS_INCOMPATIBLE= 53
38PLIST.gtk3= yes 19. include "../../lang/lua/buildlink3.mk"
39POST_INSTALL_TARGETS+= install-gtk-desktop 20PLIST.lua= yes
40.include "../../x11/gtk3/buildlink3.mk" 
41.include "../../graphics/adwaita-icon-theme/buildlink3.mk" 
42 
43.PHONY: install-gtk-desktop 
44install-gtk-desktop: 
45 ${INSTALL_DATA} ${WRKSRC}/wireshark.desktop \ 
46 ${DESTDIR}${PREFIX}/share/applications/ 
47 
48.else 21.else
49CONFIGURE_ARGS+= --without-gtk 22CMAKE_ARGS+= -DENABLE_LUA=OFF
50.endif 23.endif
51 24
52.if empty(PKG_OPTIONS:Mgtk3) && empty(PKG_OPTIONS:Mqt4) && empty(PKG_OPTIONS:Mqt5) 25.if !empty(PKG_OPTIONS:Mqt5)
53CONFIGURE_ARGS+= --disable-wireshark 26. include "../../x11/qt5-qtsvg/buildlink3.mk"
54.else 27. include "../../x11/qt5-qttools/buildlink3.mk"
55CONFIGURE_ARGS+= --enable-wireshark 28PLIST.qt= yes
56PLIST.mans= yes 29. if ${OPSYS} == "Darwin"
57INSTALLATION_DIRS+= share/applications 30. include "../../x11/qt5-qtmacextras/buildlink3.mk"
 31. else
58PLIST.icons= yes 32PLIST.icons= yes
 33. include "../../x11/qt5-qtx11extras/buildlink3.mk"
59POST_INSTALL_TARGETS+= install-icons 34POST_INSTALL_TARGETS+= install-icons
 35INSTALLATION_DIRS+= share/applications
60INSTALLATION_DIRS+= share/icons/hicolor/scalable/apps 36INSTALLATION_DIRS+= share/icons/hicolor/scalable/apps
61ICON_SIZES= 16 32 48 37ICON_SIZES= 16 32 48
62MIMEICON_SIZES= 16 24 32 48 64 128 256 38MIMEICON_SIZES= 16 24 32 48 64 128 256
63 39
64. for d in ${ICON_SIZES} 40. for d in ${ICON_SIZES}
65INSTALLATION_DIRS+= share/icons/hicolor/${d}x${d}/apps 41INSTALLATION_DIRS+= share/icons/hicolor/${d}x${d}/apps
66. endfor 42. endfor
67 43
68. for d in ${MIMEICON_SIZES} 44. for d in ${MIMEICON_SIZES}
69INSTALLATION_DIRS+= share/icons/hicolor/${d}x${d}/mimetypes 45INSTALLATION_DIRS+= share/icons/hicolor/${d}x${d}/mimetypes
70. endfor 46. endfor
71 47
72.include "../../sysutils/desktop-file-utils/desktopdb.mk" 48. include "../../sysutils/desktop-file-utils/desktopdb.mk"
73.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 49. include "../../graphics/hicolor-icon-theme/buildlink3.mk"
74 50
75.PHONY: install-icons 51.PHONY: install-icons
76install-icons: 52install-icons:
77 ${INSTALL_DATA} ${WRKSRC}/image/wsicon.svg \ 53 ${INSTALL_DATA} ${WRKSRC}/image/wsicon.svg \
78 ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wireshark.svg 54 ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wireshark.svg
79. for d in ${MIMEICON_SIZES} 55. for d in ${MIMEICON_SIZES}
80 ${INSTALL_DATA} ${WRKSRC}/image/WiresharkDoc-${d}.png \ 56 ${INSTALL_DATA} ${WRKSRC}/image/WiresharkDoc-${d}.png \
81 ${DESTDIR}${PREFIX}/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png 57 ${DESTDIR}${PREFIX}/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png
82. endfor 58. endfor
83.endif 59. endif
84 
85.if !empty(PKG_OPTIONS:Mlua) 
86LUA_VERSIONS_INCOMPATIBLE= 53 
87.include "../../lang/lua/buildlink3.mk" 
88CONFIGURE_ARGS+= --with-lua=yes 
89PLIST.lua= yes 
90.else 
91CONFIGURE_ARGS+= --with-lua=no 
92.endif 
93 
94.if !empty(PKG_OPTIONS:Mhttp2) 
95.include "../../www/nghttp2/buildlink3.mk" 
96CONFIGURE_ARGS+= --with-nghttp2 
97.else 60.else
98CONFIGURE_ARGS+= --without-nghttp2 61CMAKE_ARGS+= -DBUILD_wireshark=OFF
99.endif 62.endif

File Added: pkgsrc/net/wireshark/patches/patch-CMakeLists.txt
$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}
 )