v2.0.29

(cherry picked from commit cc9c74cb41) (cherry picked from commit f562138f21)
v2.0.28
2020-09-08 07:45:11 +02:00 · 2020-07-08 15:43:36 +02:00 · 2020-04-06 11:06:44 +02:00 · 2020-03-23 16:33:43 +01:00 · 2020-02-25 08:47:27 +01:00 · 2020-02-24 10:55:41 +01:00
3 changed files with 120 additions and 24 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,3 +6,24 @@ 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
--- a/php-phpseclib.spec
+++ b/php-phpseclib.spec
@ -3,18 +3,17 @@

 %global github_owner            phpseclib
 %global github_name             phpseclib
-%global github_commit           34a7699e6f31b1ef4035ee36444407cecf9f56aa
+%global github_commit           497856a8d997f640b4a516062f84228a772a48a8
 %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.29
 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,18 @@ Source2:    makesrc.sh

 BuildArch:      noarch

-%if %{with_tests}
+%if %{with tests}
 BuildRequires:  php-composer(fedora/autoloader)
-BuildRequires:  %{_bindir}/phpunit
+%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
+%global phpunit %{_bindir}/phpunit6
+%else
+%global phpunit %{_bindir}/phpunit
+%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 +61,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 +70,29 @@ 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");
+}
+require "%{buildroot}%{_datadir}/php/%{composer_vendor}/autoload.php";
+date_default_timezone_set('UTC');
+EOF
+
+
+# testAuthorityInfoAccess fails without internet access
+# old PHPUnit don't support --filter
+sed -e 's/testAuthorityInfoAccess/SKIP_testAuthorityInfoAccess/' \
+    -i tests/Unit/File/X509/X509Test.php

 ret=0
-for cmd in php php70 php71 php72; do
+for cmd in "php %{phpunit}" php72 php73 php74; do
  if which $cmd; then
-    $cmd %{_bindir}/phpunit || ret=1
+    set $cmd
+    $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit6} \
+       --verbose || ret=1
  fi
 done
 exit $ret
@ -93,18 +107,79 @@ exit $ret


 %changelog
+* 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
+- add patch for PHP 5.3 from
+  https://github.com/phpseclib/phpseclib/pull/1404
+
+* 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
+- add patch for PHP 5.3 from
+  https://github.com/phpseclib/phpseclib/pull/1382
+
+* 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
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (php-phpseclib-2.0.6-34a7699.tgz) = 9c95e07f3c4785bc6f561dfbde13c6e062529493e52dad42fe369688109941bfea7a2e9e9c33db137c2a7325b9945674cbc2ac4e83e2502be04a935914b83366
+SHA512 (php-phpseclib-2.0.29-497856a.tgz) = 25cd67195588ea0e48f2fcb1d31ff22290b713cea9ea2295da92257393a7fc8341ad080fd3f5db54c00e38220affe1828ddbbb87a56460674a6782da9dc2113c
Author	SHA1	Message	Date
Remi Collet	404eb11543	v2.0.29 (cherry picked from commit `cc9c74cb41`) (cherry picked from commit `f562138f21`)	2020-09-08 07:45:11 +02:00
Remi Collet	a69013714a	v2.0.28 (cherry picked from commit `8059a579e4`)	2020-07-08 15:43:36 +02:00
Remi Collet	61a9ae0010	v2.0.27 (cherry picked from commit `ef09b9e384`)	2020-04-06 11:06:44 +02:00
Remi Collet	57d80d3cf7	v2.0.26 (cherry picked from commit `be5f67da40`)	2020-03-23 16:33:43 +01:00
Remi Collet	14c437bf6a	v2.0.25 (cherry picked from commit `b7026bf6d0`)	2020-02-25 08:47:27 +01:00
Remi Collet	394134b826	drop patch merged upstream	2020-02-24 10:55:41 +01:00
Remi Collet	7025367c35	v2.0.24 (cherry picked from commit `4afb9d06d4`) (cherry picked from commit `a232b7134a`)	2020-02-24 10:54:51 +01:00
Remi Collet	85d87eb3cb	v2.0.23 (cherry picked from commit `d5c345214e`)	2019-09-17 08:55:27 +02:00
Remi Collet	73eafd0eed	add the patch	2019-09-16 09:38:02 +02:00
Remi Collet	822cc6656c	add patch for PHP 5.3 from https://github.com/phpseclib/phpseclib/pull/1404	2019-09-16 09:35:48 +02:00
Remi Collet	3c178c20ff	v2.0.22 (cherry picked from commit `25d4ebf6d1`) (cherry picked from commit `c6b46c13d5`)	2019-09-16 09:24:35 +02:00
Remi Collet	fe133d5982	v2.0.21 (cherry picked from commit `8632a71b34`)	2019-07-15 11:24:48 +02:00
Remi Collet	8df53e3194	v2.0.20	2019-06-25 08:19:04 +02:00
Remi Collet	aadff7e72d	add patch for PHP 5.3 from + https://github.com/phpseclib/phpseclib/pull/1382	2019-06-21 09:42:36 +02:00
Remi Collet	79a4fcc201	v2.0.19 (cherry picked from commit `3cebcf26f6`)	2019-06-21 09:11:31 +02:00
Remi Collet	8f235102d9	v2.0.18 (cherry picked from commit `3f9638b7c6`)	2019-06-13 11:52:46 +02:00
Remi Collet	85b465a73a	v2.0.17 (cherry picked from commit `1f9c22bdc7`)	2019-05-27 14:12:55 +02:00
Remi Collet	482472f48f	v2.0.15 (cherry picked from commit `262fb9bea4`) (cherry picked from commit `0ed2ff8a91`)	2019-03-11 08:40:39 +01:00
Remi Collet	f55697a043	v2.0.14 (cherry picked from commit `3a0877eece`)	2019-01-31 10:36:12 +01:00
Remi Collet	d4407d71de	v2.0.13 (cherry picked from commit `742b37d259`)	2018-12-18 09:01:40 +01:00
Remi Collet	2d96a415f9	v2.0.12 (cherry picked from commit `44099d2dce`) (cherry picked from commit `f7e934db28`)	2018-11-05 09:53:06 +01:00
Remi Collet	07e5b4107e	v2.0.11 skip everywhere test requiring internet connection (cherry picked from commit `d2a83a8993`) (cherry picked from commit `0d11bf1cc7`) (cherry picked from commit `b9de54b142`)	2018-04-16 09:40:18 +02:00
Remi Collet	0037d54ce7	allow to run with old PHPUnit	2018-02-20 09:00:16 +01:00
Remi Collet	678ffbc867	Update to 2.0.10 use phpunit6 when available skip tests with PHPUnit < 4.8.35 (EPEL-6) (cherry picked from commit `39d5bd939c`) (cherry picked from commit `04a8db852c`)	2018-02-20 08:50:32 +01:00
Remi Collet	999529c574	v2.0.9 (cherry picked from commit `7a833a90f2`)	2017-11-29 13:48:44 +01:00
Remi Collet	909eb86f65	v2.0.7 (cherry picked from commit `b0eda92d2b`) (cherry picked from commit `7787882e43`)	2017-10-23 13:59:35 +02:00
Remi Collet	34a046767b	cleanup changelog	2017-06-06 10:28:27 +02:00