NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/wireshark: security bump to version 3.4.10

Browse Source 
Fix the following security issues:
- https://www.wireshark.org/security/wnpa-sec-2021-07.html
  (CVE-2021-39929)
- https://www.wireshark.org/security/wnpa-sec-2021-08.html
  (CVE-2021-39926)
- https://www.wireshark.org/security/wnpa-sec-2021-09.html
  (CVE-2021-39925)
- https://www.wireshark.org/security/wnpa-sec-2021-10.html
  (CVE-2021-39924)
- https://www.wireshark.org/security/wnpa-sec-2021-11.html
- https://www.wireshark.org/security/wnpa-sec-2021-12.html
  (CVE-2021-39922)
- https://www.wireshark.org/security/wnpa-sec-2021-13.html
  (CVE-2021-39928)
- https://www.wireshark.org/security/wnpa-sec-2021-14.html
  (CVE-2021-39921)
- https://www.wireshark.org/security/wnpa-sec-2021-15.html
  (CVE-2021-39920)

Drop WIRESHARK_BUILD_LEMON_TOOL and set LEMON_C_COMPILER which is
available since
61e66c37ab

https://www.wireshark.org/docs/relnotes/wireshark-3.4.10.html

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2021-11-26 18:18:04 +01:00 committed by Peter Korsgaard
parent 228727f046
commit 0ce776942d
3 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
package/wireshark/0001-cmake-lemon-wipe-CMAKE_SYSROOT-if-needed.patch Normal file
View File

@ -0,0 +1,30 @@
From 982e5ab072816e29f6f2dc84d9a00ee7c4fdee40 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 26 Nov 2021 17:45:23 +0100
Subject: [PATCH] cmake: lemon: wipe CMAKE_SYSROOT if needed
Wipe CMAKE_SYSROOT when LEMON_C_COMPILER is set to avoid a build failure
when cross-compiling (e.g. with buildroot)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status:
https://gitlab.com/wireshark/wireshark/-/merge_requests/5224]
---
tools/lemon/CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/lemon/CMakeLists.txt b/tools/lemon/CMakeLists.txt
index 8742aa9fc9..7c8cc23a35 100644
--- a/tools/lemon/CMakeLists.txt
+++ b/tools/lemon/CMakeLists.txt
@@ -12,6 +12,7 @@ add_executable(lemon lemon.c)
if(DEFINED LEMON_C_COMPILER)
set(CMAKE_C_COMPILER "${LEMON_C_COMPILER}")
set(CMAKE_C_FLAGS "")
+ set(CMAKE_SYSROOT "")
endif()
# To keep lemon.c as close to upstream as possible, deliberately ignore
--
2.33.0

6
package/wireshark/wireshark.hash
View File

@ -1,6 +1,6 @@
# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.7.txt
sha1 3fa4bb774030442b9908243a9927d38479c52bf5 wireshark-3.4.7.tar.xz
sha256 6c4cee51ef997cb9d9aaee84113525a5629157d3c743d7c4e320000de804a09d wireshark-3.4.7.tar.xz
# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.10.txt
sha1 63839abd94d3ae376f860e2d2969777680106578 wireshark-3.4.10.tar.xz
sha256 8aa7ef4a44ae62bb8db463cf761e2cc03b97305e0e77ed5be53fa83729187cef wireshark-3.4.10.tar.xz
# Locally calculated
sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING

23
package/wireshark/wireshark.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
WIRESHARK_VERSION = 3.4.7
WIRESHARK_VERSION = 3.4.10
WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz
WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions
WIRESHARK_LICENSE = wireshark license
@ -20,29 +20,12 @@ WIRESHARK_DEPENDENCIES = \
libpcap \
speexdsp
WIRESHARK_MAKE_ENV = \
$(TARGET_MAKE_ENV) \
PATH="$(@D)/bin:$(BR_PATH)"
WIRESHARK_CONF_OPTS = \
-DDISABLE_WERROR=ON \
-DENABLE_ILBC=OFF \
-DENABLE_PCAP=ON \
-DENABLE_SMI=OFF
# wireshark needs the host version of lemon during compilation.
# This binrary is provided by sqlite-src (which is different from
# sqlite-autotools that is currently packaged in buildroot) moreover wireshark
# adds several patches.
# So, instead of creating a separate host package and installing lemon to
# $(HOST_DIR), this binary is compiled on-the-fly
define WIRESHARK_BUILD_LEMON_TOOL
cd $(@D); \
mkdir -p $(@D)/bin; \
$(HOSTCC) $(HOST_CFLAGS) -o $(@D)/bin/lemon tools/lemon/lemon.c
endef
WIRESHARK_PRE_BUILD_HOOKS += WIRESHARK_BUILD_LEMON_TOOL
-DENABLE_SMI=OFF \
-DLEMON_C_COMPILER=$(HOSTCC)
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
WIRESHARK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic