diff --git a/memcache-php81.patch b/memcache-php81.patch new file mode 100644 index 0000000..5dbd7dc --- /dev/null +++ b/memcache-php81.patch @@ -0,0 +1,25 @@ +From d20c716286034a0d21cd5505a046351aceea4cbc Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Thu, 10 Jun 2021 14:21:03 +0200 +Subject: [PATCH] Fix Deprecated: memcache_connect(): Passing null to + parameter #2... + +--- + src/memcache.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/memcache.c b/src/memcache.c +index 3048819..2cb675b 100644 +--- a/src/memcache.c ++++ b/src/memcache.c +@@ -1319,8 +1319,9 @@ static void php_mmc_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool persistent) + size_t host_len; + zend_long tcp_port = MEMCACHE_G(default_port); + double timeout = MMC_DEFAULT_TIMEOUT; ++ zend_bool null_port; + +- if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|ld", &host, &host_len, &tcp_port, &timeout) == FAILURE) { ++ if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l!d", &host, &host_len, &tcp_port, &null_port, &timeout) == FAILURE) { + return; + } + diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec index 49a1d6a..dde3b7f 100644 --- a/php-pecl-memcache.spec +++ b/php-pecl-memcache.spec @@ -19,12 +19,15 @@ Summary: Extension to work with the Memcached caching daemon Name: php-pecl-memcache Version: 8.0 -Release: 2%{?dist} +Release: 3%{?dist} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz License: PHP Group: Development/Languages URL: https://pecl.php.net/package/%{pecl_name} +Patch0: %{pecl_name}-php81.patch + +BuildRequires: make BuildRequires: gcc BuildRequires: php-devel >= 8.0 BuildRequires: php-pear @@ -63,6 +66,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml pushd NTS +%patch0 -p1 + # Check version as upstream often forget to update this sed -e '/PHP_MEMCACHE_VERSION/s/4.0.5.2/%{version}/' -i src/php_memcache.h @@ -227,6 +232,11 @@ exit $ret %changelog +* Thu Oct 28 2021 Remi Collet - 8.0-3 +- rebuild for https://fedoraproject.org/wiki/Changes/php81 +- add patch for PHP 8.1 from + https://github.com/websupport-sk/pecl-memcache/pull/88 + * Fri Jul 23 2021 Fedora Release Engineering - 8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild