From ec671ad23b64c94704ed2dda5e4ba7959316bb5b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Mar 2018 07:38:20 +0100 Subject: v3.1.4 from Fedora: - fix dependencies - Update to 3.1.4 (RHBZ #1528489, SSPSA 201801-01, CVE-2018-6519, SSPSA 201802-01, CVE-2018-7644, SSPSA 201803-01, CVE-2018-7711) - License changed from LGPLv2 to LGPLv2+ - Update "get source" to save tarball in same directory as spec file - Use range dependencies on F27+ --- php-simplesamlphp-saml2_3.spec | 49 ++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 19 deletions(-) (limited to 'php-simplesamlphp-saml2_3.spec') diff --git a/php-simplesamlphp-saml2_3.spec b/php-simplesamlphp-saml2_3.spec index 42b4bad..3eaf796 100644 --- a/php-simplesamlphp-saml2_3.spec +++ b/php-simplesamlphp-saml2_3.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-simplesamlphp-saml2_3 # -# Copyright (c) 2017 Shawn Iwinski +# Copyright (c) 2017-2018 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -12,14 +12,14 @@ %global github_owner simplesamlphp %global github_name saml2 -%global github_version 3.0.2 -%global github_commit bacad25473258cfefb7a7fd418cc5f8a22cda0a1 +%global github_version 3.1.4 +%global github_commit 4f6af7f69f29df8555a18b9bb7b646906b45924d %global composer_vendor simplesamlphp %global composer_project saml2 -# "php": ">=5.3.3" -%global php_min_ver 5.3.3 +# "php": ">=5.4" +%global php_min_ver 5.4 # "mockery/mockery": "~0.9" %global mockery_min_ver 0.9 %global mockery_max_ver 1.0 @@ -27,16 +27,7 @@ # NOTE: Min version not 1.0 because autoloader required %global psr_log_min_ver 1.0.1 %global psr_log_max_ver 2.0 -# "simplesamlphp/xmlseclibs": "^2.0|^3.0" -# -# https://github.com/simplesamlphp/xmlseclibs -# Micro-fork of xmlseclibs, sole difference is restore of PHP 5.4 compatibility -# -# Using robrichards/xmlseclibs instead of simplesamlphp/xmlseclibs because -# they use the same namespace, the only difference is PHP version compatibility, -# and tests pass. -# -# NOTE: Min version not 2.0 to force version 3.0 and remove build dependency php-mcrypt +# "robrichards/xmlseclibs": "^3.0" %global xmlseclibs_min_ver 3.0 %global xmlseclibs_max_ver 4.0 @@ -47,11 +38,11 @@ Name: php-%{composer_vendor}-%{composer_project}_3 Version: %{github_version} -Release: 3%{?github_release}%{?dist} +Release: 2%{?github_release}%{?dist} Summary: SAML2 PHP library from SimpleSAMLphp (version 3) Group: Development/Libraries -License: LGPLv2 +License: LGPLv2+ URL: https://github.com/%{github_owner}/%{github_name} # GitHub export does not include tests. @@ -64,13 +55,19 @@ BuildArch: noarch %if %{with_tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} +BuildRequires: php-composer(phpunit/phpunit) +%if 0%{?fedora} >= 27 +BuildRequires: (php-composer(mockery/mockery) >= %{mockery_min_ver} with php-composer(mockery/mockery) < %{mockery_max_ver}) +BuildRequires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver}) +BuildRequires: (php-composer(robrichards/xmlseclibs) >= %{xmlseclibs_min_ver} with php-composer(robrichards/xmlseclibs) < %{xmlseclibs_max_ver}) +%else BuildRequires: php-composer(mockery/mockery) < %{mockery_max_ver} BuildRequires: php-composer(mockery/mockery) >= %{mockery_min_ver} -BuildRequires: php-composer(phpunit/phpunit) BuildRequires: php-composer(psr/log) < %{psr_log_max_ver} BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver} BuildRequires: php-composer(robrichards/xmlseclibs) < %{xmlseclibs_max_ver} BuildRequires: php-composer(robrichards/xmlseclibs) >= %{xmlseclibs_min_ver} +%endif BuildRequires: php-dom BuildRequires: php-openssl BuildRequires: php-zlib @@ -86,10 +83,15 @@ BuildRequires: php-fedora-autoloader-devel # composer.json Requires: php(language) >= %{php_min_ver} +%if 0%{?fedora} >= 27 +Requires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver}) +Requires: (php-composer(robrichards/xmlseclibs) >= %{xmlseclibs_min_ver} with php-composer(robrichards/xmlseclibs) < %{xmlseclibs_max_ver}) +%else Requires: php-composer(psr/log) < %{psr_log_max_ver} Requires: php-composer(psr/log) >= %{psr_log_min_ver} Requires: php-composer(robrichards/xmlseclibs) < %{xmlseclibs_max_ver} Requires: php-composer(robrichards/xmlseclibs) >= %{xmlseclibs_min_ver} +%endif Requires: php-dom Requires: php-openssl Requires: php-zlib @@ -159,7 +161,7 @@ sed 's/function testToString/function SKIP_testToString/' \ : Upstream tests RETURN_CODE=0 PHPUNIT=$(which phpunit) -for PHP_EXEC in php %{?rhel:php54 php55} php56 php70 php71 php72; do +for PHP_EXEC in php %{?rhel:php55 php56} php70 php71 php72; do if [ "php" = "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --configuration=tools/phpunit --verbose || RETURN_CODE=1 fi @@ -179,6 +181,15 @@ exit $RETURN_CODE %changelog +* Mon Mar 12 2018 Remi Collet - 3.1.4-2 +- fix dependencies + +* Sat Mar 10 2018 Shawn Iwinski - 3.1.4-1 +- Update to 3.1.4 (RHBZ #1528489, SSPSA 201801-01, CVE-2018-6519, SSPSA 201802-01, CVE-2018-7644, SSPSA 201803-01, CVE-2018-7711) +- License changed from LGPLv2 to LGPLv2+ +- Update "get source" to save tarball in same directory as spec file +- Use range dependencies on F27+ + * Wed Aug 30 2017 Shawn Iwinski - 3.0.2-3 - Drop support for simplesamlphp/xmlseclibs v2 -- cgit