[ptxdist] [PATCH v3] wget: add TLS support

[ptxdist] [PATCH v3] wget: add TLS support

[Ladislav Michl]

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
  Changes:
 -v2: fix indentation, simplify --with-ssl
 -v3: remove quotes from --with-ssl, fix zlib symbol typo

 rules/wget.in   | 47 +++++++++++++++++++++++++++++++++++++++++++++--
 rules/wget.make |  9 +++++----
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/rules/wget.in b/rules/wget.in
index 033946bcc..4f9edef03 100644
--- a/rules/wget.in
+++ b/rules/wget.in
@@ -1,10 +1,14 @@
 ## SECTION=networking
-config WGET
+
+menuconfig WGET
 	tristate
-	prompt "wget"
+	prompt "wget                          "
 	depends on !BUSYBOX_WGET || ALLYES
 	select LIBC_RT
 	select GCCLIBS_GCC_S
+	select GNUTLS	if WGET_SSL_GNUTLS
+	select OPENSSL	if WGET_SSL_OPENSSL
+	select ZLIB	if WGET_ZLIB
 	help
 	  GNU wget is a commandline mirroring tool.
 
@@ -34,5 +38,44 @@ config WGET
 
 	  http://www.gnu.org/software/wget/
 
+if WGET
+
+choice
+	prompt "SSL support"
+	default WGET_SSL_NONE
+
+	config WGET_SSL_OPENSSL
+		bool
+		prompt "OpenSSL"
+		help
+		  Wget uses OpenSSL
+
+	config WGET_SSL_GNUTLS
+		bool
+		prompt "GNU TLS"
+		help
+		  Wget uses GNU TLS
+
+	config WGET_SSL_NONE
+		bool
+		prompt "none"
+		help
+		  No SSL support for wget
+
+endchoice
+
+config WGET_SSL
+	string
+	default "openssl"	if WGET_SSL_OPENSSL
+	default "gnutls"	if WGET_SSL_GNUTLS
+	default "no"		if WGET_SSL_NONE
+
+config WGET_ZLIB
+	bool "zlib support"
+	help
+	  Build wget with zlib support
+
+endif
+
 comment "BusyBox's wget is selected!"
 	depends on BUSYBOX_WGET
diff --git a/rules/wget.make b/rules/wget.make
index 9e17d410e..e6a8f8242 100644
--- a/rules/wget.make
+++ b/rules/wget.make
@@ -37,7 +37,8 @@ WGET_ENV := \
 #
 # autoconf
 #
-WGET_AUTOCONF := \
+WGET_CONF_TOOL := autoconf
+WGET_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
 	--enable-opie \
 	--enable-digest \
@@ -54,11 +55,11 @@ WGET_AUTOCONF := \
 	--disable-pcre \
 	--disable-xattr \
 	--without-libpsl \
-	--without-ssl \
-	--without-zlib \
+	--with-ssl=$(call remove_quotes, $(PTXCONF_WGET_SSL)) \
+	--$(call ptx/wwo, PTXCONF_WGET_ZLIB)-zlib \
 	--with-metalink \
 	--without-cares \
-	--without-openssl \
+	--$(call ptx/wwo, PTXCONF_WGET_SSL_OPENSSL)-openssl \
 	--with-included-libunistring \
 	--without-included-regex \
 	--with-libidn=/usr \
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de