diff --git a/debian/changelog b/debian/changelog index 1ad8ab4e..74567262 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +mosquitto (1.6.9-1) unstable; urgency=medium + + * New upstream release. + * Revert change enabling SRV functionality, it is disabled by default + upstream and of little benefit to any end user, but adds reasonable + complexity to the code. + * Remove patches 1568, 1569, 1570 - applied upstream. + + -- Roger A. Light Tue, 03 Mar 2020 15:16:15 +0000 + mosquitto (1.6.8-2) unstable; urgency=medium * Also install mqtt_protocol.h in libmosquitto-dev package. diff --git a/debian/control b/debian/control index 8b6b81b4..d0330171 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,6 @@ Priority: optional Maintainer: Roger A. Light Build-Depends: debhelper-compat (= 12), cmake, - libc-ares-dev, libssl-dev (>=1.0.0), libsystemd-dev, libwebsockets-dev, @@ -27,7 +26,7 @@ Depends: adduser (>= 3.10), ${misc:Depends}, ${shlibs:Depends} Suggests: apparmor -Description: MQTT version 3.1/3.1.1 compatible message broker +Description: MQTT version 5.0/3.1.1/3.1 compatible message broker This is a message broker that supports version 3.1 and 3.1.1 of the MQTT protocol. . @@ -55,8 +54,8 @@ Section: libs Architecture: any Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} -Description: MQTT version 3.1/3.1.1 client library - This is a C library for implementing MQTT version 3.1/3.1.1 clients. +Description: MQTT version 5.0/3.1.1/3.1 client library + This is a C library for implementing MQTT version 5.0/3.1.1/3.1 clients. . 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 @@ -73,9 +72,9 @@ Depends: libmosquitto1 (<< ${source:Version}.1~), ${misc:Depends} Replaces: libmosquitto0-dev (<< 1.2-1~) Breaks: libmosquitto0-dev (<< 1.2-1~) -Description: MQTT version 3.1/3.1.1 client library, development files +Description: MQTT version 5.0/3.1.1/3.1 client library, development files This is the header and man page for the libmosquitto1 C library, which is a - library for implementing MQTT version 3.1/3.1.1 clients. This package is + library for implementing MQTT version 5.0/3.1.1/3.1 clients. This package is needed to do development with libmosquitto1. Package: libmosquittopp1 @@ -86,8 +85,8 @@ Pre-Depends: ${misc:Pre-Depends} Depends: libmosquitto1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} -Description: MQTT version 3.1/3.1.1 client C++ library - This is a C++ library for implementing MQTT version 3.1/3.1.1 clients. +Description: MQTT version 5.0/3.1.1/3.1 client C++ library + This is a C++ library for implementing MQTT version 5.0/3.1.1/3.1 clients. . 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 @@ -117,7 +116,7 @@ Depends: libmosquitto1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: Mosquitto command line MQTT clients - This is two MQTT version 3.1/3.1.1 command line clients. mosquitto_pub can be + This is two MQTT version 5.0/3.1.1/3.1 command line clients. mosquitto_pub can be used to publish messages to a broker and mosquitto_sub can be used to subscribe to a topic to receive messages. . diff --git a/debian/patches/1568.patch b/debian/patches/1568.patch deleted file mode 100644 index 15f7a910..00000000 --- a/debian/patches/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/debian/patches/1569.patch b/debian/patches/1569.patch deleted file mode 100644 index 9718b98c..00000000 --- a/debian/patches/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/debian/patches/1570.patch b/debian/patches/1570.patch deleted file mode 100644 index f11fc481..00000000 --- a/debian/patches/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/debian/patches/1571.patch b/debian/patches/1571.patch index 2cfa4845..93ff6bcf 100644 --- a/debian/patches/1571.patch +++ b/debian/patches/1571.patch @@ -9,11 +9,9 @@ Signed-off-by: Gianfranco Costamagna lib/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index e1521f12a..14ba12739 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -88,6 +88,8 @@ set_target_properties(libmosquitto PROPERTIES +@@ -89,6 +89,8 @@ OUTPUT_NAME mosquitto VERSION ${VERSION} SOVERSION 1 diff --git a/debian/patches/install-protocol.patch b/debian/patches/install-protocol.patch index 82e54073..1397fc6a 100644 --- a/debian/patches/install-protocol.patch +++ b/debian/patches/install-protocol.patch @@ -4,9 +4,9 @@ Bug-Debian: https://bugs.debian.org/951116 Forwarded: https://github.com/eclipse/mosquitto/pull/1599 Last-Update: 2020-02-15 ---- mosquitto-1.6.8.orig/lib/CMakeLists.txt -+++ mosquitto-1.6.8/lib/CMakeLists.txt -@@ -113,4 +113,4 @@ if (WITH_STATIC_LIBRARIES) +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -114,4 +114,4 @@ install(TARGETS libmosquitto_static ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") endif (WITH_STATIC_LIBRARIES) diff --git a/debian/patches/series b/debian/patches/series index 4b55d196..d5202e63 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,3 @@ debian-config.patch -1568.patch -1569.patch -1570.patch 1571.patch install-protocol.patch diff --git a/debian/rules b/debian/rules index 8df87969..d725851c 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ SYSTEMD=OFF endif override_dh_auto_configure: - dh_auto_configure -- -DWITH_BUNDLED_DEPS=OFF -DWITH_ADNS=ON -DUSE_LIBWRAP=ON -DWITH_WEBSOCKETS=ON -DWITH_DLT=ON -DWITH_SRV=ON -DWITH_SYSTEMD=${SYSTEMD} + dh_auto_configure -- -DWITH_BUNDLED_DEPS=OFF -DWITH_ADNS=ON -DUSE_LIBWRAP=ON -DWITH_WEBSOCKETS=ON -DWITH_DLT=ON -DWITH_SYSTEMD=${SYSTEMD} override_dh_strip: dh_strip -p mosquitto --dbgsym-migration='mosquitto-dbg (<< 1.5)' -Xlibmosquitto