From ec671ad23b64c94704ed2dda5e4ba7959316bb5b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
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+
---
 composer.json | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index 6046563..23e1556 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "simplesamlphp/saml2",
     "description": "SAML2 PHP library from SimpleSAMLphp",
-    "license": "LGPL-2.1",
+    "license": "LGPL-2.1-or-later",
     "authors": [
         {
             "name": "Andreas Åkre Solberg",
@@ -9,12 +9,12 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.4",
         "ext-openssl": "*",
         "ext-dom": "*",
         "ext-zlib": "*",
 
-        "simplesamlphp/xmlseclibs": "^2.0|^3.0",
+        "robrichards/xmlseclibs": "^3.0",
         "psr/log": "~1.0"
     },
     "require-dev": {
@@ -22,7 +22,6 @@
         "phpmd/phpmd": "~1.5",
         "sensiolabs/security-checker": "~1.1",
         "phpunit/phpunit": "~3.7",
-        "satooshi/php-coveralls": "~0.6.1",
         "sebastian/phpcpd": "~1.4",
         "mockery/mockery": "~0.9"
     },
@@ -36,5 +35,10 @@
         "psr-0": {
             "SAML2\\": "tests/"
         }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "v3.0.x-dev"
+        }
     }
 }
-- 
cgit