mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-15 16:07:26 +00:00
mosquitto: upgrade 2.0.18 -> 2.0.19
- Solves CVE-2024-8376 - removed 1571.patch and 2894.patch, already applied in v2.0.19 https://github.com/eclipse/mosquitto/blob/v2.0.19/ChangeLog.txt Signed-off-by: Fabrice Aeschbacher <fabrice.aeschbacher@siemens.com> Reviewed-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Peter Marko <peter.marko@siemens.com>
This commit is contained in:
committed by
Armin Kuster
parent
e137ee78b5
commit
255faa7b69
@@ -1,22 +0,0 @@
|
|||||||
Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1571]
|
|
||||||
From 3fe5468f1bdca1bff1d18cf43c9e338f41aa9e32 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
|
|
||||||
Date: Wed, 22 Jan 2020 12:39:49 +0100
|
|
||||||
Subject: [PATCH] Add dynamic symbols linking with cmake too
|
|
||||||
|
|
||||||
Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
|
|
||||||
---
|
|
||||||
lib/CMakeLists.txt | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
--- a/lib/CMakeLists.txt
|
|
||||||
+++ b/lib/CMakeLists.txt
|
|
||||||
@@ -94,6 +94,8 @@
|
|
||||||
OUTPUT_NAME mosquitto
|
|
||||||
VERSION ${VERSION}
|
|
||||||
SOVERSION 1
|
|
||||||
+ LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/linker.version
|
|
||||||
+ LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/linker.version"
|
|
||||||
)
|
|
||||||
|
|
||||||
install(TARGETS libmosquitto
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
From: Joachim Zobel <jz-2017@heute-morgen.de>
|
|
||||||
Date: Wed, 13 Sep 2023 09:55:34 +0200
|
|
||||||
Subject: [PATCH] Link correctly with shared websockets library if needed see:
|
|
||||||
https://github.com/eclipse/mosquitto/pull/2751
|
|
||||||
|
|
||||||
Patch contributed by Joachim Zobel <jz-2017@heute-morgen.de> and Daniel Engberg <daniel.engberg.lists@pyret.net>
|
|
||||||
---
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
src/CMakeLists.txt | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
||||||
index 9380a04..dce8313 100644
|
|
||||||
--- a/src/CMakeLists.txt
|
|
||||||
+++ b/src/CMakeLists.txt
|
|
||||||
@@ -200,7 +200,7 @@ if (WITH_WEBSOCKETS)
|
|
||||||
link_directories(${mosquitto_SOURCE_DIR})
|
|
||||||
endif (WIN32)
|
|
||||||
else (STATIC_WEBSOCKETS)
|
|
||||||
- set (MOSQ_LIBS ${MOSQ_LIBS} websockets)
|
|
||||||
+ set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared)
|
|
||||||
endif (STATIC_WEBSOCKETS)
|
|
||||||
endif (WITH_WEBSOCKETS)
|
|
||||||
|
|
||||||
+1
-3
@@ -16,12 +16,10 @@ DEPENDS = "uthash cjson"
|
|||||||
|
|
||||||
SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
|
SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
|
||||||
file://mosquitto.init \
|
file://mosquitto.init \
|
||||||
file://1571.patch \
|
|
||||||
file://2894.patch \
|
|
||||||
file://2895.patch \
|
file://2895.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "d665fe7d0032881b1371a47f34169ee4edab67903b2cd2b4c083822823f4448a"
|
SRC_URI[sha256sum] = "33af3637f119a61c509c01d2f8f6cc3d8be76f49e850132f2860af142abf82a9"
|
||||||
|
|
||||||
inherit systemd update-rc.d useradd cmake pkgconfig
|
inherit systemd update-rc.d useradd cmake pkgconfig
|
||||||
|
|
||||||
Reference in New Issue
Block a user