diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
commit | 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch) | |
tree | b9791a06ab3284e27b568412c59316c66240c682 /net-misc/curl | |
parent | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff) |
gentoo resync : 22.12.2021
Diffstat (limited to 'net-misc/curl')
-rw-r--r-- | net-misc/curl/Manifest | 2 | ||||
-rw-r--r-- | net-misc/curl/curl-7.80.0.ebuild | 20 |
2 files changed, 4 insertions, 18 deletions
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 2bbcc1c25727..420b5398f49a 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -3,5 +3,5 @@ AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8 DIST curl-7.79.1.tar.xz 2465212 BLAKE2B 2b694f96661c0aa0a136fdae4159e0ca8e811557c5a1f0b47cccaaad122f3ddbdaa6450c3835290955baf9357e872ee105a8cb0912064af3d3e38d16beb124ad SHA512 1edb71647a7f4dbb070baf1a019b4751aefeda793ff523c504410bb5cc74e5bffc52f20dd889697d1585f9ca3c4e81b1a9caadd182c30c8358ffd25f33e4db4d DIST curl-7.80.0.tar.xz 2474492 BLAKE2B 0452ecb6943bc56b20ad8f1223135c9cae68cf31089b0e17e84d81af98dc5a47f5edfc271c5b4c23f232db6cea7ff5a9bffa9c7c319255d9afdb06fa5b8f761f SHA512 e04ddd74b0d5b3607a29bcf5d379d83a01c7dffa4ad3e2f25d8c85a3df7dbdb0625b0df1f04f02351695674502828e0e17e8b46c889cbf1e43f86d6e6dd716ab EBUILD curl-7.79.1.ebuild 7976 BLAKE2B c357b42732f1cd78231236fba09d431ab43feaa62601287f06d5a6254c1978d009a75d7df341837c1d192e1f3610fd6adcf4a50a07a9a58a5e96c301d3bad797 SHA512 3e97838ef17a7cc0bd45f258f1fddf22a1ba8b263860637c580d8aee3a8fccb91e75fbdd3fd9957e300a55ab26e548f9bcc95694341c17d8c4fe1e2de3793cb3 -EBUILD curl-7.80.0.ebuild 7967 BLAKE2B 1cb4782621e80352d52694bc8fce8acae5ff9155aca27c75725aa10b91e56b8d6090eb0fd8a126a87cdbe0dff34b13132ffbadd1f175947b4fefb2c403acbf27 SHA512 d5837104cc05e701fe7d7979a5907502ad874d78949426ea778344d5a70df27c20ee464f465cb317264b1fc3ce3c0758276b17c72b7e7f2e7582db845ecbda58 +EBUILD curl-7.80.0.ebuild 7525 BLAKE2B be1ff7440c5c3468bc50c9fe8b3935a6452725afdbc07b73dd167147fb3c346d3e5be89f8544241b0acbf42212b4ea7a6d803cde5ef04bf762416f7081f6e46d SHA512 070d9611fb4ecc21811040f9d742156dd5e343fd6f5dbf6a281b5081e87bc69d09727bede3060390194c0576b320e6e82266f23ab722143d91145582fdee1ed4 MISC metadata.xml 2050 BLAKE2B a795f1af5b0945a936d279317ac89de2c32ca0e0512ccbd5d19acd29d82415d6c8e4ea4480150de8910b0a1c5e7ce4260b3c26f5f720a4ec828c4d78f6d40adf SHA512 add740cc284bd6912dcd4beb1d706cbfde85ff9859032b9706dddb69dbd5df613043f8e2b1fe634700b97a92cd6a953908486ec9b7b1564a16ecbec2c48b5dfd diff --git a/net-misc/curl/curl-7.80.0.ebuild b/net-misc/curl/curl-7.80.0.ebuild index 261d977f06d5..eb15e98757d7 100644 --- a/net-misc/curl/curl-7.80.0.ebuild +++ b/net-misc/curl/curl-7.80.0.ebuild @@ -12,15 +12,14 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" LICENSE="curl" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 threads winssl zstd" -IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" +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 threads zstd" +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl" IUSE+=" nghttp3 quiche" IUSE+=" elibc_Winnt" # c-ares must be disabled for threads # only one default ssl provider can be enabled REQUIRED_USE=" - winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( @@ -28,7 +27,6 @@ REQUIRED_USE=" curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl - curl_ssl_winssl ) )" @@ -76,9 +74,6 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) # curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) # ) -# ssl providers to be added: -# fbopenssl $(use_with spnego) - DEPEND="${RDEPEND}" BDEPEND="dev-lang/perl virtual/pkgconfig @@ -114,7 +109,7 @@ multilib_src_configure() { # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) local myconf=() - myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) + myconf+=( --without-gnutls --without-mbedtls --without-nss --without-ssl ) myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) #myconf+=( --without-default-ssl-backend ) if use ssl ; then @@ -134,10 +129,6 @@ multilib_src_configure() { einfo "SSL provided by openssl" myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) fi - if use winssl || use curl_ssl_winssl; then - einfo "SSL provided by Windows" - myconf+=( --with-winssl ) - fi if use curl_ssl_gnutls; then einfo "Default SSL provided by gnutls" @@ -151,9 +142,6 @@ multilib_src_configure() { elif use curl_ssl_openssl; then einfo "Default SSL provided by openssl" myconf+=( --with-default-ssl-backend=openssl ) - elif use curl_ssl_winssl; then - einfo "Default SSL provided by Windows" - myconf+=( --with-default-ssl-backend=winssl ) else eerror "We can't be here because of REQUIRED_USE." fi @@ -218,7 +206,6 @@ multilib_src_configure() { --without-amissl --without-bearssl $(use_with brotli) - --without-cyassl --without-fish-functions-dir $(use_with http2 nghttp2) --without-hyper @@ -233,7 +220,6 @@ multilib_src_configure() { --without-rustls --without-schannel --without-secure-transport - --without-spnego --without-winidn --without-wolfssl --with-zlib |