diff options
| -rw-r--r-- | PHPINFO | 14 | ||||
| -rw-r--r-- | REFLECTION | 14 | ||||
| -rw-r--r-- | apcu-5.1.25.ini (renamed from apcu-5.1.19.ini) | 9 | ||||
| -rw-r--r-- | php-pecl-apcu.spec | 182 |
4 files changed, 122 insertions, 97 deletions
@@ -2,22 +2,22 @@ apcu APCu Support => Enabled -Version => 5.1.23 +Version => 5.1.27 APCu Debugging => Disabled MMAP Support => Enabled -MMAP File Mask => /tmp/apc.Ju2Kie -Serialization Support => php, brotli, igbinary, lz4, snappy, zstd -Build Date => Nov 12 2023 00:00:00 +MMAP File Mask => /tmp/apc.ZKInxE +Serialization Support => php, brotli, igbinary, lz4, msgpack, snappy, zstd +Build Date => Aug 29 2025 00:00:00 Directive => Local Value => Master Value apc.enabled => On => On -apc.shm_segments => 1 => 1 -apc.shm_size => 256M => 256M -apc.entries_hint => 4096 => 4096 +apc.shm_size => 32M => 32M +apc.entries_hint => 0 => 0 apc.gc_ttl => 3600 => 3600 apc.ttl => 0 => 0 apc.smart => 0 => 0 apc.mmap_file_mask => /tmp/apc.XXXXXX => /tmp/apc.XXXXXX +apc.mmap_hugepage_size => 0 => 0 apc.enable_cli => On => On apc.slam_defense => Off => Off apc.preload_path => no value => no value @@ -1,17 +1,14 @@ -Extension [ <persistent> extension #68 apcu version 5.1.23 ] { +Extension [ <persistent> extension #67 apcu version 5.1.27 ] { - INI { Entry [ apc.enabled <SYSTEM> ] Current = '1' } - Entry [ apc.shm_segments <SYSTEM> ] - Current = '1' - } Entry [ apc.shm_size <SYSTEM> ] - Current = '256M' + Current = '32M' } Entry [ apc.entries_hint <SYSTEM> ] - Current = '4096' + Current = '0' } Entry [ apc.gc_ttl <SYSTEM> ] Current = '3600' @@ -25,6 +22,9 @@ Extension [ <persistent> extension #68 apcu version 5.1.23 ] { Entry [ apc.mmap_file_mask <SYSTEM> ] Current = '/tmp/apc.XXXXXX' } + Entry [ apc.mmap_hugepage_size <SYSTEM> ] + Current = '0' + } Entry [ apc.enable_cli <SYSTEM> ] Current = '1' } @@ -46,7 +46,7 @@ Extension [ <persistent> extension #68 apcu version 5.1.23 ] { } - Constants [16] { - Constant [ int ] { 139777182917712 } + Constant [ int ] { 140184057988608 } Constant [ int APC_LIST_ACTIVE ] { 1 } Constant [ int APC_LIST_DELETED ] { 2 } Constant [ int APC_ITER_TYPE ] { 1 } diff --git a/apcu-5.1.19.ini b/apcu-5.1.25.ini index dacb938..b459a91 100644 --- a/apcu-5.1.19.ini +++ b/apcu-5.1.25.ini @@ -36,11 +36,18 @@ apc.enabled=1 ; A "hint" about the number variables expected in the cache. ; Set to zero or omit if you are not sure; -;apc.entries_hint=4096 +; Defaults to 512 entries per 1MB of shared memory. +;apc.entries_hint=0 ; The mktemp-style file_mask to pass to the mmap module apc.mmap_file_mask=/tmp/apc.XXXXXX +; To use huge pages of a certain size for the apcu shared memory segment. +; This requires support for huge pages to be enabled in the kernel. +; Note that even if this option is not set, shared memory is still configured +; to use transparent huge pages. +;apc.mmap_hugepage_size=0 + ; On very busy servers whenever you start the server or ; modify files you can create a race of many processes ; all trying to cache the same data at the same time. diff --git a/php-pecl-apcu.spec b/php-pecl-apcu.spec index 1791d39..0deeee4 100644 --- a/php-pecl-apcu.spec +++ b/php-pecl-apcu.spec @@ -3,24 +3,19 @@ # # Fedora spec file for php-pecl-apcu # -# Copyright (c) 2013-2023 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2013-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # -# we don't want -z defs linker flag -%undefine _strict_symbol_defs_build - %{?scl:%scl_package php-pecl-apcu} %bcond_without tests -%global gh_commit b771cd50a7fe519b6aaccbe5dc97594e68e0c88f -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner krakjoe -%global gh_project apcu +%global pie_vend apcu +%global pie_proj apcu %global pecl_name apcu %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global ini_name 40-%{pecl_name}.ini @@ -29,12 +24,12 @@ Name: %{?scl_prefix}php-pecl-apcu Summary: APC User Cache -Version: 5.1.23 +Version: 5.1.27 License: PHP-3.01 URL: https://pecl.php.net/package/APCu -Release: 1%{?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 +Source1: %{pecl_name}-5.1.25.ini Source2: %{pecl_name}-panel.conf Source3: %{pecl_name}.conf.php @@ -46,39 +41,27 @@ BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} -Obsoletes: %{?scl_prefix}php-apcu < 4.0.0-1 -Provides: %{?scl_prefix}php-apcu = %{version} -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} +# Extension +Obsoletes: %{?scl_prefix}php-apcu < 4.0.0-1 +Provides: %{?scl_prefix}php-apcu = %{version} +Provides: %{?scl_prefix}php-apcu%{?_isa} = %{version} +# PECL +Provides: %{?scl_prefix}php-pecl(apcu) = %{version} +Provides: %{?scl_prefix}php-pecl(apcu)%{?_isa} = %{version} +# PIE +Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version} +Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{version} + +%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" && 0%{!?scl:1} +%if "%{php_version}" >= "8.5" +Obsoletes: php8.4-pecl-apcu < %{version}-%{release} +Obsoletes: php8.5-pecl-apcu < %{version}-%{release} +Provides: php8.5-pecl-apcu = %{version}-%{release} +Provides: php8.5-pecl-apcu%{?_isa} = %{version}-%{release} +%elif "%{php_version}" >= "8.4" +Obsoletes: php8.4-pecl-apcu < %{version}-%{release} +Provides: php8.4-pecl-apcu = %{version}-%{release} +Provides: php8.4-pecl-apcu%{?_isa} = %{version}-%{release} %endif %endif @@ -103,6 +86,19 @@ Obsoletes: %{?scl_prefix}php-pecl-apc-devel < 4 Provides: %{?scl_prefix}php-pecl-apc-devel = %{version}-%{release} Provides: %{?scl_prefix}php-pecl-apc-devel%{?_isa} = %{version}-%{release} +%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" && 0%{!?scl:1} +%if "%{php_version}" >= "8.5" +Obsoletes: php8.4-pecl-apcu-devel < %{version}-%{release} +Obsoletes: php8.5-pecl-apcu-devel < %{version}-%{release} +Provides: php8.5-pecl-apcu-devel = %{version}-%{release} +Provides: php8.5-pecl-apcu-devel%{?_isa} = %{version}-%{release} +%elif "%{php_version}" >= "8.4" +Obsoletes: php8.4-pecl-apcu-devel < %{version}-%{release} +Provides: php8.4-pecl-apcu-devel = %{version}-%{release} +Provides: php8.4-pecl-apcu-devel%{?_isa} = %{version}-%{release} +%endif +%endif + %description devel These are the files needed to compile programs using APCu. @@ -119,6 +115,17 @@ Requires: httpd Obsoletes: apc-panel < 4 Provides: apc-panel = %{version}-%{release} +%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" && 0%{!?scl:1} +%if "%{php_version}" >= "8.5" +Obsoletes: php8.4-pecl-apcu-panel < %{version}-%{release} +Obsoletes: php8.5-pecl-apcu-panel < %{version}-%{release} +Provides: php8.5-pecl-apcu-panel = %{version}-%{release} +%elif "%{php_version}" >= "8.4" +Obsoletes: php8.4-pecl-apcu-panel < %{version}-%{release} +Provides: php8.4-pecl-apcu-panel = %{version}-%{release} +%endif +%endif + %description -n apcu-panel This package provides the APCu control panel, with Apache configuration, available on http://localhost/apcu-panel/ @@ -127,7 +134,7 @@ configuration, available on http://localhost/apcu-panel/ %prep %setup -qc -%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} +sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml cd %{sources} # Sanity check, really often broken @@ -157,19 +164,21 @@ sed -e '/"apc.php"/s/role="src"/role="doc"/' -i package.xml cd %{sources} %{__phpize} +[ -f Makefile.global ] && GLOBAL=Makefile.global || GLOBAL=build/Makefile.global +sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL cd ../NTS %configure \ --enable-apcu \ --with-php-config=%{__phpconfig} -make %{?_smp_mflags} +%make_build %if %{with_zts} cd ../ZTS %configure \ --enable-apcu \ --with-php-config=%{__ztsphpconfig} -make %{?_smp_mflags} +%make_build %endif @@ -177,12 +186,12 @@ make %{?_smp_mflags} %{?dtsenable} # Install the NTS stuff -make -C NTS install INSTALL_ROOT=%{buildroot} +%make_install -C NTS install -D -m 644 %{SOURCE1} %{buildroot}%{php_inidir}/%{ini_name} %if %{with_zts} # Install the ZTS stuff -make -C ZTS install INSTALL_ROOT=%{buildroot} +%make_install -C ZTS install -D -m 644 %{SOURCE1} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif @@ -216,10 +225,16 @@ done %check cd %{sources} +%if 0%{?rhel} == 8 +# Erratic results +rm tests/apc_mmap_hugepage_002.phpt +%endif +# Removed upstream +rm tests/bug63224.phpt %{_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 @@ -232,40 +247,12 @@ REPORT_EXIT_STATUS=1 \ %if %{with_zts} %{__ztsphp} -n \ -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ - -m | grep 'apcu' - -%if %{with tests} -# Upstream test suite for ZTS extension -TEST_PHP_EXECUTABLE=%{__ztsphp} \ -TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ -REPORT_EXIT_STATUS=1 \ -%{__ztsphp} -n run-tests.php -q --show-diff -%endif -%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 + -m | grep '^apcu$' %endif %files -%{?_licensedir:%license %{sources}/LICENSE} +%license %{sources}/LICENSE %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -298,6 +285,37 @@ fi %changelog +* Thu Sep 25 2025 Remi Collet <remi@remirepo.net> - 5.1.27-2 +- rebuild for PHP 8.5.0RC1 + +* Fri Aug 29 2025 Remi Collet <remi@remirepo.net> - 5.1.27-1 +- update to 5.1.27 + +* Wed Aug 27 2025 Remi Collet <remi@remirepo.net> - 5.1.26-2 +- add upstream patches for 8.5.0beta2 + +* Wed Aug 6 2025 Remi Collet <remi@remirepo.net> - 5.1.26-1 +- update to 5.1.26 + +* Wed Jul 30 2025 Remi Collet <remi@remirepo.net> - 5.1.25-2 +- rebuild for 8.5.0alpha3 + +* Tue Jul 29 2025 Remi Collet <remi@remirepo.net> - 5.1.25-1 +- update to 5.1.25 + +* Fri Jul 4 2025 Remi Collet <remi@remirepo.net> - 5.1.24-3 +- re-license spec file to CECILL-2.1 +- ignore 1 test failing with PHP 8.5 + +* Tue Sep 24 2024 Remi Collet <remi@remirepo.net> - 5.1.24-2 +- rebuild for 8.4.0RC1 + +* Mon Sep 23 2024 Remi Collet <remi@remirepo.net> - 5.1.24-1 +- update to 5.1.24 + +* 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 |