summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-11-08 07:45:41 +0100
committerRemi Collet <remi@remirepo.net>2019-11-08 07:45:41 +0100
commit89429e85a6b171512df7aa08e9bfaa85d6a2b2e3 (patch)
treefe23a15670f4d91e16a8083ae83bd1d1676fed4f
parent956b2a0c2b6051a39ad3742064c02f73a2b3e8e1 (diff)
v3.4.2 from FedoraHEADmaster
-rw-r--r--composer.json5
-rw-r--r--php-simplesamlphp-saml2_3.spec14
2 files changed, 12 insertions, 7 deletions
diff --git a/composer.json b/composer.json
index cf22ac5..5c3800b 100644
--- a/composer.json
+++ b/composer.json
@@ -15,14 +15,15 @@
"ext-zlib": "*",
"psr/log": "~1.0",
- "robrichards/xmlseclibs": "^3.0",
+ "robrichards/xmlseclibs": "^3.0.4",
"webmozart/assert": "^1.4"
},
"require-dev": {
+ "simplesamlphp/simplesamlphp-test-framework": "0.0.11",
"squizlabs/php_codesniffer": "~3.2",
+ "phpunit/phpunit": "~5.7",
"phpmd/phpmd": "~2.6",
"sensiolabs/security-checker": "~4.1",
- "phpunit/phpunit": "~4",
"sebastian/phpcpd": "~2.0",
"mockery/mockery": "~0.9"
},
diff --git a/php-simplesamlphp-saml2_3.spec b/php-simplesamlphp-saml2_3.spec
index ff283ca..4afd164 100644
--- a/php-simplesamlphp-saml2_3.spec
+++ b/php-simplesamlphp-saml2_3.spec
@@ -12,8 +12,8 @@
%global github_owner simplesamlphp
%global github_name saml2
-%global github_version 3.4.1
-%global github_commit 4faed2faa324f96e5082146933fc189c0a970074
+%global github_version 3.4.2
+%global github_commit 3806d276edb066c60aa3d748ffd0681d92ffbda7
%global composer_vendor simplesamlphp
%global composer_project saml2
@@ -30,8 +30,8 @@
# "webmozart/assert": "^1.4"
%global webmozart_assert_min_ver 1.4
%global webmozart_assert_max_ver 2.0
-# "robrichards/xmlseclibs": "^3.0"
-%global xmlseclibs_min_ver 3.0
+# "robrichards/xmlseclibs": "^3.0.4"
+%global xmlseclibs_min_ver 3.0.4
%global xmlseclibs_max_ver 4.0
# Build using "--without tests" to disable tests
@@ -180,7 +180,7 @@ RETURN_CODE=0
PHPUNIT=$(which phpunit)
for PHP_EXEC in php %{?rhel:php55 php56 php70} php71 php72 php73 php74; do
if [ "php" = "$PHP_EXEC" ] || which $PHP_EXEC; then
- $PHP_EXEC $PHPUNIT --configuration=tools/phpunit --verbose || RETURN_CODE=1
+ $PHP_EXEC $PHPUNIT --verbose || RETURN_CODE=1
fi
done
exit $RETURN_CODE
@@ -198,6 +198,10 @@ exit $RETURN_CODE
%changelog
+* Thu Nov 07 2019 Shawn Iwinski <shawn@iwin.ski> - 3.4.2-1
+- Update to 3.4.2 (RHBZ #1769354 / SSPSA 201911-01 / CVE-2019-3465)
+- https://simplesamlphp.org/security/201911-01
+
* Tue May 21 2019 Shawn Iwinski <shawn@iwin.ski> - 3.4.1-1
- Update to 3.4.1 (RHBZ #1688285)