in case anyone is interested in giving this a spin ..
(note that the old wireshark-gtk gui, which was on borrowed time,
has now been removed upstream).
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/wireshark/Makefile,v
retrieving revision 1.81
diff -u -p -r1.81 Makefile
--- Makefile 9 Jan 2019 17:14:08 -0000 1.81
+++ Makefile 23 Feb 2019 11:32:37 -0000
@@ -4,19 +4,17 @@ BROKEN-alpha = .got subsegment exceeds 6
COMMENT-main = graphical network protocol analyzer, Qt user-interface
COMMENT-text = network protocol analyzer
-COMMENT-gtk = graphical network protocol analyzer, Gtk+3 user-interface
-V = 2.6.6
+V = 3.0.0rc2
PORTROACH = limitw:1,even
DISTNAME = wireshark-$V
PKGNAME-main = wireshark-$V
PKGNAME-text = tshark-$V
-PKGNAME-gtk = wireshark-gtk-$V
-SHARED_LIBS += wscodecs 0.0 # 0.0
-SHARED_LIBS += wsutil 3.0 # 5.0
-SHARED_LIBS += wiretap 3.0 # 4.5
-SHARED_LIBS += wireshark 3.0 # 5.5
+SHARED_LIBS += wscodecs 1.0
+SHARED_LIBS += wsutil 4.0
+SHARED_LIBS += wiretap 4.0
+SHARED_LIBS += wireshark 4.0
CATEGORIES = net security x11
@@ -28,12 +26,13 @@ EXTRACT_SUFX = .tar.xz
# tools/pidl is GPLv3 or later. See COPYING.
PERMIT_PACKAGE_CDROM = Yes
-cWANTLIB += c glib-2.0 gmodule-2.0 m pcap z
+cWANTLIB += bcg729 c gcrypt glib-2.0 gmodule-2.0 gnutls gpg-error
+cWANTLIB += m pcap spandsp z
MAINTAINER = Stuart Henderson <st...@openbsd.org>
-MULTI_PACKAGES = -text -main -gtk
-PSEUDO_FLAVORS = no_x11 no_gtk no_qt
+MULTI_PACKAGES = -text -main
+PSEUDO_FLAVORS = no_x11 no_qt
# sync with devel/spidermonkey52: qt -> polkit -> mozjs17
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || \
${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "hppa" || \
@@ -53,22 +52,16 @@ MODLUA_RUNDEP = No
MODPY_RUNDEP = No
WANTLIB-text = ${cWANTLIB} ${MODLUA_WANTLIB}
-WANTLIB-text += bcg729 cares gcrypt gnutls lz4
-WANTLIB-text += maxminddb nghttp2 smi spandsp snappy ssh xml2
+WANTLIB-text += cares lz4 maxminddb nghttp2 smi snappy ssh xml2
WANTLIB-main = ${cWANTLIB} ${COMPILER_LIBCXX}
WANTLIB-main += wireshark wiretap wscodecs wsutil
-WANTLIB-main += Qt5Core Qt5Gui Qt5Multimedia Qt5PrintSupport Qt5Widgets
-
-WANTLIB-gtk = ${cWANTLIB}
-WANTLIB-gtk += wireshark wiretap wscodecs wsutil
-WANTLIB-gtk += cairo gdk-3 gdk_pixbuf-2.0 gio-2.0 gobject-2.0 gtk-3
-WANTLIB-gtk += pango-1.0 pangocairo-1.0
+WANTLIB-main += Qt5Core Qt5Gui Qt5Multimedia Qt5Network Qt5PrintSupport
Qt5Widgets
MASTER_SITES = http://www.wireshark.org/download/src/all-versions/ \
http://www.wireshark.org/download/automated/src/
-WVER = ${V:C/..$//}
+WVER = ${V:C/^(...).*/\1/}
SUBST_VARS = WVER
BUILD_DEPENDS += devel/bison \
@@ -109,12 +102,6 @@ LIB_DEPENDS-main += ${LIB_DEPENDS} \
# an "Extra" (that may later change to a real WANTLIB) than failing builds.
WANTLIB-main += Qt5Svg
-LIB_DEPENDS-gtk += tshark-$V:${BUILD_PKGPATH:S/,$//},-text \
- x11/gtk+3
-# XXX gtk build still picks this up even though it doesn't show in symbols
-# or objdump. problem will magically vanish when upstream remove gtk support!
-BUILD_DEPENDS += audio/portaudio-svn
-
MODULES += devel/cmake
CONFIGURE_STYLE = cmake
CONFIGURE_ARGS += -DDUMPCAP_INST_VALS=suid \
@@ -124,13 +111,7 @@ CONFIGURE_ARGS += -DDUMPCAP_INST_VALS=su
.include <bsd.port.arch.mk>
.if ${FLAVOR:Mno_x11}
-BUILD_PACKAGES := ${BUILD_PACKAGES:N-main:N-gtk}
-.endif
-.if ${FLAVOR:Mno_qt}
BUILD_PACKAGES := ${BUILD_PACKAGES:N-main}
-.endif
-.if ${BUILD_PACKAGES:M-gtk}
-CONFIGURE_ARGS += -DBUILD_wireshark_gtk=true
.endif
.if ${BUILD_PACKAGES:M-main}
MODULES += x11/qt5
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/wireshark/distinfo,v
retrieving revision 1.40
diff -u -p -r1.40 distinfo
--- distinfo 9 Jan 2019 17:14:08 -0000 1.40
+++ distinfo 23 Feb 2019 11:32:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (wireshark-2.6.6.tar.xz) = SHkz6gdb27JdjfBgF9nE9J/CDrf27ICvCGcY7VVQ6GM=
-SIZE (wireshark-2.6.6.tar.xz) = 28407404
+SHA256 (wireshark-3.0.0rc2.tar.xz) =
J78vzZ1MNk3Uap+VI/jUeNp7YDNJCYaZxykIHo+yeuA=
+SIZE (wireshark-3.0.0rc2.tar.xz) = 30942776
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/net/wireshark/patches/patch-CMakeLists_txt,v
retrieving revision 1.7
diff -u -p -r1.7 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 9 Jan 2019 17:14:08 -0000 1.7
+++ patches/patch-CMakeLists_txt 23 Feb 2019 11:32:37 -0000
@@ -7,21 +7,15 @@ Avoid the broken libwsutil.so that gets
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -668,17 +668,6 @@ else() # ! MSVC
- # -fwhopr
- # -fwhole-program
- )
-- # CMAKE_POSITION_INDEPENDENT_CODE is only supported starting with CMake
-- # 2.8.9. Do not add -pie automatically for older versions.
-- #
-- # XXX - are there other compilers that don't support -pie? It's
-- # not as if the only platforms we support are Windows and Linux....
-- #
-- if(NOT CMAKE_VERSION VERSION_LESS "2.8.9")
-- set(WIRESHARK_LD_FLAGS ${WIRESHARK_LD_FLAGS}
-- -pie
-- )
-- endif()
- endif() # ! MSVC
+@@ -921,11 +921,6 @@ if(NOT CMAKE_C_COMPILER_ID MATCHES "MSVC" AND NOT OSS_
+ if(CMAKE_VERSION VERSION_GREATER "3.13.999")
+ include(CheckPIESupported)
+ check_pie_supported()
+- else()
+- check_c_linker_flag(-pie LINK_pie_VALID)
+- if(LINK_pie_VALID)
+- set(CMAKE_EXE_LINKER_FLAGS "-pie
${CMAKE_EXE_LINKER_FLAGS}")
+- endif()
+ endif()
+ endif()
- set( C_FLAG_TESTS ${WIRESHARK_COMMON_FLAGS} ${WIRESHARK_C_ONLY_FLAGS} )
Index: patches/patch-caputils_capture-pcap-util_c
===================================================================
RCS file: patches/patch-caputils_capture-pcap-util_c
diff -N patches/patch-caputils_capture-pcap-util_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-caputils_capture-pcap-util_c 23 Feb 2019 11:32:37 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Index: caputils/capture-pcap-util.c
+--- caputils/capture-pcap-util.c.orig
++++ caputils/capture-pcap-util.c
+@@ -25,6 +25,10 @@
+ #include <sys/socket.h>
+ #endif
+
++#ifdef HAVE_SYS_IOCTL_H
++#include <sys/ioctl.h>
++#endif
++
+ #include "ws_attributes.h"
+
+ /*
+@@ -38,8 +42,6 @@
+ * end up trying SIOCGIWMODE on the device if that ioctl exists.
+ */
+ #if defined(HAVE_PCAP_CREATE) && defined(__linux__)
+-
+-#include <sys/ioctl.h>
+
+ /*
+ * If we're building for a Linux version that supports bonding,
Index: patches/patch-rawshark_c
===================================================================
RCS file: /cvs/ports/net/wireshark/patches/patch-rawshark_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-rawshark_c
--- patches/patch-rawshark_c 16 Oct 2018 11:29:58 -0000 1.3
+++ patches/patch-rawshark_c 23 Feb 2019 11:32:37 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-rawshark_c,v 1.3 2018/10
Index: rawshark.c
--- rawshark.c.orig
+++ rawshark.c
-@@ -584,7 +584,11 @@ real_main(int argc, char *argv[])
+@@ -565,7 +565,11 @@ main(int argc, char *argv[])
limit.rlim_cur = get_positive_int(optarg, "memory limit");
limit.rlim_max = get_positive_int(optarg, "memory limit");
Index: pkg/DESCR-gtk
===================================================================
RCS file: pkg/DESCR-gtk
diff -N pkg/DESCR-gtk
--- pkg/DESCR-gtk 18 Sep 2017 13:41:32 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-Wireshark is a network capture tool and protocol analyzer, including
-decoders for very many common and less-common protocols.
-
-This package contains the legacy Gtk+3 graphical user interface.
Index: pkg/DESCR-main
===================================================================
RCS file: /cvs/ports/net/wireshark/pkg/DESCR-main,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR-main
--- pkg/DESCR-main 30 Dec 2015 15:42:24 -0000 1.2
+++ pkg/DESCR-main 23 Feb 2019 11:32:37 -0000
@@ -4,5 +4,3 @@ decoders for very many common and less-c
This package contains the main program providing the graphical user
interface; other parts are in the tshark package which may be installed
separately if using the software on a system without X.
-
-The legacy Gtk user interface is packaged separately.
Index: pkg/PLIST-gtk
===================================================================
RCS file: pkg/PLIST-gtk
diff -N pkg/PLIST-gtk
--- pkg/PLIST-gtk 27 Jun 2018 21:04:00 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-@comment $OpenBSD: PLIST-gtk,v 1.4 2018/06/27 21:04:00 espie Exp $
-@bin bin/wireshark-gtk
-share/applications/wireshark-gtk.desktop
-@tag update-desktop-database
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/wireshark/pkg/PLIST-main,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST-main
--- pkg/PLIST-main 4 Sep 2018 12:53:16 -0000 1.13
+++ pkg/PLIST-main 23 Feb 2019 11:32:37 -0000
@@ -5,6 +5,27 @@ share/appdata/
share/appdata/wireshark.appdata.xml
share/applications/wireshark.desktop
share/doc/pkg-readmes/${PKGSTEM}
+share/doc/wireshark/
+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
share/icons/hicolor/128x128/apps/wireshark.png
share/icons/hicolor/128x128/mimetypes/application-wireshark-doc.png
share/icons/hicolor/16x16/apps/wireshark.png
Index: pkg/PLIST-text
===================================================================
RCS file: /cvs/ports/net/wireshark/pkg/PLIST-text,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-text
--- pkg/PLIST-text 19 Jul 2018 10:31:58 -0000 1.9
+++ pkg/PLIST-text 23 Feb 2019 11:32:37 -0000
@@ -19,6 +19,7 @@
@bin bin/tshark
include/wireshark/
include/wireshark/cfile.h
+include/wireshark/cli_main.h
include/wireshark/codecs/
include/wireshark/codecs/codecs.h
include/wireshark/epan/
@@ -58,7 +59,7 @@ include/wireshark/epan/diam_dict.h
include/wireshark/epan/disabled_protos.h
include/wireshark/epan/dissector_filters.h
include/wireshark/epan/dissectors/
-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
@@ -102,7 +103,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
@@ -162,7 +162,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
@@ -170,11 +169,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
@@ -193,6 +192,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
@@ -203,6 +203,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
@@ -223,11 +224,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
@@ -238,6 +241,7 @@ 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
@@ -253,7 +257,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
@@ -269,6 +272,7 @@ include/wireshark/epan/dissectors/packet
include/wireshark/epan/dissectors/packet-netbios.h
include/wireshark/epan/dissectors/packet-netlink.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
@@ -277,6 +281,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
@@ -288,6 +293,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
@@ -298,7 +304,6 @@ 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
@@ -325,7 +330,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
@@ -334,7 +338,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
@@ -366,14 +369,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
@@ -381,7 +382,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-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
@@ -493,6 +495,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/secrets.h
include/wireshark/epan/show_exception.h
include/wireshark/epan/slow_protocol_subtypes.h
include/wireshark/epan/sminmpec.h
@@ -538,27 +541,27 @@ 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/
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/
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
@@ -571,16 +574,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
@@ -605,7 +611,7 @@ 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/wsjsmn.h
+include/wireshark/wsutil/wsjson.h
include/wireshark/wsutil/xtea.h
@lib lib/libwireshark.so.${LIBwireshark_VERSION}
@lib lib/libwiretap.so.${LIBwiretap_VERSION}
@@ -613,14 +619,16 @@ include/wireshark/wsutil/xtea.h
@lib lib/libwsutil.so.${LIBwsutil_VERSION}
lib/pkgconfig/wireshark.pc
lib/wireshark/
-lib/wireshark/FindGLIB2.cmake
-lib/wireshark/FindWSWinLibs.cmake
-lib/wireshark/FindWireshark.cmake
-lib/wireshark/LocatePythonModule.cmake
-lib/wireshark/UseAsn2Wrs.cmake
-lib/wireshark/UseMakePluginReg.cmake
-lib/wireshark/WiresharkConfig.cmake
-lib/wireshark/WiresharkConfigVersion.cmake
+lib/wireshark/cmake/
+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${MODCMAKE_BUILD_SUFFIX}
+lib/wireshark/cmake/WiresharkTargets.cmake
lib/wireshark/extcap/
@bin lib/wireshark/extcap/androiddump
@bin lib/wireshark/extcap/ciscodump
@@ -681,7 +689,6 @@ share/wireshark/diameter/
share/wireshark/diameter/AlcatelLucent.xml
share/wireshark/diameter/Cisco.xml
share/wireshark/diameter/CiscoSystems.xml
-share/wireshark/diameter/Custom.make
share/wireshark/diameter/Custom.xml
share/wireshark/diameter/Ericsson.xml
share/wireshark/diameter/HP.xml
@@ -728,11 +735,12 @@ share/wireshark/help/
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
share/wireshark/init.lua
+share/wireshark/ipmap.html
share/wireshark/manuf
share/wireshark/mergecap.html
share/wireshark/mmdbresolve.html
@@ -743,8 +751,9 @@ share/wireshark/profiles/Bluetooth/color
share/wireshark/profiles/Bluetooth/preferences
share/wireshark/profiles/Classic/
share/wireshark/profiles/Classic/colorfilters
+share/wireshark/profiles/No Reassembly/
+share/wireshark/profiles/No Reassembly/preferences
share/wireshark/radius/
-share/wireshark/radius/Custom.make
share/wireshark/radius/README.radius_dictionary
share/wireshark/radius/custom.includes
share/wireshark/radius/dictionary
@@ -934,6 +943,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
