mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-01 04:43:27 +00:00
c0af251f34
Contains fix for CVE-2025-0962. Removed CVE-2025-9817.patch because it is included in this release. Add a patch that allows it building for native: it is looking for iconv.h header as a new dependency for (optional) zlib-ng support, however it is not installed in the sysroot for native builds. Add a patch that removes this hard dependency for native builds. Changelogs: https://www.wireshark.org/docs/relnotes/wireshark-4.6.3.html https://www.wireshark.org/docs/relnotes/wireshark-4.6.2.html https://www.wireshark.org/docs/relnotes/wireshark-4.6.1.html https://www.wireshark.org/docs/relnotes/wireshark-4.6.0.html Overall changelogs (including 4.4 also): https://www.wireshark.org/docs/relnotes/ Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
36 lines
940 B
Diff
36 lines
940 B
Diff
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
|
|
|
|
In case of reproducible build remove #line
|
|
directives with extra option '-l'.
|
|
|
|
Upstream-Status: Pending
|
|
Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
|
|
|
|
---
|
|
cmake/modules/UseLemon.cmake | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
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
|
|
@@ -17,6 +17,7 @@ if(LEMON_EXECUTABLE)
|
|
${_out}.h
|
|
${_out}.out
|
|
COMMAND ${LEMON_EXECUTABLE}
|
|
+ -l
|
|
-T/usr/share/lemon/lempar.c
|
|
-d.
|
|
${_in}
|
|
@@ -35,6 +36,7 @@ else()
|
|
${_out}.h
|
|
${_out}.out
|
|
COMMAND $<TARGET_FILE:lemon>
|
|
+ -l
|
|
-T${CMAKE_SOURCE_DIR}/tools/lemon/lempar.c
|
|
-d.
|
|
--
|