diff options
| author | Remi Collet <remi@remirepo.net> | 2025-07-15 15:03:08 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-07-15 15:03:08 +0200 |
| commit | 24d6dd8948e3c11bd36560e063d20324f27899c7 (patch) | |
| tree | e106fba9811715f6d1796bc38f234f18b37c1a3f | |
| parent | 9febbf99ac0978ac8b33e69fae0e629685619f79 (diff) | |
https://github.com/php-memcached-dev/php-memcached/pull/573
| -rw-r--r-- | 573.patch | 22 | ||||
| -rw-r--r-- | php-pecl-memcached.spec | 10 |
2 files changed, 31 insertions, 1 deletions
diff --git a/573.patch b/573.patch new file mode 100644 index 0000000..a328b01 --- /dev/null +++ b/573.patch @@ -0,0 +1,22 @@ +From e6a0dba47c773f5b18f4fff3ebc27b2f7c5036c7 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Tue, 15 Jul 2025 14:59:10 +0200 +Subject: [PATCH] use zend_ce_exception + +--- + php_memcached.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/php_memcached.c b/php_memcached.c +index c8abb844..b78eb82a 100644 +--- a/php_memcached.c ++++ b/php_memcached.c +@@ -3961,7 +3961,7 @@ zend_class_entry *php_memc_get_exception_base(int root) + } + } + +- return zend_exception_get_default(); ++ return zend_ce_exception; + } + + diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec index 2f60674..a3c89c4 100644 --- a/php-pecl-memcached.spec +++ b/php-pecl-memcached.spec @@ -42,12 +42,14 @@ Summary: Extension to work with the Memcached caching daemon Name: %{?scl_prefix}php-pecl-memcached Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP-3.01 URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{sources}.tgz +Patch0: 573.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.0 BuildRequires: %{?scl_prefix}php-pear @@ -128,6 +130,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd %{sources} +%patch -P0 -p1 + %if %{with fastlz} rm -r fastlz sed -e '/name=.fastlz/d' -i ../package.xml @@ -310,6 +314,10 @@ exit $ret %changelog +* Tue Jul 15 2025 Remi Collet <remi@remirepo.net> - 3.3.0-3 +- add patch for PHP 8.5.0alpha2 from + https://github.com/php-memcached-dev/php-memcached/pull/573 + * Mon Jul 7 2025 Remi Collet <remi@remirepo.net> - 3.3.0-2 - re-license spec file to CECILL-2.1 - add pie virtual provides |