summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--PHPINFO8
-rw-r--r--REFLECTION4
-rw-r--r--apcu-php83.patch15
-rw-r--r--apcu-tests.patch49
-rw-r--r--php-pecl-apcu.spec78
5 files changed, 22 insertions, 132 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..d62c7d2 100644
--- a/php-pecl-apcu.spec
+++ b/php-pecl-apcu.spec
@@ -3,7 +3,7 @@
#
# Fedora spec file for php-pecl-apcu
#
-# Copyright (c) 2013-2023 Remi Collet
+# Copyright (c) 2013-2024 Remi Collet
# License: CC-BY-SA-4.0
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -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: 2%{?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
@@ -55,36 +52,6 @@ Provides: %{?scl_prefix}php-apcu%{?_isa} = %{version}
Provides: %{?scl_prefix}php-pecl(apcu) = %{version}
Provides: %{?scl_prefix}php-pecl(apcu)%{?_isa} = %{version}
-%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-Obsoletes: php53-pecl-%{pecl_name} <= %{version}
-Obsoletes: php53u-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}
-Obsoletes: php56u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php56w-pecl-%{pecl_name} <= %{version}
-Obsoletes: php70u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php70w-pecl-%{pecl_name} <= %{version}
-%if "%{php_version}" > "7.1"
-Obsoletes: php71u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php71w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.2"
-Obsoletes: php72u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php72w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.3"
-Obsoletes: php73-pecl-%{pecl_name} <= %{version}
-Obsoletes: php73w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.4"
-Obsoletes: php74-pecl-%{pecl_name} <= %{version}
-Obsoletes: php74w-pecl-%{pecl_name} <= %{version}
-%endif
-%endif
-
%description
APCu is userland caching: APC stripped of opcode caching.
@@ -133,9 +100,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
@@ -223,9 +187,13 @@ done
%check
cd %{sources}
+if [ $(%{__php} -r 'echo PHP_VERSION_ID;') -ge 80400 ]; then
+ rm tests/apc_entry_002.phpt
+fi
+
%{_bindir}/php -n \
-d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
- -m | grep 'apcu'
+ -m | grep '^apcu$'
%if %{with tests}
# Upstream test suite for NTS extension
@@ -238,7 +206,7 @@ REPORT_EXIT_STATUS=1 \
%if %{with_zts}
%{__ztsphp} -n \
-d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
- -m | grep 'apcu'
+ -m | grep '^apcu$'
%if %{with tests}
# Upstream test suite for ZTS extension
@@ -250,28 +218,8 @@ REPORT_EXIT_STATUS=1 \
%endif
-%if 0%{?fedora} < 24 && 0%{?rhel} < 8
-# when pear installed alone, after us
-%triggerin -- %{?scl_prefix}php-pear
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-# posttrans as pear can be installed after us
-%posttrans
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{__pecl} ] ; then
- %{pecl_uninstall} %{pecl_name} >/dev/null || :
-fi
-%endif
-
-
%files
-%{?_licensedir:%license %{sources}/LICENSE}
+%license %{sources}/LICENSE
%doc %{pecl_docdir}/%{pecl_name}
%{pecl_xmldir}/%{name}.xml
@@ -304,6 +252,12 @@ fi
%changelog
+* Thu Jul 4 2024 Remi Collet <remi@remirepo.net> - 5.1.23-2
+- skip 1 test with 8.4
+
+* 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
generated by cgit (git 2.34.1) at 2024-07-15 18:40:22 +0000