diff options
| -rw-r--r-- | 573.patch | 22 | ||||
| -rw-r--r-- | 574.patch | 25 | ||||
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-memcached.spec | 12 |
5 files changed, 7 insertions, 56 deletions
diff --git a/573.patch b/573.patch deleted file mode 100644 index a328b01..0000000 --- a/573.patch +++ /dev/null @@ -1,22 +0,0 @@ -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/574.patch b/574.patch deleted file mode 100644 index 128f348..0000000 --- a/574.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b9fc8475be7239e7b144d41cd2ad79677c996ac2 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Wed, 30 Jul 2025 12:54:49 +0200 -Subject: [PATCH] use Zend/zend_smart_string.h - ---- - php_memcached_private.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/php_memcached_private.h b/php_memcached_private.h -index 2c22ecba..b7d2a5e1 100644 ---- a/php_memcached_private.h -+++ b/php_memcached_private.h -@@ -43,7 +43,11 @@ - #include <ext/standard/info.h> - #include <zend_extensions.h> - #include <zend_exceptions.h> -+#if PHP_VERSION_ID < 70200 - #include <ext/standard/php_smart_string.h> -+#else -+#include <Zend/zend_smart_string.h> -+#endif - #include <ext/standard/php_var.h> - #include <ext/standard/basic_functions.h> - @@ -2,7 +2,7 @@ memcached memcached support => enabled -Version => 3.3.0 +Version => 3.4.0 libmemcached-awesome version => 1.1.4 SASL support => yes Session support => yes @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #118 memcached version 3.3.0 ] { +Extension [ <persistent> extension #139 memcached version 3.4.0 ] { - Dependencies { Dependency [ session (Required) ] diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec index c650085..2a60cc6 100644 --- a/php-pecl-memcached.spec +++ b/php-pecl-memcached.spec @@ -30,7 +30,7 @@ # After 40-igbinary, 40-json, 40-msgpack %global ini_name 50-%{pecl_name}.ini -%global upstream_version 3.3.0 +%global upstream_version 3.4.0 #global upstream_prever RC1 # upstream use dev => alpha => beta => RC # make RPM happy DEV => alpha => beta => rc @@ -48,9 +48,6 @@ URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{sources}.tgz -Patch0: 573.patch -Patch1: 574.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.0 BuildRequires: %{?scl_prefix}php-pear @@ -135,9 +132,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd %{sources} -%patch -P0 -p1 -%patch -P1 -p1 - %if %{with fastlz} rm -r fastlz sed -e '/name=.fastlz/d' -i ../package.xml @@ -320,6 +314,10 @@ exit $ret %changelog +* Tue Oct 14 2025 Remi Collet <remi@remirepo.net> - 3.4.0-1 +- update to 3.4.0 +- drop patches merged upstream + * Thu Sep 25 2025 Remi Collet <remi@remirepo.net> - 3.3.0-5 - rebuild for PHP 8.5.0RC1 |