[14/23] wireshark: update 4.0.10 -> 4.2.0

Message ID	20231231122329.405225-14-alex@linutronix.de
State	Accepted
Headers	show Return-Path: <alex.kanavin@gmail.com> ip: 209.85.128.47, mailfrom: alex.kanavin@gmail.com) From: Alexander Kanavin <alex.kanavin@gmail.com> To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin <alex@linutronix.de> Subject: [PATCH 14/23] wireshark: update 4.0.10 -> 4.2.0 Date: Sun, 31 Dec 2023 13:23:20 +0100 Message-Id: <20231231122329.405225-14-alex@linutronix.de> In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[01/23] fontforge: add a readline PACKAGECONFIG \| expand [01/23] fontforge: add a readline PACKAGECONFIG [02/23] volume-key: disable python bindings [03/23] audit: disable python bindings as incompatible with python 3.12 [04/23] cmpi-bindings: update 1.0.1 -> 1.0.4 [05/23] libpwquality: backport a python 3.12 compatibility patch [06/23] mycroft: do not depend on python3-xmlrunner [07/23] python3-xmlrunner: remove the recipe [08/23] system-config-printer: rely on setuptools to obtain distutils copy [09/23] python3-gmpy2: fix python 3.12 issues [10/23] python3-custom-inherit: fix python 3.12 builds [11/23] python3-jsonrpcserver: remove [12/23] python3-oslash: remove [13/23] nmap: disable ndiff [14/23] wireshark: update 4.0.10 -> 4.2.0 [15/23] openipmi: update 2.0.32 -> 2.0.34 [16/23] libsigrokdecode: add python 3.12 support [17/23] cockpit: add setuptools dependency to bring in distutils copy [18/23] mongodb: skip until python 3.12 fixes are available. [19/23] mercurial: ensure setuptools is present as distutils is no longer (mercurial tries both) [20/23] rwmem: fix python modules packaging [21/23] upm: get disutils copy via setuptools [22/23] python3-kmod: remove the recipe [23/23] hplip: provide setuptools for the distutils copy

diff --git a/meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch b/meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch deleted file mode 100644 index 0d51ce1b8..000000000 --- a/meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b4f29807225cf3744c2f4f971902fbdd7486fc19 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <j@v6e.pt> -Date: Fri, 26 May 2023 13:29:23 +0100 -Subject: [PATCH] CMake: Fix a try_run() test when cross-compiling - -Upstream-Status: Backport -Signed-off-by: Armin Kuster <akuster808@gmail.com> - ---- - ConfigureChecks.cmake | 36 ++++++++++++++++++++---------------- - 1 file changed, 20 insertions(+), 16 deletions(-) - -diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake -index dd8268e077..d8bca54115 100644 ---- a/ConfigureChecks.cmake -+++ b/ConfigureChecks.cmake -@@ -122,26 +122,30 @@ check_type_size("ssize_t" SSIZE_T) - # Check if the libc vsnprintf() conforms to C99. If this fails we may - # need to fall-back on GLib I/O. - # --check_c_source_runs(" -- #include <stdio.h> -- int main(void) -- { -- /* Check that snprintf() and vsnprintf() don't return -- * -1 if the buffer is too small. C99 says this value -- * is the length that would be written not including -- * the nul byte. */ -- char buf[3]; -- return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1; -- }" -- HAVE_C99_VSNPRINTF --) --if (NOT HAVE_C99_VSNPRINTF) -- message(FATAL_ERROR -+# If cross-compiling we can't check so just assume this requirement is met. -+# -+if(NOT CMAKE_CROSSCOMPILING) -+ check_c_source_runs(" -+ #include <stdio.h> -+ int main(void) -+ { -+ /* Check that snprintf() and vsnprintf() don't return -+ * -1 if the buffer is too small. C99 says this value -+ * is the length that would be written not including -+ * the nul byte. */ -+ char buf[3]; -+ return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1; -+ }" -+ HAVE_C99_VSNPRINTF -+ ) -+ if (NOT HAVE_C99_VSNPRINTF) -+ message(FATAL_ERROR - "Building Wireshark requires a C99 compliant vsnprintf() and this \ - target does not meet that requirement. Compiling for ${CMAKE_SYSTEM} \ - using ${CMAKE_C_COMPILER_ID}. Please report this issue to the Wireshark \ - developers at wireshark-dev@wireshark.org." -- ) -+ ) -+ endif() - endif() - - # --- -2.25.1 - diff --git a/meta-networking/recipes-support/wireshark/files/0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch b/meta-networking/recipes-support/wireshark/files/0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch new file mode 100644 index 000000000..1903f38f5 --- /dev/null +++ b/meta-networking/recipes-support/wireshark/files/0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch @@ -0,0 +1,32 @@ +From 802d3cafa888b36aa72007d48232a010dbb0231d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Wed, 27 Dec 2023 16:57:28 +0100 +Subject: [PATCH] UseLemon.cmake: do not use lemon data from the host + +We use native lemon, and not the host one, so +the data should be taken from the source tree as well. + +Upstream-Status: Inappropriate [cross-specific] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + cmake/modules/UseLemon.cmake | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/cmake/modules/UseLemon.cmake b/cmake/modules/UseLemon.cmake +index fa4034e..83a7ca3 100644 +--- a/cmake/modules/UseLemon.cmake ++++ b/cmake/modules/UseLemon.cmake +@@ -13,11 +13,12 @@ if(LEMON_EXECUTABLE) + ${_out}.out + COMMAND ${LEMON_EXECUTABLE} + -l +- -T/usr/share/lemon/lempar.c ++ -T${CMAKE_SOURCE_DIR}/tools/lemon/lempar.c + -d. + ${_in} + DEPENDS + ${_in} ++ ${CMAKE_SOURCE_DIR}/tools/lemon/lempar.c + ) + endmacro() + add_custom_target(lemon) diff --git a/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch b/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch index 6ad8a62c2..202de6260 100644 --- a/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch +++ b/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch @@ -1,4 +1,4 @@ -From 0a9ab056ce7582033a21d6bc541ece520bf2b0b6 Mon Sep 17 00:00:00 2001 +From d9c4cdad0c48becab491ea4e80e5cd81f7d1dc97 Mon Sep 17 00:00:00 2001 From: Oleksiy Obitotskyy <oobitots@cisco.com> Date: Thu, 26 Nov 2020 05:38:31 -0800 Subject: [PATCH] wireshark-src: improve reproducibility @@ -8,15 +8,15 @@ comments. Upstream-Status: Pending Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> + --- - tools/make-plugin-reg.py | 2 +- - tools/ncp2222.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + tools/ncp2222.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: wireshark-4.0.6/tools/ncp2222.py -=================================================================== ---- wireshark-4.0.6.orig/tools/ncp2222.py -+++ wireshark-4.0.6/tools/ncp2222.py +diff --git a/tools/ncp2222.py b/tools/ncp2222.py +index f14d0c5..05073b9 100755 +--- a/tools/ncp2222.py ++++ b/tools/ncp2222.py @@ -5891,7 +5891,7 @@ def produce_code(): print("/*") diff --git a/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch b/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch index 069b5793d..0e6249c93 100644 --- a/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch +++ b/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch @@ -1,4 +1,4 @@ -From 3e571e24c730f747d18ed02ba7451e9e00480fc7 Mon Sep 17 00:00:00 2001 +From e4e88c2f55286cf24af230b265d0e059363baa6c Mon Sep 17 00:00:00 2001 From: Oleksiy Obitotskyy <oobitots@cisco.com> Date: Thu, 26 Nov 2020 12:00:43 -0800 Subject: [PATCH] flex: Remove #line directives @@ -8,12 +8,13 @@ generate #line directives with absolute file patch. Upstream-Status: Pending Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> + --- cmake/modules/FindLEX.cmake | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/cmake/modules/FindLEX.cmake b/cmake/modules/FindLEX.cmake -index 0008bc4..ec68f84 100644 +index 20caa09..174f452 100644 --- a/cmake/modules/FindLEX.cmake +++ b/cmake/modules/FindLEX.cmake @@ -32,11 +32,19 @@ MACRO(ADD_LEX_FILES _source _generated) @@ -22,25 +23,22 @@ index 0008bc4..ec68f84 100644 - ADD_CUSTOM_COMMAND( - OUTPUT ${_outc} ${_outh} -- COMMAND ${LEX_EXECUTABLE} -o${_outc} --header-file=${_outh} ${_in} +- COMMAND ${LEX_EXECUTABLE} $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:--debug> -o${_outc} --header-file=${_outh} ${_in} - DEPENDS ${_in} - ) + IF (DEFINED ENV{SOURCE_DATE_EPOCH}) + ADD_CUSTOM_COMMAND( + OUTPUT ${_outc} ${_outh} -+ COMMAND ${LEX_EXECUTABLE} --noline -o${_outc} --header-file=${_outh} ${_in} ++ COMMAND ${LEX_EXECUTABLE} $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:--debug> --noline -o${_outc} --header-file=${_outh} ${_in} + DEPENDS ${_in} + ) + ELSE () + ADD_CUSTOM_COMMAND( + OUTPUT ${_outc} ${_outh} -+ COMMAND ${LEX_EXECUTABLE} -o${_outc} --header-file=${_outh} ${_in} ++ COMMAND ${LEX_EXECUTABLE} $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:--debug> -o${_outc} --header-file=${_outh} ${_in} + DEPENDS ${_in} + ) + ENDIF () LIST(APPEND ${_source} ${_in}) LIST(APPEND ${_generated} ${_outc}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) --- -2.26.2.Cisco - diff --git a/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch b/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch index 134633f66..1a6fe8d39 100644 --- a/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch +++ b/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch @@ -1,4 +1,4 @@ -From 17f05a8d02c589e4867906f70381e63e46a67870 Mon Sep 17 00:00:00 2001 +From 94b951c0cccf67b66749cc87c473e63fa5207e83 Mon Sep 17 00:00:00 2001 From: Oleksiy Obitotskyy <oobitots@cisco.com> Date: Wed, 27 Jan 2021 06:47:13 -0800 Subject: [PATCH] lemon: Remove #line directives @@ -8,67 +8,28 @@ directives with extra option '-l'. Upstream-Status: Pending Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> + --- - cmake/modules/UseLemon.cmake | 49 +++++++++++++++++++++++++----------- - 1 file changed, 34 insertions(+), 15 deletions(-) + cmake/modules/UseLemon.cmake | 2 ++ + 1 file changed, 2 insertions(+) -Index: wireshark-3.4.11/cmake/modules/UseLemon.cmake -=================================================================== ---- wireshark-3.4.11.orig/cmake/modules/UseLemon.cmake -+++ wireshark-3.4.11/cmake/modules/UseLemon.cmake -@@ -7,21 +7,40 @@ MACRO(ADD_LEMON_FILES _source _generated - - SET(_out ${CMAKE_CURRENT_BINARY_DIR}/${_basename}) - -- ADD_CUSTOM_COMMAND( -- OUTPUT -- ${_out}.c -- # These files are generated as side-effect -- ${_out}.h -- ${_out}.out -- COMMAND $<TARGET_FILE:lemon> -- -T${_lemonpardir}/lempar.c -- -d. -- ${_in} -- DEPENDS -- ${_in} -- lemon -- ${_lemonpardir}/lempar.c -- ) -+ IF (DEFINED ENV{SOURCE_DATE_EPOCH}) -+ ADD_CUSTOM_COMMAND( -+ OUTPUT -+ ${_out}.c -+ # These files are generated as side-effect -+ ${_out}.h -+ ${_out}.out -+ COMMAND lemon -+ -l -+ -T${_lemonpardir}/lempar.c -+ -d. -+ ${_in} -+ DEPENDS -+ ${_in} -+ lemon -+ ${_lemonpardir}/lempar.c -+ ) -+ ELSE () -+ ADD_CUSTOM_COMMAND( -+ OUTPUT -+ ${_out}.c -+ # These files are generated as side-effect -+ ${_out}.h -+ ${_out}.out -+ COMMAND lemon -+ -T${_lemonpardir}/lempar.c -+ -d. -+ ${_in} -+ DEPENDS -+ ${_in} -+ lemon -+ ${_lemonpardir}/lempar.c -+ ) -+ ENDIF () - - LIST(APPEND ${_source} ${_in}) - LIST(APPEND ${_generated} ${_out}.c) +diff --git a/cmake/modules/UseLemon.cmake b/cmake/modules/UseLemon.cmake +index e419de1..fa4034e 100644 +--- a/cmake/modules/UseLemon.cmake ++++ b/cmake/modules/UseLemon.cmake +@@ -12,6 +12,7 @@ if(LEMON_EXECUTABLE) + ${_out}.h + ${_out}.out + COMMAND ${LEMON_EXECUTABLE} ++ -l + -T/usr/share/lemon/lempar.c + -d. + ${_in} +@@ -30,6 +31,7 @@ else() + ${_out}.h + ${_out}.out + COMMAND $<TARGET_FILE:lemon> ++ -l + -T${CMAKE_SOURCE_DIR}/tools/lemon/lempar.c + -d. + ${_in} diff --git a/meta-networking/recipes-support/wireshark/wireshark_4.0.10.bb b/meta-networking/recipes-support/wireshark/wireshark_4.2.0.bb similarity index 94% rename from meta-networking/recipes-support/wireshark/wireshark_4.0.10.bb rename to meta-networking/recipes-support/wireshark/wireshark_4.2.0.bb index 008aa8cb1..4a4768092 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_4.0.10.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_4.2.0.bb @@ -4,20 +4,20 @@ SECTION = "net" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "pcre2 expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares" +DEPENDS = "pcre2 expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares speexdsp" DEPENDS:append:class-target = " wireshark-native chrpath-replacement-native " SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz \ - file://0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch \ file://0001-wireshark-src-improve-reproducibility.patch \ file://0002-flex-Remove-line-directives.patch \ file://0004-lemon-Remove-line-directives.patch \ + file://0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch \ " UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[sha256sum] = "b2e3ff03fa2be9058a9ffbedd12b0a670433bd16c8cc6c432ab48dabc2df1898" +SRC_URI[sha256sum] = "0e428492f4c3625d61a7ccff008dc0e429d16ab8caccad4403157ea92b48a75b" PE = "1"

[14/23] wireshark: update 4.0.10 -> 4.2.0

Commit Message

Patch