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
(adam)
diff -r1.250 -r1.251 pkgsrc/net/wireshark/Makefile| @@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
| 1 | # $NetBSD: Makefile,v 1.250 2021/04/21 13:25:15 adam Exp $ | 1 | # $NetBSD: Makefile,v 1.251 2021/04/23 07:14:44 adam Exp $ | |
| 2 | 2 | |||
| 3 | DISTNAME= wireshark-3.4.4 | 3 | DISTNAME= wireshark-3.4.5 | |
| 4 | PKGREVISION= 2 | |||
| 5 | CATEGORIES= net | 4 | CATEGORIES= net | |
| 6 | MASTER_SITES= https://www.wireshark.org/download/src/ | 5 | MASTER_SITES= https://www.wireshark.org/download/src/ | |
| 7 | EXTRACT_SUFX= .tar.xz | 6 | EXTRACT_SUFX= .tar.xz | |
| 8 | 7 | |||
| 9 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
| 10 | HOMEPAGE= https://www.wireshark.org/ | 9 | HOMEPAGE= https://www.wireshark.org/ | |
| 11 | COMMENT= Network protocol analyzer | 10 | COMMENT= Network protocol analyzer | |
| 12 | LICENSE= gnu-gpl-v2 | 11 | LICENSE= gnu-gpl-v2 | |
| 13 | 12 | |||
| 14 | CONFLICTS+= ethereal-[0-9]* | 13 | CONFLICTS+= ethereal-[0-9]* | |
| 15 | 14 | |||
| 16 | USE_CMAKE= yes | 15 | USE_CMAKE= yes | |
| 17 | CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release | 16 | CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release |
| @@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
| 1 | @comment $NetBSD: PLIST,v 1.59 2021/03/11 08:22:01 adam Exp $ | 1 | @comment $NetBSD: PLIST,v 1.60 2021/04/23 07:14:44 adam Exp $ | |
| 2 | bin/capinfos | 2 | bin/capinfos | |
| 3 | bin/captype | 3 | bin/captype | |
| 4 | bin/dumpcap | 4 | bin/dumpcap | |
| 5 | bin/editcap | 5 | bin/editcap | |
| 6 | bin/idl2wrs | 6 | bin/idl2wrs | |
| 7 | bin/mergecap | 7 | bin/mergecap | |
| 8 | bin/mmdbresolve | 8 | bin/mmdbresolve | |
| 9 | bin/randpkt | 9 | bin/randpkt | |
| 10 | bin/rawshark | 10 | bin/rawshark | |
| 11 | bin/reordercap | 11 | bin/reordercap | |
| 12 | bin/sharkd | 12 | bin/sharkd | |
| 13 | bin/text2pcap | 13 | bin/text2pcap | |
| 14 | bin/tshark | 14 | bin/tshark | |
| @@ -605,30 +605,30 @@ include/wireshark/wsutil/tempfile.h | @@ -605,30 +605,30 @@ include/wireshark/wsutil/tempfile.h | |||
| 605 | include/wireshark/wsutil/time_util.h | 605 | include/wireshark/wsutil/time_util.h | |
| 606 | include/wireshark/wsutil/type_util.h | 606 | include/wireshark/wsutil/type_util.h | |
| 607 | include/wireshark/wsutil/unicode-utils.h | 607 | include/wireshark/wsutil/unicode-utils.h | |
| 608 | include/wireshark/wsutil/utf8_entities.h | 608 | include/wireshark/wsutil/utf8_entities.h | |
| 609 | include/wireshark/wsutil/ws_cpuid.h | 609 | include/wireshark/wsutil/ws_cpuid.h | |
| 610 | include/wireshark/wsutil/ws_mempbrk.h | 610 | include/wireshark/wsutil/ws_mempbrk.h | |
| 611 | include/wireshark/wsutil/ws_mempbrk_int.h | 611 | include/wireshark/wsutil/ws_mempbrk_int.h | |
| 612 | include/wireshark/wsutil/ws_pipe.h | 612 | include/wireshark/wsutil/ws_pipe.h | |
| 613 | include/wireshark/wsutil/ws_printf.h | 613 | include/wireshark/wsutil/ws_printf.h | |
| 614 | include/wireshark/wsutil/wsjson.h | 614 | include/wireshark/wsutil/wsjson.h | |
| 615 | include/wireshark/wsutil/xtea.h | 615 | include/wireshark/wsutil/xtea.h | |
| 616 | lib/libwireshark.so | 616 | lib/libwireshark.so | |
| 617 | lib/libwireshark.so.14 | 617 | lib/libwireshark.so.14 | |
| 618 | lib/libwireshark.so.14.0.4 | 618 | lib/libwireshark.so.14.0.5 | |
| 619 | lib/libwiretap.so | 619 | lib/libwiretap.so | |
| 620 | lib/libwiretap.so.11 | 620 | lib/libwiretap.so.11 | |
| 621 | lib/libwiretap.so.11.0.4 | 621 | lib/libwiretap.so.11.0.5 | |
| 622 | lib/libwsutil.so | 622 | lib/libwsutil.so | |
| 623 | lib/libwsutil.so.12 | 623 | lib/libwsutil.so.12 | |
| 624 | lib/libwsutil.so.12.0.0 | 624 | lib/libwsutil.so.12.0.0 | |
| 625 | lib/pkgconfig/wireshark.pc | 625 | lib/pkgconfig/wireshark.pc | |
| 626 | lib/wireshark/cmake/FindGLIB2.cmake | 626 | lib/wireshark/cmake/FindGLIB2.cmake | |
| 627 | lib/wireshark/cmake/FindWSLibrary.cmake | 627 | lib/wireshark/cmake/FindWSLibrary.cmake | |
| 628 | lib/wireshark/cmake/FindWSWinLibs.cmake | 628 | lib/wireshark/cmake/FindWSWinLibs.cmake | |
| 629 | lib/wireshark/cmake/LocatePythonModule.cmake | 629 | lib/wireshark/cmake/LocatePythonModule.cmake | |
| 630 | lib/wireshark/cmake/UseAsn2Wrs.cmake | 630 | lib/wireshark/cmake/UseAsn2Wrs.cmake | |
| 631 | lib/wireshark/cmake/UseMakePluginReg.cmake | 631 | lib/wireshark/cmake/UseMakePluginReg.cmake | |
| 632 | lib/wireshark/cmake/WiresharkConfig.cmake | 632 | lib/wireshark/cmake/WiresharkConfig.cmake | |
| 633 | lib/wireshark/cmake/WiresharkConfigVersion.cmake | 633 | lib/wireshark/cmake/WiresharkConfigVersion.cmake | |
| 634 | lib/wireshark/cmake/WiresharkTargets-release.cmake | 634 | lib/wireshark/cmake/WiresharkTargets-release.cmake |
| @@ -1,24 +1,7 @@ | @@ -1,24 +1,7 @@ | |||
| 1 | $NetBSD: distinfo,v 1.142 2021/04/06 10:25:01 tnn Exp $ | 1 | $NetBSD: distinfo,v 1.143 2021/04/23 07:14:44 adam Exp $ | |
| 2 | 2 | |||
| 3 | SHA1 (wireshark-3.4.4.tar.xz) = fa5c553596dcc6a59735f96a9a0845e3c40abab2 | 3 | SHA1 (wireshark-3.4.5.tar.xz) = d01a9b5f58206fb458fe9fc2dac88ad0ea7152ce | |
| 4 | RMD160 (wireshark-3.4.4.tar.xz) = 677c151b94af472ae3ae390e51781ec0cc371ddd | 4 | RMD160 (wireshark-3.4.5.tar.xz) = 9f97f8bd34d09cbe6afc2bf655b44940a90154b6 | |
| 5 | SHA512 (wireshark-3.4.4.tar.xz) = 388b5634894f08bb1a0052f989133c2a8457fbf6525d1bb557f3ffce73da8063fd9fe82b50b5ababc30fa36ce154bf9d2a3d91d76e03913d6516ca61b4b6b172 | 5 | SHA512 (wireshark-3.4.5.tar.xz) = f54d9287a48f09bbc085170791b5ca2dcc84cda55040f45f2c4a6abbe828548391e4a931536163c781e69843765a598bd29a240ad43276d0d1bb42d1cd23972a | |
| 6 | Size (wireshark-3.4.4.tar.xz) = 32290424 bytes | 6 | Size (wireshark-3.4.5.tar.xz) = 32300144 bytes | |
| 7 | SHA1 (patch-CMakeLists.txt) = f00912610e63fa50ccd85ff93382de85b005da98 | 7 | SHA1 (patch-CMakeLists.txt) = 371f16d57fd6d33c2c1c8cb4f54cf3c16ca2afce | |
| 8 | SHA1 (patch-caputils_capture__ifinfo.h) = adb4c22accb41b3ac402b458be4efaa258abd4b8 | |||
| 9 | SHA1 (patch-epan_conversation.h) = b3cdd98602570cbcb33b35e9362ff8802753edd8 | |||
| 10 | SHA1 (patch-epan_dissectors_dissectors.h) = 9a31c52fbbb97bf44444583a2b787243fbbf74b6 | |||
| 11 | SHA1 (patch-epan_epan.h) = 6bcd31b572a763092454be57a49c522cbba6824b | |||
| 12 | SHA1 (patch-epan_epan__dissect.h) = 9fe4d59c38786c1981ada2dc356f0d01a0703bf0 | |||
| 13 | SHA1 (patch-epan_prefs.h) = bdb744b3f96ed6965576316bcde121694f0de947 | |||
| 14 | SHA1 (patch-epan_value__string.h) = b3ffb1931a1e47c664fc50bcd121ec2880ce05ea | |||
| 15 | SHA1 (patch-epan_wmem_wmem__user__cb__int.h) = d7a1f31771244521de3291b3a360e34bf47f6fe5 | |||
| 16 | SHA1 (patch-ui_packet__range.h) = c2dafea7fdebc15e46782e02dce32a00e3f32c98 | |||
| 17 | SHA1 (patch-ui_qt_CMakeLists.txt) = 7fd755c4c4c2aafbf986751e9ba0ff9d7f4d32dc | |||
| 18 | SHA1 (patch-ui_recent.h) = ce8769e82c8a90feed044ca31e363349b02bafcb | |||
| 19 | SHA1 (patch-ui_rtp__media.h) = 355f9009107bde38537303cf18c03e2c7017587f | |||
| 20 | SHA1 (patch-ui_rtp__stream.h) = ad756a7dff9fcfc637401f4bde0cff05bad87d62 | |||
| 21 | SHA1 (patch-ui_taps.h) = d8ad1f7568b06bfd55bb8c43303ed6782fba319e | |||
| 22 | SHA1 (patch-ui_voip__calls.h) = 516ced815808d25574553de807b12ba08501b328 | |||
| 23 | SHA1 (patch-wsutil_file__util.h) = 06b284f1626dd1f1eca751f0e2113dacb1123b29 | |||
| 24 | SHA1 (patch-wsutil_plugins.h) = b663efdc7f78cd6b268321d7b7445585f7119b13 |
| @@ -1,68 +1,42 @@ | @@ -1,68 +1,42 @@ | |||
| 1 | $NetBSD: patch-CMakeLists.txt,v 1.5 2021/04/06 10:25:01 tnn Exp $ | 1 | $NetBSD: patch-CMakeLists.txt,v 1.6 2021/04/23 07:14:44 adam Exp $ | |
| 2 | 2 | |||
| 3 | Do not make application bundle on Darwin. | 3 | Do not make application bundle on Darwin. | |
| 4 | Avoid | |||
| 5 | CMake Error at CMakeLists.txt:3021 (install): | |||
| 6 | install FILES given directory | |||
| 7 | "${WRKDIR}/.buildlink/cmake-Modules" to install. | |||
| 8 | 4 | |||
| 9 | From 6ef6e8f607456e239e5f1a326803846930d34fa8 Mon Sep 17 00:00:00 2001 | 5 | --- CMakeLists.txt.orig 2021-04-21 17:14:36.000000000 +0000 | |
| 10 | From: Gerald Combs <gerald@wireshark.org> | |||
| 11 | Date: Fri, 26 Mar 2021 12:52:01 -0700 | |||
| 12 | Subject: [PATCH] CMake: Enable AUTO{MOC,UIC,RCC} earlier. | |||
| 13 | ||||
| 14 | Enable CMAKE_AUTOMOC, CMAKE_AUTOUIC, and CMAKE_AUTORCC before searching | |||
| 15 | for Qt packages. This is apparently required for CMake 3.20.0 and later. | |||
| 16 | Fixes #17314. | |||
| 17 | ||||
| 18 | (cherry picked from commit be2b0fc810fb2f2a80e471138dc29f0cbe87b209) | |||
| 19 | ||||
| 20 | --- CMakeLists.txt.orig 2021-03-10 18:21:20.000000000 +0000 | |||
| 21 | +++ CMakeLists.txt | 6 | +++ CMakeLists.txt | |
| 22 | @@ -1083,6 +1083,10 @@ ws_find_package(Systemd BUILD_sdjournal | 7 | @@ -1425,7 +1425,7 @@ else () | |
| 23 | ||||
| 24 | # Build the Qt GUI? | |||
| 25 | if(BUILD_wireshark) | |||
| 26 | + set(CMAKE_AUTOMOC ON) | |||
| 27 | + set(CMAKE_AUTOUIC ON) | |||
| 28 | + set(CMAKE_AUTORCC ON) | |||
| 29 | + | |||
| 30 | # Untested, may not work if CMAKE_PREFIX_PATH gets overwritten | |||
| 31 | # somewhere. The if WIN32 in this place is annoying as well. | |||
| 32 | if(WIN32) | |||
| 33 | @@ -1388,7 +1392,7 @@ else () | |||
| 34 | set(EXTCAP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/extcap" CACHE INTERNAL "The extcap dir") | 8 | set(EXTCAP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/extcap" CACHE INTERNAL "The extcap dir") | |
| 35 | endif() | 9 | endif() | |
| 36 | 10 | |||
| 37 | -if(APPLE) | 11 | -if(APPLE) | |
| 38 | +if(APPLE AND ENABLE_APPLICATION_BUNDLE) | 12 | +if(APPLE AND ENABLE_APPLICATION_BUNDLE) | |
| 39 | # | 13 | # | |
| 40 | # As https://developer.apple.com/library/archive/technotes/tn2206/_index.html | 14 | # As https://developer.apple.com/library/archive/technotes/tn2206/_index.html | |
| 41 | # says, | 15 | # says, | |
| 42 | @@ -2345,7 +2349,11 @@ if(BUILD_wireshark AND QT_FOUND) | 16 | @@ -2378,7 +2378,11 @@ if(BUILD_wireshark AND QT_FOUND) | |
| 43 | ${MINIZIP_LIBRARIES} | 17 | ${MINIZIP_LIBRARIES} | |
| 44 | ) | 18 | ) | |
| 45 | 19 | |||
| 46 | - add_executable(wireshark WIN32 MACOSX_BUNDLE ${wireshark_FILES} ${EXTRA_BUNDLE_FILES}) | 20 | - add_executable(wireshark WIN32 MACOSX_BUNDLE ${wireshark_FILES} ${EXTRA_BUNDLE_FILES}) | |
| 47 | + if(ENABLE_APPLICATION_BUNDLE) | 21 | + if(ENABLE_APPLICATION_BUNDLE) | |
| 48 | + add_executable(wireshark WIN32 MACOSX_BUNDLE ${wireshark_FILES} ${EXTRA_BUNDLE_FILES}) | 22 | + add_executable(wireshark WIN32 MACOSX_BUNDLE ${wireshark_FILES} ${EXTRA_BUNDLE_FILES}) | |
| 49 | + else() | 23 | + else() | |
| 50 | + add_executable(wireshark WIN32 ${wireshark_FILES} ${EXTRA_BUNDLE_FILES}) | 24 | + add_executable(wireshark WIN32 ${wireshark_FILES} ${EXTRA_BUNDLE_FILES}) | |
| 51 | + endif() | 25 | + endif() | |
| 52 | if(WIN32) | 26 | if(WIN32) | |
| 53 | set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT wireshark) | 27 | set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT wireshark) | |
| 54 | endif() | 28 | endif() | |
| 55 | @@ -3284,12 +3292,12 @@ endif() | 29 | @@ -3317,12 +3321,12 @@ endif() | |
| 56 | 30 | |||
| 57 | install( | 31 | install( | |
| 58 | FILES | 32 | FILES | |
| 59 | - ${CMAKE_MODULE_PATH}/FindGLIB2.cmake | 33 | - ${CMAKE_MODULE_PATH}/FindGLIB2.cmake | |
| 60 | - ${CMAKE_MODULE_PATH}/FindWSLibrary.cmake | 34 | - ${CMAKE_MODULE_PATH}/FindWSLibrary.cmake | |
| 61 | - ${CMAKE_MODULE_PATH}/FindWSWinLibs.cmake | 35 | - ${CMAKE_MODULE_PATH}/FindWSWinLibs.cmake | |
| 62 | - ${CMAKE_MODULE_PATH}/UseAsn2Wrs.cmake | 36 | - ${CMAKE_MODULE_PATH}/UseAsn2Wrs.cmake | |
| 63 | - ${CMAKE_MODULE_PATH}/LocatePythonModule.cmake | 37 | - ${CMAKE_MODULE_PATH}/LocatePythonModule.cmake | |
| 64 | - ${CMAKE_MODULE_PATH}/UseMakePluginReg.cmake | 38 | - ${CMAKE_MODULE_PATH}/UseMakePluginReg.cmake | |
| 65 | + cmake/modules/FindGLIB2.cmake | 39 | + cmake/modules/FindGLIB2.cmake | |
| 66 | + cmake/modules/FindWSLibrary.cmake | 40 | + cmake/modules/FindWSLibrary.cmake | |
| 67 | + cmake/modules/FindWSWinLibs.cmake | 41 | + cmake/modules/FindWSWinLibs.cmake | |
| 68 | + cmake/modules/UseAsn2Wrs.cmake | 42 | + cmake/modules/UseAsn2Wrs.cmake |