From 34a046767b00ac03388f59bfbd1de7bed9bd8aed Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 6 Jun 2017 10:28:27 +0200 Subject: [PATCH 01/32] cleanup changelog --- php-phpseclib.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 357d2ca..210d85d 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -95,16 +95,8 @@ exit $ret %changelog * Mon Jun 5 2017 Remi Collet - 2.0.6-1 - Update to 2.0.6 - -* Mon May 8 2017 Remi Collet - 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 - 2.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild * Tue Oct 4 2016 Remi Collet - 2.0.4-1 - update to 2.0.4 From 909eb86f65891278be49555ff669be056df138df Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 23 Oct 2017 13:55:57 +0200 Subject: [PATCH 02/32] v2.0.7 (cherry picked from commit b0eda92d2b3fda72e1b77e08af037def1965f836) (cherry picked from commit 7787882e437e6f383a67f5f348153e0da10b5e93) --- .gitignore | 1 + php-phpseclib.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 10d9469..05592a9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ 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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 210d85d..df5351f 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit 34a7699e6f31b1ef4035ee36444407cecf9f56aa +%global github_commit f4b6a522dfa1fd1e477c9cfe5909d5b31f098c0b %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor} -Version: 2.0.6 +Version: 2.0.7 Release: 1%{?dist} Summary: PHP Secure Communications Library @@ -29,7 +29,6 @@ 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 +57,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 @@ -73,7 +69,11 @@ cp -pr %{composer_vendor} %{buildroot}%{_datadir}/php %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 +require "%{buildroot}%{_datadir}/php/%{composer_vendor}/autoload.php"; +date_default_timezone_set('UTC'); +EOF + ret=0 for cmd in php php70 php71 php72; do @@ -93,6 +93,9 @@ exit $ret %changelog +* Mon Oct 23 2017 Remi Collet - 2.0.7-1 +- Update to 2.0.7 + * Mon Jun 5 2017 Remi Collet - 2.0.6-1 - Update to 2.0.6 - switch to fedora/autoloader diff --git a/sources b/sources index fb3aca6..09ddabb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.6-34a7699.tgz) = 9c95e07f3c4785bc6f561dfbde13c6e062529493e52dad42fe369688109941bfea7a2e9e9c33db137c2a7325b9945674cbc2ac4e83e2502be04a935914b83366 +SHA512 (php-phpseclib-2.0.7-f4b6a52.tgz) = 0af17d368663e08e83ecd56f28719330f6d6ab46186abb82a5abd875885eaf823008a36ad93791faf4060d772c80afd179086e46a5d6e8ccc5d9accf92800cb0 From 999529c574c408d1d7949c61d113e3ebc0083728 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Nov 2017 13:39:07 +0100 Subject: [PATCH 03/32] v2.0.9 (cherry picked from commit 7a833a90f2a36ec4278644f49c14115d9c4c5ed0) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 05592a9..1bbf2d1 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index df5351f..c31ba6c 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit f4b6a522dfa1fd1e477c9cfe5909d5b31f098c0b +%global github_commit c9a3fe35e20eb6eeaca716d6a23cde03f52d1558 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor} -Version: 2.0.7 +Version: 2.0.9 Release: 1%{?dist} Summary: PHP Secure Communications Library @@ -93,6 +93,9 @@ exit $ret %changelog +* Wed Nov 29 2017 Remi Collet - 2.0.9-1 +- Update to 2.0.9 + * Mon Oct 23 2017 Remi Collet - 2.0.7-1 - Update to 2.0.7 diff --git a/sources b/sources index 09ddabb..3c89951 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.7-f4b6a52.tgz) = 0af17d368663e08e83ecd56f28719330f6d6ab46186abb82a5abd875885eaf823008a36ad93791faf4060d772c80afd179086e46a5d6e8ccc5d9accf92800cb0 +SHA512 (php-phpseclib-2.0.9-c9a3fe3.tgz) = a139cb0eb19e45f5159fa5f767ac1534665eccbf476cb5ea67f3b10aa1b5d29dcf08517e659275673547472899238b1bfe6dc2e610a2cbe6bc23eb2b2cadcf8b From 678ffbc8672aeee32d7a17e259513dcb43b0d851 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 20 Feb 2018 08:32:12 +0100 Subject: [PATCH 04/32] Update to 2.0.10 use phpunit6 when available skip tests with PHPUnit < 4.8.35 (EPEL-6) (cherry picked from commit 39d5bd939cace186596af8ffb99105dba1952f24) (cherry picked from commit 04a8db852c496ba64fbcfe08541f3c19d7c24a8f) --- .gitignore | 1 + php-phpseclib.spec | 38 ++++++++++++++++++++++++++------------ sources | 2 +- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 1bbf2d1..20f80bb 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index c31ba6c..08b88ed 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,18 +3,17 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit c9a3fe35e20eb6eeaca716d6a23cde03f52d1558 +%global github_commit d305b780829ea4252ed9400b3f5937c2c99b51d4 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor} -Version: 2.0.9 +Version: 2.0.10 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 @@ -24,7 +23,12 @@ BuildArch: noarch %if %{with_tests} BuildRequires: php-composer(fedora/autoloader) -BuildRequires: %{_bindir}/phpunit +%if 0%{?fedora} >= 26 +%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 @@ -75,13 +79,18 @@ date_default_timezone_set('UTC'); EOF -ret=0 -for cmd in php php70 php71 php72; do - if which $cmd; then - $cmd %{_bindir}/phpunit || ret=1 - fi -done -exit $ret +if php %{phpunit} --atleast-version 4.8.35; then + ret=0 + for cmd in "php %{phpunit}" php70 php71 php72; do + if which $cmd; then + set $cmd + $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit6} --verbose || ret=1 + fi + done + exit $ret +else + : Skip test as PHPUnit is too old +fi %endif @@ -93,6 +102,11 @@ exit $ret %changelog +* Tue Feb 20 2018 Remi Collet - 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 - 2.0.9-1 - Update to 2.0.9 diff --git a/sources b/sources index 3c89951..19d2dc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.9-c9a3fe3.tgz) = a139cb0eb19e45f5159fa5f767ac1534665eccbf476cb5ea67f3b10aa1b5d29dcf08517e659275673547472899238b1bfe6dc2e610a2cbe6bc23eb2b2cadcf8b +SHA512 (php-phpseclib-2.0.10-d305b78.tgz) = e11f37c320f458c77d77e34c35c59cb3e93100cff4a46d327de8d9a1a34b6da1a7e303b61d9ed7a734a8ace50859abf7301828b3b099b3a7c0c83ce8c09aa629 From c4d8381963a6d20e3fd6931b876a236c2a41ab83 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 16 Apr 2018 09:09:05 +0200 Subject: [PATCH 05/32] v2.0.11 skip everywhere test requiring internet connection (cherry picked from commit d2a83a899348e72280513218da9f72a210fe3e37) (cherry picked from commit 0d11bf1cc73e2eda88b765874ca0b325170f9b76) (cherry picked from commit b9de54b142dd3b7d52393556caa1e754eeb274ee) --- .gitignore | 1 + php-phpseclib.spec | 33 +++++++++++++++++++-------------- sources | 2 +- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 20f80bb..0033d53 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 08b88ed..5bf489a 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit d305b780829ea4252ed9400b3f5937c2c99b51d4 +%global github_commit 7053f06f91b3de78e143d430e55a8f7889efc08b %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor} -Version: 2.0.10 +Version: 2.0.11 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -74,23 +74,25 @@ cp -pr %{composer_vendor} %{buildroot}%{_datadir}/php %check %{_bindir}/phpab --output tests/bootstrap.php tests 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 -if php %{phpunit} --atleast-version 4.8.35; then - ret=0 - for cmd in "php %{phpunit}" php70 php71 php72; do - if which $cmd; then - set $cmd - $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit6} --verbose || ret=1 - fi - done - exit $ret -else - : Skip test as PHPUnit is too old -fi +# testAuthorityInfoAccess fails without internet access +ret=0 +for cmd in "php %{phpunit}" php70 php71 php72; do + if which $cmd; then + set $cmd + $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit6} \ + --filter '^((?!(testAuthorityInfoAccess)).)*$' \ + --verbose || ret=1 + fi +done +exit $ret %endif @@ -102,6 +104,9 @@ fi %changelog +* Mon Apr 16 2018 Remi Collet - 2.0.11-1 +- update to 2.0.11 + * Tue Feb 20 2018 Remi Collet - 2.0.10-1 - Update to 2.0.10 - use phpunit6 when available diff --git a/sources b/sources index 19d2dc5..2f4942e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.10-d305b78.tgz) = e11f37c320f458c77d77e34c35c59cb3e93100cff4a46d327de8d9a1a34b6da1a7e303b61d9ed7a734a8ace50859abf7301828b3b099b3a7c0c83ce8c09aa629 +SHA512 (php-phpseclib-2.0.11-7053f06.tgz) = 57f1f4c42679b737746e3eec5e64a83661969313259724d97d375d3d9e4805290d99e17ee1a44f60a798ef04ffb989bdf3e542113846d0bba608e5ee25d0f51f From 5e8e82342171b23f5d53190721672f641259f29a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Nov 2018 09:40:54 +0100 Subject: [PATCH 06/32] v2.0.12 (cherry picked from commit 44099d2dced26e11e25740685838318d189411d7) (cherry picked from commit f7e934db28c06d278d20ea093f6e1d5053957b90) --- .gitignore | 1 + php-phpseclib.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0033d53..a4e3636 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 5bf489a..232ba23 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit 7053f06f91b3de78e143d430e55a8f7889efc08b +%global github_commit 8814dc7841db159daed0b32c2b08fb7e03c6afe7 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor} -Version: 2.0.11 +Version: 2.0.12 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -23,7 +23,7 @@ BuildArch: noarch %if %{with_tests} BuildRequires: php-composer(fedora/autoloader) -%if 0%{?fedora} >= 26 +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 %global phpunit %{_bindir}/phpunit6 %else %global phpunit %{_bindir}/phpunit @@ -84,7 +84,7 @@ EOF # testAuthorityInfoAccess fails without internet access ret=0 -for cmd in "php %{phpunit}" php70 php71 php72; do +for cmd in "php %{phpunit}" php70 php71 php72 php73; do if which $cmd; then set $cmd $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit6} \ @@ -104,6 +104,9 @@ exit $ret %changelog +* Mon Nov 5 2018 Remi Collet - 2.0.12-1 +- update to 2.0.12 + * Mon Apr 16 2018 Remi Collet - 2.0.11-1 - update to 2.0.11 diff --git a/sources b/sources index 2f4942e..f4e80cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.11-7053f06.tgz) = 57f1f4c42679b737746e3eec5e64a83661969313259724d97d375d3d9e4805290d99e17ee1a44f60a798ef04ffb989bdf3e542113846d0bba608e5ee25d0f51f +SHA512 (php-phpseclib-2.0.12-8814dc7.tgz) = c485b4eb1d7f2ba86882df83783c327434ad161e27707189326a8888e0040014936d81c3f97fc0a9f2213749f8d50daa50a682cd4609e0169400505bb5e9b53a From 4002b993ef53918c5b4b0f5b91e74f3624922e28 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 18 Dec 2018 08:54:35 +0100 Subject: [PATCH 07/32] v2.0.13 (cherry picked from commit 742b37d25927f50f6b0c08f9f0ec6418b12ede70) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a4e3636..a612b2b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 232ba23..33b0bd9 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit 8814dc7841db159daed0b32c2b08fb7e03c6afe7 +%global github_commit 42603ce3f42a27f7e14e54feab95db7b680ad473 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor} -Version: 2.0.12 +Version: 2.0.13 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -104,6 +104,9 @@ exit $ret %changelog +* Tue Dec 18 2018 Remi Collet - 2.0.13-1 +- update to 2.0.13 + * Mon Nov 5 2018 Remi Collet - 2.0.12-1 - update to 2.0.12 diff --git a/sources b/sources index f4e80cd..ef74568 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.12-8814dc7.tgz) = c485b4eb1d7f2ba86882df83783c327434ad161e27707189326a8888e0040014936d81c3f97fc0a9f2213749f8d50daa50a682cd4609e0169400505bb5e9b53a +SHA512 (php-phpseclib-2.0.13-42603ce.tgz) = 464b551408e35b89b0ea55d0dcaefb21e5d494f1f4678e344da469d27714af8b1a6623bfe66b5929dfcd58a3a90e67551ea3f3084ce3d6b08347f3dc6df8992b From b05445dfbb57a1f24b04148b0db3835ba7fd0a9b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 31 Jan 2019 10:27:36 +0100 Subject: [PATCH 08/32] v2.0.14 (cherry picked from commit 3a0877eecea8ff20ecb50075869536528e797448) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a612b2b..d0250d0 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 33b0bd9..b523fa5 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit 42603ce3f42a27f7e14e54feab95db7b680ad473 +%global github_commit 8ebfcadbf30524aeb75b2c446bc2519d5b321478 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor} -Version: 2.0.13 +Version: 2.0.14 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -104,6 +104,9 @@ exit $ret %changelog +* Thu Jan 31 2019 Remi Collet - 2.0.14-1 +- update to 2.0.14 + * Tue Dec 18 2018 Remi Collet - 2.0.13-1 - update to 2.0.13 diff --git a/sources b/sources index ef74568..cf438b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.13-42603ce.tgz) = 464b551408e35b89b0ea55d0dcaefb21e5d494f1f4678e344da469d27714af8b1a6623bfe66b5929dfcd58a3a90e67551ea3f3084ce3d6b08347f3dc6df8992b +SHA512 (php-phpseclib-2.0.14-8ebfcad.tgz) = f0ddba4bb5cf45a32f8ab64c4b84e9d80281b58e8bb5d31b91b7b41a1355410cacbfaa852a0be1450994248a41cdc4346e661186c80468ac71a34f241b027bfd From 54044044c457420090bc77aceac0d5d79d2e0803 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 11 Mar 2019 08:35:38 +0100 Subject: [PATCH 09/32] v2.0.15 (cherry picked from commit 262fb9bea46c7ac6f0872cdf5d62d8c813ff309e) (cherry picked from commit 0ed2ff8a913d336d1eb842a8298da70989fafafb) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d0250d0..1e72613 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index b523fa5..4647476 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit 8ebfcadbf30524aeb75b2c446bc2519d5b321478 +%global github_commit 11cf67cf78dc4acb18dc9149a57be4aee5036ce0 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor} -Version: 2.0.14 +Version: 2.0.15 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -104,6 +104,9 @@ exit $ret %changelog +* Mon Mar 11 2019 Remi Collet - 2.0.15-1 +- update to 2.0.15 + * Thu Jan 31 2019 Remi Collet - 2.0.14-1 - update to 2.0.14 diff --git a/sources b/sources index cf438b4..d6a99ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.14-8ebfcad.tgz) = f0ddba4bb5cf45a32f8ab64c4b84e9d80281b58e8bb5d31b91b7b41a1355410cacbfaa852a0be1450994248a41cdc4346e661186c80468ac71a34f241b027bfd +SHA512 (php-phpseclib-2.0.15-11cf67c.tgz) = 5a777388f8684f3b0fda7b9da9e98936ad7d26539bf8ee89b04142b98c688a4c6b399e7088305f6aeea5e181bb90e77550e8e9c41a73e2336be24e5e3c11e767 From faedea2a6563d4e9e6a58460ef3c9966a92a0639 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 27 May 2019 14:02:45 +0200 Subject: [PATCH 10/32] v2.0.17 (cherry picked from commit 1f9c22bdc729b004b57be99ad85582e3d9f28553) --- .gitignore | 1 + php-phpseclib.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1e72613..21ac0ca 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 4647476..196a37d 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit 11cf67cf78dc4acb18dc9149a57be4aee5036ce0 +%global github_commit 3ca5b88d582c69178c8d01fd9d02b94e15042bb8 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor} -Version: 2.0.15 +Version: 2.0.17 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -84,7 +84,7 @@ EOF # testAuthorityInfoAccess fails without internet access ret=0 -for cmd in "php %{phpunit}" php70 php71 php72 php73; do +for cmd in "php %{phpunit}" php71 php72 php73 php74; do if which $cmd; then set $cmd $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit6} \ @@ -104,6 +104,9 @@ exit $ret %changelog +* Mon May 27 2019 Remi Collet - 2.0.17-1 +- update to 2.0.17 + * Mon Mar 11 2019 Remi Collet - 2.0.15-1 - update to 2.0.15 diff --git a/sources b/sources index d6a99ab..7cfb229 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.15-11cf67c.tgz) = 5a777388f8684f3b0fda7b9da9e98936ad7d26539bf8ee89b04142b98c688a4c6b399e7088305f6aeea5e181bb90e77550e8e9c41a73e2336be24e5e3c11e767 +SHA512 (php-phpseclib-2.0.17-3ca5b88.tgz) = 528e394d4eb3379372782ef68cb768de18e83e9f57f41e09b045244843bb5ba2972c0d4b3e0a942cab4973abfa81e5626f9a21b363f07e1b26897a3d39379711 From 285a4acc2599302b3aafdc05bc9da66d5837bfcd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 13 Jun 2019 11:47:59 +0200 Subject: [PATCH 11/32] v2.0.18 (cherry picked from commit 3f9638b7c6e5e6e9bd29441e12d426f3c5dc154f) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 21ac0ca..5cec9b4 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 196a37d..214137f 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit 3ca5b88d582c69178c8d01fd9d02b94e15042bb8 +%global github_commit 60519001db8d791215a822efd366d24cafee9e63 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor} -Version: 2.0.17 +Version: 2.0.18 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -104,6 +104,9 @@ exit $ret %changelog +* Thu Jun 13 2019 Remi Collet - 2.0.18-1 +- update to 2.0.18 + * Mon May 27 2019 Remi Collet - 2.0.17-1 - update to 2.0.17 diff --git a/sources b/sources index 7cfb229..8efcd77 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.17-3ca5b88.tgz) = 528e394d4eb3379372782ef68cb768de18e83e9f57f41e09b045244843bb5ba2972c0d4b3e0a942cab4973abfa81e5626f9a21b363f07e1b26897a3d39379711 +SHA512 (php-phpseclib-2.0.18-6051900.tgz) = 619a8021cff1db422971c9e001f36eb01b3766fdbbfa4ac298239d2e528c38c9c52feb04bf994b4c873ec4b17590be914819edc55d318936b942a08d15bbb681 From 71a7e359c73a2be834abe9739062a8f8123f59fb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 21 Jun 2019 09:00:55 +0200 Subject: [PATCH 12/32] v2.0.19 (cherry picked from commit 3cebcf26f6001da159de574b81562e6419b474b8) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5cec9b4..e7727bc 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 214137f..4e00d62 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit 60519001db8d791215a822efd366d24cafee9e63 +%global github_commit d2085db7b7394baa071a69c8f9159723c250f2ba %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor} -Version: 2.0.18 +Version: 2.0.19 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -104,6 +104,9 @@ exit $ret %changelog +* Fri Jun 21 2019 Remi Collet - 2.0.19-1 +- update to 2.0.19 + * Thu Jun 13 2019 Remi Collet - 2.0.18-1 - update to 2.0.18 diff --git a/sources b/sources index 8efcd77..d35fc0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.18-6051900.tgz) = 619a8021cff1db422971c9e001f36eb01b3766fdbbfa4ac298239d2e528c38c9c52feb04bf994b4c873ec4b17590be914819edc55d318936b942a08d15bbb681 +SHA512 (php-phpseclib-2.0.19-d2085db.tgz) = 49c62eea531b0ebd45777d27302624a6bda21c1d515d0bd49a5d22c83931255dc0bd0d036e296db244262b37e5398c693691cef08212bca8e43a5f3209c4d30d From 7d3dade51f15dd6f91d81e92c8350569109f62ea Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 25 Jun 2019 08:19:57 +0200 Subject: [PATCH 13/32] v2.0.20 (cherry picked from commit 344facb219f41db447ed2eadb2a8324133b977dc) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e7727bc..42b58fa 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 4e00d62..d5da2e7 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit d2085db7b7394baa071a69c8f9159723c250f2ba +%global github_commit d6819a55b05e123db1e881d8b230d57f912126be %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor} -Version: 2.0.19 +Version: 2.0.20 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -104,6 +104,9 @@ exit $ret %changelog +* Tue Jun 25 2019 Remi Collet - 2.0.20-1 +- update to 2.0.20 + * Fri Jun 21 2019 Remi Collet - 2.0.19-1 - update to 2.0.19 diff --git a/sources b/sources index d35fc0e..1df7e20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.19-d2085db.tgz) = 49c62eea531b0ebd45777d27302624a6bda21c1d515d0bd49a5d22c83931255dc0bd0d036e296db244262b37e5398c693691cef08212bca8e43a5f3209c4d30d +SHA512 (php-phpseclib-2.0.20-d6819a5.tgz) = b9e0c50023d680d3db1e9a33a46c7c61a51ded77bef8e2deefcd12b6fa2e597b89f016e409be8d53cead6c9d6100863044bdceb0e106b18c2dbfc064e4a0e7ac From 2ff90dea1769bf967c3bf4f65aad0ca3e550acd6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 15 Jul 2019 11:19:48 +0200 Subject: [PATCH 14/32] v2.0.21 (cherry picked from commit 8632a71b342b3a054ac30831241abf96360705cc) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 42b58fa..f278bed 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index d5da2e7..765b9ce 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit d6819a55b05e123db1e881d8b230d57f912126be +%global github_commit 9f1287e68b3f283339a9f98f67515dd619e5bf9d %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor} -Version: 2.0.20 +Version: 2.0.21 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -104,6 +104,9 @@ exit $ret %changelog +* Mon Jul 15 2019 Remi Collet - 2.0.21-1 +- update to 2.0.21 + * Tue Jun 25 2019 Remi Collet - 2.0.20-1 - update to 2.0.20 diff --git a/sources b/sources index 1df7e20..e956a19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.20-d6819a5.tgz) = b9e0c50023d680d3db1e9a33a46c7c61a51ded77bef8e2deefcd12b6fa2e597b89f016e409be8d53cead6c9d6100863044bdceb0e106b18c2dbfc064e4a0e7ac +SHA512 (php-phpseclib-2.0.21-9f1287e.tgz) = 0523bf8949050beb4a4bf3130f7fc140472a7edcdbe616cd4010b3d9266138467bc9cbaf27f79ed28900d230f59435e07623d371c44baf9da492b29e132a0a79 From b0e934bb5311d73f5235a59bbf4209d7899d6178 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 16 Sep 2019 09:17:21 +0200 Subject: [PATCH 15/32] v2.0.22 (cherry picked from commit 25d4ebf6d184873a64d2bc17f60ad497c6cb26da) (cherry picked from commit c6b46c13d5d3f06664b0a657feb6eca35e392f12) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f278bed..1feff30 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 765b9ce..fb905c0 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit 9f1287e68b3f283339a9f98f67515dd619e5bf9d +%global github_commit cbddb5244edff6d2599977f1a1e4c8657f292e7c %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor} -Version: 2.0.21 +Version: 2.0.22 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -104,6 +104,9 @@ exit $ret %changelog +* Mon Sep 16 2019 Remi Collet - 2.0.22-1 +- update to 2.0.22 + * Mon Jul 15 2019 Remi Collet - 2.0.21-1 - update to 2.0.21 diff --git a/sources b/sources index e956a19..8598208 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.21-9f1287e.tgz) = 0523bf8949050beb4a4bf3130f7fc140472a7edcdbe616cd4010b3d9266138467bc9cbaf27f79ed28900d230f59435e07623d371c44baf9da492b29e132a0a79 +SHA512 (php-phpseclib-2.0.22-cbddb52.tgz) = fc6de5cb9756e37698d8426be2cc4e7e2fa0ffe42c17a8b930e9c5420095ce25d7169c32b01502c22ede1da7336d38edb7780b73e8c832bcd01050e2404cd81d From b39f1de2d9884a438c7408ccf7065ea70329e93b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 17 Sep 2019 08:42:34 +0200 Subject: [PATCH 16/32] v2.0.23 (cherry picked from commit d5c345214eeb727863f725d5a3440e7106c47bf1) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1feff30..ad690fc 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index fb905c0..e36d8fe 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit cbddb5244edff6d2599977f1a1e4c8657f292e7c +%global github_commit c78eb5058d5bb1a183133c36d4ba5b6675dfa099 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor} -Version: 2.0.22 +Version: 2.0.23 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -104,6 +104,9 @@ exit $ret %changelog +* Tue Sep 17 2019 Remi Collet - 2.0.23-1 +- update to 2.0.23 + * Mon Sep 16 2019 Remi Collet - 2.0.22-1 - update to 2.0.22 diff --git a/sources b/sources index 8598208..daad635 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.22-cbddb52.tgz) = fc6de5cb9756e37698d8426be2cc4e7e2fa0ffe42c17a8b930e9c5420095ce25d7169c32b01502c22ede1da7336d38edb7780b73e8c832bcd01050e2404cd81d +SHA512 (php-phpseclib-2.0.23-c78eb50.tgz) = 8129ce261caaccfca10e5e1d6d257fd7bc2d49d8a4ebff5dd1ff28474a175af2bba8c0e49763ff52a032e1b6cca75b02bee439b3672f0ca73a18584e24ae9eb6 From b226a53055c74384216e25c54a19539dbb85fa55 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 24 Feb 2020 10:42:45 +0100 Subject: [PATCH 17/32] v2.0.24 (cherry picked from commit 4afb9d06d4a27874fc3c1446b775b8d5cfe29961) (cherry picked from commit a232b7134ae55913ff1c60a8ffedebd7f3e57f48) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ad690fc..32b2895 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index e36d8fe..e01264b 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit c78eb5058d5bb1a183133c36d4ba5b6675dfa099 +%global github_commit 40998159a0907cc523e1f2d1904d45765613a617 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor} -Version: 2.0.23 +Version: 2.0.24 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -104,6 +104,9 @@ exit $ret %changelog +* Mon Feb 24 2020 Remi Collet - 2.0.24-1 +- update to 2.0.24 + * Tue Sep 17 2019 Remi Collet - 2.0.23-1 - update to 2.0.23 diff --git a/sources b/sources index daad635..a1fa734 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.23-c78eb50.tgz) = 8129ce261caaccfca10e5e1d6d257fd7bc2d49d8a4ebff5dd1ff28474a175af2bba8c0e49763ff52a032e1b6cca75b02bee439b3672f0ca73a18584e24ae9eb6 +SHA512 (php-phpseclib-2.0.24-4099815.tgz) = b837486b4fc14bbe54432c32936b30ec7979e8ff5729270aa26b7d27f8c144f83adffade2ff9023adae9b9bd8c016a5114301b0a2ace0d376d0d4c25f2d6cd60 From 7f06c2c49255325f7259de84c924733f471fa93d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 25 Feb 2020 08:36:43 +0100 Subject: [PATCH 18/32] v2.0.25 (cherry picked from commit b7026bf6d0865a0174468cf3dabdd702df0212cb) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 32b2895..d6365c4 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index e01264b..166df62 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit 40998159a0907cc523e1f2d1904d45765613a617 +%global github_commit c18159618ed7cd7ff721ac1a8fec7860a475d2f0 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor} -Version: 2.0.24 +Version: 2.0.25 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -104,6 +104,9 @@ exit $ret %changelog +* Tue Feb 25 2020 Remi Collet - 2.0.25-1 +- update to 2.0.25 + * Mon Feb 24 2020 Remi Collet - 2.0.24-1 - update to 2.0.24 diff --git a/sources b/sources index a1fa734..b1f7378 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.24-4099815.tgz) = b837486b4fc14bbe54432c32936b30ec7979e8ff5729270aa26b7d27f8c144f83adffade2ff9023adae9b9bd8c016a5114301b0a2ace0d376d0d4c25f2d6cd60 +SHA512 (php-phpseclib-2.0.25-c181596.tgz) = 34db733ee23b5c4d5325941003a9811a92a36d88c6bbfcc522548a04ff926eac33a0b4dd4d0725e64824843d7925d6caf0308db761d240160b9419324b515691 From 4a26d3c0ba2ca2db803d25f0ca3a7d282ffa3ff6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 23 Mar 2020 16:21:38 +0100 Subject: [PATCH 19/32] v2.0.26 (cherry picked from commit be5f67da40b9c9e3ea04b01df1ddaa0c19ff883d) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d6365c4..cccc136 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 166df62..7c6eb95 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit c18159618ed7cd7ff721ac1a8fec7860a475d2f0 +%global github_commit 09655fcc1f8bab65727be036b28f6f20311c126c %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor} -Version: 2.0.25 +Version: 2.0.26 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -104,6 +104,9 @@ exit $ret %changelog +* Mon Mar 23 2020 Remi Collet - 2.0.26-1 +- update to 2.0.26 + * Tue Feb 25 2020 Remi Collet - 2.0.25-1 - update to 2.0.25 diff --git a/sources b/sources index b1f7378..7055bd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.25-c181596.tgz) = 34db733ee23b5c4d5325941003a9811a92a36d88c6bbfcc522548a04ff926eac33a0b4dd4d0725e64824843d7925d6caf0308db761d240160b9419324b515691 +SHA512 (php-phpseclib-2.0.26-09655fc.tgz) = b96aa64420fa0cab540f7414599b78b5d097daba3de2bb5b330899e72cef14fadfd9933dd425286497132a375dd0c0ea1ca8eb33ffc0eeff7ac38b70fa649951 From a9260ad2efc5fe4d908c69fe0757019d119cfbae Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 6 Apr 2020 10:58:25 +0200 Subject: [PATCH 20/32] v2.0.27 (cherry picked from commit ef09b9e3840b4fbd376cb16ff22255233417dbb6) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cccc136..b6ce423 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 7c6eb95..298702c 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit 09655fcc1f8bab65727be036b28f6f20311c126c +%global github_commit 34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor} -Version: 2.0.26 +Version: 2.0.27 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -104,6 +104,9 @@ exit $ret %changelog +* Mon Apr 6 2020 Remi Collet - 2.0.27-1 +- update to 2.0.27 + * Mon Mar 23 2020 Remi Collet - 2.0.26-1 - update to 2.0.26 diff --git a/sources b/sources index 7055bd9..5d18860 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.26-09655fc.tgz) = b96aa64420fa0cab540f7414599b78b5d097daba3de2bb5b330899e72cef14fadfd9933dd425286497132a375dd0c0ea1ca8eb33ffc0eeff7ac38b70fa649951 +SHA512 (php-phpseclib-2.0.27-34620af.tgz) = de9419dec6cbca5945816e8d5333ab8b5b94ea721c8f39a896fcf81f86bdacfbd7878873713d2f7c9df82c6a954c9f5764a091adef231a0135f8ffbeba395162 From 428de04fa71a79028c11683d400e4b9c595a3185 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 8 Jul 2020 15:38:37 +0200 Subject: [PATCH 21/32] v2.0.28 (cherry picked from commit 8059a579e4ef86f720d64a3c6382ac345e8244af) --- .gitignore | 1 + php-phpseclib.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index b6ce423..5645540 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 298702c..81f754e 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit 34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc +%global github_commit d1ca58cf33cb21046d702ae3a7b14fdacd9f3260 %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.27 +Version: 2.0.28 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -21,7 +21,7 @@ Source2: makesrc.sh BuildArch: noarch -%if %{with_tests} +%if %{with tests} BuildRequires: php-composer(fedora/autoloader) %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 %global phpunit %{_bindir}/phpunit6 @@ -70,7 +70,7 @@ 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 cat << 'EOF' | tee -a tests/bootstrap.php @@ -84,7 +84,7 @@ EOF # testAuthorityInfoAccess fails without internet access ret=0 -for cmd in "php %{phpunit}" php71 php72 php73 php74; do +for cmd in "php %{phpunit}" php72 php73 php74 php80; do if which $cmd; then set $cmd $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit6} \ @@ -104,6 +104,9 @@ exit $ret %changelog +* Wed Jul 8 2020 Remi Collet - 2.0.28-1 +- update to 2.0.28 + * Mon Apr 6 2020 Remi Collet - 2.0.27-1 - update to 2.0.27 diff --git a/sources b/sources index 5d18860..1ad50fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.27-34620af.tgz) = de9419dec6cbca5945816e8d5333ab8b5b94ea721c8f39a896fcf81f86bdacfbd7878873713d2f7c9df82c6a954c9f5764a091adef231a0135f8ffbeba395162 +SHA512 (php-phpseclib-2.0.28-d1ca58c.tgz) = 0c8f0602d735c91778eaf24d98b6f4acea1383130440eec24fa3cbceec97bffd83eb32c322715a500ed6e8e2eeeefaaf8273f96dfa035ad38df87e8677050b10 From 367b73dc197399d5f444171d9ed0dd7e5c7eabd8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 8 Sep 2020 07:32:13 +0200 Subject: [PATCH 22/32] v2.0.29 (cherry picked from commit cc9c74cb414dcf358b5b7adfd12a98bc9596c29e) (cherry picked from commit f562138f214788dcd942e8f5abbfd5748258aa5b) --- .gitignore | 1 + php-phpseclib.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5645540..a53bbd5 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 81f754e..bd497c3 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit d1ca58cf33cb21046d702ae3a7b14fdacd9f3260 +%global github_commit 497856a8d997f640b4a516062f84228a772a48a8 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %bcond_without tests Name: php-%{composer_vendor} -Version: 2.0.28 +Version: 2.0.29 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -84,7 +84,7 @@ EOF # testAuthorityInfoAccess fails without internet access ret=0 -for cmd in "php %{phpunit}" php72 php73 php74 php80; do +for cmd in "php %{phpunit}" php72 php73 php74; do if which $cmd; then set $cmd $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit6} \ @@ -104,6 +104,9 @@ exit $ret %changelog +* Tue Sep 8 2020 Remi Collet - 2.0.29-1 +- update to 2.0.29 + * Wed Jul 8 2020 Remi Collet - 2.0.28-1 - update to 2.0.28 diff --git a/sources b/sources index 1ad50fc..48acdb9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.28-d1ca58c.tgz) = 0c8f0602d735c91778eaf24d98b6f4acea1383130440eec24fa3cbceec97bffd83eb32c322715a500ed6e8e2eeeefaaf8273f96dfa035ad38df87e8677050b10 +SHA512 (php-phpseclib-2.0.29-497856a.tgz) = 25cd67195588ea0e48f2fcb1d31ff22290b713cea9ea2295da92257393a7fc8341ad080fd3f5db54c00e38220affe1828ddbbb87a56460674a6782da9dc2113c From aa1abb29a223459a30d85b53db94c40d01d64468 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 17 Dec 2020 08:36:51 +0100 Subject: [PATCH 23/32] update to 2.0.30 switch to phpunit9 on Fedora (cherry picked from commit 655d22cd47e0097db4b94990d4d803ed8a396f50) --- .gitignore | 1 + php-phpseclib.spec | 36 ++++++++++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a53bbd5..88daa9e 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index bd497c3..6e223f5 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit 497856a8d997f640b4a516062f84228a772a48a8 +%global github_commit 136b9ca7eebef78be14abf90d65c5e57b6bc5d36 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %bcond_without tests Name: php-%{composer_vendor} -Version: 2.0.29 +Version: 2.0.30 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -23,11 +23,15 @@ BuildArch: noarch %if %{with tests} BuildRequires: php-composer(fedora/autoloader) +%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 @@ -81,13 +85,33 @@ 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 %{phpunit}" php72 php73 php74; do +for cmd in "php %{phpunit}" php73 php74 php80; do if which $cmd; then set $cmd - $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit6} \ + $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit9} \ --filter '^((?!(testAuthorityInfoAccess)).)*$' \ --verbose || ret=1 fi @@ -104,6 +128,10 @@ exit $ret %changelog +* Thu Dec 17 2020 Remi Collet - 2.0.30-1 +- update to 2.0.30 +- switch to phpunit9 on Fedora + * Tue Sep 8 2020 Remi Collet - 2.0.29-1 - update to 2.0.29 diff --git a/sources b/sources index 48acdb9..0b671cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.29-497856a.tgz) = 25cd67195588ea0e48f2fcb1d31ff22290b713cea9ea2295da92257393a7fc8341ad080fd3f5db54c00e38220affe1828ddbbb87a56460674a6782da9dc2113c +SHA512 (php-phpseclib-2.0.30-136b9ca.tgz) = 47f2c29ddd5d8501610d7171ce49a32f921571c55fe1c9f54a08a4c84b3dace3b2645e9358c5ca5a5cfb03115b3fa023c4864ee847a60a9fdce3cf6cd42f2faf From 85c0782c52e0415e09b66abdcae699cd5b9f0abc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 6 Apr 2021 16:22:55 +0200 Subject: [PATCH 24/32] v2.0.31 (cherry picked from commit 7f789fef7ce24774a1243cf314ed31353762ac18) (cherry picked from commit 8688ad3ad6cec253a0fc174e8a25832f34d4e5e9) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 88daa9e..6985230 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 6e223f5..4e04cc8 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit 136b9ca7eebef78be14abf90d65c5e57b6bc5d36 +%global github_commit 233a920cb38636a43b18d428f9a8db1f0a1a08f4 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %bcond_without tests Name: php-%{composer_vendor} -Version: 2.0.30 +Version: 2.0.31 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -128,6 +128,9 @@ exit $ret %changelog +* Tue Apr 6 2021 Remi Collet - 2.0.31-1 +- update to 2.0.31 + * Thu Dec 17 2020 Remi Collet - 2.0.30-1 - update to 2.0.30 - switch to phpunit9 on Fedora diff --git a/sources b/sources index 0b671cf..a42360c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.30-136b9ca.tgz) = 47f2c29ddd5d8501610d7171ce49a32f921571c55fe1c9f54a08a4c84b3dace3b2645e9358c5ca5a5cfb03115b3fa023c4864ee847a60a9fdce3cf6cd42f2faf +SHA512 (php-phpseclib-2.0.31-233a920.tgz) = 316104716f7a83c476680d1e8185931b304b9891d92a80c340fd9c74ab5641283ab7f8799895dd3ed34db08698f236959fe29dd30bc457d8cf54ed6fd6770830 From 6d625947cca1d6dfe9893cbe0c4dbdf9a42b5bfb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 14 Jun 2021 09:45:47 +0200 Subject: [PATCH 25/32] v2.0.32 (cherry picked from commit a6fa373423839363f04205ae313d8add510152aa) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6985230..8dc0154 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 4e04cc8..dd1204c 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit 233a920cb38636a43b18d428f9a8db1f0a1a08f4 +%global github_commit f5c4c19880d45d0be3e7d24ae8ac434844a898cd %global github_short %(c=%{github_commit}; echo ${c:0:7}) %bcond_without tests Name: php-%{composer_vendor} -Version: 2.0.31 +Version: 2.0.32 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -128,6 +128,9 @@ exit $ret %changelog +* Mon Jun 14 2021 Remi Collet - 2.0.32-1 +- update to 2.0.32 + * Tue Apr 6 2021 Remi Collet - 2.0.31-1 - update to 2.0.31 diff --git a/sources b/sources index a42360c..5c56611 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.31-233a920.tgz) = 316104716f7a83c476680d1e8185931b304b9891d92a80c340fd9c74ab5641283ab7f8799895dd3ed34db08698f236959fe29dd30bc457d8cf54ed6fd6770830 +SHA512 (php-phpseclib-2.0.32-f5c4c19.tgz) = 5a022668b3425afa0555838e5ad0681700874051d7b6a42ed741134800421a5f792c4b1bf54fb573910103fce92d40a393e6bebac3ecd33abf561b8d1669a7f8 From f856bcd293e4b436dbabf7dda2d0ad8aaf8f50ba Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Sep 2021 14:58:21 +0200 Subject: [PATCH 26/32] v2.0.33 (cherry picked from commit 4df100444a61afaa28827080cbbca714bcb09f33) (cherry picked from commit e1aa6e530c95f8095b36f26528885624c26c3ed5) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8dc0154..e76312c 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index dd1204c..875d299 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit f5c4c19880d45d0be3e7d24ae8ac434844a898cd +%global github_commit fb53b7889497ec7c1362c94e61d8127ac67ea094 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %bcond_without tests Name: php-%{composer_vendor} -Version: 2.0.32 +Version: 2.0.33 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -128,6 +128,9 @@ exit $ret %changelog +* Thu Sep 2 2021 Remi Collet - 2.0.33-1 +- update to 2.0.33 + * Mon Jun 14 2021 Remi Collet - 2.0.32-1 - update to 2.0.32 diff --git a/sources b/sources index 5c56611..83cc80d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.32-f5c4c19.tgz) = 5a022668b3425afa0555838e5ad0681700874051d7b6a42ed741134800421a5f792c4b1bf54fb573910103fce92d40a393e6bebac3ecd33abf561b8d1669a7f8 +SHA512 (php-phpseclib-2.0.33-fb53b78.tgz) = f673d6fb53edeadbb6578f43e1715cf7b9b68462f03fce1379834b9d65dc022e5095082cd423f907af5af941946a3573bf7133106facaabff5d0dcd1d0ccbf42 From 39b474b0976cc7adfff38037e80f0de0d033c29f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 27 Oct 2021 10:12:07 +0200 Subject: [PATCH 27/32] v2.0.34 (cherry picked from commit f0b178ad9f19c22b9f3d0e93fdaf39395423d174) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e76312c..77c7397 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 875d299..d89a7bf 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit fb53b7889497ec7c1362c94e61d8127ac67ea094 +%global github_commit 98a6fe587f3481aea319eef7e656d02cfe1675ec %global github_short %(c=%{github_commit}; echo ${c:0:7}) %bcond_without tests Name: php-%{composer_vendor} -Version: 2.0.33 +Version: 2.0.34 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -128,6 +128,9 @@ exit $ret %changelog +* Wed Oct 27 2021 Remi Collet - 2.0.34-1 +- update to 2.0.34 + * Thu Sep 2 2021 Remi Collet - 2.0.33-1 - update to 2.0.33 diff --git a/sources b/sources index 83cc80d..750e89f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.33-fb53b78.tgz) = f673d6fb53edeadbb6578f43e1715cf7b9b68462f03fce1379834b9d65dc022e5095082cd423f907af5af941946a3573bf7133106facaabff5d0dcd1d0ccbf42 +SHA512 (php-phpseclib-2.0.34-98a6fe5.tgz) = 4f14afbf812fecff02ea8131da8b702c41202c253c426796d98479a975e5fb24c65d70cc4ef48fb36b57aae6bdee2e0ae075b41f4417a1fb3c7e8e875ea74b83 From 3d249e0000491973b746deee446f2b630b9569bc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 29 Nov 2021 08:53:18 +0100 Subject: [PATCH 28/32] v2.0.35 (cherry picked from commit bd7a0cd5a97e2b9719246356d836f21b34b92279) --- .gitignore | 1 + php-phpseclib.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 77c7397..d79fa36 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index d89a7bf..7b116be 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit 98a6fe587f3481aea319eef7e656d02cfe1675ec +%global github_commit 4e16cf3f5f927a7d3f5317820af795c0366c0420 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %bcond_without tests Name: php-%{composer_vendor} -Version: 2.0.34 +Version: 2.0.35 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -108,7 +108,7 @@ sed -e '/require /d' -i tests/Unit/Crypt/Hash/SHA*_96Test.php # testAuthorityInfoAccess fails without internet access ret=0 -for cmd in "php %{phpunit}" php73 php74 php80; do +for cmd in "php %{phpunit}" php74 php80 php81; do if which $cmd; then set $cmd $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit9} \ @@ -128,6 +128,9 @@ exit $ret %changelog +* Mon Nov 29 2021 Remi Collet - 2.0.35-1 +- update to 2.0.35 + * Wed Oct 27 2021 Remi Collet - 2.0.34-1 - update to 2.0.34 diff --git a/sources b/sources index 750e89f..1c49d47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.34-98a6fe5.tgz) = 4f14afbf812fecff02ea8131da8b702c41202c253c426796d98479a975e5fb24c65d70cc4ef48fb36b57aae6bdee2e0ae075b41f4417a1fb3c7e8e875ea74b83 +SHA512 (php-phpseclib-2.0.35-4e16cf3.tgz) = f898190a83cc2046ef34dd382bda3cf086db06f643fd123bdf27f8425865157ec3b7ced58dd4f6f563f6194650f97ab873d201950fb8c7b1d3cb66521960c503 From 90d6cc974b7cdd2399440ea6489681103d3ce815 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 31 Jan 2022 10:42:13 +0100 Subject: [PATCH 29/32] v2.0.36 (cherry picked from commit 73ec200453c422616e684e8ba4c2ec76639681dc) (cherry picked from commit d1f31da2e9a23d69038310d7053b418310f4be8f) (cherry picked from commit f1948e31ba53b775449f2cb9e7395de7cb977ef7) --- .gitignore | 1 + php-phpseclib.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d79fa36..977071d 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 7b116be..d8d47ac 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit 4e16cf3f5f927a7d3f5317820af795c0366c0420 +%global github_commit a97547126396548c224703a267a30af1592be146 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %bcond_without tests Name: php-%{composer_vendor} -Version: 2.0.35 +Version: 2.0.36 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -81,6 +81,9 @@ 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 @@ -128,6 +131,9 @@ exit $ret %changelog +* Mon Jan 31 2022 Remi Collet - 2.0.36-1 +- update to 2.0.36 + * Mon Nov 29 2021 Remi Collet - 2.0.35-1 - update to 2.0.35 diff --git a/sources b/sources index 1c49d47..89ee3ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.35-4e16cf3.tgz) = f898190a83cc2046ef34dd382bda3cf086db06f643fd123bdf27f8425865157ec3b7ced58dd4f6f563f6194650f97ab873d201950fb8c7b1d3cb66521960c503 +SHA512 (php-phpseclib-2.0.36-a975471.tgz) = 2e4c1f661f784f61ea1f4f9d8213eae5c226e3f469de0023dd69f62323f20bf7f67a84245bff7ecdf220d174856758d2f33289ef3b6e0ddcce4e7707a0b52493 From 67ff69cf21347e932e58eccca31292796ce94c00 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Apr 2022 11:00:56 +0200 Subject: [PATCH 30/32] v2.0.37 (cherry picked from commit 118481c4ffc0b6666ad4251c4fde795e75b05693) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 977071d..9d2c883 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index d8d47ac..c3ecec2 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit a97547126396548c224703a267a30af1592be146 +%global github_commit c812fbb4d6b4d7f30235ab7298a12f09ba13b37c %global github_short %(c=%{github_commit}; echo ${c:0:7}) %bcond_without tests Name: php-%{composer_vendor} -Version: 2.0.36 +Version: 2.0.37 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -131,6 +131,9 @@ exit $ret %changelog +* Mon Apr 4 2022 Remi Collet - 2.0.37-1 +- update to 2.0.37 + * Mon Jan 31 2022 Remi Collet - 2.0.36-1 - update to 2.0.36 diff --git a/sources b/sources index 89ee3ca..35d04b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.36-a975471.tgz) = 2e4c1f661f784f61ea1f4f9d8213eae5c226e3f469de0023dd69f62323f20bf7f67a84245bff7ecdf220d174856758d2f33289ef3b6e0ddcce4e7707a0b52493 +SHA512 (php-phpseclib-2.0.37-c812fbb.tgz) = 4b92d819830697b817307d6ed6ed349ef3f1bcf0e388db685a3ee92b8ecbbcd2be96e537b3d24647479aefdb9e242f8a3e64aeb5e471e643149440c7132462dd From 1e18b27e65827aa45b125dd9b6b9addca032a7dd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Sep 2022 11:21:13 +0200 Subject: [PATCH 31/32] v2.0.38 --- .gitignore | 1 + php-phpseclib.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9d2c883..f886048 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index c3ecec2..d64d856 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit c812fbb4d6b4d7f30235ab7298a12f09ba13b37c +%global github_commit b03536539f43a4f9aa33c4f0b2f3a1c752088fcd %global github_short %(c=%{github_commit}; echo ${c:0:7}) %bcond_without tests Name: php-%{composer_vendor} -Version: 2.0.37 +Version: 2.0.38 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -111,7 +111,7 @@ sed -e '/require /d' -i tests/Unit/Crypt/Hash/SHA*_96Test.php # testAuthorityInfoAccess fails without internet access ret=0 -for cmd in "php %{phpunit}" php74 php80 php81; do +for cmd in "php %{phpunit}" php74 php80 php81 php82; do if which $cmd; then set $cmd $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit9} \ @@ -131,6 +131,9 @@ exit $ret %changelog +* Mon Sep 12 2022 Remi Collet - 2.0.38-1 +- update to 2.0.38 + * Mon Apr 4 2022 Remi Collet - 2.0.37-1 - update to 2.0.37 diff --git a/sources b/sources index 35d04b6..9211947 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.37-c812fbb.tgz) = 4b92d819830697b817307d6ed6ed349ef3f1bcf0e388db685a3ee92b8ecbbcd2be96e537b3d24647479aefdb9e242f8a3e64aeb5e471e643149440c7132462dd +SHA512 (php-phpseclib-2.0.38-b035365.tgz) = 4b08a452481d99bc2a15c3fc509e345a6d186bb555bc34776c494de46c6fdc3682cf35850d8f5b5a6eb4ebbd743a4515781c73dc6061091f5cb7874d736f7762 From 3fb3b6964e0ef0e19b7ad295dfae0a8602eab724 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 24 Oct 2022 15:06:46 +0200 Subject: [PATCH 32/32] v2.0.39 (cherry picked from commit 303f260b988adef14ebc9d7cec1415833ffe4424) --- .gitignore | 1 + php-phpseclib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f886048..d000977 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ clog /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 diff --git a/php-phpseclib.spec b/php-phpseclib.spec index d64d856..c6897e2 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit b03536539f43a4f9aa33c4f0b2f3a1c752088fcd +%global github_commit f3a0e2b715c40cf1fd270d444901b63311725d63 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %bcond_without tests Name: php-%{composer_vendor} -Version: 2.0.38 +Version: 2.0.39 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -131,6 +131,9 @@ exit $ret %changelog +* Mon Oct 24 2022 Remi Collet - 2.0.39-1 +- update to 2.0.39 + * Mon Sep 12 2022 Remi Collet - 2.0.38-1 - update to 2.0.38 diff --git a/sources b/sources index 9211947..382460a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.38-b035365.tgz) = 4b08a452481d99bc2a15c3fc509e345a6d186bb555bc34776c494de46c6fdc3682cf35850d8f5b5a6eb4ebbd743a4515781c73dc6061091f5cb7874d736f7762 +SHA512 (php-phpseclib-2.0.39-f3a0e2b.tgz) = 423de695e328670742918ac6b036807f649a31e61c436640836b443f0f18fd659e31f53a60221d580b97f5882c9d8f9148b2f0579b046b0fa9fd010059b31f0c