From cf15dbf97974810b9bd839037776d01f2e7f14cf Mon Sep 17 00:00:00 2001 From: Alexander Dahl Date: Fri, 9 Aug 2019 14:25:57 +0200 Subject: mosquitto: version bump 1.4.14 -> 1.6.4 This includes a lot of security fixes, bug fixes, fixed build issues, new features, and removed features. See ChangeLog for details: https://mosquitto.org/ChangeLog.txt Signed-off-by: Alexander Dahl Signed-off-by: Michael Olbrich --- rules/mosquitto.in | 5 ----- rules/mosquitto.make | 14 ++++++++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/rules/mosquitto.in b/rules/mosquitto.in index d7eb813c1..7ed65bf34 100644 --- a/rules/mosquitto.in +++ b/rules/mosquitto.in @@ -5,7 +5,6 @@ menuconfig MOSQUITTO prompt "mosquitto " select OPENSSL if MOSQUITTO_TLS select C_ARES if MOSQUITTO_SRV - select LIBUUID if MOSQUITTO_UUID help Open source MQTT message broker, library, and client. @@ -27,10 +26,6 @@ config MOSQUITTO_SRV bool prompt "SRV lookup support" -config MOSQUITTO_UUID - bool - prompt "UUID as client id" - endif # vim: ft=kconfig noet tw=72 diff --git a/rules/mosquitto.make b/rules/mosquitto.make index 63cd2dca5..4faabf783 100644 --- a/rules/mosquitto.make +++ b/rules/mosquitto.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MOSQUITTO) += mosquitto # # Paths and names # -MOSQUITTO_VERSION := 1.4.14 -MOSQUITTO_MD5 := 6b0966e93f118bc71ad7b61600a6c2d3 +MOSQUITTO_VERSION := 1.6.4 +MOSQUITTO_MD5 := c89df444afb121d795f8af5b4fd97d78 MOSQUITTO := mosquitto-$(MOSQUITTO_VERSION) MOSQUITTO_SUFFIX := tar.gz MOSQUITTO_URL := https://mosquitto.org/files/source/$(MOSQUITTO).$(MOSQUITTO_SUFFIX) @@ -43,13 +43,19 @@ MOSQUITTO_MAKE_OPT := \ WITH_PERSISTENCE=yes \ WITH_MEMORY_TRACKING=yes \ WITH_SYS_TREE=yes \ + WITH_SYSTEMD=no \ WITH_SRV=$(call ptx/yesno, PTXCONF_MOSQUITTO_SRV) \ - WITH_UUID=$(call ptx/yesno, PTXCONF_MOSQUITTO_UUID) \ WITH_WEBSOCKETS=no \ WITH_EC=yes \ WITH_DOCS=no \ WITH_SOCKS=yes \ - WITH_ADNS=no + WITH_STRIP=yes \ + WITH_STATIC_LIBRARIES=no \ + WITH_SHARED_LIBRARIES=yes \ + WITH_ADNS=no \ + WITH_EPOLL=yes \ + WITH_BUNDLED_DEPS=yes \ + WITH_COVERAGE=no MOSQUITTO_INSTALL_OPT := \ $(MOSQUITTO_MAKE_OPT) \ install -- cgit v1.2.3