From 07e5b4107eee9f715f26bf87e538e498eee64dbd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 16 Apr 2018 09:39:43 +0200 Subject: [PATCH] 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 | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 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 03133bd..5bf489a 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,13 +3,13 @@ %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 -Release: 2%{?dist} +Version: 2.0.11 +Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT URL: https://github.com/%{github_owner}/%{github_name} @@ -82,11 +82,14 @@ date_default_timezone_set('UTC'); EOF +# 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} --verbose || ret=1 + $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit6} \ + --filter '^((?!(testAuthorityInfoAccess)).)*$' \ + --verbose || ret=1 fi done exit $ret @@ -101,8 +104,8 @@ exit $ret %changelog -* Tue Feb 20 2018 Remi Collet - 2.0.10-2 -- allow to run with old PHPUnit +* 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 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