From 2a8b24a0fd1702fe6e86a7a045ef0a2183f6c16c Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Sun, 13 Jun 2021 15:18:10 +0200
Subject: [PATCH] update mosquitto to v1.6.15

- update mosquitto
- remove busybox stuff (and dsm5->dsm6 user migration)
---
 cross/mosquitto/Makefile           |  4 +++-
 cross/mosquitto/digests            |  6 +++---
 spk/mosquitto/Makefile             | 12 +++++-------
 spk/mosquitto/src/service-setup.sh | 13 +++----------
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/cross/mosquitto/Makefile b/cross/mosquitto/Makefile
index 796e5c89059e..7b5f1136d417 100755
--- a/cross/mosquitto/Makefile
+++ b/cross/mosquitto/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = mosquitto
-PKG_VERS = 1.6.12
+PKG_VERS = 1.6.15
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://mosquitto.org/files/source
@@ -7,6 +7,8 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/c-ares cross/openssl cross/util-linux cross/libwebsockets
 
+UNSUPPORETED_ARCHS = $(OLD_PPC_ARCHS)
+
 HOMEPAGE = https://www.mosquitto.org/
 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
diff --git a/cross/mosquitto/digests b/cross/mosquitto/digests
index bede720a5b95..65439d542685 100644
--- a/cross/mosquitto/digests
+++ b/cross/mosquitto/digests
@@ -1,3 +1,3 @@
-mosquitto-1.6.12.tar.gz SHA1 b8c047985a33f3c2e9855079030f91d6eed00c47
-mosquitto-1.6.12.tar.gz SHA256 548d73d19fb787dd0530334e398fd256ef3a581181678488a741a995c4f007fb
-mosquitto-1.6.12.tar.gz MD5 beb8d76d6e45f1e66d711006082a631f
+mosquitto-1.6.15.tar.gz SHA1 86e1819be155b5a9253f2d65f86e4ffb4479b6e8
+mosquitto-1.6.15.tar.gz SHA256 5ff2271512f745bf1a451072cd3768a5daed71e90c5179fae12b049d6c02aa0f
+mosquitto-1.6.15.tar.gz MD5 792bdd8fce3a8a1db102988ef6a9a02f
diff --git a/spk/mosquitto/Makefile b/spk/mosquitto/Makefile
index cc4045112510..3d90d6e7425c 100755
--- a/spk/mosquitto/Makefile
+++ b/spk/mosquitto/Makefile
@@ -1,8 +1,9 @@
 SPK_NAME = mosquitto
-SPK_VERS = 1.6.12
-SPK_REV = 11
+SPK_VERS = 1.6.15
+SPK_REV = 12
 SPK_ICON = src/mosquitto.png
-DEPENDS = cross/busybox cross/$(SPK_NAME)
+
+DEPENDS = cross/$(SPK_NAME)
 
 # libwebsockets is not supported for ppc except qoriq
 UNSUPPORTED_ARCHS = $(OLD_PCC_ARCHS)
@@ -12,7 +13,7 @@ DESCRIPTION = Mosquitto is an open source message broker that implements the MQT
 RELOAD_UI = yes
 DISPLAY_NAME = Mosquitto
 STARTABLE = yes
-CHANGELOG = "Update openssl to 1.1."
+CHANGELOG = "Update mosquitto to v1.6.15."
 HOMEPAGE = https://www.mosquitto.org/
 LICENSE  = EPL/EDL licensed
 
@@ -26,9 +27,6 @@ NO_SERVICE_SHORTCUT = yes
 
 POST_STRIP_TARGET = mosquitto_extra_install
 
-BUSYBOX_CONFIG = usrmng
-ENV += BUSYBOX_CONFIG="$(BUSYBOX_CONFIG)"
-
 include ../../mk/spksrc.spk.mk
 
 .PHONY: mosquitto_extra_install
diff --git a/spk/mosquitto/src/service-setup.sh b/spk/mosquitto/src/service-setup.sh
index 6bf875e8c1c6..02954f17e23c 100644
--- a/spk/mosquitto/src/service-setup.sh
+++ b/spk/mosquitto/src/service-setup.sh
@@ -1,13 +1,6 @@
-CFG_FILE="${SYNOPKG_PKGDEST}/var/mosquitto.conf"
+# mosquitto service definition
+
+CFG_FILE="${SYNOPKG_PKGVAR}/mosquitto.conf"
 PATH="${SYNOPKG_PKGDEST}/bin:${PATH}"
 SERVICE_COMMAND="${SYNOPKG_PKGDEST}/sbin/mosquitto -d -c ${CFG_FILE}"
 
-service_postinst ()
-{
-    # Discard legacy obsolete busybox user account
-    BIN=${SYNOPKG_PKGDEST}/bin
-    $BIN/busybox --install $BIN
-    $BIN/delgroup "${USER}" "users"
-    $BIN/deluser "${USER}"
-}
-