From e1aa6e530c95f8095b36f26528885624c26c3ed5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Sep 2021 14:58:21 +0200 Subject: [PATCH 1/5] v2.0.33 (cherry picked from commit 4df100444a61afaa28827080cbbca714bcb09f33) --- .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 d67b357..b188888 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 c81af78b04e14fa76466987deddf8946dc6ef909 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 27 Oct 2021 10:12:07 +0200 Subject: [PATCH 2/5] 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 b188888..0ea208e 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 5b0164a5ee26ed794d2ac779ed9e0cdc089e133b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 29 Nov 2021 08:53:18 +0100 Subject: [PATCH 3/5] 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 0ea208e..613ea62 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 f1948e31ba53b775449f2cb9e7395de7cb977ef7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 31 Jan 2022 10:42:13 +0100 Subject: [PATCH 4/5] v2.0.36 (cherry picked from commit 73ec200453c422616e684e8ba4c2ec76639681dc) (cherry picked from commit d1f31da2e9a23d69038310d7053b418310f4be8f) --- .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 613ea62..d5a8b0e 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 d4fe1c4d5d34f35bfe9c99e3993c10f3a981e291 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Apr 2022 11:00:56 +0200 Subject: [PATCH 5/5] 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 d5a8b0e..b5b6497 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