v2.0.39

(cherry picked from commit 303f260b98)

.gitignore

@@ -6,3 +6,34 @@ clog
 /php-phpseclib-2.0.4-ab8028c.tgz
 /php-phpseclib-2.0.5-f8dd0e1.tgz
 /php-phpseclib-2.0.6-34a7699.tgz
+/php-phpseclib-2.0.7-f4b6a52.tgz
+/php-phpseclib-2.0.9-c9a3fe3.tgz
+/php-phpseclib-2.0.10-d305b78.tgz
+/php-phpseclib-2.0.11-7053f06.tgz
+/php-phpseclib-2.0.12-8814dc7.tgz
+/php-phpseclib-2.0.13-42603ce.tgz
+/php-phpseclib-2.0.14-8ebfcad.tgz
+/php-phpseclib-2.0.15-11cf67c.tgz
+/php-phpseclib-2.0.17-3ca5b88.tgz
+/php-phpseclib-2.0.18-6051900.tgz
+/php-phpseclib-2.0.19-d2085db.tgz
+/php-phpseclib-2.0.20-d6819a5.tgz
+/php-phpseclib-2.0.21-9f1287e.tgz
+/php-phpseclib-2.0.22-cbddb52.tgz
+/php-phpseclib-2.0.23-c78eb50.tgz
+/php-phpseclib-2.0.24-4099815.tgz
+/php-phpseclib-2.0.25-c181596.tgz
+/php-phpseclib-2.0.26-09655fc.tgz
+/php-phpseclib-2.0.27-34620af.tgz
+/php-phpseclib-2.0.28-d1ca58c.tgz
+/php-phpseclib-2.0.29-497856a.tgz
+/php-phpseclib-2.0.30-136b9ca.tgz
+/php-phpseclib-2.0.31-233a920.tgz
+/php-phpseclib-2.0.32-f5c4c19.tgz
+/php-phpseclib-2.0.33-fb53b78.tgz
+/php-phpseclib-2.0.34-98a6fe5.tgz
+/php-phpseclib-2.0.35-4e16cf3.tgz
+/php-phpseclib-2.0.36-a975471.tgz
+/php-phpseclib-2.0.37-c812fbb.tgz
+/php-phpseclib-2.0.38-b035365.tgz
+/php-phpseclib-2.0.39-f3a0e2b.tgz

php-phpseclib.spec

@@ -3,18 +3,17 @@
 
 %global github_owner            phpseclib
 %global github_name             phpseclib
-%global github_commit           34a7699e6f31b1ef4035ee36444407cecf9f56aa
+%global github_commit           f3a0e2b715c40cf1fd270d444901b63311725d63
 %global github_short            %(c=%{github_commit}; echo ${c:0:7})
-%global with_tests              0%{!?_without_tests:1}
+%bcond_without                  tests
 
 Name:       php-%{composer_vendor}
-Version:    2.0.6
+Version:    2.0.39
 Release:    1%{?dist}
 Summary:    PHP Secure Communications Library
-
-Group:      System Environment/Libraries
 License:    MIT
 URL:        https://github.com/%{github_owner}/%{github_name}
+
 Source0:    %{name}-%{version}-%{github_short}.tgz
 Source1:    %{name}-autoload.php
 # Generate a full archive from git snapshot, with tests
@@ -22,14 +21,22 @@ Source2:    makesrc.sh
 
 BuildArch:      noarch
 
-%if %{with_tests}
+%if %{with tests}
 BuildRequires:  php-composer(fedora/autoloader)
-BuildRequires:  %{_bindir}/phpunit
+%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
+%global phpunit %{_bindir}/phpunit9
+%else
+%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
+%global phpunit %{_bindir}/phpunit6
+%else
+%global phpunit %{_bindir}/phpunit
+%endif
+%endif
+BuildRequires:  %{phpunit}
 BuildRequires:  %{_bindir}/phpab
 # Optional at runtime, to avoid too muck skipped tests
 BuildRequires:  php-bcmath
 BuildRequires:  php-gmp
-BuildRequires:  php-mcrypt
 %endif
 
 Requires:   php(language) >= 5.3.3
@@ -58,9 +65,6 @@ Rijndael, AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509
 %setup -qn %{github_name}-%{github_commit}
 cp %{SOURCE1} %{composer_vendor}/autoload.php
 
-# https://github.com/phpseclib/phpseclib/pull/1121
-chmod -x phpseclib/Net/SCP.php
-
 
 %build
 
@@ -70,15 +74,49 @@ mkdir -p %{buildroot}%{_datadir}/php
 cp -pr %{composer_vendor} %{buildroot}%{_datadir}/php
 
 
-%if %{with_tests}
+%if %{with tests}
 %check
 %{_bindir}/phpab --output tests/bootstrap.php tests
-echo 'require "%{buildroot}%{_datadir}/php/%{composer_vendor}/autoload.php";' >> tests/bootstrap.php
+cat << 'EOF' | tee -a tests/bootstrap.php
+if (class_exists("PHPUnit_Framework_TestCase") && !class_exists("PHPUnit\\Framework\\TestCase")) {
+     class_alias("PHPUnit_Framework_TestCase", "PHPUnit\\Framework\\TestCase");
+}
+if (class_exists("PHPUnit_Framework_Error_Notice") && !class_exists("PHPUnit\Framework\Error\Notice")) {
+     class_alias("PHPUnit_Framework_Error_Notice", "PHPUnit\Framework\Error\Notice");
+}
+require "%{buildroot}%{_datadir}/php/%{composer_vendor}/autoload.php";
+date_default_timezone_set('UTC');
+EOF
 
+# from travis/run-phpunit.sh
+if %{phpunit} --atleast-version 8
+then
+    find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/n setUpBeforeClass()/n setUpBeforeClass(): void/g'
+    find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/n setUp()/n setUp(): void/g'
+    find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/n tearDown()/n tearDown(): void/g'
+    find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertIsArray([^)]*)\)/\1: void/g'
+    find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertIsString([^)]*)\)/\1: void/g'
+    find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertStringContainsString([^)]*)\)/\1: void/g'
+    find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertStringNotContainsString([^)]*)\)/\1: void/g'
+    find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Unit_Crypt_\(AES\|Hash\|RSA\)_/class /g'
+    find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Unit_File_\(X509\)_/class /g'
+    find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Unit_Math_\(BigInteger\)_/class /g'
+    find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Unit_\(Crypt\|File\|Math\|Net\)_/class /g'
+    find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Functional_Net_/class /g'
+    find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/extends Unit_Crypt_Hash_\(SHA512Test\|SHA256Test\)/extends \1/g'
+fi
+
+# avoid already defined class
+sed -e '/require /d' -i tests/Unit/Crypt/Hash/SHA*_96Test.php
+
+# testAuthorityInfoAccess fails without internet access
 ret=0
-for cmd in php php70 php71 php72; do
+for cmd in "php %{phpunit}" php74 php80 php81 php82; do
   if which $cmd; then
-    $cmd %{_bindir}/phpunit || ret=1
+    set $cmd
+    $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit9} \
+       --filter '^((?!(testAuthorityInfoAccess)).)*$' \
+       --verbose || ret=1
   fi
 done
 exit $ret
@@ -93,18 +131,106 @@ exit $ret
 
 
 %changelog
+* Mon Oct 24 2022 Remi Collet <remi@remirepo.net> - 2.0.39-1
+- update to 2.0.39
+
+* Mon Sep 12 2022 Remi Collet <remi@remirepo.net> - 2.0.38-1
+- update to 2.0.38
+
+* Mon Apr  4 2022 Remi Collet <remi@remirepo.net> - 2.0.37-1
+- update to 2.0.37
+
+* Mon Jan 31 2022 Remi Collet <remi@remirepo.net> - 2.0.36-1
+- update to 2.0.36
+
+* Mon Nov 29 2021 Remi Collet <remi@remirepo.net> - 2.0.35-1
+- update to 2.0.35
+
+* Wed Oct 27 2021 Remi Collet <remi@remirepo.net> - 2.0.34-1
+- update to 2.0.34
+
+* Thu Sep  2 2021 Remi Collet <remi@remirepo.net> - 2.0.33-1
+- update to 2.0.33
+
+* Mon Jun 14 2021 Remi Collet <remi@remirepo.net> - 2.0.32-1
+- update to 2.0.32
+
+* Tue Apr  6 2021 Remi Collet <remi@remirepo.net> - 2.0.31-1
+- update to 2.0.31
+
+* Thu Dec 17 2020 Remi Collet <remi@remirepo.net> - 2.0.30-1
+- update to 2.0.30
+- switch to phpunit9 on Fedora
+
+* Tue Sep  8 2020 Remi Collet <remi@remirepo.net> - 2.0.29-1
+- update to 2.0.29
+
+* Wed Jul  8 2020 Remi Collet <remi@remirepo.net> - 2.0.28-1
+- update to 2.0.28
+
+* Mon Apr  6 2020 Remi Collet <remi@remirepo.net> - 2.0.27-1
+- update to 2.0.27
+
+* Mon Mar 23 2020 Remi Collet <remi@remirepo.net> - 2.0.26-1
+- update to 2.0.26
+
+* Tue Feb 25 2020 Remi Collet <remi@remirepo.net> - 2.0.25-1
+- update to 2.0.25
+
+* Mon Feb 24 2020 Remi Collet <remi@remirepo.net> - 2.0.24-1
+- update to 2.0.24
+
+* Tue Sep 17 2019 Remi Collet <remi@remirepo.net> - 2.0.23-1
+- update to 2.0.23
+
+* Mon Sep 16 2019 Remi Collet <remi@remirepo.net> - 2.0.22-1
+- update to 2.0.22
+
+* Mon Jul 15 2019 Remi Collet <remi@remirepo.net> - 2.0.21-1
+- update to 2.0.21
+
+* Tue Jun 25 2019 Remi Collet <remi@remirepo.net> - 2.0.20-1
+- update to 2.0.20
+
+* Fri Jun 21 2019 Remi Collet <remi@remirepo.net> - 2.0.19-1
+- update to 2.0.19
+
+* Thu Jun 13 2019 Remi Collet <remi@remirepo.net> - 2.0.18-1
+- update to 2.0.18
+
+* Mon May 27 2019 Remi Collet <remi@remirepo.net> - 2.0.17-1
+- update to 2.0.17
+
+* Mon Mar 11 2019 Remi Collet <remi@remirepo.net> - 2.0.15-1
+- update to 2.0.15
+
+* Thu Jan 31 2019 Remi Collet <remi@remirepo.net> - 2.0.14-1
+- update to 2.0.14
+
+* Tue Dec 18 2018 Remi Collet <remi@remirepo.net> - 2.0.13-1
+- update to 2.0.13
+
+* Mon Nov  5 2018 Remi Collet <remi@remirepo.net> - 2.0.12-1
+- update to 2.0.12
+
+* Mon Apr 16 2018 Remi Collet <remi@remirepo.net> - 2.0.11-1
+- update to 2.0.11
+
+* Tue Feb 20 2018 Remi Collet <remi@remirepo.net> - 2.0.10-1
+- Update to 2.0.10
+- use phpunit6 when available
+- skip tests with PHPUnit < 4.8.35 (EPEL-6)
+
+* Wed Nov 29 2017 Remi Collet <remi@remirepo.net> - 2.0.9-1
+- Update to 2.0.9
+
+* Mon Oct 23 2017 Remi Collet <remi@remirepo.net> - 2.0.7-1
+- Update to 2.0.7
+
 * Mon Jun  5 2017 Remi Collet <remi@remirepo.net> - 2.0.6-1
 - Update to 2.0.6
-
-* Mon May  8 2017 Remi Collet <remi@remirepo.net> - 2.0.5-1
-- Update to 2.0.5
 - switch to fedora/autoloader
 - use SCL of PHP when available for test suite
-- open https://github.com/phpseclib/phpseclib/issues/1122 - regression with 5.3
-- open https://github.com/phpseclib/phpseclib/pull/1121 - fix permission
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
 * Tue Oct  4 2016 Remi Collet <remi@fedoraproject.org> - 2.0.4-1
 - update to 2.0.4

sources

@@ -1 +1 @@
-SHA512 (php-phpseclib-2.0.6-34a7699.tgz) = 9c95e07f3c4785bc6f561dfbde13c6e062529493e52dad42fe369688109941bfea7a2e9e9c33db137c2a7325b9945674cbc2ac4e83e2502be04a935914b83366
+SHA512 (php-phpseclib-2.0.39-f3a0e2b.tgz) = 423de695e328670742918ac6b036807f649a31e61c436640836b443f0f18fd659e31f53a60221d580b97f5882c9d8f9148b2f0579b046b0fa9fd010059b31f0c