luci-0.9: merge r5956

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index b22b7d07326b998be7420a0c4b08eae160848e6d..d803b9635c97b3498ce136ae8d0b41c36d34c5f4 100644 (file)
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -240,7 +240,7 @@ endef
 
 
 
-NIXIO_TLS:=cyassl
+NIXIO_TLS:=
 
 define Package/luci-nixio
   $(call Package/luci/libtemplate)
@@ -255,7 +255,10 @@ endef
 define Package/luci-nixio/config
        choice
                prompt "TLS Provider"
-               default PACKAGE_luci-nixio_cyassl
+               default PACKAGE_luci-nixio_notls
+
+               config PACKAGE_luci-nixio_notls
+                       bool "Disabled"
 
                config PACKAGE_luci-nixio_axtls
                        bool "Builtin (axTLS)"