diff options
| author | Remi Collet <remi@remirepo.net> | 2025-07-30 13:33:33 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-07-30 13:33:33 +0200 |
| commit | 2036374c7908c83fa33b5b13882cf65dec742850 (patch) | |
| tree | 0f3d5bbb168cfe2cd3a7c571810fe8eb2e24f460 | |
| parent | 02ae0051a6fd03737e887334b47e88cff5acdbb4 (diff) | |
https://github.com/phpredis/phpredis/pull/2677
| -rw-r--r-- | 2677.patch | 22 | ||||
| -rw-r--r-- | php-pecl-redis6.spec | 9 |
2 files changed, 30 insertions, 1 deletions
diff --git a/2677.patch b/2677.patch new file mode 100644 index 0000000..57d9da4 --- /dev/null +++ b/2677.patch @@ -0,0 +1,22 @@ +From f20f46525ff36cce29d61ae074c416b4673d3bd8 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Wed, 30 Jul 2025 13:29:27 +0200 +Subject: [PATCH] use Zend/zend_smart_string.h + +--- + common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common.h b/common.h +index 57e2903b81..7a7ee67b6a 100644 +--- a/common.h ++++ b/common.h +@@ -11,7 +11,7 @@ + #include <ext/standard/php_var.h> + #include <ext/standard/php_math.h> + #include <zend_smart_str.h> +-#include <ext/standard/php_smart_string.h> ++#include <zend_smart_string.h> + + #define PHPREDIS_GET_OBJECT(class_entry, o) (class_entry *)((char *)o - XtOffsetOf(class_entry, std)) + #define PHPREDIS_ZVAL_GET_OBJECT(class_entry, z) PHPREDIS_GET_OBJECT(class_entry, Z_OBJ_P(z)) diff --git a/php-pecl-redis6.spec b/php-pecl-redis6.spec index 5de3bc6..3945997 100644 --- a/php-pecl-redis6.spec +++ b/php-pecl-redis6.spec @@ -14,6 +14,7 @@ %bcond_without tests %global _root_bindir %{_bindir} %endif + %bcond_without igbinary %bcond_without msgpack # use redis instead of valkey for tests @@ -36,12 +37,13 @@ Summary: PHP extension for interfacing with key-value stores Name: %{?scl_prefix}php-pecl-redis6 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -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/redis Source0: https://pecl.php.net/get/%{sources}.tgz Patch0: redis-8.0.patch +Patch1: 2677.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc @@ -128,6 +130,7 @@ sed -e 's/role="test"/role="src"/' \ cd %{sources} %patch -P0 -p1 +%patch -P1 -p1 # Use system library rm -r liblzf @@ -339,6 +342,10 @@ exit $ret %changelog +* Wed Jul 30 2025 Remi Collet <remi@remirepo.net> - 6.2.0-3 +- add patch for PHP 8.5.0alpha3 from + https://github.com/phpredis/phpredis/pull/2677 + * Tue Jun 24 2025 Remi Collet <remi@remirepo.net> - 6.2.0-2 - add upstream patch for redis 8 - use valkey by default for tests |