mosquitto: update to 1.6.12

SynoCommunity · Sep 27, 2020 · efc4de3 · efc4de3
1 parent 2185b4e
commit efc4de3
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 35 deletions.
diff --git a/cross/mosquitto/Makefile b/cross/mosquitto/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = mosquitto
-PKG_VERS = 1.4.14
+PKG_VERS = 1.6.12
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = http://mosquitto.org/files/source
@@ -8,9 +8,16 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 DEPENDS = cross/c-ares cross/openssl cross/util-linux cross/libwebsockets
 
 HOMEPAGE = http://www.mosquitto.org/
-COMMENT  = Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol version 3.1.1.
-LICENSE  = BSD licensed
+COMMENT  = Mosquitto is an open source message broker that implements the MQTT protocol versions 5.0, 3.1.1 and 3.1.
+LICENSE  = EPL/EDL licensed
 
 CONFIGURE_TARGET = nop
+#INSTALL_TARGET = mosquitto_install
+
+COMPILE_MAKE_OPTIONS = "WITH_WEBSOCKETS=yes WITH_SRV=yes WITH_DOCS=no"
 
 include ../../mk/spksrc.cross-cc.mk
+
+#.PHONY: mosquitto_install
+#mosquitto_install:
+#	$(RUN) $(MAKE) install DESTDIR=$(INSTALL_DIR)
diff --git a/cross/mosquitto/digests b/cross/mosquitto/digests
@@ -1,3 +1,3 @@
-mosquitto-1.4.14.tar.gz SHA1 7776c4433e80f74b56eb03e1ddd7e720d44b4947
-mosquitto-1.4.14.tar.gz SHA256 156b1fa731d12baad4b8b22f7b6a8af50ba881fc711b81e9919ec103cf2942d1
-mosquitto-1.4.14.tar.gz MD5 6b0966e93f118bc71ad7b61600a6c2d3
+mosquitto-1.6.12.tar.gz SHA1 b8c047985a33f3c2e9855079030f91d6eed00c47
+mosquitto-1.6.12.tar.gz SHA256 548d73d19fb787dd0530334e398fd256ef3a581181678488a741a995c4f007fb
+mosquitto-1.6.12.tar.gz MD5 beb8d76d6e45f1e66d711006082a631f
diff --git a/cross/mosquitto/patches/001-fix-prefix.patch b/cross/mosquitto/patches/001-fix-prefix.patch
@@ -1,19 +1,19 @@
---- Makefile.orig	2017-12-02 16:02:12.391948436 +0100
-+++ Makefile	2017-12-02 16:03:32.141307039 +0100
-@@ -39,11 +39,11 @@
+--- Makefile.orig	2020-09-26 09:03:00.666733022 +0000
++++ Makefile	2020-09-26 09:04:16.727992748 +0000
+@@ -85,11 +85,11 @@
  ifeq ($(WITH_DOCS),yes)
  	set -e; for d in ${DOCDIRS}; do $(MAKE) -C $${d} install; done
  endif
--	$(INSTALL) -d ${DESTDIR}/etc/mosquitto
--	$(INSTALL) -m 644 mosquitto.conf ${DESTDIR}/etc/mosquitto/mosquitto.conf.example
--	$(INSTALL) -m 644 aclfile.example ${DESTDIR}/etc/mosquitto/aclfile.example
--	$(INSTALL) -m 644 pwfile.example ${DESTDIR}/etc/mosquitto/pwfile.example
--	$(INSTALL) -m 644 pskfile.example ${DESTDIR}/etc/mosquitto/pskfile.example
-+	$(INSTALL) -d ${DESTDIR}${prefix}/etc/mosquitto
-+	$(INSTALL) -m 644 mosquitto.conf ${DESTDIR}${prefix}/etc/mosquitto/mosquitto.conf.example
-+	$(INSTALL) -m 644 aclfile.example ${DESTDIR}${prefix}/etc/mosquitto/aclfile.example
-+	$(INSTALL) -m 644 pwfile.example ${DESTDIR}${prefix}/etc/mosquitto/pwfile.example
-+	$(INSTALL) -m 644 pskfile.example ${DESTDIR}${prefix}/etc/mosquitto/pskfile.example
+-	$(INSTALL) -d "${DESTDIR}/etc/mosquitto"
+-	$(INSTALL) -m 644 mosquitto.conf "${DESTDIR}/etc/mosquitto/mosquitto.conf.example"
+-	$(INSTALL) -m 644 aclfile.example "${DESTDIR}/etc/mosquitto/aclfile.example"
+-	$(INSTALL) -m 644 pwfile.example "${DESTDIR}/etc/mosquitto/pwfile.example"
+-	$(INSTALL) -m 644 pskfile.example "${DESTDIR}/etc/mosquitto/pskfile.example"
++	$(INSTALL) -d "${DESTDIR}${prefix}/etc/mosquitto"
++	$(INSTALL) -m 644 mosquitto.conf "${DESTDIR}${prefix}/etc/mosquitto/mosquitto.conf.example"
++	$(INSTALL) -m 644 aclfile.example "${DESTDIR}${prefix}/etc/mosquitto/aclfile.example"
++	$(INSTALL) -m 644 pwfile.example "${DESTDIR}${prefix}/etc/mosquitto/pwfile.example"
++	$(INSTALL) -m 644 pskfile.example "${DESTDIR}${prefix}/etc/mosquitto/pskfile.example"
 
  uninstall :
  	set -e; for d in ${DIRS}; do $(MAKE) -C $${d} uninstall; done
diff --git a/cross/mosquitto/patches/002-build-websockets.patch b/cross/mosquitto/patches/002-build-websockets.patch
diff --git a/spk/mosquitto/Makefile b/spk/mosquitto/Makefile
@@ -1,17 +1,17 @@
 SPK_NAME = mosquitto
-SPK_VERS = 1.4.14
-SPK_REV = 9
+SPK_VERS = 1.6.12
+SPK_REV = 10
 SPK_ICON = src/mosquitto.png
 DEPENDS = cross/busybox cross/$(SPK_NAME)
 
 MAINTAINER = SynoCommunity
-DESCRIPTION = Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol version 3.1.1.
+DESCRIPTION = Mosquitto is an open source message broker that implements the MQTT protocol versions 5.0, 3.1.1 and 3.1.
 RELOAD_UI = yes
 DISPLAY_NAME = Mosquitto
 STARTABLE = yes
-CHANGELOG = "1. Update to 1.4.14. 2. Use DSM 5+6 generic service"
+CHANGELOG = "Update to 1.6.12"
 HOMEPAGE = http://www.mosquitto.org/
-LICENSE  = BSD licensed
+LICENSE  = EPL/EDL licensed
 
 SERVICE_USER = auto
 # SERVICE_COMMAND is provided there