[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/

2024-05-22 Thread Matt Jolly 
commit: cab1437c13dadf532dca4697e6f3402043bfefae
Author: Matt Jolly  gentoo  org>
AuthorDate: Wed May 22 11:46:01 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Wed May 22 13:17:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cab1437c

net-misc/curl: 8.8.0: fix builds with mbedtls 2.x

- Drop `--disable-ntlm-wb` from configure options
- Bring minimum versions in line with 8.8.0/current master
- Update live template to match

Closes: https://bugs.gentoo.org/932442
Closes: https://bugs.gentoo.org/932443
Signed-off-by: Matt Jolly  gentoo.org>

 net-misc/curl/curl-8.8.0.ebuild  |  2 +-
 net-misc/curl/curl-.ebuild   | 10 +++
 net-misc/curl/files/curl-8.8.0-mbedtls.patch | 42 
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/net-misc/curl/curl-8.8.0.ebuild b/net-misc/curl/curl-8.8.0.ebuild
index 2f3f1a6fc7ae..3910b39f6284 100644
--- a/net-misc/curl/curl-8.8.0.ebuild
+++ b/net-misc/curl/curl-8.8.0.ebuild
@@ -135,6 +135,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-prefix-2.patch
"${FILESDIR}"/${PN}-respect-cflags-3.patch
"${FILESDIR}"/${P}-install-manpage.patch
+   "${FILESDIR}"/${P}-mbedtls.patch
 )
 
 src_prepare() {
@@ -221,7 +222,6 @@ multilib_src_configure() {
$(use_enable ldap)
$(use_enable ldap ldaps)
--enable-ntlm
-   --disable-ntlm-wb
$(use_enable pop3)
--enable-rt
--enable-rtsp

diff --git a/net-misc/curl/curl-.ebuild b/net-misc/curl/curl-.ebuild
index 3edcf42e2eb6..ce9a18e91913 100644
--- a/net-misc/curl/curl-.ebuild
+++ b/net-misc/curl/curl-.ebuild
@@ -63,15 +63,15 @@ REQUIRED_USE="
 
 RDEPEND="
>=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
-   adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] )
+   adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] )
idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
nghttp3? (
-   >=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}]
-   >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
+   >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}]
+   >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
)
psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
@@ -90,7 +90,7 @@ RDEPEND="

>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
)
rustls? (
-   net-libs/rustls-ffi:=[${MULTILIB_USEDEP}]
+   >=net-libs/rustls-ffi-0.13.0:=[${MULTILIB_USEDEP}]
)
)
zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
@@ -134,6 +134,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 PATCHES=(
"${FILESDIR}"/${PN}-prefix-2.patch
"${FILESDIR}"/${PN}-respect-cflags-3.patch
+   "${FILESDIR}"/${P}-install-manpage.patch
 )
 
 src_prepare() {
@@ -220,7 +221,6 @@ multilib_src_configure() {
$(use_enable ldap)
$(use_enable ldap ldaps)
--enable-ntlm
-   --disable-ntlm-wb
$(use_enable pop3)
--enable-rt
--enable-rtsp

diff --git a/net-misc/curl/files/curl-8.8.0-mbedtls.patch 
b/net-misc/curl/files/curl-8.8.0-mbedtls.patch
new file mode 100644
index ..8fa4d6ef7cfe
--- /dev/null
+++ b/net-misc/curl/files/curl-8.8.0-mbedtls.patch
@@ -0,0 +1,42 @@
+https://github.com/curl/curl/pull/13749
+From: Stefan Eissing 
+Date: Wed, 22 May 2024 14:44:56 +0200
+Subject: [PATCH] mbedtls, check version for cipher id
+
+- mbedtls_ssl_get_ciphersuite_id_from_ssl() seems to have
+  been added in mbedtls 3.2.0. Check for that version.
+--- a/lib/vtls/mbedtls.c
 b/lib/vtls/mbedtls.c
+@@ -902,8 +902,6 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct 
Curl_easy *data)
+ (struct mbed_ssl_backend_data *)connssl->backend;
+   struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);
+   const mbedtls_x509_crt *peercert;
+-  char cipher_str[64];
+-  uint16_t cipher_id;
+ #ifndef CURL_DISABLE_PROXY
+   const char * const pinnedpubkey = Curl_ssl_cf_is_proxy(cf)?
+ data->set.str[STRING_SSL_PINNEDPUBLICKEY_PROXY]:
+@@ -932,11 +930,18 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct 
Curl_easy *data)
+ return CURLE_SSL_CONNECT_ERROR;
+   }
+ 
+-  cipher_id = (uint16_t)
+-  mbedtls_ssl_get_ciphersuite_id_from_ssl(&backend->ssl);
+-  mbed_cipher_suite_get_str(cipher_id, cipher_str, sizeof(cipher_str), true);
+-  infof(data, "mbedTLS: Handshak

[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/

2024-05-22 Thread Matt Jolly 
commit: 0adfd81907a2639d33dee2483265dc545d728542
Author: Matt Jolly  gentoo  org>
AuthorDate: Wed May 22 06:56:27 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Wed May 22 07:02:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0adfd819

net-misc/curl: drop 8.6.0-r2

Signed-off-by: Matt Jolly  gentoo.org>

 net-misc/curl/Manifest |   2 -
 net-misc/curl/curl-8.6.0-r2.ebuild | 367 -
 net-misc/curl/files/curl-8.6.0-rustls-fixes.patch  | 252 --
 ...s-revert-receive-max-buffer-add-test-case.patch |  68 
 4 files changed, 689 deletions(-)

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 197b1b91243d..f8c5cc52869e 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,7 +1,5 @@
 DIST curl-8.5.0.tar.xz 2658520 BLAKE2B 
cfd591f9703b9c63712dbe74494b05a80ce5a4fc4f8fc0fbf57058578eed5f33d71277f688d5d9f409bcd82e3a4cacaa5615a44f2a7c554559c6be7dd5188893
 SHA512 
acffa2cf61d9b8e4188575a1b40227da8d722df2e5fe8bb82a222b4eb2fd64bf8aebd90852ce050c79fb5e517d5cee2546bf7de92ede1dd394263e231cb741a3
 DIST curl-8.5.0.tar.xz.asc 488 BLAKE2B 
d706c401aecf345398411b94c87b8f1ecc752d73d24e1a578c8c0e62732e8e476333a2a4772428c6425eb0d124b1ceee8e377cf41d60a54b6f2df50b9f23
 SHA512 
9c6a2e61860878cd731d951fac1bb52cd314db20439a5173a95b48da1742737e02bfb9978d65e25de6535f839e281235203599a29f252e78e0d7a83769727329
-DIST curl-8.6.0.tar.xz 2630108 BLAKE2B 
1b01de396008d57e154e2b5fc1acf1dd000703fa5d70b913dafea5487f0166bd8fdb63eee5c9b5af08a1ca40dd026144a791016f67c2395fcfc9c6b555929034
 SHA512 
359c08d88a5dec441255b36afe1a821730eca0ca8800ba52f57132b9e7d21f32457623907b4ae4876904b5e505eb1a59652372bb7de8dbd8db429dae9785e036
-DIST curl-8.6.0.tar.xz.asc 488 BLAKE2B 
18d7583a9aa6a278bea5a8a74461ff06f45ec418cd4542b015c74091c353b340afcc5dfe7e5e99f0b9fac7de9251164044a85e4f6665bf042636868a2c613d0a
 SHA512 
2b835bb4b307e5e1c929b7136c5acfb9f6f06efa471ac27060336cabcfac40e02143f40434986c5e6817d4a9562b09efa8ff3168beed310a45453148cc1b5c8f
 DIST curl-8.7.1.tar.xz 2707016 BLAKE2B 
a2a9f48d0b69c0d92fcbbda535ce55082a5243abe3ab2db80d6fa3f32fb2c98b65026d69fc45c94e966398cf9ba8d9c95b6b91f4768b54749ed3275dd21838ef
 SHA512 
5bbde9d5648e9226f5490fa951690aaf159149345f3a315df2ba58b2468f3e59ca32e8a49734338afc861803a4f81caac6d642a4699b72c6310ebfb1f618aad2
 DIST curl-8.7.1.tar.xz.asc 488 BLAKE2B 
1c91d116aecc8e98d8ec3aad68b7c96f11151e6c2716f531e5d2989e9b6b1199e180603673891d7967cdcdaee1d6b5e15160ccabe9b51590e2887022db03c2ed
 SHA512 
f98c393997c4a32f545a8982226e8cd612395210915a4576c2ce227d0f650cff341be7bf15e989d1789abf32ac4fd9c190b9250b81e650b569e8532048746b37
 DIST curl-8.8.0.tar.xz 2748860 BLAKE2B 
c14903bad4cbd1752a5335afa6bcc78be1a484692fce0e0a6c2061963e0e6b4e56defb8332cef32d0dbddb481ad0443b71faf3a52a6e9d945c89ecbce373d2a3
 SHA512 
9d2c0d3a0d8f6c31ba4fabe48f801910f886fde43dc198dc4213708d6967ed5e040a1bb7348aa1cb126577ee508a3ec36fe65256d027d861d6ffb70f6383967a

diff --git a/net-misc/curl/curl-8.6.0-r2.ebuild 
b/net-misc/curl/curl-8.6.0-r2.ebuild
deleted file mode 100644
index c31bf46b91d8..
--- a/net-misc/curl/curl-8.6.0-r2.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
-inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs 
verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.se/";
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/curl/curl.git";
-else
-   SRC_URI="
-   https://curl.se/download/${P}.tar.xz
-   verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
-   "
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
-fi
-
-LICENSE="BSD curl ISC test? ( BSD-4 )"
-SLOT="0"
-IUSE="+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos 
ldap mbedtls nghttp3 +openssl +pop3"
-IUSE+=" +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs 
test telnet +tftp websockets zstd"
-# These select the default SSL implementation
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
-RESTRICT="!test? ( test )"
-
-# Only one default ssl provider can be enabled
-# The default ssl provider needs its USE satisfied
-# nghttp3 = https://bugs.gentoo.org/912029
-REQUIRED_USE="
-   ssl? (
-   ^^ (
-   curl_ssl_gnutls
-   curl_ssl_mbedtls
-   curl_ssl_openssl
-   curl_ssl_rustls
-   )
-   )
-   curl_ssl_gnutls? ( gnutls )
-   curl_ssl_mbedtls? ( mbedtls )
-   curl_ssl_openssl? ( openssl )
-   curl_ssl_rustls? ( rustls )

[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/

2024-05-22 Thread Matt Jolly 
commit: 7400529078754306ac09a433677165cb5c966353
Author: Matt Jolly  gentoo  org>
AuthorDate: Wed May 22 06:58:02 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Wed May 22 07:02:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74005290

net-misc/curl: drop 8.5.0-r3

Signed-off-by: Matt Jolly  gentoo.org>

 net-misc/curl/Manifest |   2 -
 net-misc/curl/curl-8.5.0-r3.ebuild | 370 -
 .../curl/files/curl-8.5.0-ipv6-configure-c99.patch |  31 --
 ...curl-8.5.0-mpd-stream-http-adjust_pollset.patch |  69 
 4 files changed, 472 deletions(-)

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index f8c5cc52869e..a42c74f10ce3 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,5 +1,3 @@
-DIST curl-8.5.0.tar.xz 2658520 BLAKE2B 
cfd591f9703b9c63712dbe74494b05a80ce5a4fc4f8fc0fbf57058578eed5f33d71277f688d5d9f409bcd82e3a4cacaa5615a44f2a7c554559c6be7dd5188893
 SHA512 
acffa2cf61d9b8e4188575a1b40227da8d722df2e5fe8bb82a222b4eb2fd64bf8aebd90852ce050c79fb5e517d5cee2546bf7de92ede1dd394263e231cb741a3
-DIST curl-8.5.0.tar.xz.asc 488 BLAKE2B 
d706c401aecf345398411b94c87b8f1ecc752d73d24e1a578c8c0e62732e8e476333a2a4772428c6425eb0d124b1ceee8e377cf41d60a54b6f2df50b9f23
 SHA512 
9c6a2e61860878cd731d951fac1bb52cd314db20439a5173a95b48da1742737e02bfb9978d65e25de6535f839e281235203599a29f252e78e0d7a83769727329
 DIST curl-8.7.1.tar.xz 2707016 BLAKE2B 
a2a9f48d0b69c0d92fcbbda535ce55082a5243abe3ab2db80d6fa3f32fb2c98b65026d69fc45c94e966398cf9ba8d9c95b6b91f4768b54749ed3275dd21838ef
 SHA512 
5bbde9d5648e9226f5490fa951690aaf159149345f3a315df2ba58b2468f3e59ca32e8a49734338afc861803a4f81caac6d642a4699b72c6310ebfb1f618aad2
 DIST curl-8.7.1.tar.xz.asc 488 BLAKE2B 
1c91d116aecc8e98d8ec3aad68b7c96f11151e6c2716f531e5d2989e9b6b1199e180603673891d7967cdcdaee1d6b5e15160ccabe9b51590e2887022db03c2ed
 SHA512 
f98c393997c4a32f545a8982226e8cd612395210915a4576c2ce227d0f650cff341be7bf15e989d1789abf32ac4fd9c190b9250b81e650b569e8532048746b37
 DIST curl-8.8.0.tar.xz 2748860 BLAKE2B 
c14903bad4cbd1752a5335afa6bcc78be1a484692fce0e0a6c2061963e0e6b4e56defb8332cef32d0dbddb481ad0443b71faf3a52a6e9d945c89ecbce373d2a3
 SHA512 
9d2c0d3a0d8f6c31ba4fabe48f801910f886fde43dc198dc4213708d6967ed5e040a1bb7348aa1cb126577ee508a3ec36fe65256d027d861d6ffb70f6383967a

diff --git a/net-misc/curl/curl-8.5.0-r3.ebuild 
b/net-misc/curl/curl-8.5.0-r3.ebuild
deleted file mode 100644
index 1ea9264041c8..
--- a/net-misc/curl/curl-8.5.0-r3.ebuild
+++ /dev/null
@@ -1,370 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
-inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs 
verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.se/";
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/curl/curl.git";
-else
-   SRC_URI="
-   https://curl.se/download/${P}.tar.xz
-   verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
-   "
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
-fi
-
-LICENSE="BSD curl ISC test? ( BSD-4 )"
-SLOT="0"
-IUSE="+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos 
ldap mbedtls nghttp3 +openssl +pop3"
-IUSE+=" +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs 
test telnet +tftp websockets zstd"
-# These select the default SSL implementation
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
-RESTRICT="!test? ( test )"
-
-# Only one default ssl provider can be enabled
-# The default ssl provider needs its USE satisfied
-# nghttp3 = https://bugs.gentoo.org/912029
-REQUIRED_USE="
-   ssl? (
-   ^^ (
-   curl_ssl_gnutls
-   curl_ssl_mbedtls
-   curl_ssl_openssl
-   curl_ssl_rustls
-   )
-   )
-   curl_ssl_gnutls? ( gnutls )
-   curl_ssl_mbedtls? ( mbedtls )
-   curl_ssl_openssl? ( openssl )
-   curl_ssl_rustls? ( rustls )
-   nghttp3? (
-   !openssl
-   alt-svc )
-"
-
-# cURL's docs and CI/CD are great resources for confirming supported versions
-# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
-# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core 
dependencies + minimum versions)
-# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a 
feature that moves quickly)
-# - 
https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml 
(CI/CD for TCP/2)
-# However 'supported' vs 'works' are two entirely different things; be sane but
-# don't be afraid

[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/

2024-03-31 Thread Matt Jolly 
commit: 2ebfd9734347ec5157a6eb74524eeaf036d7509f
Author: Matt Jolly  gentoo  org>
AuthorDate: Sun Mar 31 22:46:34 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Mon Apr  1 03:53:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ebfd973

net-misc/curl: add 8.7.1-r1

Revbump to fix some runtime issues resulting from a
subtle order-of-operations error in rustls detection via
pkgconfig.

Bug: https://bugs.gentoo.org/928236
Signed-off-by: Matt Jolly  gentoo.org>

 net-misc/curl/curl-8.7.1-r1.ebuild| 369 ++
 net-misc/curl/files/curl-8.7.1-rustls-fixes.patch |  49 +++
 2 files changed, 418 insertions(+)

diff --git a/net-misc/curl/curl-8.7.1-r1.ebuild 
b/net-misc/curl/curl-8.7.1-r1.ebuild
new file mode 100644
index ..e75203f0ef3f
--- /dev/null
+++ b/net-misc/curl/curl-8.7.1-r1.ebuild
@@ -0,0 +1,369 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
+inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs 
verify-sig
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.se/";
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/curl/curl.git";
+else
+   SRC_URI="
+   https://curl.se/download/${P}.tar.xz
+   verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
+   "
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+fi
+
+LICENSE="BSD curl ISC test? ( BSD-4 )"
+SLOT="0"
+IUSE="+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos 
ldap mbedtls nghttp3 +openssl +pop3"
+IUSE+=" +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs 
test telnet +tftp websockets zstd"
+# These select the default SSL implementation
+IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
+RESTRICT="!test? ( test )"
+
+# Only one default ssl provider can be enabled
+# The default ssl provider needs its USE satisfied
+# nghttp3 = https://bugs.gentoo.org/912029
+REQUIRED_USE="
+   ssl? (
+   ^^ (
+   curl_ssl_gnutls
+   curl_ssl_mbedtls
+   curl_ssl_openssl
+   curl_ssl_rustls
+   )
+   )
+   curl_ssl_gnutls? ( gnutls )
+   curl_ssl_mbedtls? ( mbedtls )
+   curl_ssl_openssl? ( openssl )
+   curl_ssl_rustls? ( rustls )
+   nghttp3? (
+   !openssl
+   alt-svc )
+"
+
+# cURL's docs and CI/CD are great resources for confirming supported versions
+# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
+# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core 
dependencies + minimum versions)
+# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a 
feature that moves quickly)
+# - 
https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml 
(CI/CD for TCP/2)
+# However 'supported' vs 'works' are two entirely different things; be sane but
+# don't be afraid to require a later version.
+
+RDEPEND="
+   >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
+   adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] )
+   brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+   http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] )
+   idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
+   kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
+   nghttp3? (
+   >=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}]
+   >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
+   )
+   psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
+   rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+   ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
+   ssl? (
+   gnutls? (
+   app-misc/ca-certificates
+   
>=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}]
+   dev-libs/nettle:=[${MULTILIB_USEDEP}]
+   )
+   mbedtls? (
+   app-misc/ca-certificates
+   net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+   )
+   openssl? (
+   
>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+   )
+   rustls? ( ||
+   (
+   ~net-libs/rustls-0.12.1:=[${MULTILIB_USEDEP}]
+   
~net-libs/rustls-ffi-0.12.2:=[${MULTILIB_USEDEP}]
+   )
+   )
+   )
+   zstd? ( app-arch/zstd:=[${MULT

[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/

2024-03-30 Thread Matt Jolly 
commit: 7046fc5e9c466101184aba00716f9c666c9ca680
Author: Matt Jolly  gentoo  org>
AuthorDate: Fri Mar 29 00:27:03 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Sun Mar 31 05:51:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7046fc5e

net-misc/curl: backport rustls detection fix

Closes: https://bugs.gentoo.org/919396
Signed-off-by: Matt Jolly  gentoo.org>

 net-misc/curl/curl-8.5.0-r3.ebuild |   2 +-
 net-misc/curl/curl-8.6.0-r1.ebuild |   3 +-
 .../curl-8.6.0-backport-rustls-detection.patch | 256 +
 3 files changed, 259 insertions(+), 2 deletions(-)

diff --git a/net-misc/curl/curl-8.5.0-r3.ebuild 
b/net-misc/curl/curl-8.5.0-r3.ebuild
index 2ec6057d272b..d9c017b22b2b 100644
--- a/net-misc/curl/curl-8.5.0-r3.ebuild
+++ b/net-misc/curl/curl-8.5.0-r3.ebuild
@@ -86,7 +86,7 @@ RDEPEND="

>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
)
rustls? (
-   net-libs/rustls-ffi:=[${MULTILIB_USEDEP}]
+   ~net-libs/rustls-ffi-0.10.0:=[${MULTILIB_USEDEP}]
)
)
zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )

diff --git a/net-misc/curl/curl-8.6.0-r1.ebuild 
b/net-misc/curl/curl-8.6.0-r1.ebuild
index ec36bfb60122..f48e3df12d7c 100644
--- a/net-misc/curl/curl-8.6.0-r1.ebuild
+++ b/net-misc/curl/curl-8.6.0-r1.ebuild
@@ -86,7 +86,7 @@ RDEPEND="

>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
)
rustls? (
-   net-libs/rustls-ffi:=[${MULTILIB_USEDEP}]
+   ~net-libs/rustls-ffi-0.10.0:=[${MULTILIB_USEDEP}]
)
)
zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
@@ -131,6 +131,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-prefix.patch
"${FILESDIR}"/${PN}-respect-cflags-3.patch
"${FILESDIR}"/${P}-vtls-revert-receive-max-buffer-add-test-case.patch
+   "${FILESDIR}"/${P}-backport-rustls-detection.patch
 )
 
 src_prepare() {

diff --git a/net-misc/curl/files/curl-8.6.0-backport-rustls-detection.patch 
b/net-misc/curl/files/curl-8.6.0-backport-rustls-detection.patch
new file mode 100644
index ..5d7b3a23c2c9
--- /dev/null
+++ b/net-misc/curl/files/curl-8.6.0-backport-rustls-detection.patch
@@ -0,0 +1,256 @@
+https://github.com/curl/curl/commit/647e86a3efe1eea7a2a456c009cfe1eb55fe48eb
+https://github.com/curl/curl/pull/13202
+From: Matt Jolly 
+Date: Fri, 29 Mar 2024 09:58:14 +1000
+Subject: [PATCH] curl-rustls.m4: add pkg-config support to rustls detection
+
+Based on the existing openssl pkg-config detection, this commit tries to
+use pkg-config to find `rustls` then falls back to the current approach
+if that fails.
+
+We use the following logic:
+
+- if no path is provided, just use pkg-config, if it's not there we have
+  a problem!
+- if a path is provided, try pkg-config
+  + if pkg-config fails, try and find rustls directly
+---
+ m4/curl-rustls.m4 | 209 --
+ 1 file changed, 145 insertions(+), 64 deletions(-)
+
+diff --git a/m4/curl-rustls.m4 b/m4/curl-rustls.m4
+index 75542e4..902327a 100644
+--- a/m4/curl-rustls.m4
 b/m4/curl-rustls.m4
+@@ -28,84 +28,165 @@ dnl check for rustls
+ dnl 
+ 
+ if test "x$OPT_RUSTLS" != xno; then
+-  _cppflags=$CPPFLAGS
+-  _ldflags=$LDFLAGS
+   ssl_msg=
+ 
+-  if test X"$OPT_RUSTLS" != Xno; then
++  dnl backup the pre-ssl variables
++  CLEANLDFLAGS="$LDFLAGS"
++  CLEANCPPFLAGS="$CPPFLAGS"
+ 
+-if test "$OPT_RUSTLS" = "yes"; then
+-  OPT_RUSTLS=""
+-fi
++  case $host_os in
++darwin*)
++  LDFLAGS="$LDFLAGS -framework Security"
++  ;;
++*)
++  ;;
++  esac
++  ## NEW CODE
+ 
+-case $host_os in
+-  darwin*)
+-LDFLAGS="$LDFLAGS -framework Security"
+-;;
+-  *)
+-;;
+-esac
+-
+-if test -z "$OPT_RUSTLS" ; then
+-  dnl check for lib first without setting any new path
+-
+-  AC_CHECK_LIB(rustls, rustls_client_session_read,
+-  dnl librustls found, set the variable
+-   [
+- AC_DEFINE(USE_RUSTLS, 1, [if rustls is enabled])
+- AC_SUBST(USE_RUSTLS, [1])
+- RUSTLS_ENABLED=1
+- USE_RUSTLS="yes"
+- ssl_msg="rustls"
+- test rustls != "$DEFAULT_SSL_BACKEND" || 
VALID_DEFAULT_SSL_BACKEND=yes
+-], [], -lpthread -ldl -lm)
+-fi
++  dnl use pkg-config unless we have been given a path
++  dnl even then, try pkg-config first
+ 
+-if test "x$USE_RUSTLS" != "xyes"; then
+-  dnl add the path and test again
+-  addld=-L$OPT_RUSTLS/lib$libsuff
+-  addcflags=-I$OPT_RUSTLS/include
+-  rustlslib=$OPT_RUSTLS/lib$libsuff
++  case "$OPT_RUSTLS" in
++yes)
++  dnl --with-rustls (without path) used
++  PKGTEST="yes"
++  PREFIX_RUSTL

[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/

2024-01-04 Thread Sam James 
commit: 2b070cd4a9b495cee874b94964391472fc795aaf
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 06:09:51 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 06:10:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b070cd4

net-misc/curl: drop 8.3.0-r2

Signed-off-by: Sam James  gentoo.org>

 net-misc/curl/Manifest |   2 -
 net-misc/curl/curl-8.3.0-r2.ebuild | 363 -
 .../curl/files/curl-8.3.0-CVE-2023-38545.patch | 136 
 .../curl/files/curl-8.3.0-CVE-2023-38546.patch | 131 
 .../curl/files/curl-8.3.0-tests-arm-musl.patch | 115 ---
 5 files changed, 747 deletions(-)

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index cf734b415f1c..7a6c28ff0f54 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,5 +1,3 @@
-DIST curl-8.3.0.tar.xz 2641764 BLAKE2B 
6875b20e27ed86f9b6ab256210d85e9fb3b39645e8be710b2e6fe29fba40220f870e06bc21e8a92244670fed0a08c7716e4806a267ede49c4ed6d66e03f5fcd4
 SHA512 
6404b4c74fe1185cb482631ca3a143996cb7298d0d8a76bfafd7696e7729c0055a069bdba782dee3f3eb273fb678a4438cb27d3deca54022878cdff83a51
-DIST curl-8.3.0.tar.xz.asc 488 BLAKE2B 
ef5a749e579710d45db9f73da0cbcb58d77a9dfe73be622536496997fa792fe5cbd0331a31f01e21cbdb36c6384dca44baa647c9f3d20effabb5bfc275b1b491
 SHA512 
b7d45722640ac50181b20a6d663168ec6eec6691c5604ddfe9c7177f07da598cb2de688c631043dc428c311774d781ccd16bd1e2fb4f038be651e3bee383aec4
 DIST curl-8.4.0.tar.xz 2658376 BLAKE2B 
ea5ebecc3c1aeac3ae8fd0cf7d8ff3298149b9c4c556fb85ed8d9310e3613228eb6fca133b0dfb9268988f93d694779fab8d53510cfa5710c1320bb6638f05eb
 SHA512 
7027dbf3b759b39d6ec9c4da58fadd254e84bb93bff599541b3bc3135bad4c2955c6237d7ddd60973f9f1a6948bc32d7e312985fb50658bc958b9f22fee74f2b
 DIST curl-8.4.0.tar.xz.asc 488 BLAKE2B 
0fd4ea46a0942b9bc440e91e8f9323bba6d0eb02fbc87c227004c90e5be14cc66bc235ab67f857b617975cdeada6ce38a647da9e0bd783e57d58f354cdb4
 SHA512 
b8b7a5b76be816e7b1552354f267f335fdc608cdadbd2c40ab44faf6450c6bbd2853b6de5c2746a1292aad33a8ee1c367380d32bb1a8282540b38c3b985a320e
 DIST curl-8.5.0.tar.xz 2658520 BLAKE2B 
cfd591f9703b9c63712dbe74494b05a80ce5a4fc4f8fc0fbf57058578eed5f33d71277f688d5d9f409bcd82e3a4cacaa5615a44f2a7c554559c6be7dd5188893
 SHA512 
acffa2cf61d9b8e4188575a1b40227da8d722df2e5fe8bb82a222b4eb2fd64bf8aebd90852ce050c79fb5e517d5cee2546bf7de92ede1dd394263e231cb741a3

diff --git a/net-misc/curl/curl-8.3.0-r2.ebuild 
b/net-misc/curl/curl-8.3.0-r2.ebuild
deleted file mode 100644
index 350d4acf5b7c..
--- a/net-misc/curl/curl-8.3.0-r2.ebuild
+++ /dev/null
@@ -1,363 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
-inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs 
verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.se/";
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/curl/curl.git";
-else
-   SRC_URI="
-   https://curl.se/download/${P}.tar.xz
-   verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
-   "
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
-fi
-
-LICENSE="BSD curl ISC test? ( BSD-4 )"
-SLOT="0"
-IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos 
ldap mbedtls +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl 
sslv3 static-libs test telnet +tftp websockets zstd"
-# These select the default SSL implementation
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
-IUSE+=" nghttp3"
-RESTRICT="!test? ( test )"
-
-# Only one default ssl provider can be enabled
-# The default ssl provider needs its USE satisfied
-# nghttp3 = https://bugs.gentoo.org/912029
-REQUIRED_USE="
-   ssl? (
-   ^^ (
-   curl_ssl_gnutls
-   curl_ssl_mbedtls
-   curl_ssl_openssl
-   curl_ssl_rustls
-   )
-   )
-   curl_ssl_gnutls? ( gnutls )
-   curl_ssl_mbedtls? ( mbedtls )
-   curl_ssl_openssl? ( openssl )
-   curl_ssl_rustls? ( rustls )
-   nghttp3? ( !openssl )
-"
-
-# cURL's docs and CI/CD are great resources for confirming supported versions
-# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
-# - https://github.com/curl/curl/blob/master/docs/HTTP3.md
-# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml
-# However 'supported' vs 'works' are two entirely different things; be sane but
-# don't be afraid to require a later version.
-
-RDEPEND="
-   sys-libs/zlib[${MULTILIB_USEDEP}]
-   adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] )
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/

2023-10-09 Thread Sam James 
commit: 29b62f5e62682ea855af2e5e80b23c8808bea507
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 10 04:29:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 10 04:29:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29b62f5e

net-misc/curl: fix tests on arm+musl

Bug: https://github.com/curl/curl/issues/11900
Signed-off-by: Sam James  gentoo.org>

 net-misc/curl/curl-8.3.0-r1.ebuild | 361 +
 .../curl/files/curl-8.3.0-tests-arm-musl.patch | 115 +++
 2 files changed, 476 insertions(+)

diff --git a/net-misc/curl/curl-8.3.0-r1.ebuild 
b/net-misc/curl/curl-8.3.0-r1.ebuild
new file mode 100644
index ..9c1c2fbb2ba4
--- /dev/null
+++ b/net-misc/curl/curl-8.3.0-r1.ebuild
@@ -0,0 +1,361 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
+inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs 
verify-sig
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.se/";
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/curl/curl.git";
+else
+   SRC_URI="
+   https://curl.se/download/${P}.tar.xz
+   verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
+   "
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+fi
+
+LICENSE="BSD curl ISC test? ( BSD-4 )"
+SLOT="0"
+IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos 
ldap mbedtls +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl 
sslv3 static-libs test telnet +tftp websockets zstd"
+# These select the default SSL implementation
+IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
+IUSE+=" nghttp3"
+RESTRICT="!test? ( test )"
+
+# Only one default ssl provider can be enabled
+# The default ssl provider needs its USE satisfied
+# nghttp3 = https://bugs.gentoo.org/912029
+REQUIRED_USE="
+   ssl? (
+   ^^ (
+   curl_ssl_gnutls
+   curl_ssl_mbedtls
+   curl_ssl_openssl
+   curl_ssl_rustls
+   )
+   )
+   curl_ssl_gnutls? ( gnutls )
+   curl_ssl_mbedtls? ( mbedtls )
+   curl_ssl_openssl? ( openssl )
+   curl_ssl_rustls? ( rustls )
+   nghttp3? ( !openssl )
+"
+
+# cURL's docs and CI/CD are great resources for confirming supported versions
+# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
+# - https://github.com/curl/curl/blob/master/docs/HTTP3.md
+# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml
+# However 'supported' vs 'works' are two entirely different things; be sane but
+# don't be afraid to require a later version.
+
+RDEPEND="
+   sys-libs/zlib[${MULTILIB_USEDEP}]
+   adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] )
+   brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+   http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] )
+   idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
+   kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   ldap? ( net-nds/openldap:=[static-libs?,${MULTILIB_USEDEP}] )
+   nghttp3? (
+   >=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}]
+   >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
+   )
+   rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+   ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+   ssl? (
+   gnutls? (
+   app-misc/ca-certificates
+   net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}]
+   dev-libs/nettle:=[${MULTILIB_USEDEP}]
+   )
+   mbedtls? (
+   app-misc/ca-certificates
+   net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+   )
+   openssl? (
+   
dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+   )
+   rustls? (
+   net-libs/rustls-ffi:=[${MULTILIB_USEDEP}]
+   )
+   )
+   zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+   dev-lang/perl
+   virtual/pkgconfig
+   test? (
+   sys-apps/diffutils
+   http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
+   nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
+   )
+   verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
+"
+
+DOCS=( CHANGES README 
docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/curl/curlbuild.h
+)
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/

2023-07-22 Thread Sam James 
commit: 931a75d893debd7a88d4b949e6a872463e798642
Author: Matt Jolly  footclan  ninja>
AuthorDate: Sat Jul 22 22:58:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 23 01:36:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=931a75d8

net-misc/curl: add 8.2.0-r1

Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Sam James  gentoo.org>

 net-misc/curl/curl-8.2.0-r1.ebuild  | 353 
 net-misc/curl/files/curl-8.2.0-basic-auth.patch | 127 +
 net-misc/curl/files/curl-8.2.0-http2-eof.patch  |  32 +++
 3 files changed, 512 insertions(+)

diff --git a/net-misc/curl/curl-8.2.0-r1.ebuild 
b/net-misc/curl/curl-8.2.0-r1.ebuild
new file mode 100644
index ..11500ccb756e
--- /dev/null
+++ b/net-misc/curl/curl-8.2.0-r1.ebuild
@@ -0,0 +1,353 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
+inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs 
verify-sig
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.se/";
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/curl/curl.git";
+else
+   SRC_URI="
+   https://curl.se/download/${P}.tar.xz
+   verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
+   "
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+fi
+
+LICENSE="curl"
+SLOT="0"
+IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos 
ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl 
sslv3 static-libs test telnet +tftp websockets zstd"
+# These select the default SSL implementation
+IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl 
curl_ssl_rustls"
+IUSE+=" nghttp3"
+RESTRICT="!test? ( test )"
+
+# Only one default ssl provider can be enabled
+# The default ssl provider needs its USE satisfied
+REQUIRED_USE="
+   ssl? (
+   ^^ (
+   curl_ssl_gnutls
+   curl_ssl_mbedtls
+   curl_ssl_nss
+   curl_ssl_openssl
+   curl_ssl_rustls
+   )
+   )
+   curl_ssl_gnutls? ( gnutls )
+   curl_ssl_mbedtls? ( mbedtls )
+   curl_ssl_nss? ( nss )
+   curl_ssl_openssl? ( openssl )
+   curl_ssl_rustls? ( rustls )
+"
+
+RDEPEND="
+   sys-libs/zlib[${MULTILIB_USEDEP}]
+   adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] )
+   brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+   http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] )
+   idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
+   kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+   nghttp3? (
+   net-libs/nghttp3[${MULTILIB_USEDEP}]
+   net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+   )
+   rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+   ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+   ssl? (
+   gnutls? (
+   app-misc/ca-certificates
+   net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}]
+   dev-libs/nettle:=[${MULTILIB_USEDEP}]
+   )
+   mbedtls? (
+   app-misc/ca-certificates
+   net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+   )
+   nss? (
+   app-misc/ca-certificates
+   dev-libs/nss[${MULTILIB_USEDEP}]
+   dev-libs/nss-pem
+   )
+   openssl? (
+   
dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+   )
+   rustls? (
+   net-libs/rustls-ffi:=[${MULTILIB_USEDEP}]
+   )
+   )
+   zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   dev-lang/perl
+   virtual/pkgconfig
+   test? (
+   sys-apps/diffutils
+   http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
+   nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
+   )
+   verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
+"
+
+DOCS=( CHANGES README 
docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+   /usr/bin/curl-config
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+   __builtin_available
+   closesocket
+   CloseSocket
+   getpass_r
+   ioctlsocket
+   IoctlSocket
+   mach_absolute_time
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/

2023-05-25 Thread Sam James 
commit: 3cb247e73e86b39815c50982f328562151af7ad8
Author: Sam James  gentoo  org>
AuthorDate: Fri May 26 04:30:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 26 04:30:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cb247e7

net-misc/curl: fix hanging configure test

Signed-off-by: Sam James  gentoo.org>

 net-misc/curl/curl-8.1.1.ebuild|  1 +
 .../curl/files/curl-8.1.1-configure-compiler.patch | 73 ++
 2 files changed, 74 insertions(+)

diff --git a/net-misc/curl/curl-8.1.1.ebuild b/net-misc/curl/curl-8.1.1.ebuild
index 1f799eeab629..1240b566e376 100644
--- a/net-misc/curl/curl-8.1.1.ebuild
+++ b/net-misc/curl/curl-8.1.1.ebuild
@@ -124,6 +124,7 @@ PATCHES=(
 
### Backports
"${FILESDIR}"/${P}-hanging-http2.patch
+   "${FILESDIR}"/${P}-configure-compiler.patch
 )
 
 src_prepare() {

diff --git a/net-misc/curl/files/curl-8.1.1-configure-compiler.patch 
b/net-misc/curl/files/curl-8.1.1-configure-compiler.patch
new file mode 100644
index ..f769b35880cf
--- /dev/null
+++ b/net-misc/curl/files/curl-8.1.1-configure-compiler.patch
@@ -0,0 +1,73 @@
+The check for "basic compiler options" hangs otherwise.
+
+https://github.com/curl/curl/commit/471dab2da0c6b2b08ca2b96a1da0a4825e2c3c36
+https://github.com/curl/curl/commit/c4a019603b82a08c3572591a9393df0818ee02f6
+
+From 471dab2da0c6b2b08ca2b96a1da0a4825e2c3c36 Mon Sep 17 00:00:00 2001
+From: Christian Hesse 
+Date: Tue, 23 May 2023 09:40:18 +0200
+Subject: [PATCH] configure: quote the assignments for run-compiler
+
+Building for multilib failed, as the compiler command contains an
+extra argument. That needs quoting.
+
+Regression from b78ca50cb3dda361f9c1
+
+Fixes #11179
+Closes #11180
+--- a/configure.ac
 b/configure.ac
+@@ -193,8 +193,8 @@ dnl something different but only have that affect the 
execution of the results
+ dnl of the compile, not change the libraries for the compiler itself.
+ dnl
+ compilersh="run-compiler"
+-echo "CC=$CC" > $compilersh
+-echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $compilersh
++echo "CC=\"$CC\"" > $compilersh
++echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"" >> $compilersh
+ echo 'exec $CC $@' >> $compilersh
+ 
+ dnl **
+
+From c4a019603b82a08c3572591a9393df0818ee02f6 Mon Sep 17 00:00:00 2001
+From: Emanuele Torre 
+Date: Tue, 23 May 2023 11:59:59 +0200
+Subject: [PATCH] configure: fix build with arbitrary CC and LD_LIBRARY_PATH
+
+Since ./configure and processes that inherit its environment variables
+are the only callers of the run-compiler script, we can just save the
+current value of the LD_LIBRARY_PATH and CC variables to another pair of
+environment variables, and make run-compiler a static script that
+simply restores CC and LD_LIBRARY_PATH to the saved value, and before
+running the compiler.
+
+This avoids having to inject the values of the variables in the script,
+possibly causing problems if they contains spaces, quotes, and other
+special characters.
+
+Also add exports in the script just in case LD_LIBRARY_PATH and CC are
+not already in the environment.
+
+follow-up from 471dab2
+
+Closes #11182
+--- a/configure.ac
 b/configure.ac
+@@ -193,9 +193,13 @@ dnl something different but only have that affect the 
execution of the results
+ dnl of the compile, not change the libraries for the compiler itself.
+ dnl
+ compilersh="run-compiler"
+-echo "CC=\"$CC\"" > $compilersh
+-echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"" >> $compilersh
+-echo 'exec $CC $@' >> $compilersh
++export "CURL_SAVED_CC=$CC"
++export "CURL_SAVED_LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
++cat <<\EOF > "$compilersh"
++export "CC=$CURL_SAVED_CC"
++export "LD_LIBRARY_PATH=$CURL_SAVED_LD_LIBRARY_PATH"
++exec $CC "$@"
++EOF
+ 
+ dnl **
+ dnl See which TLS backend(s) that are requested. Just do all the
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/

2023-05-25 Thread Sam James 
commit: b5a048d520b9fe74be7d34a7e5ff7929668c359a
Author: Matt Jolly  footclan  ninja>
AuthorDate: Wed May 24 11:30:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 26 02:06:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5a048d5

net-misc/curl: add 8.1.1, 

Bugfix release for 8.1.0 which already has the important fixes
backported.

Additional `REQUIRED_USE` checks to ensure that the default SSL provider
is actually enabled.

Rename the prefix patch; it hasn't changed in a major version and won't
for a while

Closes: https://bugs.gentoo.org/905222
Closes: https://bugs.gentoo.org/742641
Closes: https://bugs.gentoo.org/750752

Signed-off-by: Matt Jolly  footclan.ninja>
Closes: https://github.com/gentoo/gentoo/pull/31152
Signed-off-by: Sam James  gentoo.org>

 net-misc/curl/Manifest |  2 +
 net-misc/curl/curl-8.0.1.ebuild|  2 +-
 net-misc/curl/curl-8.1.0-r1.ebuild |  2 +-
 .../{curl-8.1.0-r1.ebuild => curl-8.1.1.ebuild}| 46 ++
 .../curl/{curl-8.0.1.ebuild => curl-.ebuild}   | 40 ---
 net-misc/curl/files/curl-8.1.1-hanging-http2.patch | 36 +
 ...{curl-7.30.0-prefix.patch => curl-prefix.patch} |  0
 7 files changed, 94 insertions(+), 34 deletions(-)

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 23d992711598..2d5667e3574a 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -2,3 +2,5 @@ DIST curl-8.0.1.tar.xz 2575544 BLAKE2B 
67d82e9d71f0a351b5c2ed3ad5eab02e367ded872
 DIST curl-8.0.1.tar.xz.asc 488 BLAKE2B 
452e1bebe1028e7621bbf8829e50cf56e254cd63a8cf2a4c0332176b9f18fb2821304ae556a203996d273c986bddbd04db2218c18fd34dee66e9155861ba50ce
 SHA512 
92c6a0570e9a8a708fe2f717b8b37a68dcb9cd4520ca50c9baafec5891bda103bce2d2dcb67f1387bf11bd7e51e0e64ccd52d196e61d58b598ad3aa1960386cf
 DIST curl-8.1.0.tar.xz 2612568 BLAKE2B 
768a824b8f5f6ddaa073599c4106f07a8134bcbe0e0d666390be1bce16ba25386d85930853bb47bc90b2c8a499a0b2abb9c685042563801e0fe58b9c315ac6cc
 SHA512 
b99926f372ddd715cd1d2b54d8fb96b26b085e6501715e25aa57b6c6a7f8452473506ddb284e2f280f8afdb301b7f0c3bfde7ad7ed393b12c022430a9301096d
 DIST curl-8.1.0.tar.xz.asc 488 BLAKE2B 
c1a8e50eddc7dd140af2af29736eb486e96a6d3b67a9161244daa86558f65522527380c92597a5f10e5dad187f0bda6ac5b9cadc29386bef4492bc047c77b423
 SHA512 
191a74c7a6b6aa78b7f36e1535fda0701bde8b333a61c90343e1f1b2d65cc5097b5febc5fa42b2f373795ef1b34078790deaaa71c8aaa45eed1c753729a45f3d
+DIST curl-8.1.1.tar.xz 2613348 BLAKE2B 
465a3237335e73665086ac43f5c66cfbab7e9b163e1ae0e2345da82f9c736d87fccf4d76369cc069abc29621f10db7ddbf22d0337db9ca85042bb12438d4aaed
 SHA512 
d034b1ab9c00e8a0acf7ba6c6344734945d45666b4f38394f5456fcd9b22623146a897270861b7411412ca25c912e1bbf24eb139a6dfc1a8c00d098b3b925399
+DIST curl-8.1.1.tar.xz.asc 488 BLAKE2B 
c92017d0fe4933d6c27d833944c231967263607a7871a658e0cbb9de46f7df8dfbec141e269296caf17ced004fb2b237b8311ec9f7bf98f03fb405b5755950fc
 SHA512 
6a71c18d67de8c340b5d80c7452a82c00f7ef466f690eec12edcd6123aee6866e8a0e757e1cc6c9af87a63fdeaafbc9fc1b1a4e2e0fd8a75b5952d4738fd0b27

diff --git a/net-misc/curl/curl-8.0.1.ebuild b/net-misc/curl/curl-8.0.1.ebuild
index 4b4b1f3aac45..4f21364a91e4 100644
--- a/net-misc/curl/curl-8.0.1.ebuild
+++ b/net-misc/curl/curl-8.0.1.ebuild
@@ -106,7 +106,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 )
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+   "${FILESDIR}"/${PN}-prefix.patch
"${FILESDIR}"/${PN}-respect-cflags-3.patch
 
# Backports

diff --git a/net-misc/curl/curl-8.1.0-r1.ebuild 
b/net-misc/curl/curl-8.1.0-r1.ebuild
index 1121646ce126..cf964b638bcd 100644
--- a/net-misc/curl/curl-8.1.0-r1.ebuild
+++ b/net-misc/curl/curl-8.1.0-r1.ebuild
@@ -106,7 +106,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 )
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+   "${FILESDIR}"/${PN}-prefix.patch
"${FILESDIR}"/${PN}-respect-cflags-3.patch
### Backports
"${FILESDIR}"/${P}-numeric-hostname.patch

diff --git a/net-misc/curl/curl-8.1.0-r1.ebuild 
b/net-misc/curl/curl-8.1.1.ebuild
similarity index 88%
copy from net-misc/curl/curl-8.1.0-r1.ebuild
copy to net-misc/curl/curl-8.1.1.ebuild
index 1121646ce126..1f799eeab629 100644
--- a/net-misc/curl/curl-8.1.0-r1.ebuild
+++ b/net-misc/curl/curl-8.1.1.ebuild
@@ -8,20 +8,28 @@ inherit autotools multilib-minimal prefix verify-sig
 
 DESCRIPTION="A Client that groks URLs"
 HOMEPAGE="https://curl.se/";
-SRC_URI="
-   https://curl.se/download/${P}.tar.xz
-   verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
-"
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/curl/curl.git";
+else
+   SRC_URI="
+   https://curl.se/download/${P}.tar.xz
+   verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
+   "
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~

[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/

2023-03-14 Thread Sam James 
commit: f7a9dcc44364ee6ae07f6bfa4c48661736d3d05f
Author: Matt Jolly  footclan  ninja>
AuthorDate: Thu Mar  9 13:19:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 15 05:04:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a9dcc4

net-misc/curl: add 7.88.1-r2

cURL attempts to resolve .onion tlds and depending on USE flags
may leak that you're using Tor.

This commit adds the upstream patch for RFC7686 compliance a
little early as it may not make the next cURL release.

Closes: https://bugs.gentoo.org/887287

Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Sam James  gentoo.org>

 net-misc/curl/curl-7.88.1-r2.ebuild| 307 +
 .../curl/files/curl-7.88.1-onion-resolution.patch  | 132 +
 2 files changed, 439 insertions(+)

diff --git a/net-misc/curl/curl-7.88.1-r2.ebuild 
b/net-misc/curl/curl-7.88.1-r2.ebuild
new file mode 100644
index ..d1a2c5b2213a
--- /dev/null
+++ b/net-misc/curl/curl-7.88.1-r2.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools multilib-minimal prefix verify-sig
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.se/";
+SRC_URI="https://curl.se/download/${P}.tar.xz
+   verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )"
+
+LICENSE="curl"
+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"
+IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap 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 
curl_ssl_rustls"
+IUSE+=" nghttp3"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
+
+#Only one default ssl provider can be enabled
+REQUIRED_USE="
+   ssl? (
+   ^^ (
+   curl_ssl_gnutls
+   curl_ssl_mbedtls
+   curl_ssl_nss
+   curl_ssl_openssl
+   curl_ssl_rustls
+   )
+   )"
+
+# lead to lots of false negatives, bug #285669
+RESTRICT="!test? ( test )"
+
+RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+   brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+   ssl? (
+   gnutls? (
+   net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}]
+   dev-libs/nettle:=[${MULTILIB_USEDEP}]
+   app-misc/ca-certificates
+   )
+   mbedtls? (
+   net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+   app-misc/ca-certificates
+   )
+   openssl? (
+   
dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+   )
+   nss? (
+   dev-libs/nss:0[${MULTILIB_USEDEP}]
+   dev-libs/nss-pem
+   app-misc/ca-certificates
+   )
+   rustls? (
+   net-libs/rustls-ffi:=[${MULTILIB_USEDEP}]
+   )
+   )
+   http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
+   nghttp3? (
+   net-libs/nghttp3[${MULTILIB_USEDEP}]
+   net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+   )
+   idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
+   adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] )
+   kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+   ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+   sys-libs/zlib[${MULTILIB_USEDEP}]
+   zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+   virtual/pkgconfig
+   test? (
+   sys-apps/diffutils
+   http2? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
+   nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
+   )
+   verify-sig? ( sec-keys/openpgp-keys-danielstenberg )"
+
+DOCS=( CHANGES README 
docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+   /usr/bin/curl-config
+)
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+   "${FILESDIR}"/${PN}-respect-cflags-3.patch
+
+   "${FILESDIR}"/${P}-header-dump-segfault.patch
+   "${FILESDIR}"/${P}-onion-resolution.patch
+   "${FILESDIR}"/${P}-pipewait.patch
+   "${FILESDIR}"/${P}-silent-parallel.patch
+)
+
+src_prepare() {
+   default
+
+   # Some tests (HTTP/#) rely on ssl certificates that

[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/

2023-02-16 Thread Sam James 
commit: 1e51a6dbd59457ce01d377be7b04954a18a7509d
Author: Matt Jolly  footclan  ninja>
AuthorDate: Thu Feb 16 10:34:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 17 05:09:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e51a6db

net-misc/curl: drop 7.88.0

Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Sam James  gentoo.org>

 net-misc/curl/curl-7.88.0.ebuild   | 298 -
 .../files/curl-7.88.0-test-gnuserv-tls-srp.patch   |  39 ---
 .../curl-7.88.0-test-uninitialised-value.patch |  30 ---
 3 files changed, 367 deletions(-)

diff --git a/net-misc/curl/curl-7.88.0.ebuild b/net-misc/curl/curl-7.88.0.ebuild
deleted file mode 100644
index b36a1acba8ac..
--- a/net-misc/curl/curl-7.88.0.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools prefix multilib-minimal verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.se/";
-SRC_URI="https://curl.se/download/${P}.tar.xz
-   verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )"
-
-LICENSE="curl"
-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"
-IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap 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 
curl_ssl_rustls"
-IUSE+=" nghttp3"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
-
-#Only one default ssl provider can be enabled
-REQUIRED_USE="
-   ssl? (
-   ^^ (
-   curl_ssl_gnutls
-   curl_ssl_mbedtls
-   curl_ssl_nss
-   curl_ssl_openssl
-   curl_ssl_rustls
-   )
-   )"
-
-# lead to lots of false negatives, bug #285669
-RESTRICT="!test? ( test )"
-
-RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-   brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-   ssl? (
-   gnutls? (
-   net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}]
-   dev-libs/nettle:=[${MULTILIB_USEDEP}]
-   app-misc/ca-certificates
-   )
-   mbedtls? (
-   net-libs/mbedtls:=[${MULTILIB_USEDEP}]
-   app-misc/ca-certificates
-   )
-   openssl? (
-   
dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
-   )
-   nss? (
-   dev-libs/nss:0[${MULTILIB_USEDEP}]
-   dev-libs/nss-pem
-   app-misc/ca-certificates
-   )
-   rustls? (
-   net-libs/rustls-ffi:=[${MULTILIB_USEDEP}]
-   )
-   )
-   http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
-   nghttp3? (
-   net-libs/nghttp3[${MULTILIB_USEDEP}]
-   net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
-   )
-   idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
-   adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] )
-   kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-   rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-   ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
-   sys-libs/zlib[${MULTILIB_USEDEP}]
-   zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
-   virtual/pkgconfig
-   test? (
-   sys-apps/diffutils
-   )
-   verify-sig? ( sec-keys/openpgp-keys-danielstenberg )"
-
-DOCS=( CHANGES README 
docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
-
-MULTILIB_WRAPPED_HEADERS=(
-   /usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-   /usr/bin/curl-config
-)
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-   "${FILESDIR}"/${PN}-respect-cflags-3.patch
-
-   "${FILESDIR}"/${P}-test-gnuserv-tls-srp.patch
-   "${FILESDIR}"/${P}-test-uninitialised-value.patch
-)
-
-src_prepare() {
-   default
-
-   eprefixify curl-config.in
-   eautoreconf
-}
-
-multilib_src_configure() {
-   # We make use of the fact that later flags override earlier ones
-   # So start with all ssl providers off until proven otherwise
-   # TODO: in the future, we may want to add wolfssl 
(https://www.wolfssl.com/)
-   local myconf=()
-
-   myconf+=( --without-ca-fallback 
--with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-   #myconf+=( --without-default-ssl-backe

[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/

2023-02-15 Thread Sam James 
commit: 1c6ec8d4579f9fbb2b3fbfb93de2abb7893cb42f
Author: Matt Jolly  footclan  ninja>
AuthorDate: Thu Feb  9 23:37:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 16 05:08:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c6ec8d4

net-misc/curl: add 7.88.0

drop ipv6 and quiche USE

Using quiche requires building cURL with the same SSL flavour
as the quiche library (i.e. BoringSSL). This is currently
unsupported on Gentoo.

Drop `ipv6` USE; it doesn't require additional deps and `--ipv4`
can be used at runtime to force connectivity in dual-stack configurations.

Closes: https://bugs.gentoo.org/881711
Closes: https://bugs.gentoo.org/792234
Closes: https://bugs.gentoo.org/847451
Closes: https://bugs.gentoo.org/867985
Closes: https://bugs.gentoo.org/835851

Signed-off-by: Matt Jolly  footclan.ninja>
Closes: https://github.com/gentoo/gentoo/pull/29511
Signed-off-by: Sam James  gentoo.org>

 net-misc/curl/Manifest |   2 +
 net-misc/curl/curl-7.88.0.ebuild   | 298 +
 .../files/curl-7.88.0-test-gnuserv-tls-srp.patch   |  39 +++
 .../curl-7.88.0-test-uninitialised-value.patch |  30 +++
 4 files changed, 369 insertions(+)

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 51a46b81b61b..631ec92aa40b 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,2 +1,4 @@
 DIST curl-7.87.0.tar.xz 2547932 BLAKE2B 
b272ec928c5ef1728434630d8910f58834327a30570913df9d47921a2810d002bd88b81371005197db857d3a53386420c1e28b1e463e6241d46c1e50fbce0c13
 SHA512 
aa125991592667280dce3788aabe81487cf8c55b0afc59d675cc30b76055bb7114f5380b4a0e3b6461a8f81bf9812fa26d493a85f7e01d84263d484a0d699ee7
 DIST curl-7.87.0.tar.xz.asc 488 BLAKE2B 
031d8236b357bd3c519548b181254dc0aea1efc1375738bce04f4f331d35bafe99d1ca394ecf5943ede7cae040854b6d2b478fd305147eb7330f8d50e5d95c96
 SHA512 
0bcc12bafc4ae50d80128af2cf4bf1a1ec6018ebb8d5b9c49f52b51c0c25acc77e820858965656549ef43c1f923f4e5fe75b0a3523623154b4cfb9dc8a1d76e4
+DIST curl-7.88.0.tar.xz 2571564 BLAKE2B 
8fae8136a8a52c58b2860b6c3b342d59bb0c9a743f94c3ea3620cbb180f1ebd1310ace17e23d9c4bd2ec4b1dd7279b2e1fbe66bb47b54a60b02247e3a07d
 SHA512 
2008cbc67694f746b7449f087a19b2a9a4950333d6bac1cdc7d80351aa38d8d9b442087dedbc7b0909a419d3b10f510521c942aac012d04a53c32bdb15dce5f0
+DIST curl-7.88.0.tar.xz.asc 488 BLAKE2B 
9714e26c1308b036f7b19c909447e20d0c3611b0995845a8fb1a356d74e68027399acaafb69244411787cf2abbcbca446f237ce1277228c33caf0adc97364dbf
 SHA512 
6f3d9a5f8fcec64652f872adf994ff3d0162fba1b483a0e359522173bf29ef3d26eeda7c328207fa1fa974a45e62674a3a8ebec21830ab3981b56851d5804ade

diff --git a/net-misc/curl/curl-7.88.0.ebuild b/net-misc/curl/curl-7.88.0.ebuild
new file mode 100644
index ..b36a1acba8ac
--- /dev/null
+++ b/net-misc/curl/curl-7.88.0.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools prefix multilib-minimal verify-sig
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.se/";
+SRC_URI="https://curl.se/download/${P}.tar.xz
+   verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )"
+
+LICENSE="curl"
+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"
+IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap 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 
curl_ssl_rustls"
+IUSE+=" nghttp3"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
+
+#Only one default ssl provider can be enabled
+REQUIRED_USE="
+   ssl? (
+   ^^ (
+   curl_ssl_gnutls
+   curl_ssl_mbedtls
+   curl_ssl_nss
+   curl_ssl_openssl
+   curl_ssl_rustls
+   )
+   )"
+
+# lead to lots of false negatives, bug #285669
+RESTRICT="!test? ( test )"
+
+RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+   brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+   ssl? (
+   gnutls? (
+   net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}]
+   dev-libs/nettle:=[${MULTILIB_USEDEP}]
+   app-misc/ca-certificates
+   )
+   mbedtls? (
+   net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+   app-misc/ca-certificates
+   )
+   openssl? (
+   
dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+   )
+   nss? (
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/

2023-01-12 Thread Sam James 
commit: 2850f811e059bb97e7412d2196b2475fd0b11720
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 13 05:50:53 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 13 05:50:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2850f811

net-misc/curl: fix regression causing zabbix build failure

Closes: https://bugs.gentoo.org/890587
Signed-off-by: Sam James  gentoo.org>

 net-misc/curl/curl-7.87.0-r2.ebuild| 302 +
 .../files/curl-7.87.0-typecheck-deprecated.patch   |  48 
 2 files changed, 350 insertions(+)

diff --git a/net-misc/curl/curl-7.87.0-r2.ebuild 
b/net-misc/curl/curl-7.87.0-r2.ebuild
new file mode 100644
index ..58cc83256461
--- /dev/null
+++ b/net-misc/curl/curl-7.87.0-r2.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools prefix multilib-minimal verify-sig
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.se/";
+SRC_URI="https://curl.se/download/${P}.tar.xz
+   verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )"
+
+LICENSE="curl"
+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"
+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 
curl_ssl_rustls"
+IUSE+=" nghttp3 quiche"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
+
+# Only one default ssl provider can be enabled
+REQUIRED_USE="
+   ssl? (
+   ^^ (
+   curl_ssl_gnutls
+   curl_ssl_mbedtls
+   curl_ssl_nss
+   curl_ssl_openssl
+   curl_ssl_rustls
+   )
+   )"
+
+# lead to lots of false negatives, bug #285669
+RESTRICT="!test? ( test )"
+
+RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+   brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+   ssl? (
+   gnutls? (
+   net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}]
+   dev-libs/nettle:=[${MULTILIB_USEDEP}]
+   app-misc/ca-certificates
+   )
+   mbedtls? (
+   net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+   app-misc/ca-certificates
+   )
+   openssl? (
+   
dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+   )
+   nss? (
+   dev-libs/nss:0[${MULTILIB_USEDEP}]
+   dev-libs/nss-pem
+   app-misc/ca-certificates
+   )
+   rustls? (
+   net-libs/rustls-ffi:=[${MULTILIB_USEDEP}]
+   )
+   )
+   http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
+   nghttp3? (
+   net-libs/nghttp3[${MULTILIB_USEDEP}]
+   net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+   )
+   quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
+   idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
+   adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] )
+   kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+   ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+   sys-libs/zlib[${MULTILIB_USEDEP}]
+   zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#  rtmp? (
+#  media-video/rtmpdump
+#  curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#  curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#  )
+
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+   virtual/pkgconfig
+   test? (
+   sys-apps/diffutils
+   )
+   verify-sig? ( sec-keys/openpgp-keys-danielstenberg )"
+
+DOCS=( CHANGES README 
docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+   /usr/bin/curl-config
+)
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+   "${FILESDIR}"/${PN}-respect-cflags-3.patch
+
+   "${FILESDIR}"/${P}-gnutls-openssl-build.patch
+   "${FILESDIR}"/${P}-typecheck-deprecated.patch
+)
+
+src_prepare() {
+   default
+
+   eprefixify curl-config.in
+   eautoreconf
+}
+
+multilib_src_configure() {
+   # We make use of the fact that later flags override earlier ones
+   #

[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/

2022-11-16 Thread Sam James 
commit: 93404ce48ebc3346b1d0a45e5b313f25bec02e5f
Author: Henning Schild  hennsch  de>
AuthorDate: Wed Nov 16 13:09:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 17 00:58:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93404ce4

net-misc/curl: backport one more noproxy regression patch to 7.86.0

Bug: https://bugs.gentoo.org/878365
Signed-off-by: Henning Schild  hennsch.de>
Closes: https://github.com/gentoo/gentoo/pull/28295
Signed-off-by: Sam James  gentoo.org>

 net-misc/curl/curl-7.86.0-r3.ebuild| 292 +
 ...roxy-tailmatch-like-in-7.85.0-and-earlier.patch |  84 ++
 2 files changed, 376 insertions(+)

diff --git a/net-misc/curl/curl-7.86.0-r3.ebuild 
b/net-misc/curl/curl-7.86.0-r3.ebuild
new file mode 100644
index ..cd08376dee7b
--- /dev/null
+++ b/net-misc/curl/curl-7.86.0-r3.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools prefix multilib-minimal verify-sig
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/";
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
+   verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )"
+
+LICENSE="curl"
+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"
+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+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
+IUSE+=" nghttp3 quiche"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
+
+# Only one default ssl provider can be enabled
+REQUIRED_USE="
+   ssl? (
+   ^^ (
+   curl_ssl_gnutls
+   curl_ssl_mbedtls
+   curl_ssl_nss
+   curl_ssl_openssl
+   )
+   )"
+
+# lead to lots of false negatives, bug #285669
+RESTRICT="!test? ( test )"
+
+RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+   brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+   ssl? (
+   gnutls? (
+   net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+   dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+   app-misc/ca-certificates
+   )
+   mbedtls? (
+   net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+   app-misc/ca-certificates
+   )
+   openssl? (
+   
dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+   )
+   nss? (
+   dev-libs/nss:0[${MULTILIB_USEDEP}]
+   dev-libs/nss-pem
+   app-misc/ca-certificates
+   )
+   )
+   http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
+   nghttp3? (
+   net-libs/nghttp3[${MULTILIB_USEDEP}]
+   net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+   )
+   quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
+   idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+   adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] )
+   kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+   ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+   sys-libs/zlib[${MULTILIB_USEDEP}]
+   zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#  rtmp? (
+#  media-video/rtmpdump
+#  curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#  curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#  )
+
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+   virtual/pkgconfig
+   test? (
+   sys-apps/diffutils
+   )
+   verify-sig? ( sec-keys/openpgp-keys-danielstenberg )"
+
+DOCS=( CHANGES README 
docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+   /usr/bin/curl-config
+)
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+   "${FILESDIR}"/${PN}-respect-cflags-3.patch
+   "${FILESDIR}"/${P}-proxy-noproxy-tailmatching.patch
+   "${FILESDIR}"/${P}-proxy-noproxy-match-comma.patch
+   "${FILESDIR}"/${P}-noproxy-tailmatch-like-in-7.85.0-and-earlier.patch
+)
+
+src_prepare() {
+   default
+
+   eprefixify curl-config.in
+   eautoreconf
+}
+
+multilib_src_configure() {
+   # We make use of the fact that l

[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/

2020-07-26 Thread Sam James 
commit: f0cf742462897b3ddeb3705b7d606e0f98bf2c5e
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 27 02:33:27 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 27 03:15:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0cf7424

net-misc/curl: security cleanup

Closes: https://bugs.gentoo.org/729374
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 net-misc/curl/Manifest  |   3 -
 net-misc/curl/curl-7.68.0.ebuild| 265 ---
 net-misc/curl/curl-7.69.1.ebuild| 265 ---
 net-misc/curl/curl-7.70.0-r1.ebuild | 267 
 net-misc/curl/files/curl-fix-cpu-load.patch |  94 --
 5 files changed, 894 deletions(-)

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 11d6b199f88..4ae3273fda0 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,5 +1,2 @@
-DIST curl-7.68.0.tar.xz 2442788 BLAKE2B 
d72dbf3c4d6ef7259f0dc9b5347f9289067807246ce6aaab03f3a9c04c17328a8315261dbc08390096571bcad3bbb185a70d15ce83687d7e792bee37318bf269
 SHA512 
bf365609c9a66a05b3a263d02bcd3f81f905570c5739c8ec522a296b4b8e2a479d64d5524e8345e14eafad28995ee22d923522f1a45fa40eb46db38759c2eb2c
-DIST curl-7.69.1.tar.xz 2467272 BLAKE2B 
71eee2a8f511ea698f4ebf879bcdccabe11439b2f6c7812cde640f944af93b33dc797c6f4990ddd2a7051d33584dacc005ae011c16a6c1f7ab7fc7258c891937
 SHA512 
dcb917ce9a6f34b30adae10e2e635d7a8c67781d69789cc5617ab2b49e898394ecfeee546453b14ab168d4b3b52baf974b2ec07e7a4b199addbc1ba57274d8fa
-DIST curl-7.70.0.tar.xz 2348780 BLAKE2B 
6b505d87242bcaa554c4ee6994eb97ca70453521c1e77b5e757677475328c70f41e23e22b3a0eb9be7a299a94d4f1f85a46f7f999f3db8439072626320352ecf
 SHA512 
ab8796af1bd6f35ae704fd5e3639a8153482615a05c24e2e6d0b9cef8ed9a1e0d497ead2dbf5972cc53f632c2d87f0bf79e9e7cac625452dd24e6c7d8045cfc6
 DIST curl-7.71.0.tar.xz 2379056 BLAKE2B 
50d7369e4335823c3032b8801b270f7d8e687b0552f25ed5f9752549483cf68870e0422132ecf86e756e1c7c27cdf60048a7765850608c3a1b734cffb1fe7b99
 SHA512 
f1ea045f23b6a7e2c84ea83954d3299c612f57c3b1e5fee0b39493dc92fc4e95e7af2a5424c2e5bc480659e80cf1adce1fc528fc816f8ff2d0e7bfcfe4c5830a
 DIST curl-7.71.1.tar.xz 2387660 BLAKE2B 
47b3a4704ae8b09b37f7a9d8850fd7d692d91db3dd4ad776aad9a57d0162e0f4091e0387a850eb048f834e6dfee5bcb36da56493a106696c72072c612b47f623
 SHA512 
631e0ee8562e5029fe022bfab4222836a3e6d666e82e2bfbd78311fe5985105218a36d1ea68c93472fc57a12b713957a3bcca6e385eda4e58a47ca8d5d50265b

diff --git a/net-misc/curl/curl-7.68.0.ebuild b/net-misc/curl/curl-7.68.0.ebuild
deleted file mode 100644
index 0141a4e0a48..000
--- a/net-misc/curl/curl-7.68.0.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/";
-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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink 
+progress-meter rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss 
+curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" nghttp3 quiche"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-   brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-   ssl? (
-   curl_ssl_gnutls? (
-   net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-   dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-   app-misc/ca-certificates
-   )
-   curl_ssl_libressl? (
-   dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-   )
-   curl_ssl_mbedtls? (
-   net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-   app-misc/ca-certificates
-   )
-   curl_ssl_openssl? (
-   dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-   )
-   curl_ssl_nss? (
-   dev-libs/nss:0[${MULTILIB_USEDEP}]
-   app-misc/ca-certificates
-   )
-   )
-   http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-   nghttp3? (
-   net-libs/nghttp3[${MULTILIB_USEDEP}]
-   net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
-   )
-   quiche? ( net-libs/quiche[${MULTILIB_USEDEP}] )
-   idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
-   adns? ( net-dns/c-ares:

[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/

2017-08-18 Thread Anthony G. Basile 
commit: d71ab1ab0c02acafad494ac843b5019c796e4c3a
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Aug 18 16:32:52 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Aug 18 16:33:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d71ab1ab

net-misc/curl: fix build for 7.55.1.  bug #627960.

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 net-misc/curl/curl-7.55.1.ebuild|  1 +
 net-misc/curl/files/curl-7.55.1-fix-build.patch | 22 ++
 2 files changed, 23 insertions(+)

diff --git a/net-misc/curl/curl-7.55.1.ebuild b/net-misc/curl/curl-7.55.1.ebuild
index 5227717914f..62d6e1d8a33 100644
--- a/net-misc/curl/curl-7.55.1.ebuild
+++ b/net-misc/curl/curl-7.55.1.ebuild
@@ -107,6 +107,7 @@ src_prepare() {
eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+   eapply "${FILESDIR}"/${P}-fix-build.patch
 
sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
 

diff --git a/net-misc/curl/files/curl-7.55.1-fix-build.patch 
b/net-misc/curl/files/curl-7.55.1-fix-build.patch
new file mode 100644
index 000..b9749d59c7f
--- /dev/null
+++ b/net-misc/curl/files/curl-7.55.1-fix-build.patch
@@ -0,0 +1,22 @@
+index d77a884..6dcd0f1 100644
+--- a/m4/curl-confopts.m4
 b/m4/curl-confopts.m4
+@@ -37,14 +37,14 @@ AC_HELP_STRING([--enable-threaded-resolver],[Enable 
threaded resolver])
+ AC_HELP_STRING([--disable-threaded-resolver],[Disable threaded resolver]),
+   OPT_THRES=$enableval)
+   case "$OPT_THRES" in
+-*)
+-  dnl configure option not specified
+-  want_thres="yes"
+-  ;;
+ no)
+   dnl --disable-threaded-resolver option used
+   want_thres="no"
+   ;;
++*)
++  dnl configure option not specified
++  want_thres="yes"
++  ;;
+   esac
+   AC_MSG_RESULT([$want_thres])
+ ])

[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/

2016-12-29 Thread Anthony G. Basile 
commit: 7edeee5b966afc5550d2b4c03b4d7f09c7db2973
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Dec 30 01:45:01 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Dec 30 01:45:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7edeee5b

net-misc/curl: fix bug #604104

Package-Manager: portage-2.3.0

 net-misc/curl/curl-7.52.1-r1.ebuild   | 252 ++
 net-misc/curl/files/curl-7.52.1-fix-openssl.patch |  36 
 2 files changed, 288 insertions(+)

diff --git a/net-misc/curl/curl-7.52.1-r1.ebuild 
b/net-misc/curl/curl-7.52.1-r1.ebuild
new file mode 100644
index ..a3bb758
--- /dev/null
+++ b/net-misc/curl/curl-7.52.1-r1.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/";
+SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2";
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~ppc-aix ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl 
static-libs test threads"
+IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls 
curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+   ssl? (
+   curl_ssl_axtls? (
+   net-libs/axtls:0=[${MULTILIB_USEDEP}]
+   app-misc/ca-certificates
+   )
+   curl_ssl_gnutls? (
+   net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+   dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+   app-misc/ca-certificates
+   )
+   curl_ssl_libressl? (
+   dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+   )
+   curl_ssl_mbedtls? (
+   net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+   app-misc/ca-certificates
+   )
+   curl_ssl_openssl? (
+   dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+   )
+   curl_ssl_nss? (
+   dev-libs/nss:0[${MULTILIB_USEDEP}]
+   app-misc/ca-certificates
+   )
+   curl_ssl_polarssl? (
+   net-libs/polarssl:0=[${MULTILIB_USEDEP}]
+   app-misc/ca-certificates
+   )
+   )
+   http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+   idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
+   adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+   kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+   rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+   ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
+   sys-libs/zlib[${MULTILIB_USEDEP}]
+   abi_x86_32? (
+   !<=app-emulation/emul-linux-x86-baselibs-20140508-r13
+   !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+   )"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#  rtmp? (
+#  media-video/rtmpdump
+#  curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#  curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#  )
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}
+   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+   test? (
+   sys-apps/diffutils
+   dev-lang/perl
+   )"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+   curl_ssl_winssl? ( elibc_Winnt )
+   threads? ( !adns )
+   ssl? (
+   ^^ (
+   curl_ssl_axtls
+   curl_ssl_gnutls
+   curl_ssl_libressl
+   curl_ssl_mbedtls
+   curl_ssl_nss
+   curl_ssl_openssl
+   curl_ssl_polarssl
+   curl_ssl_winssl
+   )
+   )"
+
+DOCS=( CHANGES README docs/FEATURES doc