diff options
| author | Remi Collet <remi@remirepo.net> | 2025-07-17 09:23:33 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-07-17 09:23:33 +0200 |
| commit | 2755752c33e63a63904bc105a97923431bead12b (patch) | |
| tree | dccfb68d48d7f0f40705f152a5960d6f56b3daca | |
| parent | 81c1d3fda64cae69a1dd776786e2fd230d811fd8 (diff) | |
https://github.com/mongodb/mongo-php-driver/pull/1849
| -rw-r--r-- | 1849.patch | 22 | ||||
| -rw-r--r-- | php-pecl-mongodb2.spec | 11 |
2 files changed, 31 insertions, 2 deletions
diff --git a/1849.patch b/1849.patch new file mode 100644 index 0000000..3fbc037 --- /dev/null +++ b/1849.patch @@ -0,0 +1,22 @@ +From 4f0549efca593cc6243846cbb1d2d5ba28f3c6fb Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Thu, 17 Jul 2025 09:20:28 +0200 +Subject: [PATCH] use ZSTR_IS_INTERNED() + +--- + src/contrib/php_array_api.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/contrib/php_array_api.h b/src/contrib/php_array_api.h +index 5a973375a..5e88c5c74 100644 +--- a/src/contrib/php_array_api.h ++++ b/src/contrib/php_array_api.h +@@ -350,7 +350,7 @@ char *php_array_zval_to_string(zval *z, int *plen, zend_bool *pfree) { + zval c = *z; + zval_copy_ctor(&c); + convert_to_string(&c); +- *pfree = ! IS_INTERNED(Z_STR(c)); ++ *pfree = ! ZSTR_IS_INTERNED(Z_STR(c)); + *plen = Z_STRLEN(c); + return Z_STRVAL(c); + } diff --git a/php-pecl-mongodb2.spec b/php-pecl-mongodb2.spec index 626216b..d07ad8b 100644 --- a/php-pecl-mongodb2.spec +++ b/php-pecl-mongodb2.spec @@ -43,7 +43,7 @@ Name: %{?scl_prefix}php-pecl-%{pecl_name}2 %global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} %global _configure ../%{sources}/configure Version: %{upstream_version}%{?upstream_lower} -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %if %{with syslib} License: Apache-2.0 %else @@ -52,6 +52,8 @@ License: Apache-2.0 AND ISC AND MIT AND Zlib AND BSD-3-Clause URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz +Patch0: 1849.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 8.1 @@ -121,6 +123,7 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml pushd %{sources} +%patch -P0 -p1 # Check our macro values cat src/*_VERSION_CURRENT @@ -261,8 +264,12 @@ OPT="-n" %changelog +* Thu Jul 17 2025 Remi Collet <remi@remirepo.net> - 2.1.1-2 +- add fix for PHP 8.5.0alpha2 from + https://github.com/mongodb/mongo-php-driver/pull/1849 + * Mon Jun 16 2025 Remi Collet <remi@remirepo.net> - 2.1.1-1 -- update to 2.1.1 +- update to 2.1.1 (no change) - use bundled libbson and libmongc 1.30.5 * Mon May 26 2025 Remi Collet <remi@remirepo.net> - 2.1.0-1 |