diff mbox series

[meta-networking,scarthgap,1/2] mosquitto: upgrade 2.0.18 -> 2.0.19

Message ID 20241211085540.6811-1-hsimeliere.opensource@witekio.com
State New
Headers show
Series [meta-networking,scarthgap,1/2] mosquitto: upgrade 2.0.18 -> 2.0.19 | expand

Commit Message

Hugo Simeliere Dec. 11, 2024, 8:55 a.m. UTC 
From: Fabrice Aeschbacher <fabrice.aeschbacher@siemens.com>

- 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: Bruno VERNAY <bruno.vernay@se.com>
Signed-off-by: Hugo SIMELIERE <hsimeliere.opensource@witekio.com>
---
 .../mosquitto/files/1571.patch                | 22 ----------------
 .../mosquitto/files/2894.patch                | 25 -------------------
 ...osquitto_2.0.18.bb => mosquitto_2.0.19.bb} |  4 +--
 3 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 meta-networking/recipes-connectivity/mosquitto/files/1571.patch
 delete mode 100644 meta-networking/recipes-connectivity/mosquitto/files/2894.patch
 rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_2.0.18.bb => mosquitto_2.0.19.bb} (95%)
diff mbox series

Patch

diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
deleted file mode 100644
index 627638ec8..000000000
--- a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
+++ /dev/null
@@ -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
diff --git a/meta-networking/recipes-connectivity/mosquitto/files/2894.patch b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch
deleted file mode 100644
index 7374cbd26..000000000
--- a/meta-networking/recipes-connectivity/mosquitto/files/2894.patch
+++ /dev/null
@@ -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)
- 
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.19.bb
similarity index 95%
rename from meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb
rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.19.bb
index ea9eb4857..c6ce2e095 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.19.bb
@@ -16,12 +16,10 @@  DEPENDS = "uthash cjson"
 
 SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
            file://mosquitto.init \
-           file://1571.patch \
-           file://2894.patch \
            file://2895.patch \
 "
 
-SRC_URI[sha256sum] = "d665fe7d0032881b1371a47f34169ee4edab67903b2cd2b4c083822823f4448a"
+SRC_URI[sha256sum] = "33af3637f119a61c509c01d2f8f6cc3d8be76f49e850132f2860af142abf82a9"
 
 inherit systemd update-rc.d useradd cmake pkgconfig