mosquitto: auto-disable TLS-PSK support if not available
authorKarl Palsson <redacted>
Mon, 19 Feb 2018 11:35:41 +0000 (11:35 +0000)
committerKarl Palsson <redacted>
Mon, 19 Feb 2018 12:04:47 +0000 (12:04 +0000)
OpenSSL grew the ability to turn off TLS-PSK support.  Make sure that
mosquitto turns on/off TLS-PSK support based on this OpenSSL config.

Fixes https://github.com/openwrt/packages/issues/5633
Signed-off-by: Karl Palsson <redacted>
net/mosquitto/Makefile

index 189ac5a14f295947cfc18aad38ea9de570ef21ee..66705701442d833e23aa7574c281f5f2d1dfccfd 100644 (file)
@@ -60,7 +60,8 @@ endef
 
 define Package/mosquitto-ssl/description
        $(call Package/mosquitto/default/description)
-       This package is built with SSL support
+This package is built with SSL support.  TLS-PSK will be included (in both
+the client and broker) if OpenSSL is built with TLS-PSK support.
 endef
 
 define Package/mosquitto-nossl/description
@@ -218,6 +219,7 @@ ifeq ($(BUILD_VARIANT),nossl)
        MAKE_FLAGS += WITH_TLS=no WITH_WEBSOCKETS=no
 else
        MAKE_FLAGS += WITH_WEBSOCKETS=$(if $(CONFIG_MOSQUITTO_LWS),"yes","no")
+       MAKE_FLAGS += WITH_TLS_PSK=$(if $(CONFIG_OPENSSL_WITH_PSK),"yes","no")
 endif
 
 $(eval $(call BuildPackage,mosquitto-ssl))
git clone https://git.99rst.org/PROJECT