Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
7466626c
Commit
7466626c
authored
Jan 17, 2018
by
Robert Lyon
Committed by
Gerrit Code Review
Jan 17, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Bug 1739331: Upgrade SSPHP to 1.15.0"
parents
dbe935e8
85c0d8df
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
Makefile
Makefile
+1
-2
htdocs/auth/saml/db/upgrade.php
htdocs/auth/saml/db/upgrade.php
+5
-0
htdocs/auth/saml/lib.php
htdocs/auth/saml/lib.php
+1
-1
htdocs/auth/saml/version.php
htdocs/auth/saml/version.php
+2
-2
No files found.
Makefile
View file @
7466626c
...
...
@@ -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
...
...
htdocs/auth/saml/db/upgrade.php
View file @
7466626c
...
...
@@ -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
;
}
htdocs/auth/saml/lib.php
View file @
7466626c
...
...
@@ -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.1
4.17
'
);
set_config_plugin
(
'auth'
,
'saml'
,
'version'
,
'1.1
5.0
'
);
}
private
static
function
create_certificates
(
$numberofdays
=
3650
)
{
...
...
htdocs/auth/saml/version.php
View file @
7466626c
...
...
@@ -11,8 +11,8 @@
defined
(
'INTERNAL'
)
||
die
();
$config
=
new
StdClass
;
$config
->
version
=
20171
026
00
;
$config
->
release
=
'1.2.
2
'
;
$config
->
version
=
20171
220
00
;
$config
->
release
=
'1.2.
3
'
;
$config
->
name
=
'saml'
;
$config
->
requires_config
=
1
;
$config
->
requires_parent
=
0
;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment