1 files changed, 90 insertions, 47 deletions

diff --git a/package/network/utils/curl/Config.in b/package/network/utils/curl/Config.in
index 87e5f99f57..11cfa39e95 100644
--- a/package/network/utils/curl/Config.in
+++ b/package/network/utils/curl/Config.in
@@ -1,111 +1,154 @@
 if PACKAGE_libcurl
 
+comment "SSL support"
+
 choice
-	prompt "SSL library"
+	prompt "Selected SSL library"
 	default LIBCURL_POLARSSL
 
-config LIBCURL_POLARSSL
-	bool "PolarSSL"
+	config LIBCURL_POLARSSL
+		bool "PolarSSL"
 
-config LIBCURL_CYASSL
-	bool "CyaSSL"
+	config LIBCURL_CYASSL
+		bool "CyaSSL"
 
-config LIBCURL_AXTLS
-	bool "axTLS"
+	config LIBCURL_AXTLS
+		bool "axTLS"
 
-config LIBCURL_OPENSSL
-	bool "OpenSSL"
+	config LIBCURL_OPENSSL
+		bool "OpenSSL"
 
-config LIBCURL_GNUTLS
-	bool "GNUTLS"
+	config LIBCURL_GNUTLS
+		bool "GNUTLS"
 
-config LIBCURL_NOSSL
-	bool "No SSL support"
+	config LIBCURL_NOSSL
+		bool "No SSL support"
 
 endchoice
 
-config LIBCURL_COOKIES
-	bool "Enable cookies support"
-	default y
-
-config LIBCURL_CRYPTO_AUTH
-	bool "Enable cryptographic authentication"
-	default n
+comment "Supported protocols"
 
 config LIBCURL_DICT
-	bool "Enable DICT support"
+	bool "DICT protocol"
 	default n
 
 config LIBCURL_FILE
-	bool "Enable FILE support"
+	bool "FILE protocol"
 	default y
 
 config LIBCURL_FTP
-	bool "Enable FTP support"
+	bool "FTP / FTPS protocol"
 	default y
 
 config LIBCURL_GOPHER
-	bool "Enable Gopher support"
+	bool "Gopher protocol"
 	default n
 
 config LIBCURL_HTTP
-	bool "Enable HTTP support"
+	bool "HTTP / HTTPS protocol"
+	default y
+
+config LIBCURL_COOKIES
+	bool "Enable Cookies support"
+	depends on LIBCURL_HTTP
 	default y
 
 config LIBCURL_IMAP
-	bool "Enable IMAP support"
+	bool "IMAP / IMAPS protocol"
 	default n
 
 config LIBCURL_LDAP
-	bool "Enable LDAP support"
+	bool "LDAP protocol"
 	default n
 
 config LIBCURL_LDAPS
 	bool "Enable LDAPS support"
+	depends on LIBCURL_LDAP && !LIBCURL_NOSSL
+	default y
+
+config LIBCURL_POP3
+	bool "POP3 / POP3S protocol"
 	default n
 
-config LIBCURL_LIBCURL_OPTION
-	bool "Enable --libcurl C code generation support"
+config LIBCURL_RTSP
+	bool "RTSP protocol"
+	depends on LIBCURL_HTTP
 	default n
+config LIBCURL_NO_RTSP
+	string "RTSP require HTTP protocol"
+	depends on !LIBCURL_HTTP
+	default "!"
 
-config LIBCURL_POP3
-	bool "Enable POP3 support"
+config LIBCURL_SSH2
+	bool "SCP / SFTP protocol"
+	default n
+
+config LIBCURL_SMB
+	bool "SMB protocol (CIFS)"
+	depends on LIBCURL_CRYPTO_AUTH && (LIBCURL_GNUTLS || LIBCURL_OPENSSL)
+	default n
+config LIBCURL_NO_SMB
+	string "SMB require 'cryptographic authentication' and either 'GnuTLS' or 'OpenSSL'"
+	depends on !LIBCURL_CRYPTO_AUTH || (!LIBCURL_GNUTLS && !LIBCURL_OPENSSL)
+	default "!"
+
+config LIBCURL_SMTP
+	bool "SMTP / SMTPS protocol"
 	default n
 
+config LIBCURL_TELNET
+	bool "TELNET protocol"
+	default n
+
+config LIBCURL_TFTP
+	bool "TFTP protocol"
+	default n
+
+comment "Miscellaneous"
+
 config LIBCURL_PROXY
 	bool "Enable proxy support"
 	default y
 
-config LIBCURL_RTSP
-	bool "Enable RTSP support"
+config LIBCURL_CRYPTO_AUTH
+	bool "Enable cryptographic authentication"
 	default n
 
-config LIBCURL_SMTP
-	bool "Enable SMTP support"
+config LIBCURL_TLS_SRP
+	bool "Enable TLS-SRP authentication"
 	default n
 
-config LIBCURL_SSPI
-	bool "Enable SSPI"
+config LIBCURL_LIBIDN
+	bool "Enable IDN support"
 	default n
 
-config LIBCURL_TELNET
-	bool "Enable TELNET support"
+config LIBCURL_THREADED_RESOLVER
+	bool "Enable threaded DNS resolver"
 	default n
+	help
+		Enable POSIX threaded asynchronous DNS resolution
 
-config LIBCURL_TFTP
-	bool "Enable TFTP support"
+config LIBCURL_ZLIB
+	bool "Enable zlib support"
 	default n
 
-config LIBCURL_THREADED_RESOLVER
-	bool "Enable threaded resolver"
+config LIBCURL_UNIX_SOCKETS
+	bool "Enable unix domain socket support"
 	default n
+	help
+		Enable HTTP over unix domain sockets.
+		To use this with the curl command line, you specify the socket path to the new --unix-domain option.
+		This feature is actually not limited to HTTP, you can do all the TCP-based protocols 
+		except FTP over the unix domain socket, but it is only HTTP that is regularly used this way. 
+		The reason FTP isn't supported is of course its use of two connections 
+		which would be even weirder to do like this.
 
-config LIBCURL_TLS-SRP
-	bool "Enable TLS-SRP authentication"
+config LIBCURL_LIBCURL_OPTION
+	bool "Enable generation of C code"
 	default n
 
-config LIBCURL_ZLIB
-	bool "Use zlib"
+config LIBCURL_VERBOSE
+	bool "Enable verbose error strings"
 	default n
 
 endif