mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Ladislav Michl <ladis@linux-mips.org>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH v2 2/2] wget: add TLS support
Date: Mon, 14 Jan 2019 08:47:55 +0100	[thread overview]
Message-ID: <20190114074754.GA22515@lenoch> (raw)
In-Reply-To: <20190112090313.GC28371@lenoch>

v3 with changes bellow...

On Sat, Jan 12, 2019 at 10:03:14AM +0100, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
>  Changes:
>  -v2: fix indentation, simplify --with-ssl
> 
>  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..4d8c3ddea 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=$(PTXCONF_WGET_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_OPENSSL)-openssl \

                         PTXCONF_WGET_SSL_OPENSSL

>  	--with-included-libunistring \
>  	--without-included-regex \
>  	--with-libidn=/usr \
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

  reply	other threads:[~2019-01-14  7:47 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-12  9:02 [ptxdist] [PATCH v2 1/2] wget: version bump 1.19.1 -> 1.20 Ladislav Michl
2019-01-12  9:03 ` [ptxdist] [PATCH v2 2/2] wget: add TLS support Ladislav Michl
2019-01-14  7:47   ` Ladislav Michl [this message]
2019-01-14  7:50   ` Denis OSTERLAND
2019-01-14  9:26     ` Ladislav Michl

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190114074754.GA22515@lenoch \
    --to=ladis@linux-mips.org \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox