fix for PHP 8.5.0alpha3 using patch from

  https://github.com/websupport-sk/pecl-memcache/pull/118
re-license spec file to CECILL-2.1

2 files changed, 73 insertions, 4 deletions

diff --git a/118.patch b/118.patch
new file mode 100644
index 0000000..da0bd6b
--- /dev/null
+++ b/118.patch
@@ -0,0 +1,60 @@
+diff -up ./src/memcache_ascii_protocol.c.pr118 ./src/memcache_ascii_protocol.c
+--- ./src/memcache_ascii_protocol.c.pr118	2023-04-30 13:27:52.000000000 +0200
++++ ./src/memcache_ascii_protocol.c	2025-07-30 12:47:45.473426080 +0200
+@@ -24,7 +24,7 @@
+ #endif
+ 
+ #include "memcache_pool.h"
+-#include "ext/standard/php_smart_string.h"
++#include "Zend/zend_smart_string.h"
+ 
+ typedef struct mmc_ascii_request {
+ 	mmc_request_t	base;							/* enable cast to mmc_request_t */
+diff -up ./src/memcache_binary_protocol.c.pr118 ./src/memcache_binary_protocol.c
+--- ./src/memcache_binary_protocol.c.pr118	2025-07-30 12:47:45.473570193 +0200
++++ ./src/memcache_binary_protocol.c	2025-07-30 12:49:24.587245680 +0200
+@@ -34,7 +34,7 @@
+ #include <netinet/in.h>
+ #endif
+ #include "memcache_pool.h"
+-#include "ext/standard/php_smart_string.h"
++#include "Zend/zend_smart_string.h"
+ 
+ #ifdef htonll
+ #undef htonll
+diff -up ./src/memcache_pool.c.pr118 ./src/memcache_pool.c
+--- ./src/memcache_pool.c.pr118	2023-04-30 13:27:52.000000000 +0200
++++ ./src/memcache_pool.c	2025-07-30 12:47:45.473729843 +0200
+@@ -35,7 +35,7 @@
+ #include "ext/standard/crc32.h"
+ #include "ext/standard/php_var.h"
+ #include "ext/standard/php_string.h"
+-#include "ext/standard/php_smart_string.h"
++#include "Zend/zend_smart_string.h"
+ #include "zend_smart_str.h"
+ #include "memcache_pool.h"
+ 
+diff -up ./src/memcache_pool.h.pr118 ./src/memcache_pool.h
+--- ./src/memcache_pool.h.pr118	2023-04-30 13:27:52.000000000 +0200
++++ ./src/memcache_pool.h	2025-07-30 12:47:45.473847580 +0200
+@@ -42,7 +42,7 @@
+ #include <string.h>
+ 
+ #include "php.h"
+-#include "ext/standard/php_smart_string_public.h"
++#include "Zend/zend_smart_string.h"
+ #include "memcache_queue.h"
+ 
+ /*
+diff -up ./src/memcache_session.c.pr118 ./src/memcache_session.c
+--- ./src/memcache_session.c.pr118	2023-04-30 13:27:52.000000000 +0200
++++ ./src/memcache_session.c	2025-07-30 12:47:45.473927007 +0200
+@@ -29,7 +29,7 @@
+ #include "php_variables.h"
+ 
+ #include "SAPI.h"
+-#include "ext/standard/php_smart_string.h"
++#include "Zend/zend_smart_string.h"
+ #include "ext/standard/url.h"
+ #include "ext/session/php_session.h"
+ #ifdef PHP_WIN32
diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index 77fccc5..8aad014 100644
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -1,8 +1,8 @@
 # spec file for php-pecl-memcache
 #
-# Copyright (c) 2007-2024 Remi Collet
-# License: CC-BY-SA-4.0
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText:  Copyright 2007-2025 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 #
 # Please, preserve the changelog entries
 #
@@ -20,11 +20,13 @@
 Summary:      Extension to work with the Memcached caching daemon
 Name:         %{?scl_prefix}php-pecl-memcache
 Version:      8.2
-Release:      3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:      4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Source0:      https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 License:      PHP-3.01
 URL:          https://pecl.php.net/package/%{pecl_name}
 
+Patch0:       118.patch
+
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel >= 8.0
@@ -65,6 +67,8 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 pushd %{sources}
+%patch -P0 -p1 -b .pr118
+
 # Check version as upstream often forget to update this
 extver=$(sed -n '/#define PHP_MEMCACHE_VERSION/{s/.* "//;s/".*$//;p}' src/php_memcache.h)
 if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then
@@ -233,6 +237,11 @@ exit $ret
 
 
 %changelog
+* Wed Jul 30 2025 Remi Collet <remi@remirepo.net> - 8.2-4
+- fix for PHP 8.5.0alpha3 using patch from
+  https://github.com/websupport-sk/pecl-memcache/pull/118
+- re-license spec file to CECILL-2.1
+
 * Wed Aug 30 2023 Remi Collet <remi@remirepo.net> - 8.2-3
 - rebuild for PHP 8.3.0RC1