2 files changed, 24 insertions, 58 deletions

diff --git a/meta-networking/recipes-connectivity/mosquitto/files/2895.patch b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch
deleted file mode 100644
index d9432e749e..0000000000
--- a/meta-networking/recipes-connectivity/mosquitto/files/2895.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
----
-Upstream-Status: Submitted [https://github.com/eclipse-mosquitto/mosquitto/pull/2895]
-
- service/systemd/mosquitto.service.simple | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- 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
---- a/service/systemd/mosquitto.service.notify
-+++ b/service/systemd/mosquitto.service.notify
-@@ -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]
- Type=notify
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.22.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.1.2.bb
index 1bdf54eea1..6a6e554453 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.22.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.1.2.bb
@@ -6,20 +6,19 @@ provides a lightweight method of carrying out messaging using a \
 publish/subscribe model. "
 HOMEPAGE = "http://mosquitto.org/"
 SECTION = "console/network"
-LICENSE = "EPL-2.0 | EDL-1.0"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca9a8f366c6babf593e374d0d7d58749 \
+LICENSE = "EPL-2.0 | BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f6d64fd27a4071b14ef656a0e8a4f4cf \
                     file://edl-v10;md5=9f6accb1afcb570f8be65039e2fcd49e \
                     file://epl-v20;md5=2dd765ca47a05140be15ebafddbeadfe \
-                    file://NOTICE.md;md5=a7a91b4754c6f7995020d1b49bc829c6 \
+                    file://NOTICE.md;md5=611234becddb76dca161d4ffce7ab420 \
 "
 DEPENDS = "uthash cjson"
 
 SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
            file://mosquitto.init \
-           file://2895.patch \
 "
 
-SRC_URI[sha256sum] = "2f752589ef7db40260b633fbdb536e9a04b446a315138d64a7ff3c14e2de6b68"
+SRC_URI[sha256sum] = "fd905380691ac65ea5a93779e8214941829e3d6e038d5edff9eac5fd74cbed02"
 
 inherit systemd update-rc.d useradd cmake pkgconfig
 
@@ -27,16 +26,24 @@ PACKAGECONFIG ??= "ssl websockets \
                   ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \
                   "
 
-PACKAGECONFIG[manpages] = "-DDOCUMENTATION=ON,-DDOCUMENTATION=OFF,libxslt-native docbook-xsl-stylesheets-native"
+PACKAGECONFIG[manpages] = "-DWITH_DOCS=ON,-DWITH_DOCS=OFF,libxslt-native docbook-xsl-stylesheets-native"
 PACKAGECONFIG[dns-srv] = "-DWITH_SRV=ON,-DWITH_SRV=OFF,c-ares"
-PACKAGECONFIG[ssl] = "-DWITH_TLS=ON -DWITH_TLS_PSK=ON -DWITH_EC=ON,-DWITH_TLS=OFF -DWITH_TLS_PSK=OFF -DWITH_EC=OFF,openssl"
+PACKAGECONFIG[ssl] = "-DWITH_TLS=ON -DWITH_TLS_PSK=ON,-DWITH_TLS=OFF -DWITH_TLS_PSK=OFF,openssl"
 PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd"
-PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON,-DWITH_WEBSOCKETS=OFF,libwebsockets"
+PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON -DWITH_WEBSOCKETS_BUILTIN=OFF,-DWITH_WEBSOCKETS=OFF,libwebsockets"
 PACKAGECONFIG[dlt] = "-DWITH_DLT=ON,-DWITH_DLT=OFF,dlt-daemon"
-
+PACKAGECONFIG[http-api] = "-DWITH_HTTP_API=ON,-DWITH_HTTP_API=OFF,libmicrohttpd"
+PACKAGECONFIG[persist-sqlite] = "-DWITH_PLUGIN_PERSIST_SQLITE=ON,-DWITH_PLUGIN_PERSIST_SQLITE=OFF,sqlite3"
+PACKAGECONFIG[ctrl-shell] = "-DWITH_CTRL_SHELL=ON,-DWITH_CTRL_SHELL=OFF,libedit"
+
+# Disable building/running tests to avoid GoogleTest discovery executing target binaries
+# during cross-compilation (Yocto). This prevents CMake from calling gtest_discover_tests().
+# See: Yocto + GTest cross-compile issues and gtest_discover_tests execution failures.
+# (Refs: SO example and googletest issue)
 EXTRA_OECMAKE = " \
     -DWITH_BUNDLED_DEPS=OFF \
-    -DWITH_ADNS=ON \
+    -DWITH_ADNS=OFF \
+    -DWITH_TESTS=OFF \
 "
 
 do_install:append() {
@@ -52,17 +59,14 @@ do_install:append() {
         ${D}${sysconfdir}/init.d/mosquitto
 }
 
-PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients"
-
-PACKAGE_BEFORE_PN = "${PN}-examples"
+PACKAGE_BEFORE_PN = "libmosquitto1 libmosquittopp1 ${PN}-clients ${PN}-examples"
 
-FILES:${PN} = "${sbindir}/mosquitto \
-               ${bindir}/mosquitto_passwd \
-               ${bindir}/mosquitto_ctrl \
-               ${libdir}/mosquitto_dynamic_security.so \
-               ${sysconfdir}/mosquitto \
-               ${sysconfdir}/init.d \
-               ${systemd_unitdir}/system/mosquitto.service \
+FILES:${PN} += " \
+    ${libdir}/mosquitto_acl_file.so \
+    ${libdir}/mosquitto_dynamic_security.so \
+    ${libdir}/mosquitto_password_file.so \
+    ${libdir}/mosquitto_sparkplug_aware.so \
+    ${systemd_unitdir}/system/mosquitto.service \
 "
 
 CONFFILES:${PN} += "${sysconfdir}/mosquitto/mosquitto.conf"