CVS commit: pkgsrc/net/wireshark

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Aug 31 08:39:33 UTC 2024

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

Log Message:
wireshark: updated to 4.4.0

Wireshark 4.4.0

Many improvements and fixes to the graphing dialogs, including I/O Graphs, Flow Graph / VoIP Calls, and TCP Stream Graphs.

Wireshark now supports automatic profile switching. You can associate a display filter with a configuration profile, and when you open a capture file that matches the filter, Wireshark will 
automatically switch to that profile.

Support for Lua 5.3 and 5.4 has been added, and support for Lua 5.1 and 5.2 has been removed. The Windows and macOS installers now ship with Lua 5.4.6.

Improved display filter support for value strings (optional string representations for numeric fields).

Display filter functions can be implemented as plugins, similar to protocol dissectors and file parsers.

Display filters can be translated to pcap filters using Edit › Copy › Display filter as pcap filter if each display filter field has a corresponding pcap filter equivalent.

Custom columns can be defined using any valid field expression, such as display filter functions, packet slices, arithmetic calculations, logical tests, raw byte addressing, and protocol layer 
modifiers.

Custom output fields for tshark -e can also be defined using any valid field expression.

Wireshark can be built with the zlib-ng instead of zlib for compressed file support. Zlib-ng is substantially faster than zlib. The official Windows and macOS packages include this feature.


To generate a diff of this commit:
cvs rdiff -u -r1.317 -r1.318 pkgsrc/net/wireshark/Makefile
cvs rdiff -u -r1.91 -r1.92 pkgsrc/net/wireshark/PLIST
cvs rdiff -u -r1.175 -r1.176 pkgsrc/net/wireshark/distinfo
cvs rdiff -u -r1.35 -r1.36 pkgsrc/net/wireshark/options.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/wireshark/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/wireshark/patches/patch-ui_qt_utils_qt__ui__utils.cpp

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

Modified files:

Index: pkgsrc/net/wireshark/Makefile
diff -u pkgsrc/net/wireshark/Makefile:1.317 pkgsrc/net/wireshark/Makefile:1.318
--- pkgsrc/net/wireshark/Makefile:1.317 Sun Aug 25 06:19:09 2024
+++ pkgsrc/net/wireshark/Makefile       Sat Aug 31 08:39:32 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.317 2024/08/25 06:19:09 wiz Exp $
+# $NetBSD: Makefile,v 1.318 2024/08/31 08:39:32 adam Exp $
 
-DISTNAME=      wireshark-4.2.6
+DISTNAME=      wireshark-4.4.0
 CATEGORIES=    net
 MASTER_SITES=  https://www.wireshark.org/download/src/
 EXTRACT_SUFX=  .tar.xz
@@ -29,7 +29,6 @@ CHECK_PORTABILITY_SKIP+=      tools/bsd-setup
 
 PTHREAD_OPTS+=         require
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27 # Python 2.7 is not supported
 PYTHON_FOR_BUILD_ONLY=         yes
 REPLACE_PYTHON+=               tools/asn2deb
 REPLACE_PYTHON+=               tools/asn2wrs.py
@@ -54,9 +53,6 @@ USE_BUILTIN.libpcap=  no
 # Extra post install targets are in options.mk
 post-install: ${POST_INSTALL_TARGETS}
 
-# wireshark no longer builds with NetBSD 3.x provided zlib
-BUILDLINK_API_DEPENDS.zlib+=   zlib>=1.2.1
-
 # wireshark uses gdk_pixbuf_new_from_inline which is deprecated, but asks
 # to hide deprecated prototypes. This leads to pointer truncation.
 # gui_utils.c:514:12: warning: incompatible integer to pointer conversion
@@ -73,6 +69,7 @@ SUBST_SED.lemon=      -e 's,/usr/share,${PREF
 .include "../../archivers/brotli/buildlink3.mk"
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../archivers/minizip/buildlink3.mk"
+.include "../../archivers/zlib-ng/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../audio/libopus/buildlink3.mk"
 .include "../../audio/opencore-amr/buildlink3.mk"
@@ -82,7 +79,6 @@ SUBST_SED.lemon=      -e 's,/usr/share,${PREF
 .include "../../devel/libsmi/buildlink3.mk"
 .include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/snappy/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
 .include "../../geography/libmaxminddb/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../net/libcares/buildlink3.mk"

Index: pkgsrc/net/wireshark/PLIST
diff -u pkgsrc/net/wireshark/PLIST:1.91 pkgsrc/net/wireshark/PLIST:1.92
--- pkgsrc/net/wireshark/PLIST:1.91     Sat Jul 13 21:33:59 2024
+++ pkgsrc/net/wireshark/PLIST  Sat Aug 31 08:39:32 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.91 2024/07/13 21:33:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.92 2024/08/31 08:39:32 adam Exp $
 bin/capinfos
 bin/captype
 bin/dumpcap
@@ -14,40 +14,41 @@ bin/text2pcap
 bin/tshark
 ${PLIST.qt}bin/wireshark
 lib/libwireshark.so
-lib/libwireshark.so.17
-lib/libwireshark.so.17.0.6
+lib/libwireshark.so.18
+lib/libwireshark.so.18.0.0
 lib/libwiretap.so
-lib/libwiretap.so.14
-lib/libwiretap.so.14.1.6
+lib/libwiretap.so.15
+lib/libwiretap.so.15.0.0
 lib/libwsutil.so
-lib/libwsutil.so.15
-lib/libwsutil.so.15.0.0
+lib/libwsutil.so.16
+lib/libwsutil.so.16.0.0
 lib/wireshark/extcap/androiddump
 lib/wireshark/extcap/ciscodump
 lib/wireshark/extcap/randpktdump
 lib/wireshark/extcap/sshdump
 lib/wireshark/extcap/udpdump
 lib/wireshark/extcap/wifidump
-lib/wireshark/plugins/4.2/codecs/amrnb.so
-lib/wireshark/plugins/4.2/codecs/g711.so
-${PLIST.spandsp}lib/wireshark/plugins/4.2/codecs/g722.so
-${PLIST.spandsp}lib/wireshark/plugins/4.2/codecs/g726.so
-${PLIST.ilbc}lib/wireshark/plugins/4.2/codecs/ilbc.so
-lib/wireshark/plugins/4.2/codecs/l16mono.so
-lib/wireshark/plugins/4.2/codecs/opus_dec.so
-lib/wireshark/plugins/4.2/epan/ethercat.so
-lib/wireshark/plugins/4.2/epan/gryphon.so
-lib/wireshark/plugins/4.2/epan/irda.so
-lib/wireshark/plugins/4.2/epan/mate.so
-lib/wireshark/plugins/4.2/epan/opcua.so
-lib/wireshark/plugins/4.2/epan/profinet.so
-lib/wireshark/plugins/4.2/epan/stats_tree.so
-lib/wireshark/plugins/4.2/epan/transum.so
-lib/wireshark/plugins/4.2/epan/unistim.so
-lib/wireshark/plugins/4.2/epan/wimax.so
-lib/wireshark/plugins/4.2/epan/wimaxasncp.so
-lib/wireshark/plugins/4.2/epan/wimaxmacphy.so
-lib/wireshark/plugins/4.2/wiretap/usbdump.so
+lib/wireshark/plugins/4.4/codecs/amrnb.so
+lib/wireshark/plugins/4.4/codecs/g711.so
+${PLIST.spandsp}lib/wireshark/plugins/4.4/codecs/g722.so
+${PLIST.spandsp}lib/wireshark/plugins/4.4/codecs/g726.so
+${PLIST.ilbc}lib/wireshark/plugins/4.4/codecs/ilbc.so
+lib/wireshark/plugins/4.4/codecs/l16mono.so
+lib/wireshark/plugins/4.4/codecs/opus_dec.so
+lib/wireshark/plugins/4.4/epan/ethercat.so
+lib/wireshark/plugins/4.4/epan/gryphon.so
+lib/wireshark/plugins/4.4/epan/ipaddr.so
+lib/wireshark/plugins/4.4/epan/irda.so
+lib/wireshark/plugins/4.4/epan/mate.so
+lib/wireshark/plugins/4.4/epan/opcua.so
+lib/wireshark/plugins/4.4/epan/profinet.so
+lib/wireshark/plugins/4.4/epan/stats_tree.so
+lib/wireshark/plugins/4.4/epan/transum.so
+lib/wireshark/plugins/4.4/epan/unistim.so
+lib/wireshark/plugins/4.4/epan/wimax.so
+lib/wireshark/plugins/4.4/epan/wimaxasncp.so
+lib/wireshark/plugins/4.4/epan/wimaxmacphy.so
+lib/wireshark/plugins/4.4/wiretap/usbdump.so
 ${PLIST.icons}share/applications/org.wireshark.Wireshark.desktop
 share/doc/wireshark/COPYING
 share/doc/wireshark/README.xml-output
@@ -79,7 +80,6 @@ ${PLIST.icons}share/metainfo/org.wiresha
 ${PLIST.icons}share/mime/packages/org.wireshark.Wireshark.xml
 share/wireshark/cfilters
 share/wireshark/colorfilters
-share/wireshark/dfilter_macros
 share/wireshark/dfilters
 share/wireshark/diameter/AlcatelLucent.xml
 share/wireshark/diameter/Cisco.xml
@@ -100,6 +100,7 @@ share/wireshark/diameter/Starent.xml
 share/wireshark/diameter/TGPP.xml
 share/wireshark/diameter/TGPP2.xml
 share/wireshark/diameter/Telefonica.xml
+share/wireshark/diameter/Travelping.xml
 share/wireshark/diameter/VerizonWireless.xml
 share/wireshark/diameter/Vodafone.xml
 share/wireshark/diameter/chargecontrol.xml
@@ -112,6 +113,7 @@ share/wireshark/diameter/mobileipv6.xml
 share/wireshark/diameter/nasreq.xml
 share/wireshark/diameter/sip.xml
 share/wireshark/diameter/sunping.xml
+share/wireshark/dmacros
 share/wireshark/dtds/dc.dtd
 share/wireshark/dtds/itunes.dtd
 share/wireshark/dtds/mscml.dtd
@@ -129,6 +131,7 @@ share/wireshark/profiles/Bluetooth/color
 share/wireshark/profiles/Bluetooth/preferences
 share/wireshark/profiles/Classic/colorfilters
 share/wireshark/profiles/No Reassembly/preferences
+share/wireshark/radius/.editorconfig
 share/wireshark/radius/README.radius_dictionary
 share/wireshark/radius/custom.includes
 share/wireshark/radius/dictionary
@@ -139,12 +142,15 @@ share/wireshark/radius/dictionary.5x9
 share/wireshark/radius/dictionary.acc
 share/wireshark/radius/dictionary.acme
 share/wireshark/radius/dictionary.actelis
+share/wireshark/radius/dictionary.adtran
+share/wireshark/radius/dictionary.adva
 share/wireshark/radius/dictionary.aerohive
 share/wireshark/radius/dictionary.airespace
 share/wireshark/radius/dictionary.alcatel
 share/wireshark/radius/dictionary.alcatel-lucent.aaa
 share/wireshark/radius/dictionary.alcatel.esam
 share/wireshark/radius/dictionary.alcatel.sr
+share/wireshark/radius/dictionary.alphion
 share/wireshark/radius/dictionary.alteon
 share/wireshark/radius/dictionary.altiga
 share/wireshark/radius/dictionary.alvarion
@@ -153,15 +159,19 @@ share/wireshark/radius/dictionary.apc
 share/wireshark/radius/dictionary.aptilo
 share/wireshark/radius/dictionary.aptis
 share/wireshark/radius/dictionary.arbor
+share/wireshark/radius/dictionary.arista
 share/wireshark/radius/dictionary.aruba
 share/wireshark/radius/dictionary.ascend
+share/wireshark/radius/dictionary.ascend.illegal
 share/wireshark/radius/dictionary.asn
 share/wireshark/radius/dictionary.audiocodes
 share/wireshark/radius/dictionary.avaya
 share/wireshark/radius/dictionary.azaire
 share/wireshark/radius/dictionary.bay
+share/wireshark/radius/dictionary.bigswitch
 share/wireshark/radius/dictionary.bintec
 share/wireshark/radius/dictionary.bluecoat
+share/wireshark/radius/dictionary.boingo
 share/wireshark/radius/dictionary.bristol
 share/wireshark/radius/dictionary.broadsoft
 share/wireshark/radius/dictionary.brocade
@@ -169,14 +179,20 @@ share/wireshark/radius/dictionary.bskyb
 share/wireshark/radius/dictionary.bt
 share/wireshark/radius/dictionary.cablelabs
 share/wireshark/radius/dictionary.cabletron
+share/wireshark/radius/dictionary.calix
+share/wireshark/radius/dictionary.cambium
 share/wireshark/radius/dictionary.camiant
+share/wireshark/radius/dictionary.centec
+share/wireshark/radius/dictionary.checkpoint
 share/wireshark/radius/dictionary.chillispot
+share/wireshark/radius/dictionary.ciena
 share/wireshark/radius/dictionary.cisco
 share/wireshark/radius/dictionary.cisco.asa
 share/wireshark/radius/dictionary.cisco.bbsm
 share/wireshark/radius/dictionary.cisco.vpn3000
 share/wireshark/radius/dictionary.cisco.vpn5000
 share/wireshark/radius/dictionary.citrix
+share/wireshark/radius/dictionary.ckey
 share/wireshark/radius/dictionary.clavister
 share/wireshark/radius/dictionary.cnergee
 share/wireshark/radius/dictionary.colubris
@@ -184,13 +200,14 @@ share/wireshark/radius/dictionary.columb
 share/wireshark/radius/dictionary.compat
 share/wireshark/radius/dictionary.compatible
 share/wireshark/radius/dictionary.cosine
+share/wireshark/radius/dictionary.covaro
 share/wireshark/radius/dictionary.dante
 share/wireshark/radius/dictionary.dellemc
-share/wireshark/radius/dictionary.dhcp
 share/wireshark/radius/dictionary.digium
 share/wireshark/radius/dictionary.dlink
 share/wireshark/radius/dictionary.dragonwave
 share/wireshark/radius/dictionary.efficientip
+share/wireshark/radius/dictionary.eleven
 share/wireshark/radius/dictionary.eltex
 share/wireshark/radius/dictionary.enterasys
 share/wireshark/radius/dictionary.epygi
@@ -198,24 +215,29 @@ share/wireshark/radius/dictionary.equall
 share/wireshark/radius/dictionary.ericsson
 share/wireshark/radius/dictionary.ericsson.ab
 share/wireshark/radius/dictionary.ericsson.packet.core.networks
+share/wireshark/radius/dictionary.erx
 share/wireshark/radius/dictionary.extreme
 share/wireshark/radius/dictionary.f5
 share/wireshark/radius/dictionary.fdxtended
+share/wireshark/radius/dictionary.force10
 share/wireshark/radius/dictionary.fortinet
 share/wireshark/radius/dictionary.foundry
 share/wireshark/radius/dictionary.freedhcp
 share/wireshark/radius/dictionary.freeradius
+share/wireshark/radius/dictionary.freeradius.evs5
 share/wireshark/radius/dictionary.freeradius.internal
 share/wireshark/radius/dictionary.freeswitch
 share/wireshark/radius/dictionary.gandalf
 share/wireshark/radius/dictionary.garderos
 share/wireshark/radius/dictionary.gemtek
 share/wireshark/radius/dictionary.h3c
+share/wireshark/radius/dictionary.hillstone
 share/wireshark/radius/dictionary.hp
 share/wireshark/radius/dictionary.huawei
 share/wireshark/radius/dictionary.iana
 share/wireshark/radius/dictionary.identity_engines
 share/wireshark/radius/dictionary.iea
+share/wireshark/radius/dictionary.infinera
 share/wireshark/radius/dictionary.infoblox
 share/wireshark/radius/dictionary.infonet
 share/wireshark/radius/dictionary.ipunplugged
@@ -226,39 +248,50 @@ share/wireshark/radius/dictionary.junipe
 share/wireshark/radius/dictionary.karlnet
 share/wireshark/radius/dictionary.kineto
 share/wireshark/radius/dictionary.lancom
+share/wireshark/radius/dictionary.lantronix
 share/wireshark/radius/dictionary.livingston
 share/wireshark/radius/dictionary.localweb
 share/wireshark/radius/dictionary.lucent
 share/wireshark/radius/dictionary.manzara
 share/wireshark/radius/dictionary.meinberg
+share/wireshark/radius/dictionary.mellanox
 share/wireshark/radius/dictionary.meraki
 share/wireshark/radius/dictionary.merit
 share/wireshark/radius/dictionary.meru
 share/wireshark/radius/dictionary.microsemi
 share/wireshark/radius/dictionary.microsoft
 share/wireshark/radius/dictionary.mikrotik
+share/wireshark/radius/dictionary.mimosa
 share/wireshark/radius/dictionary.motorola
+share/wireshark/radius/dictionary.motorola.illegal
 share/wireshark/radius/dictionary.motorola.wimax
 share/wireshark/radius/dictionary.navini
+share/wireshark/radius/dictionary.net
+share/wireshark/radius/dictionary.netelastic
 share/wireshark/radius/dictionary.netscreen
 share/wireshark/radius/dictionary.networkphysics
 share/wireshark/radius/dictionary.nexans
+share/wireshark/radius/dictionary.nile
 share/wireshark/radius/dictionary.nokia
 share/wireshark/radius/dictionary.nokia.conflict
 share/wireshark/radius/dictionary.nomadix
 share/wireshark/radius/dictionary.nortel
 share/wireshark/radius/dictionary.ntua
 share/wireshark/radius/dictionary.openser
+share/wireshark/radius/dictionary.openwifi
 share/wireshark/radius/dictionary.packeteer
 share/wireshark/radius/dictionary.paloalto
 share/wireshark/radius/dictionary.patton
 share/wireshark/radius/dictionary.perle
+share/wireshark/radius/dictionary.pfsense
+share/wireshark/radius/dictionary.pica8
 share/wireshark/radius/dictionary.propel
 share/wireshark/radius/dictionary.prosoft
 share/wireshark/radius/dictionary.proxim
 share/wireshark/radius/dictionary.purewave
 share/wireshark/radius/dictionary.quiconnect
 share/wireshark/radius/dictionary.quintum
+share/wireshark/radius/dictionary.rcntec
 share/wireshark/radius/dictionary.redcreek
 share/wireshark/radius/dictionary.rfc2865
 share/wireshark/radius/dictionary.rfc2866
@@ -292,6 +325,8 @@ share/wireshark/radius/dictionary.rfc715
 share/wireshark/radius/dictionary.rfc7268
 share/wireshark/radius/dictionary.rfc7499
 share/wireshark/radius/dictionary.rfc7930
+share/wireshark/radius/dictionary.rfc8045
+share/wireshark/radius/dictionary.rfc8559
 share/wireshark/radius/dictionary.riverbed
 share/wireshark/radius/dictionary.riverstone
 share/wireshark/radius/dictionary.roaringpenguin
@@ -303,7 +338,9 @@ share/wireshark/radius/dictionary.shasta
 share/wireshark/radius/dictionary.shiva
 share/wireshark/radius/dictionary.siemens
 share/wireshark/radius/dictionary.slipstream
+share/wireshark/radius/dictionary.smartsharesystems
 share/wireshark/radius/dictionary.sofaware
+share/wireshark/radius/dictionary.softbank
 share/wireshark/radius/dictionary.sonicwall
 share/wireshark/radius/dictionary.springtide
 share/wireshark/radius/dictionary.starent
@@ -313,22 +350,27 @@ share/wireshark/radius/dictionary.symbol
 share/wireshark/radius/dictionary.t_systems_nova
 share/wireshark/radius/dictionary.telebit
 share/wireshark/radius/dictionary.telkom
+share/wireshark/radius/dictionary.telrad
 share/wireshark/radius/dictionary.terena
+share/wireshark/radius/dictionary.tplink
 share/wireshark/radius/dictionary.trapeze
 share/wireshark/radius/dictionary.travelping
+share/wireshark/radius/dictionary.tripplite
 share/wireshark/radius/dictionary.tropos
 share/wireshark/radius/dictionary.ukerna
 share/wireshark/radius/dictionary.unisphere
 share/wireshark/radius/dictionary.unix
 share/wireshark/radius/dictionary.usr
+share/wireshark/radius/dictionary.usr.illegal
 share/wireshark/radius/dictionary.utstarcom
 share/wireshark/radius/dictionary.valemount
+share/wireshark/radius/dictionary.vasexperts
 share/wireshark/radius/dictionary.verizon
 share/wireshark/radius/dictionary.versanet
-share/wireshark/radius/dictionary.vqp
 share/wireshark/radius/dictionary.walabi
 share/wireshark/radius/dictionary.waverider
 share/wireshark/radius/dictionary.wichorus
+share/wireshark/radius/dictionary.wifialliance
 share/wireshark/radius/dictionary.wimax
 share/wireshark/radius/dictionary.wimax.alvarion
 share/wireshark/radius/dictionary.wimax.wichorus

Index: pkgsrc/net/wireshark/distinfo
diff -u pkgsrc/net/wireshark/distinfo:1.175 pkgsrc/net/wireshark/distinfo:1.176
--- pkgsrc/net/wireshark/distinfo:1.175 Sat Jul 13 21:33:59 2024
+++ pkgsrc/net/wireshark/distinfo       Sat Aug 31 08:39:32 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.175 2024/07/13 21:33:59 adam Exp $
+$NetBSD: distinfo,v 1.176 2024/08/31 08:39:32 adam Exp $
 
-BLAKE2s (wireshark-4.2.6.tar.xz) = 3323dab15629374024bf8186521c2dba57ad86be743c4d41019f83b1719acca9
-SHA512 (wireshark-4.2.6.tar.xz) = 265bbc50787ba15646a8a4602e2598bb58494aee496b14a2392293862725320674f7084c7c00de5f9db41dbfc2eb23d88fd8e6b72f3c4036067192b44da22516
-Size (wireshark-4.2.6.tar.xz) = 45015272 bytes
-SHA1 (patch-CMakeLists.txt) = 6c9e1dc7a7c7000a15ed49c24036b987f43156f2
+BLAKE2s (wireshark-4.4.0.tar.xz) = 1ea33cdcdc58b426b81304376a7f7e084ee272bd95ed002fdaf25f97331a7a5f
+SHA512 (wireshark-4.4.0.tar.xz) = a00275ffcc7c5bdf546e3e1c95a2fa77b86232d008f77b1b2f3de8e63f1862321d7a439cba2d136be4407131e07e20071d972a4efb7db2bc55388a347f47ce9e
+Size (wireshark-4.4.0.tar.xz) = 46786568 bytes
+SHA1 (patch-CMakeLists.txt) = 80af7e00226894efe82db3b89ea8fee08bd30681
+SHA1 (patch-ui_qt_utils_qt__ui__utils.cpp) = 4ba9b67aa961431f8b862b91ee2fdfa02e39e953

Index: pkgsrc/net/wireshark/options.mk
diff -u pkgsrc/net/wireshark/options.mk:1.35 pkgsrc/net/wireshark/options.mk:1.36
--- pkgsrc/net/wireshark/options.mk:1.35        Sun Aug 25 06:19:09 2024
+++ pkgsrc/net/wireshark/options.mk     Sat Aug 31 08:39:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.35 2024/08/25 06:19:09 wiz Exp $
+# $NetBSD: options.mk,v 1.36 2024/08/31 08:39:32 adam Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.wireshark
 PKG_SUPPORTED_OPTIONS=         http2 http3 ilbc lua spandsp
@@ -8,37 +8,37 @@ PKG_SUGGESTED_OPTIONS=                http2 http3 lua 
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           icons ilbc qt spandsp
+PLIST_VARS+=   icons ilbc qt spandsp
 
 .if !empty(PKG_OPTIONS:Mhttp2)
 .  include "../../www/nghttp2/buildlink3.mk"
 .else
-CMAKE_CONFIGURE_ARGS+=         -DENABLE_NGHTTP2=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_NGHTTP2=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mhttp3)
 .  include "../../www/nghttp3/buildlink3.mk"
 .else
-CMAKE_CONFIGURE_ARGS+=         -DENABLE_NGHTTP3=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_NGHTTP3=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Milbc)
 .  include "../../audio/libilbc/buildlink3.mk"
 PLIST.ilbc=            yes
 .else
-CMAKE_CONFIGURE_ARGS+=         -DENABLE_ILBC=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_ILBC=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mlua)
-LUA_VERSIONS_ACCEPTED= 52 51
+LUA_VERSIONS_ACCEPTED= 54 53
 .  include "../../lang/lua/buildlink3.mk"
 .else
-CMAKE_CONFIGURE_ARGS+=         -DENABLE_LUA=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LUA=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mqt5) || !empty(PKG_OPTIONS:Mqt6)
 .  if !empty(PKG_OPTIONS:Mqt5)
-CMAKE_CONFIGURE_ARGS+=         -DUSE_qt6=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_qt6=OFF
 .    include "../../x11/qt5-qtsvg/buildlink3.mk"
 .    include "../../x11/qt5-qttools/buildlink3.mk"
 .    if ${OPSYS} == "Darwin"
@@ -47,7 +47,7 @@ CMAKE_CONFIGURE_ARGS+=                -DUSE_qt6=OFF
 .      include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .    endif
 .  elif !empty(PKG_OPTIONS:Mqt6)
-CMAKE_CONFIGURE_ARGS+=         -DUSE_qt6=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_qt6=ON
 .    include "../../graphics/qt6-qtsvg/buildlink3.mk"
 .    include "../../multimedia/qt6-qtmultimedia/buildlink3.mk"
 .    include "../../devel/qt6-qttools/buildlink3.mk"
@@ -83,13 +83,13 @@ install-icons:
 .    endfor
 .  endif
 .else
-CMAKE_CONFIGURE_ARGS+=         -DBUILD_wireshark=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_wireshark=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mspandsp)
 .include "../../comms/spandsp/buildlink3.mk"
 PLIST.spandsp=         yes
-CMAKE_CONFIGURE_ARGS+=         -DENABLE_SPANDSP=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SPANDSP=ON
 .else
-CMAKE_CONFIGURE_ARGS+=         -DENABLE_SPANDSP=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SPANDSP=OFF
 .endif

Index: pkgsrc/net/wireshark/patches/patch-CMakeLists.txt
diff -u pkgsrc/net/wireshark/patches/patch-CMakeLists.txt:1.9 pkgsrc/net/wireshark/patches/patch-CMakeLists.txt:1.10
--- pkgsrc/net/wireshark/patches/patch-CMakeLists.txt:1.9       Mon Nov 20 18:34:49 2023
+++ pkgsrc/net/wireshark/patches/patch-CMakeLists.txt   Sat Aug 31 08:39:32 2024
@@ -1,13 +1,13 @@
-$NetBSD: patch-CMakeLists.txt,v 1.9 2023/11/20 18:34:49 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.10 2024/08/31 08:39:32 adam Exp $
 
 Do not make application bundle on Darwin.
 
 editcap needs -lm, like tfshark:
 editcap.c:(.text.startup+0x5b8): undefined reference to `modf'
 
---- CMakeLists.txt.orig        2023-11-15 18:30:18.000000000 +0000
+--- CMakeLists.txt.orig        2024-08-28 18:51:12.000000000 +0000
 +++ CMakeLists.txt
-@@ -1536,7 +1536,7 @@ if(WIN32)
+@@ -1605,7 +1605,7 @@ if(WIN32)
        set(WIN_WS2_32_LIBRARY   ws2_32.lib)
  endif()
  
@@ -16,17 +16,17 @@ editcap.c:(.text.startup+0x5b8): undefin
        #
        # We assume that APPLE means macOS so that we have the macOS
        # frameworks.
-@@ -1595,7 +1595,7 @@ else()
+@@ -1669,7 +1669,7 @@ else()
+       endif()
  endif()
- set(EXTCAP_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${EXTCAP_INSTALL_LIBDIR}")
  
 -if(APPLE)
 +if(FALSE)
        #
        # As https://developer.apple.com/library/archive/technotes/tn2206/_index.html
        # says,
-@@ -2732,7 +2732,11 @@ if(BUILD_wireshark AND QT_FOUND)
-               ${MINIZIP_LIBRARIES}
+@@ -2846,7 +2846,11 @@ if(BUILD_wireshark AND QT_FOUND)
+               ${MINIZIPNG_LIBRARIES}
        )
  
 +      if(ENABLE_APPLICATION_BUNDLE)
@@ -37,7 +37,7 @@ editcap.c:(.text.startup+0x5b8): undefin
        if(MSVC)
                set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT wireshark)
        endif()
-@@ -3231,6 +3235,7 @@ endif()
+@@ -3352,6 +3356,7 @@ endif()
  
  if(BUILD_editcap)
        set(editcap_LIBS

Added files:

Index: pkgsrc/net/wireshark/patches/patch-ui_qt_utils_qt__ui__utils.cpp
diff -u /dev/null pkgsrc/net/wireshark/patches/patch-ui_qt_utils_qt__ui__utils.cpp:1.1
--- /dev/null   Sat Aug 31 08:39:33 2024
+++ pkgsrc/net/wireshark/patches/patch-ui_qt_utils_qt__ui__utils.cpp    Sat Aug 31 08:39:32 2024
@@ -0,0 +1,19 @@
+$NetBSD: patch-ui_qt_utils_qt__ui__utils.cpp,v 1.1 2024/08/31 08:39:32 adam Exp $
+
+Fix build.
+https://gitlab.com/wireshark/wireshark/-/issues/20031
+
+--- ui/qt/utils/qt_ui_utils.cpp.orig   2024-08-31 08:25:52.306338124 +0000
++++ ui/qt/utils/qt_ui_utils.cpp
+@@ -246,7 +246,11 @@ void desktop_show_in_folder(const QStrin
+     // If that failed, perhaps we are sandboxed.  Try using Portal Services.
+     // https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.portal.OpenURI.html
+     if (!success) {
++#ifdef O_PATH
+         const int fd = ws_open(QFile::encodeName(file_path), O_CLOEXEC | O_PATH, 0000);
++#else
++        const int fd = ws_open(QFile::encodeName(file_path), O_CLOEXEC, 0000);
++#endif
+         if (fd != -1) {
+             QDBusUnixFileDescriptor descriptor;
+             descriptor.giveFileDescriptor(fd);