Received: by mail.netbsd.org (Postfix, from userid 605) id 98A8D84DE7; Fri, 23 Apr 2021 07:14:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D571D84DAF for ; Fri, 23 Apr 2021 07:14:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id SX7dECPcxrPU for ; Fri, 23 Apr 2021 07:14:45 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id E755E84CDA for ; Fri, 23 Apr 2021 07:14:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E380AFA95; Fri, 23 Apr 2021 07:14:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1619162084263060" MIME-Version: 1.0 Date: Fri, 23 Apr 2021 07:14:44 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/net/wireshark To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20210423071444.E380AFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1619162084263060 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: adam Date: Fri Apr 23 07:14:44 UTC 2021 Modified Files: pkgsrc/net/wireshark: Makefile PLIST distinfo pkgsrc/net/wireshark/patches: patch-CMakeLists.txt Removed Files: pkgsrc/net/wireshark/patches: patch-caputils_capture__ifinfo.h patch-epan_conversation.h patch-epan_dissectors_dissectors.h patch-epan_epan.h patch-epan_epan__dissect.h patch-epan_prefs.h patch-epan_value__string.h patch-epan_wmem_wmem__user__cb__int.h patch-ui_packet__range.h patch-ui_qt_CMakeLists.txt patch-ui_recent.h patch-ui_rtp__media.h patch-ui_rtp__stream.h patch-ui_taps.h patch-ui_voip__calls.h patch-wsutil_file__util.h patch-wsutil_plugins.h Log Message: wireshark: updated to 3.4.5 Wireshark 3.4.5 Release Notes What’s New Bug Fixes The following vulnerabilities have been fixed: • wnpa-sec-2021-04[1] MS-WSP dissector excessive memory consumption. Issue 17331[2]. The following bugs have been fixed: • TShark does not print GeoIP information Issue 14691[3]. • TShark error when piping to "head" Issue 16192[4]. • Parts of ASCII representation in Packet Bytes pane are missing Issue 17087[5]. • Buildbot crash output: fuzz-2021-02-22-1012761.pcap Issue 17254[6]. • NDPE attribute of NAN packet is not dissected Issue 17278[7]. • TECMP: reserved flag interpreted as part of timestamp Issue 17279[8]. • Master branch does not compile at least with gcc-11 Issue 17281[9]. • DNS IXFR/AXFR multiple response Issue 17293[10]. • File too large Issue 17301[11]. • Build fails with CMake 3.20 Issue 17314[12]. New and Updated Features New Protocol Support There are no new protocols in this release. Updated Protocol Support DECT, DNS, EAP, Kerberos, LDAP, MS-WSP, SMB2, Sysdig, TECMP, and WiFi NAN New and Updated Capture File Support pcapng To generate a diff of this commit: cvs rdiff -u -r1.250 -r1.251 pkgsrc/net/wireshark/Makefile cvs rdiff -u -r1.59 -r1.60 pkgsrc/net/wireshark/PLIST cvs rdiff -u -r1.142 -r1.143 pkgsrc/net/wireshark/distinfo cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/wireshark/patches/patch-CMakeLists.txt cvs rdiff -u -r1.2 -r0 \ pkgsrc/net/wireshark/patches/patch-caputils_capture__ifinfo.h \ pkgsrc/net/wireshark/patches/patch-epan_epan.h \ pkgsrc/net/wireshark/patches/patch-epan_prefs.h \ pkgsrc/net/wireshark/patches/patch-ui_recent.h cvs rdiff -u -r1.1 -r0 pkgsrc/net/wireshark/patches/patch-epan_conversation.h \ pkgsrc/net/wireshark/patches/patch-epan_dissectors_dissectors.h \ pkgsrc/net/wireshark/patches/patch-epan_epan__dissect.h \ pkgsrc/net/wireshark/patches/patch-epan_value__string.h \ pkgsrc/net/wireshark/patches/patch-epan_wmem_wmem__user__cb__int.h \ pkgsrc/net/wireshark/patches/patch-ui_packet__range.h \ pkgsrc/net/wireshark/patches/patch-ui_qt_CMakeLists.txt \ pkgsrc/net/wireshark/patches/patch-ui_rtp__media.h \ pkgsrc/net/wireshark/patches/patch-ui_rtp__stream.h \ pkgsrc/net/wireshark/patches/patch-ui_taps.h \ pkgsrc/net/wireshark/patches/patch-ui_voip__calls.h \ pkgsrc/net/wireshark/patches/patch-wsutil_file__util.h \ pkgsrc/net/wireshark/patches/patch-wsutil_plugins.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1619162084263060 Content-Disposition: inline Content-Length: 6157 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/wireshark/Makefile diff -u pkgsrc/net/wireshark/Makefile:1.250 pkgsrc/net/wireshark/Makefile:1.251 --- pkgsrc/net/wireshark/Makefile:1.250 Wed Apr 21 13:25:15 2021 +++ pkgsrc/net/wireshark/Makefile Fri Apr 23 07:14:44 2021 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.250 2021/04/21 13:25:15 adam Exp $ +# $NetBSD: Makefile,v 1.251 2021/04/23 07:14:44 adam Exp $ -DISTNAME= wireshark-3.4.4 -PKGREVISION= 2 +DISTNAME= wireshark-3.4.5 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.59 pkgsrc/net/wireshark/PLIST:1.60 --- pkgsrc/net/wireshark/PLIST:1.59 Thu Mar 11 08:22:01 2021 +++ pkgsrc/net/wireshark/PLIST Fri Apr 23 07:14:44 2021 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.59 2021/03/11 08:22:01 adam Exp $ +@comment $NetBSD: PLIST,v 1.60 2021/04/23 07:14:44 adam Exp $ bin/capinfos bin/captype bin/dumpcap @@ -615,10 +615,10 @@ include/wireshark/wsutil/wsjson.h include/wireshark/wsutil/xtea.h lib/libwireshark.so lib/libwireshark.so.14 -lib/libwireshark.so.14.0.4 +lib/libwireshark.so.14.0.5 lib/libwiretap.so lib/libwiretap.so.11 -lib/libwiretap.so.11.0.4 +lib/libwiretap.so.11.0.5 lib/libwsutil.so lib/libwsutil.so.12 lib/libwsutil.so.12.0.0 Index: pkgsrc/net/wireshark/distinfo diff -u pkgsrc/net/wireshark/distinfo:1.142 pkgsrc/net/wireshark/distinfo:1.143 --- pkgsrc/net/wireshark/distinfo:1.142 Tue Apr 6 10:25:01 2021 +++ pkgsrc/net/wireshark/distinfo Fri Apr 23 07:14:44 2021 @@ -1,24 +1,7 @@ -$NetBSD: distinfo,v 1.142 2021/04/06 10:25:01 tnn Exp $ +$NetBSD: distinfo,v 1.143 2021/04/23 07:14:44 adam Exp $ -SHA1 (wireshark-3.4.4.tar.xz) = fa5c553596dcc6a59735f96a9a0845e3c40abab2 -RMD160 (wireshark-3.4.4.tar.xz) = 677c151b94af472ae3ae390e51781ec0cc371ddd -SHA512 (wireshark-3.4.4.tar.xz) = 388b5634894f08bb1a0052f989133c2a8457fbf6525d1bb557f3ffce73da8063fd9fe82b50b5ababc30fa36ce154bf9d2a3d91d76e03913d6516ca61b4b6b172 -Size (wireshark-3.4.4.tar.xz) = 32290424 bytes -SHA1 (patch-CMakeLists.txt) = f00912610e63fa50ccd85ff93382de85b005da98 -SHA1 (patch-caputils_capture__ifinfo.h) = adb4c22accb41b3ac402b458be4efaa258abd4b8 -SHA1 (patch-epan_conversation.h) = b3cdd98602570cbcb33b35e9362ff8802753edd8 -SHA1 (patch-epan_dissectors_dissectors.h) = 9a31c52fbbb97bf44444583a2b787243fbbf74b6 -SHA1 (patch-epan_epan.h) = 6bcd31b572a763092454be57a49c522cbba6824b -SHA1 (patch-epan_epan__dissect.h) = 9fe4d59c38786c1981ada2dc356f0d01a0703bf0 -SHA1 (patch-epan_prefs.h) = bdb744b3f96ed6965576316bcde121694f0de947 -SHA1 (patch-epan_value__string.h) = b3ffb1931a1e47c664fc50bcd121ec2880ce05ea -SHA1 (patch-epan_wmem_wmem__user__cb__int.h) = d7a1f31771244521de3291b3a360e34bf47f6fe5 -SHA1 (patch-ui_packet__range.h) = c2dafea7fdebc15e46782e02dce32a00e3f32c98 -SHA1 (patch-ui_qt_CMakeLists.txt) = 7fd755c4c4c2aafbf986751e9ba0ff9d7f4d32dc -SHA1 (patch-ui_recent.h) = ce8769e82c8a90feed044ca31e363349b02bafcb -SHA1 (patch-ui_rtp__media.h) = 355f9009107bde38537303cf18c03e2c7017587f -SHA1 (patch-ui_rtp__stream.h) = ad756a7dff9fcfc637401f4bde0cff05bad87d62 -SHA1 (patch-ui_taps.h) = d8ad1f7568b06bfd55bb8c43303ed6782fba319e -SHA1 (patch-ui_voip__calls.h) = 516ced815808d25574553de807b12ba08501b328 -SHA1 (patch-wsutil_file__util.h) = 06b284f1626dd1f1eca751f0e2113dacb1123b29 -SHA1 (patch-wsutil_plugins.h) = b663efdc7f78cd6b268321d7b7445585f7119b13 +SHA1 (wireshark-3.4.5.tar.xz) = d01a9b5f58206fb458fe9fc2dac88ad0ea7152ce +RMD160 (wireshark-3.4.5.tar.xz) = 9f97f8bd34d09cbe6afc2bf655b44940a90154b6 +SHA512 (wireshark-3.4.5.tar.xz) = f54d9287a48f09bbc085170791b5ca2dcc84cda55040f45f2c4a6abbe828548391e4a931536163c781e69843765a598bd29a240ad43276d0d1bb42d1cd23972a +Size (wireshark-3.4.5.tar.xz) = 32300144 bytes +SHA1 (patch-CMakeLists.txt) = 371f16d57fd6d33c2c1c8cb4f54cf3c16ca2afce Index: pkgsrc/net/wireshark/patches/patch-CMakeLists.txt diff -u pkgsrc/net/wireshark/patches/patch-CMakeLists.txt:1.5 pkgsrc/net/wireshark/patches/patch-CMakeLists.txt:1.6 --- pkgsrc/net/wireshark/patches/patch-CMakeLists.txt:1.5 Tue Apr 6 10:25:01 2021 +++ pkgsrc/net/wireshark/patches/patch-CMakeLists.txt Fri Apr 23 07:14:44 2021 @@ -1,36 +1,10 @@ -$NetBSD: patch-CMakeLists.txt,v 1.5 2021/04/06 10:25:01 tnn Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.6 2021/04/23 07:14:44 adam Exp $ Do not make application bundle on Darwin. -Avoid - CMake Error at CMakeLists.txt:3021 (install): - install FILES given directory - "${WRKDIR}/.buildlink/cmake-Modules" to install. -From 6ef6e8f607456e239e5f1a326803846930d34fa8 Mon Sep 17 00:00:00 2001 -From: Gerald Combs -Date: Fri, 26 Mar 2021 12:52:01 -0700 -Subject: [PATCH] CMake: Enable AUTO{MOC,UIC,RCC} earlier. - -Enable CMAKE_AUTOMOC, CMAKE_AUTOUIC, and CMAKE_AUTORCC before searching -for Qt packages. This is apparently required for CMake 3.20.0 and later. -Fixes #17314. - -(cherry picked from commit be2b0fc810fb2f2a80e471138dc29f0cbe87b209) - ---- CMakeLists.txt.orig 2021-03-10 18:21:20.000000000 +0000 +--- CMakeLists.txt.orig 2021-04-21 17:14:36.000000000 +0000 +++ CMakeLists.txt -@@ -1083,6 +1083,10 @@ ws_find_package(Systemd BUILD_sdjournal - - # Build the Qt GUI? - if(BUILD_wireshark) -+ set(CMAKE_AUTOMOC ON) -+ set(CMAKE_AUTOUIC ON) -+ set(CMAKE_AUTORCC ON) -+ - # Untested, may not work if CMAKE_PREFIX_PATH gets overwritten - # somewhere. The if WIN32 in this place is annoying as well. - if(WIN32) -@@ -1388,7 +1392,7 @@ else () +@@ -1425,7 +1425,7 @@ else () set(EXTCAP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/extcap" CACHE INTERNAL "The extcap dir") endif() @@ -39,7 +13,7 @@ Fixes #17314. # # As https://developer.apple.com/library/archive/technotes/tn2206/_index.html # says, -@@ -2345,7 +2349,11 @@ if(BUILD_wireshark AND QT_FOUND) +@@ -2378,7 +2378,11 @@ if(BUILD_wireshark AND QT_FOUND) ${MINIZIP_LIBRARIES} ) @@ -52,7 +26,7 @@ Fixes #17314. if(WIN32) set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT wireshark) endif() -@@ -3284,12 +3292,12 @@ endif() +@@ -3317,12 +3321,12 @@ endif() install( FILES --_----------=_1619162084263060--