CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

wireshark: Update to 3.2.18

Browse Source 
Source: wireshark.org
MR: 114425, 114409, 114441, 114269, 114417, 114311, 114449
Type: Security Fix
Disposition: Backport from wireshark.org
ChangeID: 8663cdebb2f10ee84817e5199fa3be0acb715af9
Description:

This is a bugfix only update.

Addresses these CVES:
wnpa-sec-2021-07 Bluetooth DHT dissector crash. Issue 17651. CVE-2021-39929.
wnpa-sec-2021-09 Bluetooth SDP dissector crash. Issue 17635. CVE-2021-39925.
wnpa-sec-2021-10 Bluetooth DHT dissector large loop. Issue 17677. CVE-2021-39924.
wnpa-sec-2021-11 PNRP dissector large loop. Issue 17684.  CVE-2021-39920, CVE-2021-39923.
wnpa-sec-2021-12 C12.22 dissector crash. Issue 17636. CVE-2021-39922.
wnpa-sec-2021-13 IEEE 802.11 dissector crash. Issue 17704. CVE-2021-39928.
wnpa-sec-2021-14 Modbus dissector crash. Issue 17703. CVE-2021-39921.

Signed-off-by: Armin Kuster <akuster@mvista.com>

---
V2]
Fixes: /build/run/lemon: Exec format error
revert "cmake: lemon: fix path to internal lemon tool"
so the wireshark-native version is instead.

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster 2022-01-25 08:45:56 -08:00 committed by Armin Kuster
parent 9e5b6ad6ce
commit cc90900dfb
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meta-networking/recipes-support/wireshark/files/fix_lemon_path.patch Normal file
View File

@ -0,0 +1,22 @@
Fix update to build for alt arch machine.
Commit 9ca6e39c7ee26570e29dc87332ffb0f6c1d0e4a4 changed the UseLemon to use
the target lemon built by the target wireshark. Revert to use the one built by
wireshark-native.
Upstream-Status: Inappropriate [configuration]
Signed-off: Armin Kuster <akuster@mvista.com>
Index: wireshark-3.2.18/cmake/modules/UseLemon.cmake
===================================================================
--- wireshark-3.2.18.orig/cmake/modules/UseLemon.cmake
+++ wireshark-3.2.18/cmake/modules/UseLemon.cmake
@@ -13,7 +13,7 @@ MACRO(ADD_LEMON_FILES _source _generated
# These files are generated as side-effect
${_out}.h
${_out}.out
- COMMAND $<TARGET_FILE:lemon>
+ COMMAND lemon
-T${_lemonpardir}/lempar.c
-d.
${_in}

5
meta-networking/recipes-support/wireshark/wireshark_3.2.15.bb → meta-networking/recipes-support/wireshark/wireshark_3.2.18.bb
View File

@ -8,11 +8,12 @@ DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bi
DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native "
SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz"
SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz \
file://fix_lemon_path.patch "
UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src"
SRC_URI[sha256sum] = "32f6cfd67b00903a1bfca02ecc4ccf72db6b70d4fda33e4a099fefb03e849bdb"
SRC_URI[sha256sum] = "bbe75d909b052fcd67a850f149f0d5b1e2531026fc2413946b48570293306887"
PE = "1"