From: Karl Palsson <karlp@remake.is>
Date: Fri, 15 Jan 2016 09:29:41 +0000 (+0000)
Subject: mosquitto: optionally include mosquitto_passwd utility
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=5dda75f84c3fee692a1994948d40aae36b1980d4;p=feed%2Fpackages.git

mosquitto: optionally include mosquitto_passwd utility

Many users of the SSL build of mosquitto need the passwd utility for
managing keys.

Fixes github issue #1909

Signed-off-by: Karl Palsson <karlp@remake.is>
---

diff --git a/net/mosquitto/Config.in b/net/mosquitto/Config.in
index 9fe48ce3b5..9b169c58e7 100644
--- a/net/mosquitto/Config.in
+++ b/net/mosquitto/Config.in
@@ -4,3 +4,10 @@ config MOSQUITTO_LWS
     default y
     help
         Includes websockets support in the broker, via libwebsockets
+
+config MOSQUITTO_PASSWD
+    bool "Include mosquitto_passwd utility"
+    depends on PACKAGE_mosquitto
+    default y
+    help
+        mosquitto_passwd is a tool for managing password files for mosquitto.
diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index 87ff529e8e..07d506afa3 100644
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -148,6 +148,9 @@ Package/$(PKG_NAME)-nossl/conffiles = $(Package/$(PKG_NAME)/conffiles)
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mosquitto $(1)/usr/sbin/mosquitto
+ifeq ($(CONFIG_MOSQUITTO_PASSWD),y)
+        $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mosquitto_passwd $(1)/usr/sbin
+endif
 	$(INSTALL_DIR) $(1)/etc/mosquitto
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/mosquitto.conf $(1)/etc/mosquitto/mosquitto.conf
 	$(INSTALL_DIR) $(1)/etc/init.d