net-misc/curl: Sync with Gentoo

It's from Gentoo commit bc57bee3e73decce0bce78f3636228969749b1cc.
This commit is contained in:
Flatcar Buildbot 2022-12-12 07:15:11 +00:00
parent 07bcf8ae60
commit 621d335329
2 changed files with 15 additions and 4 deletions

View File

@ -13,8 +13,8 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
LICENSE="curl" LICENSE="curl"
SLOT="0" SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl" IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls"
IUSE+=" nghttp3 quiche" IUSE+=" nghttp3 quiche"
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
@ -26,6 +26,7 @@ REQUIRED_USE="
curl_ssl_mbedtls curl_ssl_mbedtls
curl_ssl_nss curl_ssl_nss
curl_ssl_openssl curl_ssl_openssl
curl_ssl_rustls
) )
)" )"
@ -52,6 +53,9 @@ RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
dev-libs/nss-pem dev-libs/nss-pem
app-misc/ca-certificates app-misc/ca-certificates
) )
rustls? (
net-libs/rustls-ffi:=[${MULTILIB_USEDEP}]
)
) )
http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
nghttp3? ( nghttp3? (
@ -116,7 +120,7 @@ multilib_src_configure() {
myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
#myconf+=( --without-default-ssl-backend ) #myconf+=( --without-default-ssl-backend )
if use ssl ; then if use ssl ; then
myconf+=( --without-gnutls --without-mbedtls --without-nss ) myconf+=( --without-gnutls --without-mbedtls --without-nss --without-rustls )
if use gnutls || use curl_ssl_gnutls; then if use gnutls || use curl_ssl_gnutls; then
einfo "SSL provided by gnutls" einfo "SSL provided by gnutls"
@ -134,6 +138,10 @@ multilib_src_configure() {
einfo "SSL provided by openssl" einfo "SSL provided by openssl"
myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
fi fi
if use rustls || use curl_ssl_rustls; then
einfo "SSL provided by rustls"
myconf+=( --with-rustls )
fi
if use curl_ssl_gnutls; then if use curl_ssl_gnutls; then
einfo "Default SSL provided by gnutls" einfo "Default SSL provided by gnutls"
@ -147,6 +155,9 @@ multilib_src_configure() {
elif use curl_ssl_openssl; then elif use curl_ssl_openssl; then
einfo "Default SSL provided by openssl" einfo "Default SSL provided by openssl"
myconf+=( --with-default-ssl-backend=openssl ) myconf+=( --with-default-ssl-backend=openssl )
elif use curl_ssl_rustls; then
einfo "Default SSL provided by rustls"
myconf+=( --with-default-ssl-backend=rustls )
else else
eerror "We can't be here because of REQUIRED_USE." eerror "We can't be here because of REQUIRED_USE."
fi fi
@ -224,7 +235,6 @@ multilib_src_configure() {
$(use_with nghttp3 ngtcp2) $(use_with nghttp3 ngtcp2)
$(use_with quiche) $(use_with quiche)
$(use_with rtmp librtmp) $(use_with rtmp librtmp)
--without-rustls
--without-schannel --without-schannel
--without-secure-transport --without-secure-transport
$(use_enable websockets) $(use_enable websockets)

View File

@ -22,6 +22,7 @@
<flag name="pop3">Enable Post Office Protocol 3 support</flag> <flag name="pop3">Enable Post Office Protocol 3 support</flag>
<flag name="progress-meter">Enable the progress meter</flag> <flag name="progress-meter">Enable the progress meter</flag>
<flag name="rtmp">Enable RTMP Streaming Media support</flag> <flag name="rtmp">Enable RTMP Streaming Media support</flag>
<flag name="rustls">Enable Rustls ssl backend</flag>
<flag name="smtp">Enable Simple Mail Transfer Protocol support</flag> <flag name="smtp">Enable Simple Mail Transfer Protocol support</flag>
<flag name="ssh">Enable SSH urls in curl using libssh2</flag> <flag name="ssh">Enable SSH urls in curl using libssh2</flag>
<flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag> <flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag>