* [meta-networking][kirkstone][PATCH 0/5] mosquitto: upgrade 2.0.14 -> 2.0.18
@ 2023-10-06 21:05 Peter Marko
2023-10-06 21:05 ` [meta-networking][kirkstone][PATCH 1/5] mosquitto: upgrade 2.0.14 -> 2.0.15 Peter Marko
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Peter Marko @ 2023-10-06 21:05 UTC (permalink / raw)
To: openembedded-devel; +Cc: Peter Marko
Addresses CVE-2023-0809, CVE-2023-3592 and CVE-2023-28366
Cherry pick all commits for mosquitto recipe from master.
All applied without fuzz/conflict, just upstream status commit
was also updating different recipe which is not in kirkstone yet.
Gianfranco Costamagna (3):
mosquitto: do not automatically depend on dlt-daemon, it's a
non-mandatory logging system
mosquitto: upgrade 2.0.15 -> 2.0.17
mosquitto: upgrade 2.0.17 -> 2.0.18
Martin Jansa (1):
mosquitto: add missing Upstream-Status
Wang Mingyu (1):
mosquitto: upgrade 2.0.14 -> 2.0.15
.../mosquitto/files/2894.patch | 25 +++++++++++++++++
.../mosquitto/files/2895.patch | 27 +++++++++++++++++++
.../mosquitto/files/mosquitto.init | 20 +++++++-------
...osquitto_2.0.14.bb => mosquitto_2.0.18.bb} | 6 +++--
4 files changed, 66 insertions(+), 12 deletions(-)
create mode 100644 meta-networking/recipes-connectivity/mosquitto/files/2894.patch
create mode 100644 meta-networking/recipes-connectivity/mosquitto/files/2895.patch
rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_2.0.14.bb => mosquitto_2.0.18.bb} (94%)
--
2.30.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [meta-networking][kirkstone][PATCH 1/5] mosquitto: upgrade 2.0.14 -> 2.0.15
2023-10-06 21:05 [meta-networking][kirkstone][PATCH 0/5] mosquitto: upgrade 2.0.14 -> 2.0.18 Peter Marko
@ 2023-10-06 21:05 ` Peter Marko
2023-10-06 21:05 ` [meta-networking][kirkstone][PATCH 2/5] mosquitto: do not automatically depend on dlt-daemon, it's a non-mandatory logging system Peter Marko
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Peter Marko @ 2023-10-06 21:05 UTC (permalink / raw)
To: openembedded-devel; +Cc: Wang Mingyu, Khem Raj, Peter Marko
From: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
.../mosquitto/{mosquitto_2.0.14.bb => mosquitto_2.0.15.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_2.0.14.bb => mosquitto_2.0.15.bb} (97%)
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.14.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.15.bb
similarity index 97%
rename from meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.14.bb
rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.15.bb
index 739b7de625..d06dd2d9ca 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.14.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.15.bb
@@ -19,7 +19,7 @@ SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
file://1571.patch \
"
-SRC_URI[sha256sum] = "d0dde8fdb12caf6e2426b4f28081919a2fce3448773bdb8af0d3cd5fe5776925"
+SRC_URI[sha256sum] = "4735b1d32e3f91c7a8896741d88a3022e89730a1ee897946decfa0df27039ac6"
inherit systemd update-rc.d useradd cmake pkgconfig
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-networking][kirkstone][PATCH 2/5] mosquitto: do not automatically depend on dlt-daemon, it's a non-mandatory logging system
2023-10-06 21:05 [meta-networking][kirkstone][PATCH 0/5] mosquitto: upgrade 2.0.14 -> 2.0.18 Peter Marko
2023-10-06 21:05 ` [meta-networking][kirkstone][PATCH 1/5] mosquitto: upgrade 2.0.14 -> 2.0.15 Peter Marko
@ 2023-10-06 21:05 ` Peter Marko
2023-10-06 21:05 ` [meta-networking][kirkstone][PATCH 3/5] mosquitto: upgrade 2.0.15 -> 2.0.17 Peter Marko
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Peter Marko @ 2023-10-06 21:05 UTC (permalink / raw)
To: openembedded-devel; +Cc: Gianfranco Costamagna, Khem Raj, Peter Marko
From: Gianfranco Costamagna <costamagna.gianfranco@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
.../recipes-connectivity/mosquitto/mosquitto_2.0.15.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.15.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.15.bb
index d06dd2d9ca..eea672a706 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.15.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.15.bb
@@ -23,7 +23,7 @@ SRC_URI[sha256sum] = "4735b1d32e3f91c7a8896741d88a3022e89730a1ee897946decfa0df27
inherit systemd update-rc.d useradd cmake pkgconfig
-PACKAGECONFIG ??= "ssl dlt websockets \
+PACKAGECONFIG ??= "ssl websockets \
${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \
"
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-networking][kirkstone][PATCH 3/5] mosquitto: upgrade 2.0.15 -> 2.0.17
2023-10-06 21:05 [meta-networking][kirkstone][PATCH 0/5] mosquitto: upgrade 2.0.14 -> 2.0.18 Peter Marko
2023-10-06 21:05 ` [meta-networking][kirkstone][PATCH 1/5] mosquitto: upgrade 2.0.14 -> 2.0.15 Peter Marko
2023-10-06 21:05 ` [meta-networking][kirkstone][PATCH 2/5] mosquitto: do not automatically depend on dlt-daemon, it's a non-mandatory logging system Peter Marko
@ 2023-10-06 21:05 ` Peter Marko
2023-10-06 21:05 ` [meta-networking][kirkstone][PATCH 4/5] mosquitto: upgrade 2.0.17 -> 2.0.18 Peter Marko
2023-10-06 21:05 ` [meta-networking][kirkstone][PATCH 5/5] mosquitto: add missing Upstream-Status Peter Marko
4 siblings, 0 replies; 6+ messages in thread
From: Peter Marko @ 2023-10-06 21:05 UTC (permalink / raw)
To: openembedded-devel
Cc: Gianfranco Costamagna, Gianfranco Costamagna, Khem Raj, Peter Marko
From: Gianfranco Costamagna <costamagna.gianfranco@gmail.com>
Fix for CVE-2023-28366, CVE-2023-0809, CVE-2023-3592
Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
.../mosquitto/files/mosquitto.init | 20 +++++++++----------
...osquitto_2.0.15.bb => mosquitto_2.0.17.bb} | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_2.0.15.bb => mosquitto_2.0.17.bb} (97%)
diff --git a/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init b/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init
index 9d5963c418..d0da219d6d 100644
--- a/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init
+++ b/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init
@@ -1,18 +1,18 @@
-#! /bin/sh
+#!/bin/sh
# Based on the Debian initscript for mosquitto
### BEGIN INIT INFO
-# Provides: mosquitto
-# Required-Start: $remote_fs $syslog
-# Required-Stop: $remote_fs $syslog
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: mosquitto MQTT message broker
-# Description:
-# This is a message broker that supports version 3.1/3.1.1 of the MQ Telemetry
+# Provides: mosquitto
+# Required-Start: $remote_fs $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: mosquitto MQTT 3.1/3.1.1 message broker
+# Description:
+# This is a message broker that supports version 3.1 of the MQ Telemetry
# Transport (MQTT) protocol.
-#
+#
# MQTT provides a method of carrying out messaging using a publish/subscribe
# model. It is lightweight, both in terms of bandwidth usage and ease of
# implementation. This makes it particularly useful at the edge of the network
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.15.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb
similarity index 97%
rename from meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.15.bb
rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb
index eea672a706..690b6bc126 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.15.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb
@@ -19,7 +19,7 @@ SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
file://1571.patch \
"
-SRC_URI[sha256sum] = "4735b1d32e3f91c7a8896741d88a3022e89730a1ee897946decfa0df27039ac6"
+SRC_URI[sha256sum] = "3be7a911236567c1a9fbe25baf3e3167004ba4a0c151a448ef1f7fc077dba52f"
inherit systemd update-rc.d useradd cmake pkgconfig
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-networking][kirkstone][PATCH 4/5] mosquitto: upgrade 2.0.17 -> 2.0.18
2023-10-06 21:05 [meta-networking][kirkstone][PATCH 0/5] mosquitto: upgrade 2.0.14 -> 2.0.18 Peter Marko
` (2 preceding siblings ...)
2023-10-06 21:05 ` [meta-networking][kirkstone][PATCH 3/5] mosquitto: upgrade 2.0.15 -> 2.0.17 Peter Marko
@ 2023-10-06 21:05 ` Peter Marko
2023-10-06 21:05 ` [meta-networking][kirkstone][PATCH 5/5] mosquitto: add missing Upstream-Status Peter Marko
4 siblings, 0 replies; 6+ messages in thread
From: Peter Marko @ 2023-10-06 21:05 UTC (permalink / raw)
To: openembedded-devel; +Cc: Gianfranco Costamagna, Khem Raj, Peter Marko
From: Gianfranco Costamagna <costamagna.gianfranco@gmail.com>
Add two patches from Debian, pull requests proposed upstream as 2894 and 2895
to make it start only when board is online, and to fix dynamic websockets link failure
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
.../mosquitto/files/2894.patch | 23 +++++++++++++++++
.../mosquitto/files/2895.patch | 25 +++++++++++++++++++
...osquitto_2.0.17.bb => mosquitto_2.0.18.bb} | 4 ++-
3 files changed, 51 insertions(+), 1 deletion(-)
create mode 100644 meta-networking/recipes-connectivity/mosquitto/files/2894.patch
create mode 100644 meta-networking/recipes-connectivity/mosquitto/files/2895.patch
rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_2.0.17.bb => mosquitto_2.0.18.bb} (95%)
diff --git a/meta-networking/recipes-connectivity/mosquitto/files/2894.patch b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch
new file mode 100644
index 0000000000..3275e57e38
--- /dev/null
+++ b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch
@@ -0,0 +1,23 @@
+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>
+---
+ 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/files/2895.patch b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch
new file mode 100644
index 0000000000..a9e9c97b83
--- /dev/null
+++ b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch
@@ -0,0 +1,25 @@
+From: Joachim Zobel <jz-2017@heute-morgen.de>
+Date: Wed, 13 Sep 2023 10:05:43 +0200
+Subject: [PATCH] Mosquitto now waits for network-online when starting
+ (Closes: #1036450)
+
+See: https://github.com/eclipse/mosquitto/issues/2878
+---
+ service/systemd/mosquitto.service.simple | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/service/systemd/mosquitto.service.simple b/service/systemd/mosquitto.service.simple
+index 15ee0d6..c2a330b 100644
+--- a/service/systemd/mosquitto.service.simple
++++ b/service/systemd/mosquitto.service.simple
+@@ -1,8 +1,8 @@
+ [Unit]
+ Description=Mosquitto MQTT Broker
+ Documentation=man:mosquitto.conf(5) man:mosquitto(8)
+-After=network.target
+-Wants=network.target
++After=network-online.target
++Wants=network-online.target
+
+ [Service]
+ ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb
similarity index 95%
rename from meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb
rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb
index 690b6bc126..0c9ccc810d 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb
@@ -17,9 +17,11 @@ 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] = "3be7a911236567c1a9fbe25baf3e3167004ba4a0c151a448ef1f7fc077dba52f"
+SRC_URI[sha256sum] = "d665fe7d0032881b1371a47f34169ee4edab67903b2cd2b4c083822823f4448a"
inherit systemd update-rc.d useradd cmake pkgconfig
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-networking][kirkstone][PATCH 5/5] mosquitto: add missing Upstream-Status
2023-10-06 21:05 [meta-networking][kirkstone][PATCH 0/5] mosquitto: upgrade 2.0.14 -> 2.0.18 Peter Marko
` (3 preceding siblings ...)
2023-10-06 21:05 ` [meta-networking][kirkstone][PATCH 4/5] mosquitto: upgrade 2.0.17 -> 2.0.18 Peter Marko
@ 2023-10-06 21:05 ` Peter Marko
4 siblings, 0 replies; 6+ messages in thread
From: Peter Marko @ 2023-10-06 21:05 UTC (permalink / raw)
To: openembedded-devel; +Cc: Martin Jansa, Khem Raj, Peter Marko
From: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
meta-networking/recipes-connectivity/mosquitto/files/2894.patch | 2 ++
meta-networking/recipes-connectivity/mosquitto/files/2895.patch | 2 ++
2 files changed, 4 insertions(+)
diff --git a/meta-networking/recipes-connectivity/mosquitto/files/2894.patch b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch
index 3275e57e38..7374cbd26f 100644
--- a/meta-networking/recipes-connectivity/mosquitto/files/2894.patch
+++ b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch
@@ -5,6 +5,8 @@ Subject: [PATCH] Link correctly with shared websockets library if needed see:
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/meta-networking/recipes-connectivity/mosquitto/files/2895.patch b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch
index a9e9c97b83..853f881754 100644
--- a/meta-networking/recipes-connectivity/mosquitto/files/2895.patch
+++ b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch
@@ -5,6 +5,8 @@ Subject: [PATCH] Mosquitto now waits for network-online when starting
See: https://github.com/eclipse/mosquitto/issues/2878
---
+Upstream-Status: Pending
+
service/systemd/mosquitto.service.simple | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-10-06 21:06 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-06 21:05 [meta-networking][kirkstone][PATCH 0/5] mosquitto: upgrade 2.0.14 -> 2.0.18 Peter Marko
2023-10-06 21:05 ` [meta-networking][kirkstone][PATCH 1/5] mosquitto: upgrade 2.0.14 -> 2.0.15 Peter Marko
2023-10-06 21:05 ` [meta-networking][kirkstone][PATCH 2/5] mosquitto: do not automatically depend on dlt-daemon, it's a non-mandatory logging system Peter Marko
2023-10-06 21:05 ` [meta-networking][kirkstone][PATCH 3/5] mosquitto: upgrade 2.0.15 -> 2.0.17 Peter Marko
2023-10-06 21:05 ` [meta-networking][kirkstone][PATCH 4/5] mosquitto: upgrade 2.0.17 -> 2.0.18 Peter Marko
2023-10-06 21:05 ` [meta-networking][kirkstone][PATCH 5/5] mosquitto: add missing Upstream-Status Peter Marko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.