[pkgsrc/trunk]: pkgsrc/net/wireshark wireshark: updated to 3.2.7

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/83c424484e7f
branches:  trunk
changeset: 439757:83c424484e7f
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon Sep 28 19:22:03 2020 +0000

description:
wireshark: updated to 3.2.7

Wireshark 3.2.7 Release Notes

  The Windows installers now ship with Npcap 0.9997. They previously
  shipped with Npcap 0.9994.

  The Windows installers now ship with Qt 5.12.9. They previously
  shipped with Qt 5.12.8.

  Bug Fixes

   The following vulnerabilities have been fixed:

     • wnpa-sec-2020-11[1] MIME Multipart dissector crash. Bug 16741[2].
       Fixed in master: 2411eae9ed Fixed in master-3.2: 21f082cb6e Fixed
       in master-3.0: 14e274f3be Fixed in master-2.6: 5803c7b87b

     • wnpa-sec-2020-12[3] TCP dissector crash. Bug 16816[4]. Fixed in
       master: c4634b1e99 Fixed in master-3.2: e9b727595b Fixed in
       master-3.0: 7f3fe6164a Fixed in master-2.6: 9d7ab8b46f

     • wnpa-sec-2020-13[5] BLIP dissector crash. Bug 16866[6]. Fixed in
       master: 4a94842710 Fixed in master-3.2: 594d312b12 Fixed in
       master-3.0: 2fb6002559 Fixed in master-2.6: n/a

   The following bugs have been fixed:

     • HTTP dissector fails to display correct UTF-16 XML Bug 9069[7].

     • TFTP dissector does not track conversations correctly. Source
       file and Destination File redundant or disagree. Bug 10305[8].

     • Dissector skips DICOM command Bug 13110[9].

     • Editcap time adjustment doesn’t work when both infile and outfile
       are ERF Bug 16578[10].

     • dissect_tds7_colmetadata_token() has wrong return value if count
       is 0 Bug 16682[11].

     • "total block length …<U+200B> is too small" for Systemd Journal Export
       Block Bug 16734[12].

     • MNC 11 is showing Mobile Network Code (MNC): NTT DoCoMo Tokai
       Inc. (11) But its belonging to Rakuten Network Bug 16755[13].

     • DICOM object extraction: discrepancy between tshark and wireshark
       Bug 16771[14].

     • S1-U data forwarding info and S103 PDN data forwarding info IE’s
       showing improper value Bug 16777[15].

     • Wireshark crashes while opening a capture Bug 16780[16].

     • Changing preferences via Decode As does not call callback Bug
       16787[17].

     • Decoding of PFCP IE 'Remote GTP-U Peer' is incorrect Bug
       16805[18].

     • Ng-enb not decoded correctly for Target Identification IE for
       GTPV2 Bug 16822[19].

     • The client timestamp is parsed error for Google QUIC (version
       Q039) Bug 16839[20].

     • NAS-5G : PDU session reactivation result Bug 16842[21].

     • Wireshark fails to detect libssh >= 0.9.5 Bug 16845[22].

diffstat:

 net/wireshark/Makefile                                     |   5 +-
 net/wireshark/PLIST                                        |   6 +-
 net/wireshark/distinfo                                     |  11 ++--
 net/wireshark/patches/patch-cmake_modules_FindLIBSSH.cmake |  31 --------------
 4 files changed, 10 insertions(+), 43 deletions(-)

diffs (87 lines):

diff -r ed0e95afe64e -r 83c424484e7f net/wireshark/Makefile
--- a/net/wireshark/Makefile    Mon Sep 28 18:56:03 2020 +0000
+++ b/net/wireshark/Makefile    Mon Sep 28 19:22:03 2020 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.239 2020/08/31 18:10:55 wiz Exp $
+# $NetBSD: Makefile,v 1.240 2020/09/28 19:22:03 adam Exp $
 
-DISTNAME=      wireshark-3.2.6
-PKGREVISION=   3
+DISTNAME=      wireshark-3.2.7
 CATEGORIES=    net
 MASTER_SITES=  https://www.wireshark.org/download/src/
 EXTRACT_SUFX=  .tar.xz
diff -r ed0e95afe64e -r 83c424484e7f net/wireshark/PLIST
--- a/net/wireshark/PLIST       Mon Sep 28 18:56:03 2020 +0000
+++ b/net/wireshark/PLIST       Mon Sep 28 19:22:03 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.53 2020/08/13 08:21:52 adam Exp $
+@comment $NetBSD: PLIST,v 1.54 2020/09/28 19:22:03 adam Exp $
 bin/capinfos
 bin/captype
 bin/dumpcap
@@ -607,10 +607,10 @@
 include/wireshark/wsutil/xtea.h
 lib/libwireshark.so
 lib/libwireshark.so.13
-lib/libwireshark.so.13.0.6
+lib/libwireshark.so.13.0.7
 lib/libwiretap.so
 lib/libwiretap.so.10
-lib/libwiretap.so.10.0.6
+lib/libwiretap.so.10.0.7
 lib/libwsutil.so
 lib/libwsutil.so.11
 lib/libwsutil.so.11.0.0
diff -r ed0e95afe64e -r 83c424484e7f net/wireshark/distinfo
--- a/net/wireshark/distinfo    Mon Sep 28 18:56:03 2020 +0000
+++ b/net/wireshark/distinfo    Mon Sep 28 19:22:03 2020 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.133 2020/09/15 10:19:20 wiz Exp $
+$NetBSD: distinfo,v 1.134 2020/09/28 19:22:03 adam Exp $
 
-SHA1 (wireshark-3.2.6.tar.xz) = e8f3e6cb9072670c8bdbbff7e5fe3ccd5203d35e
-RMD160 (wireshark-3.2.6.tar.xz) = 09dcd3a088aa339e18871b053c9c8d8414b25a6a
-SHA512 (wireshark-3.2.6.tar.xz) = 71905836370b916a92e7a76e4f93cb10a658374c7a95aa47b607b2b142abebdb0d1562f642782a5a946a167dfb28169572330a7603cf0d7ab6016ce7f12fac78
-Size (wireshark-3.2.6.tar.xz) = 31635628 bytes
+SHA1 (wireshark-3.2.7.tar.xz) = b564c2e729066cb7c952463fef6163e23a5fea1e
+RMD160 (wireshark-3.2.7.tar.xz) = 81787ab8814cba0452da9cb45fcfd988da5ec587
+SHA512 (wireshark-3.2.7.tar.xz) = c17913fe6c193ccc6b0dbf86932d625a1f3b670aef805296e5db2639118218e06d513910ad50ab3926204f94a0010425b0d498176f987516d64fdd6a52d2517b
+Size (wireshark-3.2.7.tar.xz) = 31659996 bytes
 SHA1 (patch-CMakeLists.txt) = 8faf8f63d75d5733a69b52ce9fbf291bd90a5575
-SHA1 (patch-cmake_modules_FindLIBSSH.cmake) = fc8d508bd21290b1705a219056f9b2338ec15116
diff -r ed0e95afe64e -r 83c424484e7f net/wireshark/patches/patch-cmake_modules_FindLIBSSH.cmake
--- a/net/wireshark/patches/patch-cmake_modules_FindLIBSSH.cmake        Mon Sep 28 18:56:03 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-cmake_modules_FindLIBSSH.cmake,v 1.1 2020/09/15 10:19:20 wiz Exp $
-
-Fix detection of libssh >= 0.9.5. Upstream commit fd7739de6b.
-
---- cmake/modules/FindLIBSSH.cmake.orig        Wed Aug 12 17:53:19 2020
-+++ cmake/modules/FindLIBSSH.cmake
-@@ -59,15 +59,21 @@ else ()
-       ${LIBSSH_LIBRARY}
-     )
- 
--    file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MAJOR
-+    # libssh >= 0.9.5 has libssh_version.h
-+    set(_libssh_version_header "${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h")
-+    if(NOT EXISTS "${_libssh_version_header}")
-+        set(_libssh_version_header "${LIBSSH_INCLUDE_DIR}/libssh/libssh.h")
-+    endif()
-+
-+    file(STRINGS "${_libssh_version_header}" LIBSSH_VERSION_MAJOR
-       REGEX "#define[ ]+LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
-     # Older versions of libssh like libssh-0.2 have LIBSSH_VERSION but not LIBSSH_VERSION_MAJOR
-     if(LIBSSH_VERSION_MAJOR)
-       string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MAJOR ${LIBSSH_VERSION_MAJOR})
--      file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MINOR
-+      file(STRINGS "${_libssh_version_header}" LIBSSH_VERSION_MINOR
-         REGEX "#define[ ]+LIBSSH_VERSION_MINOR[ ]+[0-9]+")
-       string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MINOR ${LIBSSH_VERSION_MINOR})
--      file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_PATCH
-+      file(STRINGS "${_libssh_version_header}" LIBSSH_VERSION_PATCH
-         REGEX "#define[ ]+LIBSSH_VERSION_MICRO[ ]+[0-9]+")
-       string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_PATCH ${LIBSSH_VERSION_PATCH})
-       set(LIBSSH_VERSION ${LIBSSH_VERSION_MAJOR}.${LIBSSH_VERSION_MINOR}.${LIBSSH_VERSION_PATCH})