Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
ff228ca0
Commit
ff228ca0
authored
Jan 11, 2019
by
Robert Lyon
Committed by
Gerrit Code Review
Jan 11, 2019
Browse files
Merge "Bug 1811282: upgrade simplesaml to 1.16.3"
parents
ae417b0b
0080525a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
ff228ca0
...
...
@@ -62,7 +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.16.
1
/simplesamlphp-1.16.
1
.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.16.
3
/simplesamlphp-1.16.
3
.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 require predis/predis
@
echo
"Copying www/resources/* files to sp/resources/ ..."
@
cp
-R
htdocs/auth/saml/extlib/simplesamlphp/www/resources/ htdocs/auth/saml/sp/
...
...
htdocs/auth/saml/db/upgrade.php
View file @
ff228ca0
...
...
@@ -41,6 +41,9 @@ function xmldb_auth_saml_upgrade($oldversion=0) {
if
(
$oldversion
<
2018080300
)
{
set_config_plugin
(
'auth'
,
'saml'
,
'version'
,
'1.16.1'
);
}
if
(
$oldversion
<
2019011100
)
{
set_config_plugin
(
'auth'
,
'saml'
,
'version'
,
'1.16.3'
);
}
return
$status
;
}
htdocs/auth/saml/version.php
View file @
ff228ca0
...
...
@@ -11,8 +11,8 @@
defined
(
'INTERNAL'
)
||
die
();
$config
=
new
stdClass
();
$config
->
version
=
201
80803
00
;
$config
->
release
=
'1.
4
.0'
;
$config
->
version
=
201
90111
00
;
$config
->
release
=
'1.
5
.0'
;
$config
->
name
=
'saml'
;
$config
->
requires_config
=
1
;
$config
->
requires_parent
=
0
;
Write
Preview
Supports
Markdown
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