mosquitto: update to 1.6.12 (SynoCommunity#4191)

* mosquitto: update to 1.6.12
* fix configure options (similar to SynoCommunity#4196)
* changes not already commited on SynoCommunity#4068
- updated libwebsockets
- fix clock_gettime for arm5 and older ppc
- install mosquitto_rr too
- update icon
* use current config file
* support ppc853x by patch
* Fix openssl install for CMake to detect it
* fix make options SynoCommunity#4210
* final fix for openssl 1.0.1
- remove openssl.cnf from PLIST as it was removed by using installed /etc/ssl/openssl.cnf

Co-authored-by: hgy59 <hpgy59@gmail.com>

cross/c-ares/Makefile

@@ -12,7 +12,7 @@ COMMENT  = c-ares is a C library that performs DNS requests and name resolves as
 LICENSE  =
 
 GNU_CONFIGURE = 1
-CONFIGURE_ARGS = CFLAGS=$(TC_EXTRA_CFLAGS)
+CONFIGURE_ARGS = CFLAGS="$(TC_EXTRA_CFLAGS)"
 
 include ../../mk/spksrc.cross-cc.mk
 

cross/libwebsockets/Makefile

@@ -1,15 +1,15 @@
 PKG_NAME = libwebsockets
-PKG_VERS = 2.4.1
+PKG_VERS = 3.2.2
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/warmcat/libwebsockets/archive
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/openssl
 
-HOMEPAGE = http://libevent.org/
-COMMENT  = An event notification library
-LICENSE  = http://libevent.org/LICENSE.txt
+HOMEPAGE = https://libwebsockets.org/
+COMMENT  = Libwebsockets (LWS) is a flexible, lightweight pure C library for implementing modern network protocols easily with a tiny footprint, using a nonblocking event loop.
+LICENSE  = MIT
 
 include ../../mk/spksrc.cross-cmake.mk

cross/libwebsockets/PLIST

@@ -1,9 +1,7 @@
 bin:bin/libwebsockets-test-client
-bin:bin/libwebsockets-test-echo
-bin:bin/libwebsockets-test-fraggle
-bin:bin/libwebsockets-test-ping
+bin:bin/libwebsockets-test-lejp
 bin:bin/libwebsockets-test-server
 bin:bin/libwebsockets-test-server-extpoll
 lnk:lib/libwebsockets.so
-lib:lib/libwebsockets.so.12
+lib:lib/libwebsockets.so.15
 rsc:share/libwebsockets-test-server

cross/libwebsockets/digests

@@ -1,3 +1,3 @@
-libwebsockets-2.4.1.tar.gz SHA1 0f7841014958b654efc595e96ddce13586f868e1
-libwebsockets-2.4.1.tar.gz SHA256 29414be4f79f6abc0e6aadccd09a4da0f0c431e3b5691f496acd081ae6a8240c
-libwebsockets-2.4.1.tar.gz MD5 742c94e3fd255bb94735a87e86b1bdde
+libwebsockets-3.2.2.tar.gz SHA1 96fbfa59ee6a0e9b2861d60c9a030463e0a28ea3
+libwebsockets-3.2.2.tar.gz SHA256 166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
+libwebsockets-3.2.2.tar.gz MD5 a29a3e69d22bbb6aa33def7cb6d58c0a

cross/mosquitto/Makefile

@@ -1,16 +1,24 @@
 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
 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 1.0 and EDL 1.0
 
 CONFIGURE_TARGET = nop
 
+COMPILE_MAKE_OPTIONS = WITH_WEBSOCKETS=yes WITH_SRV=yes WITH_DOCS=no
+
+ifeq ($(findstring $(ARCH), 88f6281),$(ARCH))
+# use clock_gettime of librt
+ADDITIONAL_LDFLAGS = -lrt 
+endif
+
 include ../../mk/spksrc.cross-cc.mk

cross/mosquitto/PLIST

@@ -1,6 +1,7 @@
 bin:sbin/mosquitto
 bin:bin/mosquitto_passwd
 bin:bin/mosquitto_pub
+bin:bin/mosquitto_rr
 bin:bin/mosquitto_sub
 lnk:lib/libmosquitto.so
 lib:lib/libmosquitto.so.1

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

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

cross/mosquitto/patches/ppc853x/002-remove-use_of_unsupported-pthread-functions.patch

@@ -0,0 +1,20 @@
+# since mosquitto 1.6.11 pthread_setname_np is required, but not supported with glibc < 2.12
+# this is for naming threads only as introduced with https://github.com/eclipse/mosquitto/commit/bd27935ff63613301e485c0ce9e7e9b4e67e6d07
+# and has no effect to the theading support in mosquitto.
+
+--- lib/thread_mosq.c.org	2020-08-19 13:55:03.000000000 +0000
++++ lib/thread_mosq.c	2020-09-29 07:13:18.196407777 +0000
+@@ -41,13 +41,6 @@
+
+ 	mosq->threaded = mosq_ts_self;
+ 	if(!pthread_create(&mosq->thread_id, NULL, mosquitto__thread_main, mosq)){
+-#if defined(__linux__)
+-		pthread_setname_np(mosq->thread_id, "mosquitto loop");
+-#elif defined(__NetBSD__)
+-		pthread_setname_np(mosq->thread_id, "%s", "mosquitto loop");
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
+-		pthread_set_name_np(mosq->thread_id, "mosquitto loop");
+-#endif
+ 		return MOSQ_ERR_SUCCESS;
+ 	}else{
+ 		return MOSQ_ERR_ERRNO;

cross/openssl/Makefile

@@ -56,4 +56,4 @@ openssl_configure:
 
 .PHONY: openssl_install
 openssl_install:
-	$(RUN) $(MAKE) install_sw DESTDIR=$(INSTALL_DIR)
+	$(RUN) $(MAKE) install_sw INSTALL_PREFIX=$(INSTALL_DIR)

cross/openssl/PLIST

@@ -16,4 +16,3 @@ lnk:lib/libcrypto.so
 lib:lib/libcrypto.so.1.0.0
 lnk:lib/libssl.so
 lib:lib/libssl.so.1.0.0
-rsc:openssl.cnf

mk/spksrc.cross-cmake-env.mk

@@ -1,4 +1,4 @@
-# Configuration for cmake build
+# Configuration for CMake build
 #
 CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(INSTALL_PREFIX)
 CMAKE_ARGS += -DCMAKE_CROSSCOMPILING=TRUE
@@ -15,29 +15,29 @@ CMAKE_ARGS += -DBUILD_SHARED_LIBS=ON
 
 # set default ASM build environment
 ifeq ($(strip $(CMAKE_USE_NASM)),1)
-DEPENDS += native/nasm 
-NASM_PATH = $(WORK_DIR)/../../../native/nasm/work-native/install/usr/local/bin
-ENV += PATH=$(NASM_PATH):$$PATH
-ENV += AS=$(NASM_PATH)/nasm
-CMAKE_ARGS += -DENABLE_ASSEMBLY=ON
+  DEPENDS += native/nasm
+  NASM_PATH = $(WORK_DIR)/../../../native/nasm/work-native/install/usr/local/bin
+  ENV += PATH=$(NASM_PATH):$$PATH
+  ENV += AS=$(NASM_PATH)/nasm
+  CMAKE_ARGS += -DENABLE_ASSEMBLY=ON
 else
-CMAKE_USE_NASM = 0
-CMAKE_ARGS += -DENABLE_ASSEMBLY=OFF
+  CMAKE_USE_NASM = 0
+  CMAKE_ARGS += -DENABLE_ASSEMBLY=OFF
 endif
 
 # set default build directory
 ifeq ($(strip $(CMAKE_USE_DESTDIR)),)
-CMAKE_USE_DESTDIR = 1
+  CMAKE_USE_DESTDIR = 1
 endif
 
 # set default build directory
 ifeq ($(strip $(CMAKE_DESTDIR)),)
-CMAKE_DESTDIR = $(INSTALL_DIR)
+  CMAKE_DESTDIR = $(INSTALL_DIR)
 endif
 
 # set default build directory
 ifeq ($(strip $(CMAKE_BUILD_DIR)),)
-CMAKE_BUILD_DIR = $(WORK_DIR)/$(PKG_DIR)/build
+  CMAKE_BUILD_DIR = $(WORK_DIR)/$(PKG_DIR)/build
 endif
 
 # Define per arch specific common options

mk/spksrc.cross-cmake.mk

@@ -1,11 +1,8 @@
-# Build go programs
-# 
+# Build CMake programs
+#
 # prerequisites:
 # - cross/module depends on cmake
-# 
-# remarks:
-# - improvised from spksrc.cross-go.mk
-# 
+#
 
 # Common makefiles
 include ../../mk/spksrc.common.mk

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