Thanks, applied as 21e4d71d3c932449e6bebd5c5fc29077b8ac9d86. Michael
[sent from post-receive hook] On Wed, 16 Jun 2021 12:35:49 +0200, Bastian Krause <[email protected]> wrote: > Signed-off-by: Bastian Krause <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/libcurl.in b/rules/libcurl.in > index 390e495cac3b..632ed48e47ca 100644 > --- a/rules/libcurl.in > +++ b/rules/libcurl.in > @@ -5,7 +5,8 @@ menuconfig LIBCURL > prompt "libcurl " > select LIBC_RT > select ZLIB > - select OPENSSL if LIBCURL_SSL > + select OPENSSL if LIBCURL_SSL_OPENSSL > + select GNUTLS if LIBCURL_SSL_GNUTLS > select LIBSSH2 if LIBCURL_LIBSSH2 > select CA_CERTIFICATES if LIBCURL_SSL_CA_CERTIFICATES && RUNTIME > select C_ARES if LIBCURL_C_ARES > @@ -58,6 +59,17 @@ config LIBCURL_SSL > > if LIBCURL_SSL > > +choice > + prompt "SSL backend" > + default LIBCURL_SSL_OPENSSL > + > + config LIBCURL_SSL_OPENSSL > + bool "OpenSSL" > + > + config LIBCURL_SSL_GNUTLS > + bool "GnuTLS" > +endchoice > + > choice > prompt "Central CA certificate storage" > > @@ -81,6 +93,12 @@ config LIBCURL_SSL_CA_CERTIFICATES_PATH > > endif > > +config LIBCURL_SSL_DEFAULT_BACKEND > + string > + default "openssl" if LIBCURL_SSL_OPENSSL > + default "gnutls" if LIBCURL_SSL_GNUTLS > + default "no" if !LIBCURL_SSL > + > config LIBCURL_SSL_CAPATH_PATH > string "CA directory path" if LIBCURL_SSL_CAPATH > default "/etc/ssl/certs" if LIBCURL_SSL_CAPATH || > (LIBCURL_SSL_CA_CERTIFICATES && LIBCURL_SSL_CA_CERTIFICATES_PATH) > diff --git a/rules/libcurl.make b/rules/libcurl.make > index 5620ba2767e7..7a915dce32f7 100644 > --- a/rules/libcurl.make > +++ b/rules/libcurl.make > @@ -89,15 +89,15 @@ LIBCURL_CONF_OPT := \ > --without-brotli \ > --without-zstd \ > --without-gssapi \ > - --with-default-ssl-backend=$(call ptx/ifdef, > PTXCONF_LIBCURL_SSL,openssl,no) \ > + --with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) \ > --without-winssl \ > --without-schannel \ > --without-darwinssl \ > --without-secure-transport \ > --without-amissl \ > - --with-ssl=$(call ptx/ifdef, PTXCONF_LIBCURL_SSL,$(SYSROOT)/usr,no) \ > + --with-ssl=$(call ptx/ifdef, > PTXCONF_LIBCURL_SSL_OPENSSL,$(SYSROOT)/usr,no) \ > --with-random=/dev/urandom \ > - --without-gnutls \ > + --with-gnutls=$(call ptx/ifdef, > PTXCONF_LIBCURL_SSL_GNUTLS,$(SYSROOT)/usr,no) \ > --without-mbedtls \ > --without-wolfssl \ > --without-mesalink \ _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
