Re: [ptxdist] [PATCH 2/2] libcurl: version bump 7.72.0 -> 7.77.0

[Bastian Krause <bst@pengutronix.de>]

On 6/8/21 5:53 PM, Bastian Krause wrote:
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> ---
>  rules/libcurl.make | 31 +++++++++++++++++++------------
>  1 file changed, 19 insertions(+), 12 deletions(-)
> 
> diff --git a/rules/libcurl.make b/rules/libcurl.make
> index 7a915dce3..2e68e51ea 100644
> --- a/rules/libcurl.make
> +++ b/rules/libcurl.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBCURL) += libcurl
>  #
>  # Paths and names
>  #
> -LIBCURL_VERSION	:= 7.72.0
> -LIBCURL_MD5	:= 84c557176d185661655b00c17f150fc7
> +LIBCURL_VERSION	:= 7.77.0
> +LIBCURL_MD5	:= 045d28029679dabb6b20a814934671ad
>  LIBCURL		:= curl-$(LIBCURL_VERSION)
>  LIBCURL_SUFFIX	:= tar.bz2
>  LIBCURL_URL	:= https://curl.haxx.se/download/$(LIBCURL).$(LIBCURL_SUFFIX)
> @@ -43,7 +43,7 @@ LIBCURL_CONF_OPT	:= \
>  	--enable-hidden-symbols \
>  	--$(call ptx/endis, PTXCONF_LIBCURL_C_ARES)-ares \
>  	--enable-rt \
> -	--disable-esni \
> +	--disable-ech \
>  	--disable-code-coverage \
>  	$(GLOBAL_LARGE_FILE_OPTION) \
>  	--$(call ptx/endis, PTXCONF_LIBCURL_HTTP)-http \
> @@ -77,6 +77,7 @@ LIBCURL_CONF_OPT	:= \
>  	--enable-tls-srp \
>  	--enable-unix-sockets \
>  	--$(call ptx/endis, PTXCONF_LIBCURL_COOKIES)-cookies \
> +	--enable-socketpair \
>  	--$(call ptx/endis, PTXCONF_LIBCURL_HTTP)-http-auth \
>  	--disable-doh \
>  	--disable-mime \
> @@ -84,29 +85,31 @@ LIBCURL_CONF_OPT	:= \
>  	--enable-netrc \
>  	--enable-progress-meter \
>  	--disable-dnsshuffle \
> +	--enable-get-easy-option \

For the record: the help text advertises this as
--enable-get-easy-options (with plural s), but the configure option is
acutally --enable-get-easy-option (without plural s).

I've opened a PR to fix this:

https://github.com/curl/curl/pull/7213

For now, just use --enable-get-easy-option.

Regards,
Bastian

>  	--disable-alt-svc \
> -	--with-zlib=$(SYSROOT) \
> -	--without-brotli \
> -	--without-zstd \
> -	--without-gssapi \
> -	--with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) \
> -	--without-winssl \
> +	--enable-hsts \
>  	--without-schannel \
> -	--without-darwinssl \
>  	--without-secure-transport \
>  	--without-amissl \
> -	--with-ssl=$(call ptx/ifdef, PTXCONF_LIBCURL_SSL_OPENSSL,$(SYSROOT)/usr,no) \
> -	--with-random=/dev/urandom \
> +	--with-openssl=$(call ptx/ifdef, PTXCONF_LIBCURL_SSL_OPENSSL,$(SYSROOT)/usr,no) \
>  	--with-gnutls=$(call ptx/ifdef, PTXCONF_LIBCURL_SSL_GNUTLS,$(SYSROOT)/usr,no) \
>  	--without-mbedtls \
>  	--without-wolfssl \
>  	--without-mesalink \
>  	--without-bearssl \
> +	--without-rustls \
>  	--without-nss \
> +	--with-zlib=$(SYSROOT) \
> +	--without-brotli \
> +	--without-zstd \
> +	--without-gssapi \
> +	--with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) \
> +	--with-random=/dev/urandom \
>  	--with-ca-bundle=$(PTXCONF_LIBCURL_SSL_CABUNDLE_PATH) \
>  	--with-ca-path=$(PTXCONF_LIBCURL_SSL_CAPATH_PATH) \
>  	--without-ca-fallback \
>  	--without-libpsl \
> +	--without-libgsasl \
>  	--without-libmetalink \
>  	--$(call ptx/wwo, PTXCONF_LIBCURL_LIBSSH2)-libssh2 \
>  	--without-libssh \
> @@ -115,6 +118,10 @@ LIBCURL_CONF_OPT	:= \
>  	--without-winidn \
>  	--without-libidn2 \
>  	--without-nghttp2 \
> +	--without-ngtcp2 \
> +	--without-nghttp3 \
> +	--without-quiche \
> +	--without-hyper \
>  	--without-zsh-functions-dir \
>  	--without-fish-functions-dir
>  
> 


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de