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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D7F6C158086 for ; Mon, 13 Dec 2021 12:06:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CDE582BC008; Mon, 13 Dec 2021 12:06:16 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A99202BC008 for ; Mon, 13 Dec 2021 12:06:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2FC5B342E71 for ; Mon, 13 Dec 2021 12:06:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91A5722B for ; Mon, 13 Dec 2021 12:06:12 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1639397151.f37a7a6d03f9f5e75fd435132cea0a3a58669784.blueness@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.80.0.ebuild X-VCS-Directories: net-misc/curl/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: f37a7a6d03f9f5e75fd435132cea0a3a58669784 X-VCS-Branch: master Date: Mon, 13 Dec 2021 12:06:12 +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: e0c7398b-bdbc-4092-87b4-8fa11be0cced X-Archives-Hash: c05371b3c92add7b572091bca5621ff1 commit: f37a7a6d03f9f5e75fd435132cea0a3a58669784 Author: Anthony G. Basile gentoo org> AuthorDate: Mon Dec 13 12:05:51 2021 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon Dec 13 12:05:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f37a7a6d net-misc/curl: remove deprecated configure options Closes: https://bugs.gentoo.org/828553 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Anthony G. Basile gentoo.org> net-misc/curl/curl-7.80.0.ebuild | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) 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