| 1 |
commit: cc398545cb7b4475548fa805353e16405bbdf467 |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 2 11:37:38 2021 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 2 11:37:38 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc398545 |
| 7 |
|
| 8 |
net-misc/curl: remove libressl support |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
| 11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 12 |
|
| 13 |
net-misc/curl/curl-7.74.0-r2.ebuild | 13 ++++--------- |
| 14 |
1 file changed, 4 insertions(+), 9 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-misc/curl/curl-7.74.0-r2.ebuild b/net-misc/curl/curl-7.74.0-r2.ebuild |
| 17 |
index 8b9f7cd2598..e5b102b31a7 100644 |
| 18 |
--- a/net-misc/curl/curl-7.74.0-r2.ebuild |
| 19 |
+++ b/net-misc/curl/curl-7.74.0-r2.ebuild |
| 20 |
@@ -13,8 +13,8 @@ LICENSE="curl" |
| 21 |
SLOT="0" |
| 22 |
#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" |
| 23 |
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" |
| 24 |
-IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd" |
| 25 |
-IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" |
| 26 |
+IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd" |
| 27 |
+IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" |
| 28 |
IUSE+=" nghttp3 quiche" |
| 29 |
IUSE+=" elibc_Winnt" |
| 30 |
|
| 31 |
@@ -34,8 +34,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) |
| 32 |
app-misc/ca-certificates |
| 33 |
) |
| 34 |
openssl? ( |
| 35 |
- !libressl? ( dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] ) |
| 36 |
- libressl? ( dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] ) |
| 37 |
+ dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] |
| 38 |
) |
| 39 |
nss? ( |
| 40 |
dev-libs/nss:0[${MULTILIB_USEDEP}] |
| 41 |
@@ -82,7 +81,6 @@ REQUIRED_USE=" |
| 42 |
ssl? ( |
| 43 |
^^ ( |
| 44 |
curl_ssl_gnutls |
| 45 |
- curl_ssl_libressl |
| 46 |
curl_ssl_mbedtls |
| 47 |
curl_ssl_nss |
| 48 |
curl_ssl_openssl |
| 49 |
@@ -136,7 +134,7 @@ multilib_src_configure() { |
| 50 |
einfo "SSL provided by nss" |
| 51 |
myconf+=( --with-nss ) |
| 52 |
fi |
| 53 |
- if use openssl || use curl_ssl_openssl || use curl_ssl_libressl; then |
| 54 |
+ if use openssl || use curl_ssl_openssl; then |
| 55 |
einfo "SSL provided by openssl" |
| 56 |
myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
| 57 |
fi |
| 58 |
@@ -148,9 +146,6 @@ multilib_src_configure() { |
| 59 |
if use curl_ssl_gnutls; then |
| 60 |
einfo "Default SSL provided by gnutls" |
| 61 |
myconf+=( --with-default-ssl-backend=gnutls ) |
| 62 |
- elif use curl_ssl_libressl; then |
| 63 |
- einfo "Default SSL provided by LibreSSL" |
| 64 |
- myconf+=( --with-default-ssl-backend=openssl ) # NOTE THE HACK HERE |
| 65 |
elif use curl_ssl_mbedtls; then |
| 66 |
einfo "Default SSL provided by mbedtls" |
| 67 |
myconf+=( --with-default-ssl-backend=mbedtls ) |
Archives