CVS commit: pkgsrc/net/wireshark

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Nov  1 08:59:26 UTC 2022

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

Log Message:
wireshark: updated to 4.0.1

Wireshark 4.0.1 Release Notes

 What’s New

  We do not ship official 32-bit Windows packages for Wireshark 4.0 and
  later. If you need to use Wireshark on that platform, we recommend
  using the latest 3.6 release. Issue 17779[1]

    • The Windows installers now ship with Qt 5.12.2. They previously
      shipped with Qt 6.2.3.

  Bug Fixes

   The following bugs have been fixed:

     • Comparing a boolean field against 1 always succeeds on big-endian
       machines. Issue 12236[2].

     • Qt: MaxMind GeoIP columns not added to Endpoints table. Issue
       18320[3].

     • Fuzz job crash output: fuzz-2022-10-04-7131.pcap. Issue 18402[4].

     • The RTP player might not play audio on Windows. Issue 18413[5].

     • Wireshark 4.0 breaks display filter expression with > sign. Issue
       18418[6].

     • Capture filters not working when using SSH capture and dumpcap.
       Issue 18420[7].

     • Packet diagram field values are not terminated. Issue 18428[8].

     • Packet bytes not displayed completely if scrolling. Issue
       18438[9].

     • Fuzz job crash output: fuzz-2022-10-13-7166.pcap. Issue
       18467[10].

     • Decoding bug H.245 userInput Signal. Issue 18468[11].

     • CFDP dissector doesn’t handle \"destination filename\" only.
       Issue 18495[12].

     • Home page capture button doesn’t pop up capture options dialog.
       Issue 18506[13].

     • Missing dot in H.248 protocol name. Issue 18513[14].

     • Missing dot for protocol H.264 in protocol column. Issue
       18524[15].

     • Fuzz job crash output: fuzz-2022-10-23-7240.pcap. Issue
       18534[16].

  New and Updated Features

  Removed Features and Support

     • The experimental display filter syntax for literals using angle
       brackets <…​> that was introduced in Wireshark 4.0.0 has been
       removed. For byte arrays a colon prefix can be used instead. See
       the User’s Guide[17] for details.

  New Protocol Support

   There are no new protocols in this release.

  Updated Protocol Support

   ASN.1 PER, CFDP, Diameter, DirectPlay, F5 Ethernet Trailer, GTP,
   H.223, H.248, H.264, H.265, IEEE 802.11, IPv4, MBIM, O-RAN FH CUS,
   PFCP, RTCP, SCTP, SMB, TCP, and TRANSUM

  New and Updated Capture File Support

   BLF

  New File Format Decoding Support

   There is no new or updated file format support in this release.


To generate a diff of this commit:
cvs rdiff -u -r1.280 -r1.281 pkgsrc/net/wireshark/Makefile
cvs rdiff -u -r1.74 -r1.75 pkgsrc/net/wireshark/PLIST
cvs rdiff -u -r1.159 -r1.160 pkgsrc/net/wireshark/distinfo
cvs rdiff -u -r1.27 -r1.28 pkgsrc/net/wireshark/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/wireshark/patches/patch-CMakeLists.txt

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

Modified files:

Index: pkgsrc/net/wireshark/Makefile
diff -u pkgsrc/net/wireshark/Makefile:1.280 pkgsrc/net/wireshark/Makefile:1.281
--- pkgsrc/net/wireshark/Makefile:1.280 Wed Oct 26 10:31:53 2022
+++ pkgsrc/net/wireshark/Makefile       Tue Nov  1 08:59:25 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.280 2022/10/26 10:31:53 wiz Exp $
+# $NetBSD: Makefile,v 1.281 2022/11/01 08:59:25 adam Exp $
 
-DISTNAME=      wireshark-3.6.8
-PKGREVISION=   1
+DISTNAME=      wireshark-4.0.1
 CATEGORIES=    net
 MASTER_SITES=  https://www.wireshark.org/download/src/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/net/wireshark/PLIST
diff -u pkgsrc/net/wireshark/PLIST:1.74 pkgsrc/net/wireshark/PLIST:1.75
--- pkgsrc/net/wireshark/PLIST:1.74     Sun Sep 11 14:12:02 2022
+++ pkgsrc/net/wireshark/PLIST  Tue Nov  1 08:59:25 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.74 2022/09/11 14:12:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.75 2022/11/01 08:59:25 adam Exp $
 bin/capinfos
 bin/captype
 bin/dumpcap
@@ -52,6 +52,7 @@ include/wireshark/epan/dfilter/drange.h
 include/wireshark/epan/diam_dict.h
 include/wireshark/epan/disabled_protos.h
 include/wireshark/epan/dissectors/cond_ace_token_enum.h
+include/wireshark/epan/dissectors/file-pcapng.h
 include/wireshark/epan/dissectors/file-rbm.h
 include/wireshark/epan/dissectors/packet-6lowpan.h
 include/wireshark/epan/dissectors/packet-a21.h
@@ -71,8 +72,10 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-atalk.h
 include/wireshark/epan/dissectors/packet-atm.h
 include/wireshark/epan/dissectors/packet-atn-ulcs.h
+include/wireshark/epan/dissectors/packet-autosar-ipdu-multiplexer.h
 include/wireshark/epan/dissectors/packet-bacapp.h
 include/wireshark/epan/dissectors/packet-bacnet.h
+include/wireshark/epan/dissectors/packet-bblog.h
 include/wireshark/epan/dissectors/packet-ber.h
 include/wireshark/epan/dissectors/packet-bfd.h
 include/wireshark/epan/dissectors/packet-bgp.h
@@ -138,6 +141,7 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-diameter_3gpp.h
 include/wireshark/epan/dissectors/packet-diffserv-mpls-common.h
 include/wireshark/epan/dissectors/packet-disp.h
+include/wireshark/epan/dissectors/packet-dlt.h
 include/wireshark/epan/dissectors/packet-dns.h
 include/wireshark/epan/dissectors/packet-docsis-tlv.h
 include/wireshark/epan/dissectors/packet-doip.h
@@ -175,6 +179,7 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-frame.h
 include/wireshark/epan/dissectors/packet-ftam.h
 include/wireshark/epan/dissectors/packet-ftdi-ft.h
+include/wireshark/epan/dissectors/packet-gdt.h
 include/wireshark/epan/dissectors/packet-geonw.h
 include/wireshark/epan/dissectors/packet-giop.h
 include/wireshark/epan/dissectors/packet-gluster.h
@@ -394,7 +399,8 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-tacacs.h
 include/wireshark/epan/dissectors/packet-tcap.h
 include/wireshark/epan/dissectors/packet-tcp.h
-include/wireshark/epan/dissectors/packet-tcpclv3.h
+include/wireshark/epan/dissectors/packet-tcpcl.h
+include/wireshark/epan/dissectors/packet-tecmp.h
 include/wireshark/epan/dissectors/packet-tetra.h
 include/wireshark/epan/dissectors/packet-thrift.h
 include/wireshark/epan/dissectors/packet-tls-utils.h
@@ -409,6 +415,7 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-uavcan-dsdl.h
 include/wireshark/epan/dissectors/packet-ubertooth.h
 include/wireshark/epan/dissectors/packet-udp.h
+include/wireshark/epan/dissectors/packet-uds.h
 include/wireshark/epan/dissectors/packet-umts_fp.h
 include/wireshark/epan/dissectors/packet-umts_mac.h
 include/wireshark/epan/dissectors/packet-umts_rlc.h
@@ -471,12 +478,12 @@ include/wireshark/epan/frame_data.h
 include/wireshark/epan/frame_data_sequence.h
 include/wireshark/epan/ftypes/ftypes.h
 include/wireshark/epan/funnel.h
-include/wireshark/epan/garrayfix.h
 include/wireshark/epan/golay.h
 include/wireshark/epan/guid-utils.h
 include/wireshark/epan/iana_charsets.h
 include/wireshark/epan/iax2_codec_type.h
 include/wireshark/epan/in_cksum.h
+include/wireshark/epan/introspection.h
 include/wireshark/epan/ip_opts.h
 include/wireshark/epan/ipproto.h
 include/wireshark/epan/ipv4.h
@@ -527,7 +534,6 @@ include/wireshark/epan/t35.h
 include/wireshark/epan/tap-voip.h
 include/wireshark/epan/tap.h
 include/wireshark/epan/tfs.h
-include/wireshark/epan/time_fmt.h
 include/wireshark/epan/timestamp.h
 include/wireshark/epan/timestats.h
 include/wireshark/epan/to_str.h
@@ -543,7 +549,7 @@ include/wireshark/epan/wscbor.h
 include/wireshark/epan/x264_prt_id.h
 include/wireshark/epan/xdlc.h
 include/wireshark/file.h
-include/wireshark/globals.h
+include/wireshark/wireshark.h
 include/wireshark/wiretap/file_wrappers.h
 include/wireshark/wiretap/merge.h
 include/wireshark/wiretap/pcap-encap.h
@@ -556,6 +562,7 @@ include/wireshark/ws_attributes.h
 include/wireshark/ws_compiler_tests.h
 include/wireshark/ws_diag_control.h
 include/wireshark/ws_log_defs.h
+include/wireshark/ws_posix_compat.h
 include/wireshark/ws_symbol_export.h
 include/wireshark/ws_version.h
 include/wireshark/wsutil/802_11-utils.h
@@ -567,7 +574,6 @@ include/wireshark/wsutil/bitswap.h
 include/wireshark/wsutil/buffer.h
 include/wireshark/wsutil/codecs.h
 include/wireshark/wsutil/color.h
-include/wireshark/wsutil/copyright_info.h
 include/wireshark/wsutil/cpu_info.h
 include/wireshark/wsutil/crash_info.h
 include/wireshark/wsutil/crc10.h
@@ -583,6 +589,7 @@ include/wireshark/wsutil/curve25519.h
 include/wireshark/wsutil/eax.h
 include/wireshark/wsutil/epochs.h
 include/wireshark/wsutil/exported_pdu_tlvs.h
+include/wireshark/wsutil/feature_list.h
 include/wireshark/wsutil/filesystem.h
 include/wireshark/wsutil/g711.h
 include/wireshark/wsutil/glib-compat.h
@@ -601,6 +608,7 @@ include/wireshark/wsutil/please_report_b
 include/wireshark/wsutil/pow2.h
 include/wireshark/wsutil/privileges.h
 include/wireshark/wsutil/processes.h
+include/wireshark/wsutil/regex.h
 include/wireshark/wsutil/report_message.h
 include/wireshark/wsutil/sign_ext.h
 include/wireshark/wsutil/sober128.h
@@ -621,6 +629,7 @@ include/wireshark/wsutil/wmem/wmem_inter
 include/wireshark/wsutil/wmem/wmem_list.h
 include/wireshark/wsutil/wmem/wmem_map.h
 include/wireshark/wsutil/wmem/wmem_miscutl.h
+include/wireshark/wsutil/wmem/wmem_multimap.h
 include/wireshark/wsutil/wmem/wmem_queue.h
 include/wireshark/wsutil/wmem/wmem_stack.h
 include/wireshark/wsutil/wmem/wmem_strbuf.h
@@ -633,19 +642,21 @@ include/wireshark/wsutil/ws_getopt.h
 include/wireshark/wsutil/ws_mempbrk.h
 include/wireshark/wsutil/ws_mempbrk_int.h
 include/wireshark/wsutil/ws_pipe.h
+include/wireshark/wsutil/ws_return.h
 include/wireshark/wsutil/ws_roundup.h
+include/wireshark/wsutil/wsgcrypt.h
 include/wireshark/wsutil/wsjson.h
 include/wireshark/wsutil/wslog.h
 include/wireshark/wsutil/xtea.h
 lib/libwireshark.so
-lib/libwireshark.so.15
-lib/libwireshark.so.15.0.8
+lib/libwireshark.so.16
+lib/libwireshark.so.16.0.1
 lib/libwiretap.so
-lib/libwiretap.so.12
-lib/libwiretap.so.12.0.8
+lib/libwiretap.so.13
+lib/libwiretap.so.13.0.1
 lib/libwsutil.so
-lib/libwsutil.so.13
-lib/libwsutil.so.13.1.0
+lib/libwsutil.so.14
+lib/libwsutil.so.14.0.0
 lib/pkgconfig/wireshark.pc
 lib/wireshark/cmake/FindGLIB2.cmake
 lib/wireshark/cmake/FindWSLibrary.cmake
@@ -662,24 +673,25 @@ lib/wireshark/extcap/ciscodump
 lib/wireshark/extcap/randpktdump
 lib/wireshark/extcap/sshdump
 lib/wireshark/extcap/udpdump
-lib/wireshark/plugins/3.6/codecs/g711.so
-${PLIST.spandsp}lib/wireshark/plugins/3.6/codecs/g722.so
-${PLIST.spandsp}lib/wireshark/plugins/3.6/codecs/g726.so
-lib/wireshark/plugins/3.6/codecs/l16mono.so
-lib/wireshark/plugins/3.6/codecs/opus_dec.so
-lib/wireshark/plugins/3.6/epan/ethercat.so
-lib/wireshark/plugins/3.6/epan/gryphon.so
-lib/wireshark/plugins/3.6/epan/irda.so
-lib/wireshark/plugins/3.6/epan/mate.so
-lib/wireshark/plugins/3.6/epan/opcua.so
-lib/wireshark/plugins/3.6/epan/profinet.so
-lib/wireshark/plugins/3.6/epan/stats_tree.so
-lib/wireshark/plugins/3.6/epan/transum.so
-lib/wireshark/plugins/3.6/epan/unistim.so
-lib/wireshark/plugins/3.6/epan/wimax.so
-lib/wireshark/plugins/3.6/epan/wimaxasncp.so
-lib/wireshark/plugins/3.6/epan/wimaxmacphy.so
-lib/wireshark/plugins/3.6/wiretap/usbdump.so
+lib/wireshark/extcap/wifidump
+lib/wireshark/plugins/4.0/codecs/g711.so
+lib/wireshark/plugins/4.0/codecs/g722.so
+lib/wireshark/plugins/4.0/codecs/g726.so
+lib/wireshark/plugins/4.0/codecs/l16mono.so
+lib/wireshark/plugins/4.0/codecs/opus_dec.so
+lib/wireshark/plugins/4.0/epan/ethercat.so
+lib/wireshark/plugins/4.0/epan/gryphon.so
+lib/wireshark/plugins/4.0/epan/irda.so
+lib/wireshark/plugins/4.0/epan/mate.so
+lib/wireshark/plugins/4.0/epan/opcua.so
+lib/wireshark/plugins/4.0/epan/profinet.so
+lib/wireshark/plugins/4.0/epan/stats_tree.so
+lib/wireshark/plugins/4.0/epan/transum.so
+lib/wireshark/plugins/4.0/epan/unistim.so
+lib/wireshark/plugins/4.0/epan/wimax.so
+lib/wireshark/plugins/4.0/epan/wimaxasncp.so
+lib/wireshark/plugins/4.0/epan/wimaxmacphy.so
+lib/wireshark/plugins/4.0/wiretap/usbdump.so
 ${PLIST.icons}share/applications/org.wireshark.Wireshark.desktop
 ${PLIST.icons}share/icons/hicolor/128x128/apps/org.wireshark.Wireshark.png
 ${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-vnd.tcpdump.pcap.png
@@ -706,6 +718,7 @@ ${PLIST.icons}share/icons/hicolor/scalab
 ${PLIST.icons}share/icons/hicolor/scalable/apps/wireshark.svg
 ${PLIST.icons}share/metainfo/org.wireshark.Wireshark.metainfo.xml
 ${PLIST.icons}share/mime/packages/org.wireshark.Wireshark.xml
+share/wireshark/Acknowledgements.md
 share/wireshark/COPYING
 share/wireshark/cfilters
 share/wireshark/colorfilters
@@ -757,6 +770,7 @@ share/wireshark/dtds/watcherinfo.dtd
 share/wireshark/dtds/xcap-caps.dtd
 share/wireshark/dtds/xcap-error.dtd
 share/wireshark/enterprises.tsv
+share/wireshark/gpl-2.0-standalone.html
 ${PLIST.lua}share/wireshark/init.lua
 share/wireshark/ipmap.html
 share/wireshark/manuf

Index: pkgsrc/net/wireshark/distinfo
diff -u pkgsrc/net/wireshark/distinfo:1.159 pkgsrc/net/wireshark/distinfo:1.160
--- pkgsrc/net/wireshark/distinfo:1.159 Sun Sep 11 14:12:02 2022
+++ pkgsrc/net/wireshark/distinfo       Tue Nov  1 08:59:25 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.159 2022/09/11 14:12:02 wiz Exp $
+$NetBSD: distinfo,v 1.160 2022/11/01 08:59:25 adam Exp $
 
-BLAKE2s (wireshark-3.6.8.tar.xz) = 692c8bf63c56648218732148eb64a3af73087e0d21c2093875f0d226bba8715d
-SHA512 (wireshark-3.6.8.tar.xz) = c286e84e113f06b13b931da89b6d21b18e342660682579f88e77697f3e9c335ba75cdc190b41651da4d5729529a20740ef1a41e9f9523d9f6cc768147363053a
-Size (wireshark-3.6.8.tar.xz) = 39942580 bytes
-SHA1 (patch-CMakeLists.txt) = 6e2761f3798c9662603d2d40425255043434d1ea
+BLAKE2s (wireshark-4.0.1.tar.xz) = 41b35ad61edf9b9bb44228df373483a9f5c5df9c42bab3c7a5eaf5ca78ee34f7
+SHA512 (wireshark-4.0.1.tar.xz) = 10ac8e738b4bd70ba4a1a9124e8c8e6238feb7c5a4cef79a03dae6adef08230700bb8ba700d2f89a5aad28cabdaf06b8825a1124d9d466de4e2e10cc55968525
+Size (wireshark-4.0.1.tar.xz) = 41282116 bytes
+SHA1 (patch-CMakeLists.txt) = bfb0e748ce1f6577a758b650d1bed2b6d66dc026

Index: pkgsrc/net/wireshark/options.mk
diff -u pkgsrc/net/wireshark/options.mk:1.27 pkgsrc/net/wireshark/options.mk:1.28
--- pkgsrc/net/wireshark/options.mk:1.27        Tue Jul 26 22:54:51 2022
+++ pkgsrc/net/wireshark/options.mk     Tue Nov  1 08:59:25 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.27 2022/07/26 22:54:51 tnn Exp $
+# $NetBSD: options.mk,v 1.28 2022/11/01 08:59:25 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.wireshark
 PKG_SUPPORTED_OPTIONS= http2 lua qt5 spandsp
@@ -50,10 +50,10 @@ INSTALLATION_DIRS+= share/icons/hicolor/
 
 .PHONY: install-icons
 install-icons:
-       ${INSTALL_DATA} ${WRKSRC}/image/wsicon.svg \
+       ${INSTALL_DATA} ${WRKSRC}/resources/icons/wsicon.svg \
                ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wireshark.svg
 .    for d in ${MIMEICON_SIZES}
-       ${INSTALL_DATA} ${WRKSRC}/image/WiresharkDoc-${d}.png \
+       ${INSTALL_DATA} ${WRKSRC}/resources/icons/WiresharkDoc-${d}.png \
                ${DESTDIR}${PREFIX}/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png
 .    endfor
 .  endif

Index: pkgsrc/net/wireshark/patches/patch-CMakeLists.txt
diff -u pkgsrc/net/wireshark/patches/patch-CMakeLists.txt:1.7 pkgsrc/net/wireshark/patches/patch-CMakeLists.txt:1.8
--- pkgsrc/net/wireshark/patches/patch-CMakeLists.txt:1.7       Thu Dec 16 09:36:06 2021
+++ pkgsrc/net/wireshark/patches/patch-CMakeLists.txt   Tue Nov  1 08:59:25 2022
@@ -1,13 +1,13 @@
-$NetBSD: patch-CMakeLists.txt,v 1.7 2021/12/16 09:36:06 tnn Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.8 2022/11/01 08:59:25 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        2021-11-22 18:39:27.000000000 +0000
+--- CMakeLists.txt.orig        2022-10-26 17:36:47.000000000 +0000
 +++ CMakeLists.txt
-@@ -1521,7 +1521,7 @@ else ()
+@@ -1530,7 +1530,7 @@ else ()
        set(EXTCAP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/extcap" CACHE INTERNAL "The extcap dir")
  endif()
  
@@ -16,7 +16,7 @@ editcap.c:(.text.startup+0x5b8): undefin
        #
        # As https://developer.apple.com/library/archive/technotes/tn2206/_index.html
        # says,
-@@ -2498,7 +2498,11 @@ if(BUILD_wireshark AND QT_FOUND)
+@@ -2599,7 +2599,11 @@ if(BUILD_wireshark AND QT_FOUND)
                ${MINIZIP_LIBRARIES}
        )
  
@@ -29,7 +29,7 @@ editcap.c:(.text.startup+0x5b8): undefin
        if(WIN32)
                set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT wireshark)
        endif()
-@@ -2883,6 +2887,7 @@ endif()
+@@ -3099,6 +3103,7 @@ endif()
  
  if(BUILD_editcap)
        set(editcap_LIBS
@@ -37,22 +37,3 @@ editcap.c:(.text.startup+0x5b8): undefin
                ui
                wiretap
                version_info
-@@ -3501,12 +3506,12 @@ endif()
- 
- install(
-       FILES
--              ${CMAKE_MODULE_PATH}/FindGLIB2.cmake
--              ${CMAKE_MODULE_PATH}/FindWSLibrary.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/FindWSLibrary.cmake
-+              cmake/modules/FindWSWinLibs.cmake
-+              cmake/modules/UseAsn2Wrs.cmake
-+              cmake/modules/LocatePythonModule.cmake
-+              cmake/modules/UseMakePluginReg.cmake
-       DESTINATION
-               ${WIRESHARK_INSTALL_CMAKEDIR}
- )