update to 8.2

drop patches merged upstream

5 files changed, 15 insertions, 120 deletions

diff --git a/PHPINFO b/PHPINFO
index 194e253..d651313 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,8 +2,7 @@
 memcache
 
 memcache support => enabled
-Version => 8.0
-Revision => $Revision$
+Version => 8.2
 
 Directive => Local Value => Master Value
 memcache.allow_failover => 1 => 1
diff --git a/REFLECTION b/REFLECTION
index ffa0fc3..26e47e9 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #72 memcache version 8.0 ] {
+Extension [ <persistent> extension #84 memcache version 8.2 ] {
 
   - INI {
     Entry [ memcache.allow_failover <ALL> ]
diff --git a/memcache-php81.patch b/memcache-php81.patch
deleted file mode 100644
index 5dbd7dc..0000000
--- a/memcache-php81.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d20c716286034a0d21cd5505a046351aceea4cbc Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-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/memcache-php82.patch b/memcache-php82.patch
deleted file mode 100644
index c732b5c..0000000
--- a/memcache-php82.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 88178b8788c475bbc80c6df46ac8bda47cb1b983 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 5 Oct 2022 11:39:04 +0200
-Subject: [PATCH] trivial/minimal fix for PHP 8.2
-
----
- src/memcache.c | 6 ++++++
- tests/029.phpt | 2 +-
- tests/045.phpt | 4 +++-
- 3 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/src/memcache.c b/src/memcache.c
-index c05105a..c43e48f 100644
---- a/src/memcache.c
-+++ b/src/memcache.c
-@@ -733,9 +733,15 @@ PHP_MINIT_FUNCTION(memcache)
- 
- 	INIT_CLASS_ENTRY(ce, "MemcachePool", php_memcache_pool_class_functions);
- 	memcache_pool_ce = zend_register_internal_class(&ce);
-+#if PHP_VERSION_ID >= 80200
-+	memcache_pool_ce->ce_flags |= ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES;
-+#endif
- 
- 	INIT_CLASS_ENTRY(ce, "Memcache", php_memcache_class_functions);
- 	memcache_ce = zend_register_internal_class_ex(&ce, memcache_pool_ce);
-+#if PHP_VERSION_ID >= 80200
-+	memcache_ce->ce_flags |= ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES;
-+#endif
- 
- 	le_memcache_pool = zend_register_list_destructors_ex(_mmc_pool_list_dtor, NULL, "memcache connection", module_number);
- 	le_memcache_server = zend_register_list_destructors_ex(NULL, _mmc_server_list_dtor, "persistent memcache connection", module_number);
-diff --git a/tests/029.phpt b/tests/029.phpt
-index bcacf33..4427948 100644
---- a/tests/029.phpt
-+++ b/tests/029.phpt
-@@ -44,7 +44,7 @@ if (is_array($result))
- 	sort($result);
- var_dump($result);
- 
--$result = ini_set('memcache.allow_failover', "abc");
-+$result = @ini_set('memcache.allow_failover', "abc");
- var_dump($result);
- 
- ?>
-diff --git a/tests/045.phpt b/tests/045.phpt
-index e1c10ec..ddc5531 100644
---- a/tests/045.phpt
-+++ b/tests/045.phpt
-@@ -8,6 +8,8 @@ Nested get's in __wakeup()
- include 'connect.inc';
- 
- class testclass {
-+	public $result = null;
-+
- 	function __wakeup() {
- 		global $memcache;
- 		$this->result = $memcache->get('_test_key3');
-@@ -48,4 +50,4 @@ array(2) {
-     [0]=>
-     int(123)
-   }
--}
-\ No newline at end of file
-+}
diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index a26509a..7285761 100644
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -1,15 +1,12 @@
 # spec file for php-pecl-memcache
 #
-# Copyright (c) 2007-2022 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2007-2023 Remi Collet
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%if 0%{?scl:1}
-%global sub_prefix %{scl_prefix}
-%scl_package       php-pecl-memcache
-%endif
+%{?scl:%scl_package php-pecl-memcache}
 
 # Not ready, some failed UDP tests. Neded investigation.
 %bcond_with         tests
@@ -20,15 +17,12 @@
 
 Summary:      Extension to work with the Memcached caching daemon
 Name:         %{?scl_prefix}php-pecl-memcache
-Version:      8.0
-Release:      4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:      8.2
+Release:      1%{?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
+License:      PHP-3.01
 URL:          https://pecl.php.net/package/%{pecl_name}
 
-Patch0:       %{pecl_name}-php81.patch
-Patch1:       %{pecl_name}-php82.patch
-
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel >= 8.0
@@ -46,16 +40,12 @@ Provides:     %{?scl_prefix}php-%{pecl_name}               = %{version}
 Provides:     %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
 Provides:     %{?scl_prefix}php-pecl(%{pecl_name})         = %{version}
 Provides:     %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
-%if "%{?scl_prefix}" != "%{?sub_prefix}"
-Provides:     %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{release}
-Provides:     %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
-%endif
 
-%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
+%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} == 7
 # Other third party repo stuff
-Obsoletes:     php53-pecl-%{pecl_name}  <= %{version}
+Obsoletes:      php53-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php53u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php54-pecl-%{pecl_name}  <= %{version}
+Obsoletes:      php54-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php54w-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php55u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php55w-pecl-%{pecl_name} <= %{version}
@@ -70,10 +60,6 @@ Obsoletes:     php72w-pecl-%{pecl_name} <= %{version}
 Obsoletes:      php73-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php73w-pecl-%{pecl_name} <= %{version}
 Obsoletes:      php74-pecl-%{pecl_name} <= %{version}
-Obsoletes:      php80-pecl-%{pecl_name} <= %{version}
-%if "%{php_version}" > "8.1"
-Obsoletes:      php81-pecl-%{pecl_name} <= %{version}
-%endif
 %endif
 
 
@@ -100,11 +86,6 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 pushd NTS
-%patch0 -p1
-%patch1 -p1
-
-sed -e '/PHP_MEMCACHE_VERSION/s/4.0.5.2/%{version}/' -i src/php_memcache.h
-
 # 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
@@ -290,6 +271,10 @@ fi
 
 
 %changelog
+* Mon May  1 2023 Remi Collet <remi@remirepo.net> - 8.2-1
+- update to 8.2
+- drop patches merged upstream
+
 * Wed Oct  5 2022 Remi Collet <remi@remirepo.net> - 8.0-4
 - add patch for PHP 8.2 from
   https://github.com/websupport-sk/pecl-memcache/pull/104