.gitignore

@@ -1,6 +1,6 @@
-SOURCES/Archive_Tar-1.4.14.tgz
-SOURCES/Console_Getopt-1.4.3.tgz
-SOURCES/PEAR-1.10.13.tgz
+SOURCES/Archive_Tar-1.4.3.tgz
+SOURCES/Console_Getopt-1.4.1.tgz
+SOURCES/PEAR-1.10.5.tgz
 SOURCES/PEAR_Manpages-1.10.0.tgz
 SOURCES/Structures_Graph-1.1.1.tgz
-SOURCES/XML_Util-1.4.5.tgz
+SOURCES/XML_Util-1.4.3.tgz

.php-pear.metadata

@@ -1,6 +1,6 @@
-ef023e94c632e80ef78ddfee19e4af6abc54eed4 SOURCES/Archive_Tar-1.4.14.tgz
-88b7bfce2f71cd99b922fa5eff5247bd754a3bc1 SOURCES/Console_Getopt-1.4.3.tgz
-f1ea5eae354f7a302c62edaa06d8b057de1b8be5 SOURCES/PEAR-1.10.13.tgz
-50e7d88cafe27d02389b351ec4633a1219bf3603 SOURCES/PEAR_Manpages-1.10.0.tgz
-2a9e5999e035aa3a6789011238b0a9a54806124a SOURCES/Structures_Graph-1.1.1.tgz
-c9fe1448ae7af4522f2cdfd741e14b1ef3998309 SOURCES/XML_Util-1.4.5.tgz
+947d43997ca0c0074b2f154b6487b41aec0e4aa7 SOURCES/Archive_Tar-1.4.3.tgz
+a98e088c20b18524c8d254d25a5c9b6dd8e81853 SOURCES/Console_Getopt-1.4.1.tgz
+c63a247f765b67eb16a43093a0cbafaadfb3b9d6 SOURCES/PEAR-1.10.5.tgz
+327f6f97de909ffa40204f49614df72b05d26d00 SOURCES/PEAR_Manpages-1.10.0.tgz
+a27a6b3c9910675cff86be3a0d016f56f2c1750f SOURCES/Structures_Graph-1.1.1.tgz
+95e07febe0b6c843c51bfd0157e61fd1ba1e5626 SOURCES/XML_Util-1.4.3.tgz

SOURCES/71.patch

@@ -0,0 +1,23 @@
+From c5f321f171783c1b088490dcaf39b0aad5eb5c13 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 12 Oct 2017 09:35:57 +0200
+Subject: [PATCH] fix  Warning: count(): Parameter must be an array or an
+ object that implements Countable in PEAR/RunTest.php on line 346
+
+---
+ PEAR/RunTest.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/PEAR/RunTest.php b/PEAR/RunTest.php
+index 8eabac3c3..482beccb3 100644
+--- a/PEAR/RunTest.php
++++ b/PEAR/RunTest.php
+@@ -343,7 +343,7 @@ function run($file, $ini_settings = array(), $test_number = 1)
+ 
+         // Check if test should be skipped.
+         $res  = $this->_runSkipIf($section_text, $temp_skipif, $tested, $ini_settings);
+-        if (count($res) != 2) {
++        if ($res == 'SKIPPED' || count($res) != 2) {
+             return $res;
+         }
+         $info = $res['info'];

SPECS/php-pear.spec

@@ -8,12 +8,12 @@
 %global peardir %{_datadir}/pear
 %global metadir %{_localstatedir}/lib/pear
 
-%global getoptver 1.4.3
-%global arctarver 1.4.14
+%global getoptver 1.4.1
+%global arctarver 1.4.3
 # https://pear.php.net/bugs/bug.php?id=19367
 # Structures_Graph 1.0.4 - incorrect FSF address
 %global structver 1.1.1
-%global xmlutil   1.4.5
+%global xmlutil   1.4.3
 %global manpages  1.10.0
 
 # Tests are only run with rpmbuild --with tests
@@ -26,12 +26,13 @@
 
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
-Version: 1.10.13
-Release: 1%{?dist}
+Version: 1.10.5
+Release: 9%{?dist}
 Epoch: 1
 # PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD
 # Structures_Graph is LGPLv3+
 License: BSD and LGPLv3+
+Group: Development/Languages
 URL: http://pear.php.net/package/PEAR
 Source0: http://download.pear.php.net/package/PEAR-%{version}%{?pearprever}.tgz
 # wget https://raw.githubusercontent.com/pear/pear-core/stable/install-pear.php
@@ -47,6 +48,9 @@ Source23: http://pear.php.net/get/Structures_Graph-%{structver}.tgz
 Source24: http://pear.php.net/get/XML_Util-%{xmlutil}.tgz
 Source25: http://pear.php.net/get/PEAR_Manpages-%{manpages}.tgz
 
+# https://github.com/pear/pear-core/pull/71
+Patch0:   https://patch-diff.githubusercontent.com/raw/pear/pear-core/pull/71.patch
+
 BuildArch: noarch
 BuildRequires: php(language) > 5.4
 BuildRequires: php-cli
@@ -104,7 +108,7 @@ Requires:  php-bz2
 # for /var/www/html ownership
 Requires: httpd-filesystem
 %if 0%{?fedora}
-Recommends: php-composer(fedora/autoloader)
+Requires: php-composer(fedora/autoloader)
 %endif
 
 
@@ -219,7 +223,7 @@ install -m 644 -D macros.pear \
 
 # apply patches on installed PEAR tree
 pushd %{buildroot}%{peardir}
-: no patch
+patch --no-backup --fuzz 0 -p1 < %{PATCH0}
 popd
 
 # Why this file here ?
@@ -258,9 +262,10 @@ phpunit \
    AllTests || ret=1
 
 cd %{buildroot}%{_datadir}/tests/pear/XML_Util/tests
-phpunit \
-   --bootstrap=/usr/share/pear/XML/Util/autoload.php \
-   --test-suffix .php . || ret=1
+%{_bindir}/php \
+   %{buildroot}/usr/share/pear/pearcmd.php \
+   run-tests \
+   | tee $LOG
 
 cd %{buildroot}%{_datadir}/tests/pear/Console_Getopt/tests
 %{_bindir}/php \
@@ -332,114 +337,8 @@ fi
 
 
 %changelog
-* Tue Dec 14 2021 Remi Collet <rcollet@redhat.com> - 1:1.10.13-1
-- update PEAR to 1.10.13 #2032448
-- update Archive_Tar to 1.4.14
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.10.12-9
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.10.12-8
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.10.12-7
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.10.12-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jan 19 2021 Remi Collet <remi@remirepo.net> - 1:1.10.12-5
-- update Archive_Tar to 1.4.12
-
-* Mon Nov 23 2020 Remi Collet <remi@remirepo.net> - 1:1.10.12-4
-- update Archive_Tar to 1.4.11
-
-* Wed Sep 16 2020 Remi Collet <remi@remirepo.net> - 1:1.10.12-3
-- update Archive_Tar to 1.4.10
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.10.12-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Apr 20 2020 Remi Collet <remi@remirepo.net> - 1.10.12-1
-- update PEAR to 1.10.12
-- update XML_Util to 1.4.5
-- drop patch merged upstream
-
-* Tue Apr 14 2020 Remi Collet <remi@remirepo.net> - 1.10.11-1
-- update to 1.10.11
-- drop patch merged upstream
-
-* Mon Mar 30 2020 Remi Collet <remi@remirepo.net> - 1:1.10.10-7
-- add patch for PEAR and PHP 7.4 from
-  https://github.com/pear/pear-core/pull/103
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.10.10-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Dec 12 2019 Remi Collet <remi@remirepo.net> - 1:1.10.10-5
-- add patch for XML_Util and PHP 7.4 from
-  https://github.com/pear/XML_Util/pull/12
-
-* Fri Dec  6 2019 Remi Collet <remi@remirepo.net> - 1:1.10.10-4
-- update XML_Util to 1.4.4
-- drop patch merged upstream
-
-* Thu Dec  5 2019 Remi Collet <remi@remirepo.net> - 1:1.10.10-3
-- update Archive_Tar to 1.4.9
-- add patch for XML_Util and PHP 7.4 from
-  https://github.com/pear/XML_Util/pull/11
-
-* Thu Nov 21 2019 Remi Collet <remi@remirepo.net> - 1:1.10.10-2
-- update Console_Getopt to 1.4.3
-- drop patches merged upstream
-
-* Wed Nov 20 2019 Remi Collet <remi@remirepo.net> - 1:1.10.10-1
-- update PEAR to 1.10.10
-
-* Tue Nov 19 2019 Remi Collet <remi@remirepo.net> - 1:1.10.9-5
-- add upstream patches for PHP 7.4
-
-* Tue Oct 22 2019 Remi Collet <remi@remirepo.net> - 1:1.10.9-4
-- update Archive_Tar to 1.4.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.10.9-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Apr  8 2019 Remi Collet <remi@remirepo.net> - 1:1.10.9-2
-- update Archive_Tar to 1.4.7
-
-* Thu Mar 14 2019 Remi Collet <remi@remirepo.net> - 1:1.10.9-1
-- update PEAR to 1.10.9
-
-* Fri Feb  8 2019 Remi Collet <remi@remirepo.net> - 1:1.10.8-1
-- update PEAR to 1.10.8
-- source generated from github tag
-- drop patch merged upstream
-
-* Thu Feb  7 2019 Remi Collet <remi@remirepo.net> - 1:1.10.7-5
-- update Console_Getopt to 1.4.2
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.10.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jan  3 2019 Remi Collet <remi@remirepo.net> - 1:1.10.7-3
-- update Archive_Tar to 1.4.5
-
-* Fri Dec 21 2018 Remi Collet <remi@remirepo.net> - 1:1.10.7-2
-- update Archive_Tar to 1.4.4
-- drop PHP 7.2 deprecated option, patch from
-  https://github.com/pear/pear-core/pull/83
-
-* Thu Dec  6 2018 Remi Collet <remi@remirepo.net> - 1:1.10.7-1
-- update PEAR to 1.10.7
-
-* Thu Aug 23 2018 Remi Collet <remi@remirepo.net> - 1:1.10.6-1
-- update PEAR to 1.10.6
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.10.5-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Wed May 15 2019 Joe Orton <jorton@redhat.com> - 1:1.10.5-9
+- rebuild
 
 * Wed Apr 11 2018 Remi Collet <remi@remirepo.net> - 1:1.10.5-8
 - require /usr/bin/gpg instead of gnupg