From 59f47567c00a3f2b0a6fd83db3770f7c3d94ef67 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Mon, 2 Mar 2020 11:11:25 +0000 Subject: mosquitto: upgrade 1.6.8 -> 1.6.9 Bugfix release. For details, see: https://mosquitto.org/blog/2020/02/version-1-6-9-released/ Also remove patches applied upstream. Signed-off-by: Pierre-Jean Texier --- .../mosquitto/files/1568.patch | 67 ---------------- .../mosquitto/files/1569.patch | 25 ------ .../mosquitto/files/1570.patch | 39 ---------- .../mosquitto/mosquitto_1.6.8.bb | 89 ---------------------- .../mosquitto/mosquitto_1.6.9.bb | 86 +++++++++++++++++++++ 5 files changed, 86 insertions(+), 220 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/mosquitto/files/1568.patch delete mode 100644 meta-networking/recipes-connectivity/mosquitto/files/1569.patch delete mode 100644 meta-networking/recipes-connectivity/mosquitto/files/1570.patch delete mode 100644 meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.8.bb create mode 100644 meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1568.patch b/meta-networking/recipes-connectivity/mosquitto/files/1568.patch deleted file mode 100644 index 15f7a91057..0000000000 --- a/meta-networking/recipes-connectivity/mosquitto/files/1568.patch +++ /dev/null @@ -1,67 +0,0 @@ -Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1568] -From 50bfc79cae5764a6e513b684a5eb5bef2b35c856 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna -Date: Wed, 22 Jan 2020 12:30:25 +0100 -Subject: [PATCH] Bugfix: include "deps" directory only if BUNDLED_DEPS has - been provided and set to true - -Signed-off-by: Gianfranco Costamagna ---- - config.mk | 5 ++++- - lib/CMakeLists.txt | 5 ++++- - test/unit/Makefile | 6 +++++- - 3 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/config.mk b/config.mk -index 51e36e0d0..0ac24b3d4 100644 ---- a/config.mk -+++ b/config.mk -@@ -135,7 +135,10 @@ endif - - STATIC_LIB_DEPS:= - --LIB_CPPFLAGS=$(CPPFLAGS) -I. -I.. -I../lib -I../src/deps -+LIB_CPPFLAGS=$(CPPFLAGS) -I. -I.. -I../lib -+ifeq ($(WITH_BUNDLED_DEPS),yes) -+ LIB_CPPFLAGS:=$(LIB_CPPFLAGS) -I../src/deps -+endif - LIB_CFLAGS:=$(CFLAGS) - LIB_CXXFLAGS:=$(CXXFLAGS) - LIB_LDFLAGS:=$(LDFLAGS) -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index e1521f12a..891046a81 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -1,11 +1,14 @@ - add_subdirectory(cpp) - - include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/lib -- ${mosquitto_SOURCE_DIR}/src/deps - ${STDBOOL_H_PATH} ${STDINT_H_PATH} - ${OPENSSL_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}) - link_directories(${mosquitto_SOURCE_DIR}/lib) - -+if (WITH_BUNDLED_DEPS) -+ include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/src/deps) -+endif (WITH_BUNDLED_DEPS) -+ - set(C_SRC - actions.c - callbacks.c -diff --git a/test/unit/Makefile b/test/unit/Makefile -index 9d422428d..928579492 100644 ---- a/test/unit/Makefile -+++ b/test/unit/Makefile -@@ -2,7 +2,11 @@ include ../../config.mk - - .PHONY: all check test test-broker test-lib clean coverage - --CPPFLAGS:=$(CPPFLAGS) -I../.. -I../../lib -I../../src -I../../src/deps -+CPPFLAGS:=$(CPPFLAGS) -I../.. -I../../lib -I../../src -+ifeq ($(WITH_BUNDLED_DEPS),yes) -+ CPPFLAGS:=$(CPPFLAGS) -I../../src/deps -+endif -+ - CFLAGS:=$(CFLAGS) -coverage -Wall -ggdb - LDFLAGS:=$(LDFLAGS) -coverage - LDADD:=$(LDADD) -lcunit diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1569.patch b/meta-networking/recipes-connectivity/mosquitto/files/1569.patch deleted file mode 100644 index 9718b98c82..0000000000 --- a/meta-networking/recipes-connectivity/mosquitto/files/1569.patch +++ /dev/null @@ -1,25 +0,0 @@ -Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1569] -From fda932612afce2cead2fd2ca1c8ea543b2892177 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna -Date: Wed, 22 Jan 2020 12:31:01 +0100 -Subject: [PATCH] Bugfix: enabling DLT was overriding everything else on linker - flags because of error in cmake set keyword - -Signed-off-by: Gianfranco Costamagna ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 7898ff5b1..6dfbba5e6 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -130,7 +130,7 @@ add_definitions (-DWITH_BROKER) - if (WITH_DLT) - message(STATUS "DLT_LIBDIR = ${DLT_LIBDIR}") - link_directories(${DLT_LIBDIR}) -- set (MOSQ_LIBS ${DLT_LIBRARIES}) -+ set (MOSQ_LIBS ${MOSQ_LIBS} ${DLT_LIBRARIES}) - endif (WITH_DLT) - - set (MOSQ_LIBS ${MOSQ_LIBS} ${OPENSSL_LIBRARIES}) diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1570.patch b/meta-networking/recipes-connectivity/mosquitto/files/1570.patch deleted file mode 100644 index f11fc48150..0000000000 --- a/meta-networking/recipes-connectivity/mosquitto/files/1570.patch +++ /dev/null @@ -1,39 +0,0 @@ -Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1570] -From 775677b05190380c3736bf0dbef002ee7b9bff33 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna -Date: Wed, 22 Jan 2020 12:29:41 +0100 -Subject: [PATCH] cmake: add ADNS enable/disable dynamic support - -Signed-off-by: Gianfranco Costamagna ---- - src/CMakeLists.txt | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 7898ff5b1..edae76f32 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -105,6 +105,9 @@ if (WITH_SYS_TREE) - add_definitions("-DWITH_SYS_TREE") - endif (WITH_SYS_TREE) - -+option(WITH_ADNS -+ "Include ADNS support?" OFF) -+ - if (CMAKE_SYSTEM_NAME STREQUAL Linux) - option(WITH_SYSTEMD - "Include systemd support?" OFF) -@@ -137,10 +140,11 @@ set (MOSQ_LIBS ${MOSQ_LIBS} ${OPENSSL_LIBRARIES}) - # Check for getaddrinfo_a - include(CheckLibraryExists) - check_library_exists(anl getaddrinfo_a "" HAVE_GETADDRINFO_A) --if (HAVE_GETADDRINFO_A) -+if (HAVE_GETADDRINFO_A AND WITH_ADNS) -+ add_definitions("-DWITH_ADNS") - add_definitions(-DHAVE_GETADDRINFO_A) - set (MOSQ_LIBS ${MOSQ_LIBS} anl) --endif (HAVE_GETADDRINFO_A) -+endif (HAVE_GETADDRINFO_A AND WITH_ADNS) - - - if (UNIX) diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.8.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.8.bb deleted file mode 100644 index 6079555a0c..0000000000 --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.8.bb +++ /dev/null @@ -1,89 +0,0 @@ -SUMMARY = "Open source MQTT implementation" -DESCRIPTION = "Mosquitto is an open source (Eclipse licensed) message broker \ -that implements the MQ Telemetry Transport protocol version 3.1, 3.1.1 and \ -5, providing both an MQTT broker and several command-line clients. MQTT \ -provides a lightweight method of carrying out messaging using a \ -publish/subscribe model. " -HOMEPAGE = "http://mosquitto.org/" -SECTION = "console/network" -LICENSE = "EPL-1.0 | EDL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=62ddc846179e908dc0c8efec4a42ef20 \ - file://edl-v10;md5=c09f121939f063aeb5235972be8c722c \ - file://epl-v10;md5=8d383c379e91d20ba18a52c3e7d3a979 \ - file://notice.html;md5=a00d6f9ab542be7babc2d8b80d5d2a4c \ -" -DEPENDS = "uthash" - -SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ - file://mosquitto.init \ - file://1568.patch \ - file://1569.patch \ - file://1570.patch \ - file://1571.patch \ -" - -SRC_URI[md5sum] = "24a0e567c845b3e41b75e237d200edf8" -SRC_URI[sha256sum] = "7df23c81ca37f0e070574fe74414403cf25183016433d07add6134366fb45df6" - -inherit systemd update-rc.d useradd cmake - -PACKAGECONFIG ??= "ssl dlt websockets dns-srv\ - ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ - " - -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[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" -PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON,-DWITH_WEBSOCKETS=OFF,libwebsockets" -PACKAGECONFIG[dlt] = "-DWITH_DLT=ON,-DWITH_DLT=OFF,dlt-daemon" - -EXTRA_OECMAKE = " \ - -DWITH_BUNDLED_DEPS=OFF \ - -DWITH_ADNS=ON \ -" - -do_install_append() { - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${S}/service/systemd/mosquitto.service.notify ${D}${systemd_unitdir}/system/mosquitto.service - - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/mosquitto.init ${D}${sysconfdir}/init.d/mosquitto - sed -i -e 's,@SBINDIR@,${sbindir},g' \ - -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ - -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - ${D}${sysconfdir}/init.d/mosquitto -} - -PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients" - -PACKAGE_BEFORE_PN = "${PN}-examples" - -FILES_${PN} = "${sbindir}/mosquitto \ - ${bindir}/mosquitto_passwd \ - ${sysconfdir}/mosquitto \ - ${sysconfdir}/init.d \ - ${systemd_unitdir}/system/mosquitto.service \ -" - -CONFFILES_${PN} += "${sysconfdir}/mosquitto/mosquitto.conf" - -FILES_libmosquitto1 = "${libdir}/libmosquitto.so.*" - -FILES_libmosquittopp1 = "${libdir}/libmosquittopp.so.*" - -FILES_${PN}-clients = "${bindir}/mosquitto_pub \ - ${bindir}/mosquitto_sub \ - ${bindir}/mosquitto_rr \ -" - -FILES_${PN}-examples = "${sysconfdir}/mosquitto/*.example" - -SYSTEMD_SERVICE_${PN} = "mosquitto.service" - -INITSCRIPT_NAME = "mosquitto" -INITSCRIPT_PARAMS = "defaults 30" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --shell /bin/false \ - --user-group mosquitto" diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb new file mode 100644 index 0000000000..0d840e938b --- /dev/null +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb @@ -0,0 +1,86 @@ +SUMMARY = "Open source MQTT implementation" +DESCRIPTION = "Mosquitto is an open source (Eclipse licensed) message broker \ +that implements the MQ Telemetry Transport protocol version 3.1, 3.1.1 and \ +5, providing both an MQTT broker and several command-line clients. MQTT \ +provides a lightweight method of carrying out messaging using a \ +publish/subscribe model. " +HOMEPAGE = "http://mosquitto.org/" +SECTION = "console/network" +LICENSE = "EPL-1.0 | EDL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=62ddc846179e908dc0c8efec4a42ef20 \ + file://edl-v10;md5=c09f121939f063aeb5235972be8c722c \ + file://epl-v10;md5=8d383c379e91d20ba18a52c3e7d3a979 \ + file://notice.html;md5=a00d6f9ab542be7babc2d8b80d5d2a4c \ +" +DEPENDS = "uthash" + +SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ + file://mosquitto.init \ + file://1571.patch \ +" + +SRC_URI[md5sum] = "52f5078ec18aaf623b14dfb121fd534b" +SRC_URI[sha256sum] = "412979b2db0a0020bd02fa64f0a0de9e7000b84462586e32b67f29bb1f6c1685" + +inherit systemd update-rc.d useradd cmake + +PACKAGECONFIG ??= "ssl dlt websockets dns-srv\ + ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ + " + +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[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" +PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON,-DWITH_WEBSOCKETS=OFF,libwebsockets" +PACKAGECONFIG[dlt] = "-DWITH_DLT=ON,-DWITH_DLT=OFF,dlt-daemon" + +EXTRA_OECMAKE = " \ + -DWITH_BUNDLED_DEPS=OFF \ + -DWITH_ADNS=ON \ +" + +do_install_append() { + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${S}/service/systemd/mosquitto.service.notify ${D}${systemd_unitdir}/system/mosquitto.service + + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/mosquitto.init ${D}${sysconfdir}/init.d/mosquitto + sed -i -e 's,@SBINDIR@,${sbindir},g' \ + -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ + -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + ${D}${sysconfdir}/init.d/mosquitto +} + +PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients" + +PACKAGE_BEFORE_PN = "${PN}-examples" + +FILES_${PN} = "${sbindir}/mosquitto \ + ${bindir}/mosquitto_passwd \ + ${sysconfdir}/mosquitto \ + ${sysconfdir}/init.d \ + ${systemd_unitdir}/system/mosquitto.service \ +" + +CONFFILES_${PN} += "${sysconfdir}/mosquitto/mosquitto.conf" + +FILES_libmosquitto1 = "${libdir}/libmosquitto.so.*" + +FILES_libmosquittopp1 = "${libdir}/libmosquittopp.so.*" + +FILES_${PN}-clients = "${bindir}/mosquitto_pub \ + ${bindir}/mosquitto_sub \ + ${bindir}/mosquitto_rr \ +" + +FILES_${PN}-examples = "${sysconfdir}/mosquitto/*.example" + +SYSTEMD_SERVICE_${PN} = "mosquitto.service" + +INITSCRIPT_NAME = "mosquitto" +INITSCRIPT_PARAMS = "defaults 30" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --no-create-home --shell /bin/false \ + --user-group mosquitto" -- cgit v1.2.3-54-g00ecf