mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH 1/2] wget: version bump 1.19.1 -> 1.20
@ 2019-01-09 12:25 Ladislav Michl
  2019-01-09 13:12 ` [ptxdist] [PATCH 1/2] wget: add TLS support Ladislav Michl
  2019-01-11 16:16 ` [ptxdist] [PATCH 1/2] wget: version bump 1.19.1 -> 1.20 Michael Olbrich
  0 siblings, 2 replies; 6+ messages in thread
From: Ladislav Michl @ 2019-01-09 12:25 UTC (permalink / raw)
  To: ptxdist

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 rules/wget.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/wget.make b/rules/wget.make
index 4e62dd18c..9e17d410e 100644
--- a/rules/wget.make
+++ b/rules/wget.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_WGET) += wget
 #
 # Paths and names
 #
-WGET_VERSION	:= 1.19.1
-WGET_MD5	:= 87cea36b7161fd43e3fd51a4e8b89689
+WGET_VERSION	:= 1.20
+WGET_MD5	:= 9f1515d083b769e9ff7642ce6016518e
 WGET		:= wget-$(WGET_VERSION)
 WGET_SUFFIX	:= tar.gz
 WGET_URL	:= $(call ptx/mirror, GNU, wget/$(WGET).$(WGET_SUFFIX))
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [ptxdist] [PATCH 1/2] wget: add TLS support
  2019-01-09 12:25 [ptxdist] [PATCH 1/2] wget: version bump 1.19.1 -> 1.20 Ladislav Michl
@ 2019-01-09 13:12 ` Ladislav Michl
  2019-01-11 13:56   ` Michael Olbrich
  2019-01-11 16:16 ` [ptxdist] [PATCH 1/2] wget: version bump 1.19.1 -> 1.20 Michael Olbrich
  1 sibling, 1 reply; 6+ messages in thread
From: Ladislav Michl @ 2019-01-09 13:12 UTC (permalink / raw)
  To: ptxdist

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 rules/wget.in   | 41 +++++++++++++++++++++++++++++++++++++++--
 rules/wget.make |  9 +++++----
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/rules/wget.in b/rules/wget.in
index 033946bcc..516590b06 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,38 @@ 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_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..8f5ac80f5 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 ptx/ifdef,PTXCONF_WGET_SSL_GNUTLS,gnutls,$(call ptx/ifdef,PTXCONF_WGET_SSL_OPENSSL,openssl,no)) \
+	--$(call ptx/wwo,PTXCONF_WGET_ZLIB)-zlib \
 	--with-metalink \
 	--without-cares \
-	--without-openssl \
+	--$(call ptx/wwo,PTXCONF_WGET_OPENSSL)-openssl \
 	--with-included-libunistring \
 	--without-included-regex \
 	--with-libidn=/usr \
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [ptxdist] [PATCH 1/2] wget: add TLS support
  2019-01-09 13:12 ` [ptxdist] [PATCH 1/2] wget: add TLS support Ladislav Michl
@ 2019-01-11 13:56   ` Michael Olbrich
  2019-01-12  9:01     ` Ladislav Michl
  0 siblings, 1 reply; 6+ messages in thread
From: Michael Olbrich @ 2019-01-11 13:56 UTC (permalink / raw)
  To: ptxdist

On Wed, Jan 09, 2019 at 02:12:36PM +0100, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
>  rules/wget.in   | 41 +++++++++++++++++++++++++++++++++++++++--
>  rules/wget.make |  9 +++++----
>  2 files changed, 44 insertions(+), 6 deletions(-)
> 
> diff --git a/rules/wget.in b/rules/wget.in
> index 033946bcc..516590b06 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

align with <tab>if ....


>  	help
>  	  GNU wget is a commandline mirroring tool.
>  
> @@ -34,5 +38,38 @@ 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
> +

Don't indent the sub-options.

> +endchoice

config WGET_SSL
	string
	default "gnutls if WGET_SSL_GNUTLS
	...

> +
> +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..8f5ac80f5 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 ptx/ifdef,PTXCONF_WGET_SSL_GNUTLS,gnutls,$(call ptx/ifdef,PTXCONF_WGET_SSL_OPENSSL,openssl,no)) \

	--with-ssl=$(PTXCONF_WGET_SSL) \

Michael

> +	--$(call ptx/wwo,PTXCONF_WGET_ZLIB)-zlib \
>  	--with-metalink \
>  	--without-cares \
> -	--without-openssl \
> +	--$(call ptx/wwo,PTXCONF_WGET_OPENSSL)-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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [ptxdist] [PATCH 1/2] wget: version bump 1.19.1 -> 1.20
  2019-01-09 12:25 [ptxdist] [PATCH 1/2] wget: version bump 1.19.1 -> 1.20 Ladislav Michl
  2019-01-09 13:12 ` [ptxdist] [PATCH 1/2] wget: add TLS support Ladislav Michl
@ 2019-01-11 16:16 ` Michael Olbrich
  1 sibling, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2019-01-11 16:16 UTC (permalink / raw)
  To: ptxdist

On Wed, Jan 09, 2019 at 01:25:39PM +0100, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
>  rules/wget.make | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/wget.make b/rules/wget.make
> index 4e62dd18c..9e17d410e 100644
> --- a/rules/wget.make
> +++ b/rules/wget.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_WGET) += wget
>  #
>  # Paths and names
>  #
> -WGET_VERSION	:= 1.19.1
> -WGET_MD5	:= 87cea36b7161fd43e3fd51a4e8b89689
> +WGET_VERSION	:= 1.20
> +WGET_MD5	:= 9f1515d083b769e9ff7642ce6016518e
>  WGET		:= wget-$(WGET_VERSION)
>  WGET_SUFFIX	:= tar.gz
>  WGET_URL	:= $(call ptx/mirror, GNU, wget/$(WGET).$(WGET_SUFFIX))

The old version has a patch. Is that included in the new version?

Michael

> -- 
> 2.20.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [ptxdist] [PATCH 1/2] wget: add TLS support
  2019-01-11 13:56   ` Michael Olbrich
@ 2019-01-12  9:01     ` Ladislav Michl
  2019-01-16 15:25       ` Michael Olbrich
  0 siblings, 1 reply; 6+ messages in thread
From: Ladislav Michl @ 2019-01-12  9:01 UTC (permalink / raw)
  To: ptxdist

On Fri, Jan 11, 2019 at 02:56:47PM +0100, Michael Olbrich wrote:
> On Wed, Jan 09, 2019 at 02:12:36PM +0100, Ladislav Michl wrote:
> > Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> > ---
> >  rules/wget.in   | 41 +++++++++++++++++++++++++++++++++++++++--
> >  rules/wget.make |  9 +++++----
> >  2 files changed, 44 insertions(+), 6 deletions(-)
> > 
> > diff --git a/rules/wget.in b/rules/wget.in
> > index 033946bcc..516590b06 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
> 
> align with <tab>if ....
> 
> 
> >  	help
> >  	  GNU wget is a commandline mirroring tool.
> >  
> > @@ -34,5 +38,38 @@ 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
> > +
> 
> Don't indent the sub-options.

Does the rule changed here? As the all other choice statements have
sub-options indented.

> > +endchoice
> 
> config WGET_SSL
> 	string
> 	default "gnutls if WGET_SSL_GNUTLS
> 	...
> 
> > +
> > +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..8f5ac80f5 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 ptx/ifdef,PTXCONF_WGET_SSL_GNUTLS,gnutls,$(call ptx/ifdef,PTXCONF_WGET_SSL_OPENSSL,openssl,no)) \
> 
> 	--with-ssl=$(PTXCONF_WGET_SSL) \
> 
> Michael
> 
> > +	--$(call ptx/wwo,PTXCONF_WGET_ZLIB)-zlib \
> >  	--with-metalink \
> >  	--without-cares \
> > -	--without-openssl \
> > +	--$(call ptx/wwo,PTXCONF_WGET_OPENSSL)-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

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [ptxdist] [PATCH 1/2] wget: add TLS support
  2019-01-12  9:01     ` Ladislav Michl
@ 2019-01-16 15:25       ` Michael Olbrich
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2019-01-16 15:25 UTC (permalink / raw)
  To: ptxdist

On Sat, Jan 12, 2019 at 10:01:26AM +0100, Ladislav Michl wrote:
> On Fri, Jan 11, 2019 at 02:56:47PM +0100, Michael Olbrich wrote:
> > On Wed, Jan 09, 2019 at 02:12:36PM +0100, Ladislav Michl wrote:
> > > Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> > > +	config WGET_SSL_NONE
> > > +		bool
> > > +		prompt "none"
> > > +		help
> > > +		  No SSL support for wget
> > > +
> > 
> > Don't indent the sub-options.
> 
> Does the rule changed here? As the all other choice statements have
> sub-options indented.

I usually don't indent, but you are correct, a lot of other packages do the
same. It's not that important.

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2019-01-16 15:25 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-09 12:25 [ptxdist] [PATCH 1/2] wget: version bump 1.19.1 -> 1.20 Ladislav Michl
2019-01-09 13:12 ` [ptxdist] [PATCH 1/2] wget: add TLS support Ladislav Michl
2019-01-11 13:56   ` Michael Olbrich
2019-01-12  9:01     ` Ladislav Michl
2019-01-16 15:25       ` Michael Olbrich
2019-01-11 16:16 ` [ptxdist] [PATCH 1/2] wget: version bump 1.19.1 -> 1.20 Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox