From d1f31da2e9a23d69038310d7053b418310f4be8f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 31 Jan 2022 10:42:13 +0100 Subject: [PATCH 1/5] v2.0.36 (cherry picked from commit 73ec200453c422616e684e8ba4c2ec76639681dc) --- .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 0e09453..eeb9e2a 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 5b36f411e3d433916772642a25e606179c5618fd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Apr 2022 11:00:56 +0200 Subject: [PATCH 2/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 eeb9e2a..db640c2 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 809a2a22ed61fc54f4758f6d6569a6b6d94b195e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Sep 2022 11:21:13 +0200 Subject: [PATCH 3/5] v2.0.38 (cherry picked from commit 1e18b27e65827aa45b125dd9b6b9addca032a7dd) --- .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 db640c2..af85b1e 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 4789049adfe1d46f6f1a4f95a78815fe68baf79e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Sep 2022 11:55:12 +0200 Subject: [PATCH 4/5] skip more tests with erratic results (cherry picked from commit 259132ea6123fedf64b5894c1bb3559bfbf9f159) --- php-phpseclib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-phpseclib.spec b/php-phpseclib.spec index af85b1e..1b09c73 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -115,7 +115,7 @@ for cmd in "php %{phpunit}" php74 php80 php81 php82; do if which $cmd; then set $cmd $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit9} \ - --filter '^((?!(testAuthorityInfoAccess)).)*$' \ + --filter '^((?!(testAuthorityInfoAccess|testVectors|testKeySizes|testOpenSSHEncrypted)).)*$' \ --verbose || ret=1 fi done From 603e48890bfb7c1dd5cc8da0b575103b63a47e1c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 24 Oct 2022 15:06:46 +0200 Subject: [PATCH 5/5] 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 1b09c73..716b70d 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