.gitignore

@@ -1 +1 @@
-SOURCES/apcu-5.1.23.tgz
+SOURCES/apcu-5.1.20.tgz

.php-pecl-apcu.metadata

@@ -1 +1 @@
-a36e4073f6368a21dad433fe07cd01416fcd8723 SOURCES/apcu-5.1.23.tgz
+b253a175cbd7a232eae27aca53cf8d445639bd2c SOURCES/apcu-5.1.20.tgz

SOURCES/apcu-panel.conf

@@ -3,7 +3,15 @@ Alias /apcu-panel /usr/share/apcu-panel
 
 <Directory /usr/share/apcu-panel>
    <IfModule mod_authz_core.c>
+     # Apache 2.4
      Require local
    </IfModule>
+   <IfModule !mod_authz_core.c>
+     # Apache 2.2
+     Order Deny,Allow
+     Deny from All
+     Allow from 127.0.0.1
+     Allow from ::1
+   </IfModule>
 </Directory>
 

SPECS/php-pecl-apcu.spec

@@ -1,34 +1,36 @@
 # Fedora spec file for php-pecl-apcu
 #
-# Copyright (c) 2013-2023 Remi Collet
+# Copyright (c) 2013-2021 Remi Collet
-# License: CC-BY-SA-4.0
+# License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 
-%global pecl_name  apcu
+# we don't want -z defs linker flag
-%global with_zts   0%{?__ztsphp:1}
+%undefine _strict_symbol_defs_build
-%global ini_name   40-%{pecl_name}.ini
+
-%global sources    %{pecl_name}-%{version}
+%global pecl_name apcu
-%global _configure ../%{sources}/configure
+%global with_zts  0%{?__ztsphp:1}
+%global ini_name  40-%{pecl_name}.ini
 
 Name:           php-pecl-apcu
 Summary:        APC User Cache
-Version:        5.1.23
+Version:        5.1.20
 Release:        5%{?dist}
-Source0:        https://pecl.php.net/get/%{sources}.tgz
+Source0:        https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 Source1:        %{pecl_name}.ini
 Source2:        %{pecl_name}-panel.conf
 Source3:        %{pecl_name}.conf.php
 
-License:        PHP-3.01
+License:        PHP
 URL:            https://pecl.php.net/package/APCu
 
 BuildRequires:  make
 BuildRequires:  gcc
 BuildRequires:  php-devel
 BuildRequires:  php-pear
+BuildRequires:  pcre-devel
 
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
@@ -78,10 +80,11 @@ 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 %{sources}
+cd NTS
 # 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
@@ -90,31 +93,30 @@ if test "x${extver}" != "x%{version}"; then
 fi
 cd ..
 
-mkdir NTS
 %if %{with_zts}
-mkdir ZTS
+# duplicate for ZTS build
+cp -pr NTS ZTS
 %endif
 
 # Fix path to configuration file
 sed -e s:apc.conf.php:%{_sysconfdir}/apcu-panel/conf.php:g \
-    -i  %{sources}/apc.php
+    -i  NTS/apc.php
 
 
 %build
-cd %{sources}
+cd NTS
-%{__phpize}
+%{_bindir}/phpize
-
-cd ../NTS
 %configure \
    --enable-apcu \
-   --with-php-config=%{__phpconfig}
+   --with-php-config=%{_bindir}/php-config
 make %{?_smp_mflags}
 
 %if %{with_zts}
 cd ../ZTS
+%{_bindir}/zts-phpize
 %configure \
    --enable-apcu \
-   --with-php-config=%{__ztsphpconfig}
+   --with-php-config=%{_bindir}/zts-php-config
 make %{?_smp_mflags}
 %endif
 
@@ -135,7 +137,7 @@ install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
 
 # Install the Control Panel
 # Pages
-install -D -m 644 -p %{sources}/apc.php  \
+install -D -m 644 -p NTS/apc.php  \
         %{buildroot}%{_datadir}/apcu-panel/index.php
 # Apache config
 install -D -m 644 -p %{SOURCE2} \
@@ -145,7 +147,7 @@ install -D -m 644 -p %{SOURCE3} \
         %{buildroot}%{_sysconfdir}/apcu-panel/conf.php
 
 # Test & Documentation
-cd %{sources}
+cd NTS
 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
@@ -155,30 +157,35 @@ done
 
 
 %check
-cd %{sources}
+cd NTS
-%{__php} -n \
+%{_bindir}/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=%{__php} \
+TEST_PHP_EXECUTABLE=%{_bindir}/php \
 TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
-%{__php} -n run-tests.php -q --show-diff
+NO_INTERACTION=1 \
+REPORT_EXIT_STATUS=1 \
+%{_bindir}/php -n run-tests.php
 
 %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" \
-%{__ztsphp} -n run-tests.php -q --show-diff
+NO_INTERACTION=1 \
+REPORT_EXIT_STATUS=1 \
+%{__ztsphp} -n run-tests.php
 %endif
 
 
 %files
-%license %{sources}/LICENSE
+%license NTS/LICENSE
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 
@@ -209,58 +216,19 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \
 
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 5.1.23-5
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 5.1.20-5
-- Bump release for October 2024 mass rebuild:
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Resolves: RHEL-64018
+  Related: rhbz#1991688
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 5.1.23-4
-- Bump release for June 2024 mass rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.23-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.23-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Nov 13 2023 Remi Collet <remi@remirepo.net> - 5.1.23-1
-- update to 5.1.23
-
-* Tue Oct 03 2023 Remi Collet <remi@remirepo.net> - 5.1.22-6
-- rebuild for https://fedoraproject.org/wiki/Changes/php83
-- build out of sources tree
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.22-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Apr 20 2023 Remi Collet <remi@remirepo.net> - 5.1.22-5
-- use SPDX license ID
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.22-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Oct 05 2022 Remi Collet <remi@remirepo.net> - 5.1.22-3
-- rebuild for https://fedoraproject.org/wiki/Changes/php82
-
-* Tue Sep 20 2022 Remi Collet <remi@remirepo.net> - 5.1.22-2
-- drop unneeded build dependency on pcre #2128350
-
-* Mon Sep 19 2022 Remi Collet <remi@remirepo.net> - 5.1.22-1
-- update to 5.1.22
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.21-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.21-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Thu Oct 28 2021 Remi Collet <remi@remirepo.net> - 5.1.21-2
+* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 5.1.20-4
-- rebuild for https://fedoraproject.org/wiki/Changes/php81
+- Rebuilt for RHEL 9 BETA for openssl 3.0
+  Related: rhbz#1971065
 
-* Thu Oct  7 2021 Remi Collet <remi@remirepo.net> - 5.1.21-1
+* Mon Apr 19 2021 Remi Collet <rcollet@redhat.com> - 5.1.20-3
-- update to 5.1.21
+- Rebuilt for PHP 8. Related rhbz#1949319
 
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.20-2
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.1.20-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Thu Mar  4 2021 Remi Collet <remi@remirepo.net> - 5.1.20-1
 - update to 5.1.20