update to 5.1.23HEADmaster

5 files changed, 11 insertions, 78 deletions

diff --git a/PHPINFO b/PHPINFO
index 4ffdfc8..c4305d9 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,12 +2,12 @@
 apcu
 
 APCu Support => Enabled
-Version => 5.1.22
+Version => 5.1.23
 APCu Debugging => Disabled
 MMAP Support => Enabled
-MMAP File Mask => /tmp/apc.DGbixt
-Serialization Support => php, igbinary, lz4, snappy, zstd
-Build Date => Sep 19 2022 00:00:00
+MMAP File Mask => /tmp/apc.Ju2Kie
+Serialization Support => php, brotli, igbinary, lz4, snappy, zstd
+Build Date => Nov 12 2023 00:00:00
 
 Directive => Local Value => Master Value
 apc.enabled => On => On
diff --git a/REFLECTION b/REFLECTION
index 404153e..1c3f326 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #68 apcu version 5.1.22 ] {
+Extension [ <persistent> extension #68 apcu version 5.1.23 ] {
 
   - INI {
     Entry [ apc.enabled <SYSTEM> ]
@@ -46,7 +46,7 @@ Extension [ <persistent> extension #68 apcu version 5.1.22 ] {
   }
 
   - Constants [16] {
-    Constant [ int  ] { 139969585086944 }
+    Constant [ int  ] { 139777182917712 }
     Constant [ int APC_LIST_ACTIVE ] { 1 }
     Constant [ int APC_LIST_DELETED ] { 2 }
     Constant [ int APC_ITER_TYPE ] { 1 }
diff --git a/apcu-php83.patch b/apcu-php83.patch
deleted file mode 100644
index b085b91..0000000
--- a/apcu-php83.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/tests/typed_prop.phpt b/tests/typed_prop.phpt
-index 80f0d3c..04e87c9 100644
---- a/tests/typed_prop.phpt
-+++ b/tests/typed_prop.phpt
-@@ -28,8 +28,8 @@ try {
- var_dump($test->array);
- 
- ?>
----EXPECT--
-+--EXPECTF--
- bool(true)
--Cannot assign bool to reference held by property Test::$array of type array
-+Cannot assign %s to reference held by property Test::$array of type array
- array(0) {
- }
diff --git a/apcu-tests.patch b/apcu-tests.patch
deleted file mode 100644
index 692dbad..0000000
--- a/apcu-tests.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 22a39fe4cb2db46aaf660ef2f724b4cd813d2481 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 6 Jun 2023 11:08:10 +0200
-Subject: [PATCH] use TEST_PHP_ARGS if set
-
----
- tests/server_test.inc | 21 ++++++++++++---------
- 1 file changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/tests/server_test.inc b/tests/server_test.inc
-index 88c7045..5e60f47 100644
---- a/tests/server_test.inc
-+++ b/tests/server_test.inc
-@@ -16,6 +16,7 @@ function server_start_one($host, $port, $code = 'echo "Hello world";', $php_opts
- 	global $doc_root, $router, $handles, $ports;
- 
- 	$php_executable = getenv('TEST_PHP_EXECUTABLE');
-+	$php_args = getenv('TEST_PHP_ARGS');
- 
- 	$descriptorspec = array(
- 		0 => STDIN,
-@@ -23,16 +24,18 @@ function server_start_one($host, $port, $code = 'echo "Hello world";', $php_opts
- 		2 => STDERR,
- 	);
- 
--	$ext = (substr(PHP_OS, 0, 3) == 'WIN') ? 'php_apcu.dll' : 'apcu.so';
--	if (substr(PHP_OS, 0, 3) == 'WIN') {
--		$part0 = 8 == PHP_INT_SIZE ? "x64" : "";
--		$part1 = ZEND_DEBUG_BUILD ? "Debug" : "Release";
--		$part1 = PHP_ZTS ? ($part1 . "_TS") : $part1;
--		$php_args = "-d extension_dir=$doc_root/../$part0/$part1";
--	} else {
--		$php_args = "-d extension_dir=$doc_root/../modules";
-+	if (!$php_args) {
-+		$ext = (substr(PHP_OS, 0, 3) == 'WIN') ? 'php_apcu.dll' : 'apcu.so';
-+		if (substr(PHP_OS, 0, 3) == 'WIN') {
-+			$part0 = 8 == PHP_INT_SIZE ? "x64" : "";
-+			$part1 = ZEND_DEBUG_BUILD ? "Debug" : "Release";
-+			$part1 = PHP_ZTS ? ($part1 . "_TS") : $part1;
-+			$php_args = "-d extension_dir=$doc_root/../$part0/$part1";
-+		} else {
-+			$php_args = "-d extension_dir=$doc_root/../modules";
-+		}
-+		$php_args = "$php_args -d extension=$ext";
- 	}
--	$php_args = "$php_args -d extension=$ext";
- 
- 	if ($php_opts) {
- 		$php_args = "$php_args -d " . implode(' -d ', $php_opts);;
diff --git a/php-pecl-apcu.spec b/php-pecl-apcu.spec
index 4a0b799..1791d39 100644
--- a/php-pecl-apcu.spec
+++ b/php-pecl-apcu.spec
@@ -29,18 +29,15 @@
 
 Name:           %{?scl_prefix}php-pecl-apcu
 Summary:        APC User Cache
-Version:        5.1.22
+Version:        5.1.23
 License:        PHP-3.01
 URL:            https://pecl.php.net/package/APCu
-Release:        3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Source0:        https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 Source1:        %{pecl_name}-5.1.19.ini
 Source2:        %{pecl_name}-panel.conf
 Source3:        %{pecl_name}.conf.php
 
-Patch0:         %{pecl_name}-php83.patch
-Patch1:         %{pecl_name}-tests.patch
-
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel >= 7.0
@@ -133,9 +130,6 @@ configuration, available on http://localhost/apcu-panel/
 %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
 
 cd %{sources}
-%patch -P0 -p1 -b.php83
-%patch -P1 -p1 -b.pr490
-
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_APCU_VERSION/{s/.* "//;s/".*$//;p}' php_apc.h)
 if test "x${extver}" != "x%{version}%{?prever}"; then
@@ -304,6 +298,9 @@ fi
 
 
 %changelog
+* Sun Nov 12 2023 Remi Collet <remi@remirepo.net> - 5.1.23-1
+- update to 5.1.23
+
 * Wed Aug 30 2023 Remi Collet <remi@remirepo.net> - 5.1.22-3
 - rebuild for PHP 8.3.0RC1