From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 870211382C5 for ; Sun, 2 May 2021 11:38:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD980E083B; Sun, 2 May 2021 11:38:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AE978E083B for ; Sun, 2 May 2021 11:38:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 721A8340CC9 for ; Sun, 2 May 2021 11:38:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F7F766A for ; Sun, 2 May 2021 11:38:31 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1619955458.cc398545cb7b4475548fa805353e16405bbdf467.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/curl/curl-7.74.0-r2.ebuild X-VCS-Directories: net-misc/curl/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: cc398545cb7b4475548fa805353e16405bbdf467 X-VCS-Branch: master Date: Sun, 2 May 2021 11:38:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 775a143e-38a3-461a-8761-2862a40c539b X-Archives-Hash: e5d0ef94e14a6e31d2b236713af4ac54 commit: cc398545cb7b4475548fa805353e16405bbdf467 Author: Mikle Kolyada gentoo org> AuthorDate: Sun May 2 11:37:38 2021 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Sun May 2 11:37:38 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc398545 net-misc/curl: remove libressl support Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Mikle Kolyada gentoo.org> net-misc/curl/curl-7.74.0-r2.ebuild | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/net-misc/curl/curl-7.74.0-r2.ebuild b/net-misc/curl/curl-7.74.0-r2.ebuild index 8b9f7cd2598..e5b102b31a7 100644 --- a/net-misc/curl/curl-7.74.0-r2.ebuild +++ b/net-misc/curl/curl-7.74.0-r2.ebuild @@ -13,8 +13,8 @@ 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" 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 libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd" -IUSE+=" curl_ssl_gnutls curl_ssl_libressl 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 metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl 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+=" nghttp3 quiche" IUSE+=" elibc_Winnt" @@ -34,8 +34,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) app-misc/ca-certificates ) openssl? ( - !libressl? ( dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] ) + dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] ) nss? ( dev-libs/nss:0[${MULTILIB_USEDEP}] @@ -82,7 +81,6 @@ REQUIRED_USE=" ssl? ( ^^ ( curl_ssl_gnutls - curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl @@ -136,7 +134,7 @@ multilib_src_configure() { einfo "SSL provided by nss" myconf+=( --with-nss ) fi - if use openssl || use curl_ssl_openssl || use curl_ssl_libressl; then + if use openssl || use curl_ssl_openssl; then einfo "SSL provided by openssl" myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) fi @@ -148,9 +146,6 @@ multilib_src_configure() { if use curl_ssl_gnutls; then einfo "Default SSL provided by gnutls" myconf+=( --with-default-ssl-backend=gnutls ) - elif use curl_ssl_libressl; then - einfo "Default SSL provided by LibreSSL" - myconf+=( --with-default-ssl-backend=openssl ) # NOTE THE HACK HERE elif use curl_ssl_mbedtls; then einfo "Default SSL provided by mbedtls" myconf+=( --with-default-ssl-backend=mbedtls )