summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2025-10-15 10:00:16 +0200
committerRemi Collet <remi@php.net>2025-10-15 10:00:16 +0200
commit25f32ebf1ed235517b1283686359945e98402d2d (patch)
treeaf80c6996293adf91d6a468825c0097664b5284a
parent685e7d184e71e0b5f3549eb4f600aa978b6f4bdf (diff)
fix for PHP 8.5.0RC1 using patch fromHEADmaster
https://github.com/websupport-sk/pecl-memcache/pull/120
-rw-r--r--120.patch23
-rw-r--r--php-pecl-memcache.spec8
2 files changed, 30 insertions, 1 deletions
diff --git a/120.patch b/120.patch
new file mode 100644
index 0000000..53dee18
--- /dev/null
+++ b/120.patch
@@ -0,0 +1,23 @@
+From 0fa9b4a7f50bb31da7eb45ed3b3eba82f985f06c Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 15 Oct 2025 09:56:40 +0200
+Subject: [PATCH] clean deprecated ini
+
+---
+ tests/pecl63142.phpt | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/tests/pecl63142.phpt b/tests/pecl63142.phpt
+index 5eef5f9..bea5697 100644
+--- a/tests/pecl63142.phpt
++++ b/tests/pecl63142.phpt
+@@ -2,9 +2,6 @@
+ PECL bug #63142 (memcache 3.0.7 segfaults with object (un)serialization)
+ --SKIPIF--
+ <?php include 'connect.inc'; ?>
+---INI--
+-;fix me later
+-report_memleaks=0
+ --FILE--
+ <?php
+
diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index 336fff1..7927757 100644
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -20,12 +20,13 @@
Summary: Extension to work with the Memcached caching daemon
Name: %{?scl_prefix}php-pecl-memcache
Version: 8.2
-Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 6%{?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
+Patch1: 120.patch
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
@@ -68,6 +69,7 @@ sed -e 's/role="test"/role="src"/' \
pushd %{sources}
%patch -P0 -p1 -b .pr118
+%patch -P1 -p1 -b .pr120
# Check version as upstream often forget to update this
extver=$(sed -n '/#define PHP_MEMCACHE_VERSION/{s/.* "//;s/".*$//;p}' src/php_memcache.h)
@@ -237,6 +239,10 @@ exit $ret
%changelog
+* Wed Oct 15 2025 Remi Collet <remi@remirepo.net> - 8.2-6
+- fix for PHP 8.5.0RC1 using patch from
+ https://github.com/websupport-sk/pecl-memcache/pull/120
+
* Thu Sep 25 2025 Remi Collet <remi@remirepo.net> - 8.2-5
- rebuild for PHP 8.5.0RC1