Commit 7466626c authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Bug 1739331: Upgrade SSPHP to 1.15.0"

parents dbe935e8 85c0d8df
......@@ -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
......
......@@ -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;
}
......@@ -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) {
......
......@@ -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;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment