Update mosquitto to 2.0.20 (#6299)

* Update mosquitto to 2.0.20 * mosquitto: fix build for ARMv5 * update libwebsockets from v4.3.2 to v4.3.3 --------- Co-authored-by: hgy59 <[email protected]>
SynoCommunity · Nov 7, 2024 · ae66c36 · ae66c36
1 parent d2deac6
commit ae66c36
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/cross/libwebsockets/Makefile b/cross/libwebsockets/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = libwebsockets
-PKG_VERS = 4.3.2
+PKG_VERS = 4.3.3
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/warmcat/libwebsockets/archive

diff --git a/cross/libwebsockets/digests b/cross/libwebsockets/digests
@@ -1,3 +1,3 @@
-libwebsockets-4.3.2.tar.gz SHA1 4cf7124278b7c4425f53d30dd31af692132dce7a
-libwebsockets-4.3.2.tar.gz SHA256 6a85a1bccf25acc7e8e5383e4934c9b32a102880d1e4c37c70b27ae2a42406e1
-libwebsockets-4.3.2.tar.gz MD5 a73519f68c0e617e6bc7f8704903a9fe
+libwebsockets-4.3.3.tar.gz SHA1 16c3e1180d2530eb4b3d22d2419176c0c703e221
+libwebsockets-4.3.3.tar.gz SHA256 6fd33527b410a37ebc91bb64ca51bdabab12b076bc99d153d7c5dd405e4bdf90
+libwebsockets-4.3.3.tar.gz MD5 c078b08b712316f6302f54a9d05273ae
diff --git a/cross/mosquitto/Makefile b/cross/mosquitto/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = mosquitto
-PKG_VERS = 2.0.18
+PKG_VERS = 2.0.20
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://mosquitto.org/files/source
@@ -22,4 +22,10 @@ CMAKE_ARGS += -DWITH_SRV=ON
 CMAKE_ARGS += -DDOCUMENTATION=OFF
 CMAKE_USE_TOOLCHAIN_FILE = OFF
 
+include ../../mk/spksrc.archs.mk
+ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
+# use clock_gettime of librt
+ADDITIONAL_LDFLAGS += -lrt
+endif
+
 include ../../mk/spksrc.cross-cmake.mk
diff --git a/cross/mosquitto/PLIST b/cross/mosquitto/PLIST
@@ -6,8 +6,8 @@ bin:bin/mosquitto_rr
 bin:bin/mosquitto_sub
 lnk:lib/libmosquitto.so
 lnk:lib/libmosquitto.so.1
-lib:lib/libmosquitto.so.2.0.18
+lib:lib/libmosquitto.so.2.0.20
 lnk:lib/libmosquittopp.so
 lnk:lib/libmosquittopp.so.1
-lib:lib/libmosquittopp.so.2.0.18
+lib:lib/libmosquittopp.so.2.0.20
 lib:lib/mosquitto_dynamic_security.so
diff --git a/cross/mosquitto/digests b/cross/mosquitto/digests
@@ -1,3 +1,3 @@
-mosquitto-2.0.18.tar.gz SHA1 408e29db57133b514e48db595af400d8323a1a2c
-mosquitto-2.0.18.tar.gz SHA256 d665fe7d0032881b1371a47f34169ee4edab67903b2cd2b4c083822823f4448a
-mosquitto-2.0.18.tar.gz MD5 7fe95d0bef1aacd291d21d7752fbd21b
+mosquitto-2.0.20.tar.gz SHA1 85d49ff46583c84ffbcc4cab3b171bfbc1ed05d8
+mosquitto-2.0.20.tar.gz SHA256 ebd07d89d2a446a7f74100ad51272e4a8bf300b61634a7812e19f068f2759de8
+mosquitto-2.0.20.tar.gz MD5 d2c42e267a4d4eb9498b9ac0bae698e0
diff --git a/spk/mosquitto/Makefile b/spk/mosquitto/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = mosquitto
-SPK_VERS = 2.0.18
-SPK_REV = 15
+SPK_VERS = 2.0.20
+SPK_REV = 16
 SPK_ICON = src/mosquitto.png
 
 DEPENDS = cross/mosquitto
@@ -10,7 +10,7 @@ UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 MAINTAINER = SynoCommunity
 DESCRIPTION = 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.
 DISPLAY_NAME = Mosquitto
-CHANGELOG = "Update mosquitto to v2.0.18."
+CHANGELOG = "Update mosquitto to v2.0.20. Update libwebsockets to v4.3.3."
 HOMEPAGE = https://www.mosquitto.org/
 LICENSE  = EPL/EDL