diff --git a/.gitignore b/.gitignore index 9d3b469..7214088 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/apcu-5.1.18.tgz +apcu-5.1.23.tgz diff --git a/.php-pecl-apcu.metadata b/.php-pecl-apcu.metadata deleted file mode 100644 index fa9479c..0000000 --- a/.php-pecl-apcu.metadata +++ /dev/null @@ -1 +0,0 @@ -feb857e48c942501f16760460427a5c902eb7a98 SOURCES/apcu-5.1.18.tgz diff --git a/SOURCES/apcu-panel.conf b/apcu-panel.conf similarity index 50% rename from SOURCES/apcu-panel.conf rename to apcu-panel.conf index e51a40f..de7d690 100644 --- a/SOURCES/apcu-panel.conf +++ b/apcu-panel.conf @@ -3,15 +3,7 @@ Alias /apcu-panel /usr/share/apcu-panel - # Apache 2.4 Require local - - # Apache 2.2 - Order Deny,Allow - Deny from All - Allow from 127.0.0.1 - Allow from ::1 - diff --git a/SOURCES/apcu.conf.php b/apcu.conf.php similarity index 100% rename from SOURCES/apcu.conf.php rename to apcu.conf.php diff --git a/SOURCES/apcu.ini b/apcu.ini similarity index 98% rename from SOURCES/apcu.ini rename to apcu.ini index ed8dd16..dacb938 100644 --- a/SOURCES/apcu.ini +++ b/apcu.ini @@ -55,7 +55,7 @@ apc.mmap_file_mask=/tmp/apc.XXXXXX ;apc.serializer='php' ; use the SAPI request start time for TTL -;apc.use_request_time=1 +;apc.use_request_time=0 ; Enables APCu handling of signals, such as SIGSEGV, that write core files ; when signaled. APCu will attempt to unmap the shared memory segment in diff --git a/SPECS/php-pecl-apcu.spec b/php-pecl-apcu.spec similarity index 66% rename from SPECS/php-pecl-apcu.spec rename to php-pecl-apcu.spec index f430136..097ad45 100644 --- a/SPECS/php-pecl-apcu.spec +++ b/php-pecl-apcu.spec @@ -1,35 +1,34 @@ -# RHEL / Fedora spec file for php-pecl-apcu +# Fedora spec file for php-pecl-apcu # -# Copyright (c) 2013-2020 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2013-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -# we don't want -z defs linker flag -%undefine _strict_symbol_defs_build - -%global pecl_name apcu -%global with_zts 0%{?__ztsphp:1} -%global ini_name 40-%{pecl_name}.ini +%global pecl_name apcu +%global with_zts 0%{?__ztsphp:1} +%global ini_name 40-%{pecl_name}.ini +%global sources %{pecl_name}-%{version} +%global _configure ../%{sources}/configure Name: php-pecl-apcu Summary: APC User Cache -Version: 5.1.18 -Release: 1%{?dist} -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Version: 5.1.23 +Release: 5%{?dist} +Source0: https://pecl.php.net/get/%{sources}.tgz Source1: %{pecl_name}.ini Source2: %{pecl_name}-panel.conf Source3: %{pecl_name}.conf.php -License: PHP -URL: http://pecl.php.net/package/APCu +License: PHP-3.01 +URL: https://pecl.php.net/package/APCu +BuildRequires: make BuildRequires: gcc -BuildRequires: php-devel > 7 +BuildRequires: php-devel BuildRequires: php-pear -BuildRequires: pcre-devel Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} @@ -79,11 +78,10 @@ configuration, available on http://localhost/apcu-panel/ %prep %setup -qc -mv %{pecl_name}-%{version} NTS sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml -cd NTS +cd %{sources} # Sanity check, really often broken extver=$(sed -n '/#define PHP_APCU_VERSION/{s/.* "//;s/".*$//;p}' php_apc.h) if test "x${extver}" != "x%{version}"; then @@ -92,30 +90,31 @@ if test "x${extver}" != "x%{version}"; then fi cd .. +mkdir NTS %if %{with_zts} -# duplicate for ZTS build -cp -pr NTS ZTS +mkdir ZTS %endif # Fix path to configuration file sed -e s:apc.conf.php:%{_sysconfdir}/apcu-panel/conf.php:g \ - -i NTS/apc.php + -i %{sources}/apc.php %build -cd NTS -%{_bindir}/phpize +cd %{sources} +%{__phpize} + +cd ../NTS %configure \ --enable-apcu \ - --with-php-config=%{_bindir}/php-config + --with-php-config=%{__phpconfig} make %{?_smp_mflags} %if %{with_zts} cd ../ZTS -%{_bindir}/zts-phpize %configure \ --enable-apcu \ - --with-php-config=%{_bindir}/zts-php-config + --with-php-config=%{__ztsphpconfig} make %{?_smp_mflags} %endif @@ -136,7 +135,7 @@ install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml # Install the Control Panel # Pages -install -D -m 644 -p NTS/apc.php \ +install -D -m 644 -p %{sources}/apc.php \ %{buildroot}%{_datadir}/apcu-panel/index.php # Apache config install -D -m 644 -p %{SOURCE2} \ @@ -146,7 +145,7 @@ install -D -m 644 -p %{SOURCE3} \ %{buildroot}%{_sysconfdir}/apcu-panel/conf.php # Test & Documentation -cd NTS +cd %{sources} for i in $(grep 'role="test"' ../package.xml | sed -e 's/^.*name="//;s/".*$//') do install -Dpm 644 $i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i done @@ -156,35 +155,30 @@ done %check -cd NTS -%{_bindir}/php -n \ +cd %{sources} +%{__php} -n \ -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ - -m | grep 'apcu' + -m | grep '^apcu$' # Upstream test suite for NTS extension -TEST_PHP_EXECUTABLE=%{_bindir}/php \ +TEST_PHP_EXECUTABLE=%{__php} \ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ -%{_bindir}/php -n run-tests.php +%{__php} -n run-tests.php -q --show-diff %if %{with_zts} -cd ../ZTS %{__ztsphp} -n \ -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ - -m | grep 'apcu' + -m | grep '^apcu$' # Upstream test suite for ZTS extension TEST_PHP_EXECUTABLE=%{__ztsphp} \ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ -%{__ztsphp} -n run-tests.php +%{__ztsphp} -n run-tests.php -q --show-diff %endif %files -%license NTS/LICENSE +%license %{sources}/LICENSE %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -215,12 +209,105 @@ REPORT_EXIT_STATUS=1 \ %changelog -* Thu May 14 2020 Remi Collet - 5.1.18-1 +* Tue Oct 29 2024 Troy Dawson - 5.1.23-5 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 5.1.23-4 +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 5.1.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 5.1.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Nov 13 2023 Remi Collet - 5.1.23-1 +- update to 5.1.23 + +* Tue Oct 03 2023 Remi Collet - 5.1.22-6 +- rebuild for https://fedoraproject.org/wiki/Changes/php83 +- build out of sources tree + +* Fri Jul 21 2023 Fedora Release Engineering - 5.1.22-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Apr 20 2023 Remi Collet - 5.1.22-5 +- use SPDX license ID + +* Fri Jan 20 2023 Fedora Release Engineering - 5.1.22-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Oct 05 2022 Remi Collet - 5.1.22-3 +- rebuild for https://fedoraproject.org/wiki/Changes/php82 + +* Tue Sep 20 2022 Remi Collet - 5.1.22-2 +- drop unneeded build dependency on pcre #2128350 + +* Mon Sep 19 2022 Remi Collet - 5.1.22-1 +- update to 5.1.22 + +* Fri Jul 22 2022 Fedora Release Engineering - 5.1.21-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 5.1.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Oct 28 2021 Remi Collet - 5.1.21-2 +- rebuild for https://fedoraproject.org/wiki/Changes/php81 + +* Thu Oct 7 2021 Remi Collet - 5.1.21-1 +- update to 5.1.21 + +* Fri Jul 23 2021 Fedora Release Engineering - 5.1.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Mar 4 2021 Remi Collet - 5.1.20-1 +- update to 5.1.20 + +* Wed Jan 27 2021 Fedora Release Engineering - 5.1.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Oct 5 2020 Remi Collet - 5.1.19-1 +- update to 5.1.19 + +* Tue Jul 28 2020 Fedora Release Engineering - 5.1.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jan 30 2020 Fedora Release Engineering - 5.1.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Oct 28 2019 Remi Collet - 5.1.18-1 - update to 5.1.18 -* Tue May 7 2019 Remi Collet - 5.1.17-1 +* Thu Oct 03 2019 Remi Collet - 5.1.17-3 +- rebuild for https://fedoraproject.org/wiki/Changes/php74 +- add upstream patches for test suite + +* Fri Jul 26 2019 Fedora Release Engineering - 5.1.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 8 2019 Remi Collet - 5.1.17-1 - update to 5.1.17 +* Sat Feb 02 2019 Fedora Release Engineering - 5.1.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Dec 7 2018 Remi Collet - 5.1.15-1 +- update to 5.1.15 + +* Wed Nov 21 2018 Remi Collet - 5.1.14-1 +- update to 5.1.14 (stable) + +* Mon Nov 19 2018 Remi Collet - 5.1.13-1 +- update to 5.1.13 (stable) + +* Thu Oct 11 2018 Remi Collet - 5.1.12-3 +- Rebuild for https://fedoraproject.org/wiki/Changes/php73 + +* Fri Jul 13 2018 Fedora Release Engineering - 5.1.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jul 9 2018 Remi Collet - 5.1.12-1 - update to 5.1.12 (stable) diff --git a/sources b/sources new file mode 100644 index 0000000..b76a11f --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (apcu-5.1.23.tgz) = 89e9f10f5d8d1a9503132e80140680be2a10d96f957f69b2f77cc1c496d15cc26dfe4c0368ebe46c72c68d1b4a794d3ddc95942b02d3ba5e8c971b09969058d8