From 1518a4062c0e14ba1bb9c56edc6d94245a869509 Mon Sep 17 00:00:00 2001 From: Robert Lyon Date: Wed, 20 Dec 2017 14:38:31 +1300 Subject: [PATCH] Bug 1739331: Upgrade SSPHP to 1.15.0 To take advantage of the new things plus the bug fixes behatnotneeded Change-Id: Id7033f4c1308ecbfbd38a76e018a1a4ca4327dda Signed-off-by: Robert Lyon (cherry picked from commit 85c0d8dfe5ab47fc88c7c8a000afd91cb45c6195) --- Makefile | 3 +-- htdocs/auth/saml/db/upgrade.php | 5 +++++ htdocs/auth/saml/lib.php | 2 +- htdocs/auth/saml/version.php | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c3126c871e..c45b15ae2e 100644 --- a/Makefile +++ b/Makefile @@ -62,8 +62,7 @@ ifdef simplesamlphp @echo "SimpleSAMLphp already exists - doing nothing" else @echo "Pulling SimpleSAMLphp from download ..." - @curl -sSL https://github.com/simplesamlphp/simplesamlphp/releases/download/v1.14.17/simplesamlphp-1.14.17.tar.gz | tar --transform 's/simplesamlphp-[0-9]+\.[0-9]+\.[0-9]+/simplesamlphp/x1' -C htdocs/auth/saml/extlib -xzf - -# SimpleSAMLPHP release tarball already has all composer dependencies. + @curl -sSL https://github.com/simplesamlphp/simplesamlphp/releases/download/v1.15.0/simplesamlphp-1.15.0.tar.gz | tar --transform 's/simplesamlphp-[0-9]+\.[0-9]+\.[0-9]+/simplesamlphp/x1' -C htdocs/auth/saml/extlib -xzf - # SimpleSAMLPHP release tarball already has all composer dependencies. # @php external/composer.phar --working-dir=htdocs/auth/saml/extlib/simplesamlphp update --no-dev @echo "Deleting unneeded files ..." # Delete composer.json and .lock files to avoid leaking minor version info diff --git a/htdocs/auth/saml/db/upgrade.php b/htdocs/auth/saml/db/upgrade.php index 4ab1956b3e..12e3e7c1f9 100644 --- a/htdocs/auth/saml/db/upgrade.php +++ b/htdocs/auth/saml/db/upgrade.php @@ -29,5 +29,10 @@ function xmldb_auth_saml_upgrade($oldversion=0) { set_config_plugin('auth', 'saml', 'version', '1.14.17'); } + if ($oldversion < 2017122000) { + // Set library version to download + set_config_plugin('auth', 'saml', 'version', '1.15.0'); + } + return $status; } diff --git a/htdocs/auth/saml/lib.php b/htdocs/auth/saml/lib.php index 9d0f1589f8..6305865d12 100644 --- a/htdocs/auth/saml/lib.php +++ b/htdocs/auth/saml/lib.php @@ -363,7 +363,7 @@ class PluginAuthSaml extends PluginAuth { public static function install_auth_default() { // Set library version to download - set_config_plugin('auth', 'saml', 'version', '1.14.17'); + set_config_plugin('auth', 'saml', 'version', '1.15.0'); } private static function create_certificates($numberofdays = 3650) { diff --git a/htdocs/auth/saml/version.php b/htdocs/auth/saml/version.php index 173038d266..9e5ffe6807 100644 --- a/htdocs/auth/saml/version.php +++ b/htdocs/auth/saml/version.php @@ -11,8 +11,8 @@ defined('INTERNAL') || die(); $config = new StdClass; -$config->version = 2017102600; -$config->release = '1.2.2'; +$config->version = 2017122000; +$config->release = '1.2.3'; $config->name = 'saml'; $config->requires_config = 1; $config->requires_parent = 0; -- GitLab