gentoo resync : 25.09.2021

6 files changed, 21 insertions, 104 deletions

diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest
index 3e9bab47960c..5d858307a2b6 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,10 +1,8 @@
-AUX pecl-http-4.1.0-use-getenv.patch 903 BLAKE2B 1cbf60b5c28918a203f46690cf9c0c7e1d61493582dca79f4933c0354c44f25df8c346ce6cd964e9e9eef5e15ba0f39b7d9229a8bcd566447a816ad3bd4f20e0 SHA512 6242db71bc36de20064e787b435e91e27d4ae98685c2fb050c2247d241c4bd81383d71f7e204e57a86403b1392da4bba4a6be92d1b3628322a2227b895ad8a91
+AUX pecl-http-3.2.4-curl-cookies.patch 502 BLAKE2B b2ac97150edc35e649bcf5674be59401753413bef6d920beee1f50b3a9f9519545fc3ceb5ed030ce28acf4469ab69323a96bc07cdc7a3993b0033f039964d9ca SHA512 19c24fe2701ec6bf360a9e780a3573ea5ce2aad519412d66c18b9c331083c50e4dbbc453d04e931c7df0b9016a4407f316646ab00537a538bb5fdc9d84a97e54
 DIST pecl_http-3.2.1.tgz 221244 BLAKE2B b6581829fb8a800e24ccedd4d0f3efbaf558850bdc356d27a6e1d1097a8e2cfc61963a1daccd1d0f269a7cef5b243d45cdfaff5138321fe20df615dde44d19e3 SHA512 e67d4b32ba6f524e3fcf65f5497b94275e1a4a14fce97c57afe366369f368b3acdbedf364ed73cf983fb2c5f57f498adaa1100e7c936f11cbc5de1caedad7b51
 DIST pecl_http-3.2.4.tgz 220631 BLAKE2B 996236cf9dd2f7d9bfaf046306e99c3ccf778261df19df8fd828b5811798f784841d89a6890e7347bd20cc6da71c966ea3ac9b17bf058e0bb766db7e1a8a6c49 SHA512 59c41d57c94a6e50e2f0b261130a24791b2845246f783b55e7f644f9a897d3650da364c5b38a860761b4a23f9266ed05000d6348bae2a7941e59d6bf5fb61a9e
-DIST pecl_http-4.0.0.tgz 218259 BLAKE2B c9f5973686fd4db95a24dd4c50f217b93becc6a439066a395b0b7fec6e977154e5ae8f2261414458aed8e4a9d1281f44da2ecc67a05127610579f5be91196a88 SHA512 268b569c23f10ed72fe3c84fc5e5bf526c3e5ac345ca0556a24fbd01ce95da468d4e9aac6300d058001534ab826836793bf901e9560b744f1e20d7059be2ec79
-DIST pecl_http-4.1.0.tgz 220349 BLAKE2B 71152ee20930843636d90547339270fecf5569cb9a252a516c8150a134bf75fcb88b4fcfd129af1ca1366f4df775653b4dcdddbf0eb02426625550c1b1a0b483 SHA512 653c1dd8ec6dc738ce2dbf235a3c92522858e17ab9c0d00dd75a51bcfeb836f3fb02a6040b8b67d8d6839055286599958db844891686ca70c36031500be0bc1c
+DIST pecl_http-4.2.1.tgz 224452 BLAKE2B 58d2e1159aa64b9893b2b8b67c8444801308084ac13a743760c25cb3d0456fb586f69dc6b9e77db53341e4e9e45ce68f954c47b4e2663afe86de67d63db5e8e2 SHA512 2ad7e57fae313a7b46ba88e528e124ac9d83804827131a6ef478ccf3cf5883dec2d928b8ceb377ee7f5947c76f24d640d77533a9946612419e526786a79877e6
 EBUILD pecl-http-3.2.1.ebuild 2263 BLAKE2B 10fbe37789566e35b728134e8a8a5f3f8b5bb14175d471c112c68f5d8163bce79f4d57b419d9e707456227155827b5061da21f799500fd38b93a4e0526a1be75 SHA512 93c5002b610f37af407f632c16337bacefd0429492a158413757559063888d30b2eedc1f3ec4c823fcbdeb9e3143143344a9a1485e15d5854c332a1c926050ba
-EBUILD pecl-http-3.2.4.ebuild 2021 BLAKE2B f5cb3e15af3e2d4e263df6fe5b6a17f2beb2708950ba9259a2e571f18ff6da387390b42931adcc9251c4973fca9c5b9833659bf21918310f4400d4619aac4dc1 SHA512 86e25ed3765edf637cf9fbcb3d670366d82bba7a3f83542217693f6df530379baeb80ebe5a2c5a5f731497fc557e24aec866dd5980af4a79aff56f6e5b4f2676
-EBUILD pecl-http-4.0.0.ebuild 1747 BLAKE2B e73bd951bab8c3b1fc2da5e28557f77bf5b9dbad70440960ed43068ad4c1af26fa7d4745d05f4c5490bbf7cfcb8d47740e7e39d70323adcae83a89ca08500aa3 SHA512 c5e8b1b34da25acc2698dd6d1eab1d84dacb67730e28cf594f9084575cd2264a33e2b250d37fcb690bbfdecb52eb2c032e629e180bffa5781d5e7ce3d785e34e
-EBUILD pecl-http-4.1.0.ebuild 1879 BLAKE2B 7e22bd02d6ef7dff6089da17643d124a10a1f4a0e23aab29152ae11d950d044f6b5b7437af817a9a6aefc7a1f7503cefc4839e02583cea7aae46faac57ecc08c SHA512 f477e7613249544d842ae5277dc33a90df0097b05bb9d56e5200662bf8e380a5581b2b31ea60ba9278a1fe71331bb97677e54c91746f3b4052296cd8350427e3
+EBUILD pecl-http-3.2.4-r1.ebuild 2229 BLAKE2B 445ce6fc6ea5179cce22a9fb5a0d014d43a0da20d812ea45b190b3cf1fe4aecfac1d87ca15b478f5c671aa74a2e5bbefb37ed0d2ea60524442cb2649af2892be SHA512 8f72982eabfc0bc712d54890baf4dabb07c4ca2bec89df91904484bbbef321f7496e5037dc6b6e30064c661f8f3f9d99161d077fe9b92105ad1c16ba488877dc
+EBUILD pecl-http-4.2.1.ebuild 1830 BLAKE2B d4150e54da5c4c74685971133e9abe32af0c37b3e34e085dc23cdd64133884478df6fda8561a447fd3ef54939f5551eb416920f017c98e4ee29d097337febab0 SHA512 29bb1775656308df9c88e5cc2801b6f185b3ed4077b793f0c51da6b62b0cc520cf6fca5c0c04796817d059cec032f2321c2944e26773db095fea40f1afb0c178
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch b/dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch
new file mode 100644
index 000000000000..3c124b4624a6
--- /dev/null
+++ b/dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch
@@ -0,0 +1,11 @@
+--- a/src/php_http_client_curl.c	2021-01-13 10:34:34.000000000 -0500
++++ b/src/php_http_client_curl.c	2021-09-22 10:38:58.854615743 -0400
+@@ -834,7 +834,7 @@
+ 	} else {
+ 		storage->cookiestore = NULL;
+ 	}
+-	if (	CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEFILE, storage->cookiestore)
++	if (	CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEFILE, storage->cookiestore ? storage->cookiestore : "")
+ 		||	CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEJAR, storage->cookiestore)
+ 	) {
+ 		return FAILURE;
diff --git a/dev-php/pecl-http/files/pecl-http-4.1.0-use-getenv.patch b/dev-php/pecl-http/files/pecl-http-4.1.0-use-getenv.patch
deleted file mode 100644
index c3ad7d968360..000000000000
--- a/dev-php/pecl-http/files/pecl-http-4.1.0-use-getenv.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit a4f66fb42bb5203e9d1897a6cf554aa702ce0380
-Author:     Thomas Deutschmann <whissi@gentoo.org>
-AuthorDate: Tue May 18 19:55:47 2021 +0200
-Commit:     Thomas Deutschmann <whissi@gentoo.org>
-CommitDate: Tue May 18 19:55:47 2021 +0200
-
-    tests: use getenv() to access environment variable
-    
-    Fixes
-    
-      Warning: Undefined array key "PATH" in pecl-http-4.1.0/work/php8.0/tests/skipif.inc on line 56
-
-diff --git a/tests/skipif.inc b/tests/skipif.inc
-index 51272fb..76c3bd7 100644
---- a/tests/skipif.inc
-+++ b/tests/skipif.inc
-@@ -53,7 +53,7 @@ function skip_http2_test($message = "skip need http2 support") {
- 	if (!(http\Client\Curl\FEATURES & http\Client\Curl\Features\HTTP2)) {
- 		die("$message (FEATURES & HTTP2)\n");
- 	}
--	foreach (explode(":", $_ENV["PATH"]) as $path) {
-+	foreach (explode(":", getenv("PATH")) as $path) {
- 		if (is_executable($path . "/nghttpd")) {
- 			return;
- 		}
diff --git a/dev-php/pecl-http/pecl-http-3.2.4.ebuild b/dev-php/pecl-http/pecl-http-3.2.4-r1.ebuild
index 0a717e5377db..94c0833cc07d 100644
--- a/dev-php/pecl-http/pecl-http-3.2.4.ebuild
+++ b/dev-php/pecl-http/pecl-http-3.2.4-r1.ebuild
@@ -22,14 +22,16 @@ LICENSE="BSD-2 MIT"
 SLOT="7"
 IUSE="ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl"
 
+# Patch gets cookies working with curl 7.77, but further interop work was done later
+# Just set min version for this short time to live branch
 COMMON_DEPEND="app-arch/brotli:=
 	dev-libs/libevent
 	dev-php/pecl-propro:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?]
 	>=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?]
 	net-dns/libidn2
 	sys-libs/zlib
-	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] )
-	!ssl? ( net-misc/curl[-ssl] )
+	ssl? ( >=net-misc/curl-7.77[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] )
+	!ssl? ( >=net-misc/curl-7.77[-ssl] )
 "
 DEPEND="
 	php_targets_php7-3? ( ${COMMON_DEPEND} dev-lang/php:7.3[hash(+),session(-),iconv(-)] )
@@ -39,6 +41,8 @@ RDEPEND="${DEPEND}
 
 PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
 
+PATCHES=( "${FILESDIR}/${P}-curl-cookies.patch" )
+
 src_prepare() {
 	if use php_targets_php7-3 || use php_targets_php7-4 ; then
 		php-ext-source-r3_src_prepare
diff --git a/dev-php/pecl-http/pecl-http-4.0.0.ebuild b/dev-php/pecl-http/pecl-http-4.0.0.ebuild
deleted file mode 100644
index 92ccc331b626..000000000000
--- a/dev-php/pecl-http/pecl-http-4.0.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="http"
-PHP_EXT_PECL_PKG="pecl_http"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_INI_NAME="50-http"
-
-USE_PHP="php7-3 php7-4 php8-0"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php8-0"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Extended HTTP Support for PHP"
-LICENSE="BSD-2 MIT"
-SLOT="8"
-IUSE="ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl"
-
-COMMON_DEPEND="app-arch/brotli:=
-	dev-libs/libevent
-	>=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?]
-	net-dns/libidn2
-	sys-libs/zlib
-	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] )
-	!ssl? ( net-misc/curl[-ssl] )
-"
-DEPEND="
-	php_targets_php8-0? ( ${COMMON_DEPEND} dev-lang/php:8.0[session(-),iconv(-)] )"
-RDEPEND="${DEPEND}
-	php_targets_php7-3? ( dev-php/pecl-http:7[php_targets_php7-3(-)] )
-	php_targets_php7-4? ( dev-php/pecl-http:7[php_targets_php7-4(-)] )"
-
-PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
-
-src_prepare() {
-	if use php_targets_php8-0 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php8-0 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
-
-src_test() {
-	# Cannot use eclass function due to required modules
-	# All tests SKIP otherwise
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		# Link in required modules for testing
-		ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die
-		sed -i \
-			's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=raphf/' \
-			Makefile || die
-		SKIP_ONLINE_TESTS=yes NO_INTERACTION="yes" emake test
-		# Clean up testing links
-		rm modules/raphf.so || die
-	done
-}
diff --git a/dev-php/pecl-http/pecl-http-4.1.0.ebuild b/dev-php/pecl-http/pecl-http-4.2.1.ebuild
index 9ffc9765e462..00f8de1189da 100644
--- a/dev-php/pecl-http/pecl-http-4.1.0.ebuild
+++ b/dev-php/pecl-http/pecl-http-4.2.1.ebuild
@@ -38,8 +38,6 @@ RDEPEND="${DEPEND}
 
 PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
 
-PATCHES=( "${FILESDIR}"/${P}-use-getenv.patch )
-
 src_prepare() {
 	if use php_targets_php8-0 ; then
 		php-ext-source-r3_src_prepare