From 99b87b6c99034430685def44521c6604016dc9ab Mon Sep 17 00:00:00 2001
From: Shawn Iwinski <shawn@iwin.ski>
Date: Nov 07 2019 20:30:39 +0000
Subject: Update to 3.4.2 (RHBZ #1769354 / SSPSA 201911-01 / CVE-2019-3465)


- https://simplesamlphp.org/security/201911-01

---

diff --git a/.gitignore b/.gitignore
index c4e8295..b545bf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /php-simplesamlphp-saml2_3-3.1.6-d809ffbe2aa7260a0b3e72bf5be8cd6de0325d7c.tar.gz
 /php-simplesamlphp-saml2_3-3.3.8-43753d180f12f7159188995916dc2bbf6ae191b6.tar.gz
 /php-simplesamlphp-saml2_3-3.4.1-4faed2faa324f96e5082146933fc189c0a970074.tar.gz
+/php-simplesamlphp-saml2_3-3.4.2-3806d276edb066c60aa3d748ffd0681d92ffbda7.tar.gz
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 01eea38..8400f51 100644
--- a/php-simplesamlphp-saml2_3.spec
+++ b/php-simplesamlphp-saml2_3.spec
@@ -11,8 +11,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
@@ -29,8 +29,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
@@ -40,7 +40,7 @@
 
 Name:          php-%{composer_vendor}-%{composer_project}_3
 Version:       %{github_version}
-Release:       2%{?github_release}%{?dist}
+Release:       1%{?github_release}%{?dist}
 Summary:       SAML2 PHP library from SimpleSAMLphp (version 3)
 
 License:       LGPLv2+
@@ -179,7 +179,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
@@ -197,6 +197,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
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 388d21f..bb52b81 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-simplesamlphp-saml2_3-3.4.1-4faed2faa324f96e5082146933fc189c0a970074.tar.gz) = 2154aaf373d9d918f7e3a89dac7a25f8236deee5ef608aec9b3a23696fd2f1907eb9c8d37695e584164daf2c766fc423db91fad5035cb5b989b0aaf06ad1596d
+SHA512 (php-simplesamlphp-saml2_3-3.4.2-3806d276edb066c60aa3d748ffd0681d92ffbda7.tar.gz) = 34cefb50fcf234d3e6ff8f14cc79f54db3372ebef3e83533c7c1f9ea2c84c75bccf372fd2f5f7865f8bd009eb6fabbfc2d7726c89b84e6c8dbc185f07a9adb56