okhsunrog/buildroot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

package/wireshark: update to 4.2.6

Browse source 
For release notes see following page:
https://www.wireshark.org/docs/relnotes/wireshark-4.2.6.html

Support for QT6 was disabled in this update and could be
added in a later commit.

Patch 0001 is upstream.

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Waldemar Brodkorb 2024-08-26 06:21:30 +02:00 • committed by Thomas Petazzoni
parent c84b89fd0e
commit 3ded56bd1b
4 changed files with 5 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.checkpackageignore
View file

@ -1369,7 +1369,6 @@ package/wilc-driver/0004-Fix-struct-station_parameters-Linux-6.1-build-failur.pa
package/wilc-driver/0005-Fix-cast-warnings.patch lib_patch.Upstream
package/wipe/0001-musl.patch lib_patch.Upstream
package/wireless_tools/0001-remove-bzero.patch lib_patch.Upstream
package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch lib_patch.Upstream
package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch lib_patch.Upstream
package/wpa_supplicant/ifupdown.sh Shellcheck
package/x11r7/xapp_luit/0001-posix-openpt.patch lib_patch.Upstream

31
package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch
View file

@ -1,31 +0,0 @@
From 33270f56477542dedf978e660cf8d08464f28797 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_{EXE_LINKER_FLAGS,SYSROOT} if needed
Wipe CMAKE_{EXE_LINKER_FLAGS,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 | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/lemon/CMakeLists.txt b/tools/lemon/CMakeLists.txt
index 8742aa9fc9..7a9263fe0d 100644
--- a/tools/lemon/CMakeLists.txt
+++ b/tools/lemon/CMakeLists.txt
@@ -12,6 +12,8 @@ add_executable(lemon lemon.c)
if(DEFINED LEMON_C_COMPILER)
set(CMAKE_C_COMPILER "${LEMON_C_COMPILER}")
set(CMAKE_C_FLAGS "")
+ set(CMAKE_EXE_LINKER_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-4.0.12.txt
sha1 e00d90769995bf786b05c05bdd9a2c6c8e372e70 wireshark-4.0.12.tar.xz
sha256 e4e3d618ba11e159fb163f0dc4716a8b72a065aafd1111db9405332552a5a115 wireshark-4.0.12.tar.xz
# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.2.6.txt
sha1 db0374dce360b99d8abb9a3f3471f3fc98d6d099 wireshark-4.2.6.tar.xz
sha256 5ec6028df29068d889c98489bf194a884b00831106fea1e921fea3c65f2003f5 wireshark-4.2.6.tar.xz
# Locally calculated
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING

4
package/wireshark/wireshark.mk
View file

@ -4,7 +4,7 @@
#
################################################################################
WIRESHARK_VERSION = 4.0.12
WIRESHARK_VERSION = 4.2.6
WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz
WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions
WIRESHARK_LICENSE = wireshark license
@ -40,7 +40,7 @@ WIRESHARK_CONF_OPTS += -DENABLE_LTO=OFF
endif
ifeq ($(BR2_PACKAGE_WIRESHARK_GUI),y)
WIRESHARK_CONF_OPTS += -DBUILD_wireshark=ON
WIRESHARK_CONF_OPTS += -DBUILD_wireshark=ON -DUSE_qt6=OFF
WIRESHARK_DEPENDENCIES += qt5base qt5multimedia qt5svg qt5tools
else
WIRESHARK_CONF_OPTS += -DBUILD_wireshark=OFF