bump mosquitto

Freetz-NG · Jul 19, 2021 · be43d90 · be43d90
1 parent 7b0b92a
commit be43d90
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 56 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -79,6 +79,7 @@ Latest changes
  * libtirpc 1.3.2
  * mbed TLS 2.7.19/2.27.0
  * minidlna 1.3.0
+ * Mosquitto 1.6.15
  * OpenSSH 8.6p1
  * OpenSSL 0.9.8zh/1.0.2u/1.1.1k/3.0.0-beta1
  * OpenVPN 2.4.11/2.5.3

diff --git a/docs/make/README.md b/docs/make/README.md
@@ -859,7 +859,7 @@ Index:
  * **[mini_fo 0.3](mini_fo.md)<a id='mini-fo'></a>**<br>
  Makes the filesystem writeable. Changes are not reboot-persistent, unless stored on a hard disk or on flash storage media. The way mini_fo is configured here creates the overlay filesystem in the router's RAM disk, so they definitely are *not* reboot-persistent. Nonetheless, mini_fo is tremendously helpful, eliminating the need for tricks like 'mount -o bind' etc. Note: The mini_fo root filesystem will not be used if an NFS-root was mounted first (see NFS-root package). Still, both packages can be installed at the same time, because mini_fo is still useful if NFS-root is decativated. This package does not work with (at least) 7390 at the moment.
 
- * **<u>Mosquitto 1.6.8</u><a id='mosquitto'></a>**<br>
+ * **<u>Mosquitto 1.6.15</u><a id='mosquitto'></a>**<br>
  Eclipse Mosquitto™ is an open source (EPL/EDL licensed) message broker that implements the MQTT protocol versions 5.0, 3.1.1 and 3.1. MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for "Internet of Things" messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino.
 
  * **[MySQL 6.0.11-alpha](mysql.md)<a id='mysql'></a>**<br>

diff --git a/make/README.md b/make/README.md
@@ -1151,7 +1151,7 @@ Index:
  - [Mögliche Nebeneffekte](../docs/make/mini_fo.md#mögliche-nebeneffekte)
  - [Restore original file](../docs/make/mini_fo.md#restore-original-file)
 
- * **<u>Mosquitto 1.6.8</u><a id='mosquitto'></a>**<br>
+ * **<u>Mosquitto 1.6.15</u><a id='mosquitto'></a>**<br>
  Eclipse Mosquitto™ is an open source (EPL/EDL licensed) message broker that implements the MQTT protocol versions 5.0, 3.1.1 and 3.1. MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for "Internet of Things" messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino.
 
  * **[MySQL 6.0.11-alpha](../docs/make/mysql.md)<a id='mysql'></a>**<br>

diff --git a/make/mosquitto/Config.in b/make/mosquitto/Config.in
@@ -1,5 +1,5 @@
 config FREETZ_PACKAGE_MOSQUITTO
- bool "Mosquitto 1.6.8"
+ bool "Mosquitto 1.6.15"
  default n
  select FREETZ_PACKAGE_MOSQUITTO_BROKER if (!FREETZ_PACKAGE_MOSQUITTO_CLIENT_PUB && !FREETZ_PACKAGE_MOSQUITTO_CLIENT_SUB)
  help
@@ -9,57 +9,59 @@ config FREETZ_PACKAGE_MOSQUITTO
  for "Internet of Things" messaging such as with low power sensors or mobile devices
  such as phones, embedded computers or microcontrollers like the Arduino.
 
-config FREETZ_PACKAGE_MOSQUITTO_BROKER
- bool "include broker"
- depends on FREETZ_PACKAGE_MOSQUITTO
- select FREETZ_LIB_libdl if FREETZ_TARGET_UCLIBC_HAS_multiple_libs
- select FREETZ_LIB_libm if FREETZ_TARGET_UCLIBC_HAS_multiple_libs
- select FREETZ_LIB_librt if FREETZ_TARGET_UCLIBC_HAS_multiple_libs
- default y
- help
- Adds the mosquitto broker to the image
+if FREETZ_PACKAGE_MOSQUITTO
 
-config FREETZ_PACKAGE_MOSQUITTO_CLIENTS
- bool "include clients"
- depends on FREETZ_PACKAGE_MOSQUITTO
- # libmosquitto dependencies
- select FREETZ_LIB_librt if FREETZ_TARGET_UCLIBC_HAS_multiple_libs
- select FREETZ_LIB_libpthread if FREETZ_TARGET_UCLIBC_HAS_multiple_libs
- default n
+ config FREETZ_PACKAGE_MOSQUITTO_BROKER
+ bool "include broker"
+ select FREETZ_LIB_libdl if FREETZ_TARGET_UCLIBC_HAS_multiple_libs
+ select FREETZ_LIB_libm if FREETZ_TARGET_UCLIBC_HAS_multiple_libs
+ select FREETZ_LIB_librt if FREETZ_TARGET_UCLIBC_HAS_multiple_libs
+ default y
+ help
+ Adds the mosquitto broker to the image
 
-config FREETZ_PACKAGE_MOSQUITTO_CLIENT_PUB
- bool "include publish client"
- depends on FREETZ_PACKAGE_MOSQUITTO_CLIENTS
- default n
- help
- Adds the mosquitto publish client to the image
+ config FREETZ_PACKAGE_MOSQUITTO_CLIENTS
+  bool "include clients"
+  # libmosquitto dependencies
+  select FREETZ_LIB_librt if FREETZ_TARGET_UCLIBC_HAS_multiple_libs
+  select FREETZ_LIB_libpthread if FREETZ_TARGET_UCLIBC_HAS_multiple_libs
+ default n
 
-config FREETZ_PACKAGE_MOSQUITTO_CLIENT_SUB
- bool "include subscribe client"
- depends on FREETZ_PACKAGE_MOSQUITTO_CLIENTS
- default n
- help
- Adds the mosquitto subscribe client to the image
+ if FREETZ_PACKAGE_MOSQUITTO
 
-config FREETZ_PACKAGE_MOSQUITTO_WITH_UUID
- bool "enable uuid support in mosquitto"
- depends on FREETZ_PACKAGE_MOSQUITTO_CLIENTS
- select FREETZ_LIB_libuuid
- default y
- help
- Build using libuuid for clientid generation.
+ config FREETZ_PACKAGE_MOSQUITTO_CLIENT_PUB
+ bool "include publish client"
+ default n
+ help
+ Adds the mosquitto publish client to the image
 
-comment "SSL not available, needs OpenSSL 1.0 or newer"
- depends on !FREETZ_OPENSSL_VERSION_1_MIN
+ config FREETZ_PACKAGE_MOSQUITTO_CLIENT_SUB
+ bool "include subscribe client"
+ default n
+ help
+ Adds the mosquitto subscribe client to the image
 
-config FREETZ_PACKAGE_MOSQUITTO_WITH_SSL
- bool "build with SSL support"
- depends on FREETZ_PACKAGE_MOSQUITTO
- depends on FREETZ_OPENSSL_VERSION_1_MIN
- select FREETZ_LIB_libcrypto
- select FREETZ_LIB_libcrypto_WITH_EC
- select FREETZ_LIB_libssl
- default n
- help
- This option enables SSL support for mosquitto.
+ config FREETZ_PACKAGE_MOSQUITTO_WITH_UUID
+ bool "enable uuid support in mosquitto"
+ select FREETZ_LIB_libuuid
+ default y
+ help
+ Build using libuuid for clientid generation.
+
+ endif # FREETZ_PACKAGE_MOSQUITTO
+
+ comment "SSL not available, needs OpenSSL 1.0 or newer"
+ depends on !FREETZ_OPENSSL_VERSION_1_MIN
+
+ config FREETZ_PACKAGE_MOSQUITTO_WITH_SSL
+ bool "build with SSL support"
+ depends on FREETZ_OPENSSL_VERSION_1_MIN
+ select FREETZ_LIB_libcrypto
+ select FREETZ_LIB_libcrypto_WITH_EC
+ select FREETZ_LIB_libssl
+ default n
+ help
+ This option enables SSL support for mosquitto.
+
+endif # FREETZ_PACKAGE_MOSQUITTO
 
diff --git a/make/mosquitto/mosquitto.mk b/make/mosquitto/mosquitto.mk
@@ -1,6 +1,6 @@
-$(call PKG_INIT_BIN, 1.6.8)
+$(call PKG_INIT_BIN, 1.6.15)
 $(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz
-$(PKG)_SOURCE_MD5:=24a0e567c845b3e41b75e237d200edf8
+$(PKG)_SOURCE_MD5:=792bdd8fce3a8a1db102988ef6a9a02f
 $(PKG)_SITE:=http:https://mosquitto.org/files/source
 
 $(PKG)_CATEGORY:=Unstable

diff --git a/make/mosquitto/patches/010-no_cxx_lib.patch b/make/mosquitto/patches/010-no_cxx_lib.patch
@@ -1,6 +1,6 @@
 --- lib/Makefile
 +++ lib/Makefile
-@@ -56,7 +56,7 @@ endif
+@@ -57,7 +57,7 @@
 
  all : ${ALL_DEPS}
  ifeq ($(WITH_SHARED_LIBRARIES),yes)
@@ -9,16 +9,16 @@
  endif
 
  install : all
-@@ -75,7 +75,7 @@ endif
+@@ -76,7 +76,7 @@
  $(INSTALL) -m644 ../libmosquitto.pc.in "${DESTDIR}${libdir}/pkgconfig/libmosquitto.pc"
- sed -i -e "s#@CMAKE_INSTALL_PREFIX@#${prefix}#" -e "s#@VERSION@#${VERSION}#" "${DESTDIR}${libdir}/pkgconfig/libmosquitto.pc"
+ sed ${SEDINPLACE} -e "s#@CMAKE_INSTALL_PREFIX@#${prefix}#" -e "s#@VERSION@#${VERSION}#" "${DESTDIR}${libdir}/pkgconfig/libmosquitto.pc"
  ifeq ($(WITH_SHARED_LIBRARIES),yes)
 - $(MAKE) -C cpp install
 +# $(MAKE) -C cpp install
  endif
 
  uninstall :
-@@ -88,7 +88,7 @@ reallyclean : clean
+@@ -89,7 +89,7 @@
 
  clean :
  -rm -f *.o libmosquitto.so.${SOVERSION} libmosquitto.so libmosquitto.a *.gcno *.gcda