Re: [ptxdist] [PATCH 1/7] libcurl: version bump to 7.85
On Tue, Sep 20, 2022 at 04:47:20PM +0200, Marc Kleine-Budde wrote:
> On 20.09.2022 16:29:07, Michael Olbrich wrote:
> > > > Why do you need this stuff anyways? From looking at configure.ac, the
> > > > existing options should work. What am I missing here?
> > >
> > > If configure is called with '--with-default-ssl-backend="no"' it fails:
> > >
> > > | checking if GSS-API support is requested... no
> > > | checking whether to enable Windows native SSL/TLS... no
> > > | checking whether to enable Secure Transport... no
> > > | checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
> > > | configure: error: TLS not detected, you will not be able to use HTTPS,
> > > FTPS, NTLM and more.
> > > | Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls,
> > > --with-nss, --with-schannel, --with-secure-transport, --with-amissl,
> > > --with-bearssl or --with-rustls to address this.
> >
> > I think adding ptx/wwo --with{out,}-ssl should work. No need to make the
> > backend conditional.
>
> No, it doesn't.
What fails for you?
> > Or $(call ptx/ifdef,PTXCONF_LIBCURL_SSL,,--without-ssl). Either one
> > inserted at the correct place.
>
> This works, though:
>
> @@ -105,7 +105,7 @@ LIBCURL_CONF_OPT:= \
> --without-brotli \
> --without-zstd \
> --without-gssapi \
> - --with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) \
> + $(call
> ptx/ifdef,PTXCONF_LIBCURL_SSL,--with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND),--without-ssl)
> --with-random=/dev/urandom \
> --with-ca-bundle=$(PTXCONF_LIBCURL_SSL_CABUNDLE_PATH) \
> --with-ca-path=$(PTXCONF_LIBCURL_SSL_CAPATH_PATH) \
I tried this and configure runs without error, with PTXCONF_LIBCURL_SSL
enabled and disabled:
diff --git a/rules/libcurl.make b/rules/libcurl.make
index 0d0ac9ea33d0..5da835d730a8 100644
--- a/rules/libcurl.make
+++ b/rules/libcurl.make
@@ -93,6 +93,7 @@ LIBCURL_CONF_OPT := \
--without-schannel \
--without-secure-transport \
--without-amissl \
+ --$(call ptx/wwo,PTXCONF_LIBCURL_SSL)-ssl \
--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 \
Michael
--
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- |
Re: [ptxdist] [PATCH 1/7] libcurl: version bump to 7.85
On 20.09.2022 16:29:07, Michael Olbrich wrote:
> > > Why do you need this stuff anyways? From looking at configure.ac, the
> > > existing options should work. What am I missing here?
> >
> > If configure is called with '--with-default-ssl-backend="no"' it fails:
> >
> > | checking if GSS-API support is requested... no
> > | checking whether to enable Windows native SSL/TLS... no
> > | checking whether to enable Secure Transport... no
> > | checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
> > | configure: error: TLS not detected, you will not be able to use HTTPS,
> > FTPS, NTLM and more.
> > | Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls,
> > --with-nss, --with-schannel, --with-secure-transport, --with-amissl,
> > --with-bearssl or --with-rustls to address this.
>
> I think adding ptx/wwo --with{out,}-ssl should work. No need to make the
> backend conditional.
No, it doesn't.
> Or $(call ptx/ifdef,PTXCONF_LIBCURL_SSL,,--without-ssl). Either one
> inserted at the correct place.
This works, though:
@@ -105,7 +105,7 @@ LIBCURL_CONF_OPT:= \
--without-brotli \
--without-zstd \
--without-gssapi \
- --with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) \
+ $(call
ptx/ifdef,PTXCONF_LIBCURL_SSL,--with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND),--without-ssl)
--with-random=/dev/urandom \
--with-ca-bundle=$(PTXCONF_LIBCURL_SSL_CABUNDLE_PATH) \
--with-ca-path=$(PTXCONF_LIBCURL_SSL_CAPATH_PATH) \
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
signature.asc
Description: PGP signature
Re: [ptxdist] [PATCH 1/7] libcurl: version bump to 7.85
On Tue, Sep 20, 2022 at 04:20:35PM +0200, Marc Kleine-Budde wrote:
> On 20.09.2022 16:14:32, Michael Olbrich wrote:
> > On Tue, Sep 20, 2022 at 03:20:29PM +0200, Marc Kleine-Budde wrote:
> > > On 20.09.2022 15:07:22, Alexander Dahl wrote:
> > > > Hello Marc,
> > > >
> > > > Am Tue, Sep 20, 2022 at 02:56:59PM +0200 schrieb Marc Kleine-Budde:
> > > > > Signed-off-by: Marc Kleine-Budde
> > > > > ---
> > > > > rules/libcurl.make | 9 -
> > > > > 1 file changed, 8 insertions(+), 1 deletion(-)
> > > > >
> > > > > diff --git a/rules/libcurl.make b/rules/libcurl.make
> > > > > index 0d0ac9ea33d0..1ddefa9a5b4e 100644
> > > > > --- a/rules/libcurl.make
> > > > > +++ b/rules/libcurl.make
> > > > > @@ -105,7 +105,6 @@ LIBCURL_CONF_OPT := \
> > > > > --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) \
> > > > > @@ -126,6 +125,14 @@ LIBCURL_CONF_OPT := \
> > > > > --without-zsh-functions-dir \
> > > > > --without-fish-functions-dir
> > > > >
> > > > > +ifdef PTXCONF_LIBCURL_SSL
> > > > > +LIBCURL_CONF_OPT += \
> > > > > +
> > > > > --with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND)
> > > > > +else
> > > > > +LIBCURL_CONF_OPT += \
> > > > > + --without-ssl
> > > > > +endif
> > > >
> > > > The diff does not match patch subject.
> > >
> > > Oh, the version bump disappeared after rebasing to current master. Will
> > > send a v2.
> >
> > Why do you need this stuff anyways? From looking at configure.ac, the
> > existing options should work. What am I missing here?
>
> If configure is called with '--with-default-ssl-backend="no"' it fails:
>
> | checking if GSS-API support is requested... no
> | checking whether to enable Windows native SSL/TLS... no
> | checking whether to enable Secure Transport... no
> | checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
> | configure: error: TLS not detected, you will not be able to use HTTPS,
> FTPS, NTLM and more.
> | Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls,
> --with-nss, --with-schannel, --with-secure-transport, --with-amissl,
> --with-bearssl or --with-rustls to address this.
I think adding ptx/wwo --with{out,}-ssl should work. No need to make the
backend conditional.
Or $(call ptx/ifdef,PTXCONF_LIBCURL_SSL,,--without-ssl). Either one
inserted at the correct place.
Michael
--
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- |
Re: [ptxdist] [PATCH 1/7] libcurl: version bump to 7.85
On 20.09.2022 16:14:32, Michael Olbrich wrote: > On Tue, Sep 20, 2022 at 03:20:29PM +0200, Marc Kleine-Budde wrote: > > On 20.09.2022 15:07:22, Alexander Dahl wrote: > > > Hello Marc, > > > > > > Am Tue, Sep 20, 2022 at 02:56:59PM +0200 schrieb Marc Kleine-Budde: > > > > Signed-off-by: Marc Kleine-Budde > > > > --- > > > > rules/libcurl.make | 9 - > > > > 1 file changed, 8 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/rules/libcurl.make b/rules/libcurl.make > > > > index 0d0ac9ea33d0..1ddefa9a5b4e 100644 > > > > --- a/rules/libcurl.make > > > > +++ b/rules/libcurl.make > > > > @@ -105,7 +105,6 @@ LIBCURL_CONF_OPT:= \ > > > > --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) \ > > > > @@ -126,6 +125,14 @@ LIBCURL_CONF_OPT := \ > > > > --without-zsh-functions-dir \ > > > > --without-fish-functions-dir > > > > > > > > +ifdef PTXCONF_LIBCURL_SSL > > > > +LIBCURL_CONF_OPT += \ > > > > + > > > > --with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) > > > > +else > > > > +LIBCURL_CONF_OPT += \ > > > > + --without-ssl > > > > +endif > > > > > > The diff does not match patch subject. > > > > Oh, the version bump disappeared after rebasing to current master. Will > > send a v2. > > Why do you need this stuff anyways? From looking at configure.ac, the > existing options should work. What am I missing here? If configure is called with '--with-default-ssl-backend="no"' it fails: | checking if GSS-API support is requested... no | checking whether to enable Windows native SSL/TLS... no | checking whether to enable Secure Transport... no | checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no | configure: error: TLS not detected, you will not be able to use HTTPS, FTPS, NTLM and more. | Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-nss, --with-schannel, --with-secure-transport, --with-amissl, --with-bearssl or --with-rustls to address this. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | signature.asc Description: PGP signature
Re: [ptxdist] [PATCH 1/7] libcurl: version bump to 7.85
On Tue, Sep 20, 2022 at 03:20:29PM +0200, Marc Kleine-Budde wrote: > On 20.09.2022 15:07:22, Alexander Dahl wrote: > > Hello Marc, > > > > Am Tue, Sep 20, 2022 at 02:56:59PM +0200 schrieb Marc Kleine-Budde: > > > Signed-off-by: Marc Kleine-Budde > > > --- > > > rules/libcurl.make | 9 - > > > 1 file changed, 8 insertions(+), 1 deletion(-) > > > > > > diff --git a/rules/libcurl.make b/rules/libcurl.make > > > index 0d0ac9ea33d0..1ddefa9a5b4e 100644 > > > --- a/rules/libcurl.make > > > +++ b/rules/libcurl.make > > > @@ -105,7 +105,6 @@ LIBCURL_CONF_OPT := \ > > > --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) \ > > > @@ -126,6 +125,14 @@ LIBCURL_CONF_OPT := \ > > > --without-zsh-functions-dir \ > > > --without-fish-functions-dir > > > > > > +ifdef PTXCONF_LIBCURL_SSL > > > +LIBCURL_CONF_OPT += \ > > > + --with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) > > > +else > > > +LIBCURL_CONF_OPT += \ > > > + --without-ssl > > > +endif > > > > The diff does not match patch subject. > > Oh, the version bump disappeared after rebasing to current master. Will > send a v2. Why do you need this stuff anyways? From looking at configure.ac, the existing options should work. What am I missing here? Michael -- 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- |
Re: [ptxdist] [PATCH 1/7] libcurl: version bump to 7.85
On 20.09.2022 15:07:22, Alexander Dahl wrote: > Hello Marc, > > Am Tue, Sep 20, 2022 at 02:56:59PM +0200 schrieb Marc Kleine-Budde: > > Signed-off-by: Marc Kleine-Budde > > --- > > rules/libcurl.make | 9 - > > 1 file changed, 8 insertions(+), 1 deletion(-) > > > > diff --git a/rules/libcurl.make b/rules/libcurl.make > > index 0d0ac9ea33d0..1ddefa9a5b4e 100644 > > --- a/rules/libcurl.make > > +++ b/rules/libcurl.make > > @@ -105,7 +105,6 @@ LIBCURL_CONF_OPT:= \ > > --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) \ > > @@ -126,6 +125,14 @@ LIBCURL_CONF_OPT := \ > > --without-zsh-functions-dir \ > > --without-fish-functions-dir > > > > +ifdef PTXCONF_LIBCURL_SSL > > +LIBCURL_CONF_OPT += \ > > + --with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) > > +else > > +LIBCURL_CONF_OPT += \ > > + --without-ssl > > +endif > > The diff does not match patch subject. Oh, the version bump disappeared after rebasing to current master. Will send a v2. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | signature.asc Description: PGP signature
Re: [ptxdist] [PATCH 1/7] libcurl: version bump to 7.85
Hello Marc, Am Tue, Sep 20, 2022 at 02:56:59PM +0200 schrieb Marc Kleine-Budde: > Signed-off-by: Marc Kleine-Budde > --- > rules/libcurl.make | 9 - > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/rules/libcurl.make b/rules/libcurl.make > index 0d0ac9ea33d0..1ddefa9a5b4e 100644 > --- a/rules/libcurl.make > +++ b/rules/libcurl.make > @@ -105,7 +105,6 @@ LIBCURL_CONF_OPT := \ > --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) \ > @@ -126,6 +125,14 @@ LIBCURL_CONF_OPT := \ > --without-zsh-functions-dir \ > --without-fish-functions-dir > > +ifdef PTXCONF_LIBCURL_SSL > +LIBCURL_CONF_OPT += \ > + --with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) > +else > +LIBCURL_CONF_OPT += \ > + --without-ssl > +endif The diff does not match patch subject. Greets Alex > + > # > > # Target-Install > # > > -- > 2.30.2 > >
[ptxdist] [PATCH 1/7] libcurl: version bump to 7.85
Signed-off-by: Marc Kleine-Budde --- rules/libcurl.make | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/rules/libcurl.make b/rules/libcurl.make index 0d0ac9ea33d0..1ddefa9a5b4e 100644 --- a/rules/libcurl.make +++ b/rules/libcurl.make @@ -105,7 +105,6 @@ LIBCURL_CONF_OPT:= \ --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) \ @@ -126,6 +125,14 @@ LIBCURL_CONF_OPT := \ --without-zsh-functions-dir \ --without-fish-functions-dir +ifdef PTXCONF_LIBCURL_SSL +LIBCURL_CONF_OPT += \ + --with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) +else +LIBCURL_CONF_OPT += \ + --without-ssl +endif + # # Target-Install # -- 2.30.2
