summaryrefslogtreecommitdiffstats
path: root/inc/simplesamlphp/bin
diff options
context:
space:
mode:
authorJérôme Schneider <jschneider@entrouvert.com>2015-03-27 17:15:46 (GMT)
committerJérôme Schneider <jschneider@entrouvert.com>2015-03-27 17:15:46 (GMT)
commitc47b99cede0c135ec4b190acebf6343edca1f944 (patch)
treef443556e57d020cc006689653e7a400a36374384 /inc/simplesamlphp/bin
parent502161d955a871e812022a5a704c9d74d2434b39 (diff)
downloadspip-saml-c47b99cede0c135ec4b190acebf6343edca1f944.zip
spip-saml-c47b99cede0c135ec4b190acebf6343edca1f944.tar.gz
spip-saml-c47b99cede0c135ec4b190acebf6343edca1f944.tar.bz2
simplesamlphp: update to 1.13.2
Diffstat (limited to 'inc/simplesamlphp/bin')
-rwxr-xr-xinc/simplesamlphp/bin/build-release.sh15
-rwxr-xr-xinc/simplesamlphp/bin/pack.php2
-rwxr-xr-xinc/simplesamlphp/bin/pwgen.php1
-rwxr-xr-xinc/simplesamlphp/bin/translation.php12
4 files changed, 23 insertions, 7 deletions
diff --git a/inc/simplesamlphp/bin/build-release.sh b/inc/simplesamlphp/bin/build-release.sh
index 3e77c88..179ca1c 100755
--- a/inc/simplesamlphp/bin/build-release.sh
+++ b/inc/simplesamlphp/bin/build-release.sh
@@ -15,8 +15,6 @@ fi
cd /tmp
-REPOPATH="http://simplesamlphp.googlecode.com/svn/tags/$TAG/"
-
if [ -a "$TAG" ]; then
echo "$0: Destination already exists: $TAG" >&2
exit 1
@@ -24,7 +22,20 @@ fi
umask 0022
+REPOPATH="http://simplesamlphp.googlecode.com/svn/tags/$TAG/"
+
svn export "$REPOPATH"
+
+# Use composer only on newer versions that have a composer.json
+if [ -f "$TAG/composer.json" ]; then
+ if [ ! -x composer.phar ]; then
+ curl -sS https://getcomposer.org/installer | php
+ fi
+
+ # Install dependencies (without vcs history or dev tools)
+ php composer.phar install --no-dev --prefer-dist -o -d "$TAG"
+fi
+
mkdir -p "$TAG/config" "$TAG/metadata"
cp -rv "$TAG/config-templates/"* "$TAG/config/"
cp -rv "$TAG/metadata-templates/"* "$TAG/metadata/"
diff --git a/inc/simplesamlphp/bin/pack.php b/inc/simplesamlphp/bin/pack.php
index f69cafb..3328cf2 100755
--- a/inc/simplesamlphp/bin/pack.php
+++ b/inc/simplesamlphp/bin/pack.php
@@ -12,7 +12,7 @@ if (count($argv) < 1) {
}
// Needed in order to make session_start to be called before output is printed.
-$session = SimpleSAML_Session::getInstance();
+$session = SimpleSAML_Session::getSessionFromRequest();
$config = SimpleSAML_Configuration::getConfig('config.php');
diff --git a/inc/simplesamlphp/bin/pwgen.php b/inc/simplesamlphp/bin/pwgen.php
index 31a8eb9..83b4dfe 100755
--- a/inc/simplesamlphp/bin/pwgen.php
+++ b/inc/simplesamlphp/bin/pwgen.php
@@ -1,7 +1,6 @@
#!/usr/bin/env php
<?php
/*
- * $Id$
* Interactive script to generate password hashes.
*
*/
diff --git a/inc/simplesamlphp/bin/translation.php b/inc/simplesamlphp/bin/translation.php
index 4359d1a..e07f5d5 100755
--- a/inc/simplesamlphp/bin/translation.php
+++ b/inc/simplesamlphp/bin/translation.php
@@ -46,8 +46,14 @@ switch($action) {
case 'pull':
- $content = SimpleSAML_Utilities::fetch($base . 'export.php?aid=' . $application . '&type=translation&file=' . $basefile);
- file_put_contents($fileWithoutExt . '.translation.json' , $content);
+ try {
+ $content = SimpleSAML_Utilities::fetch($base . 'export.php?aid=' . $application . '&type=translation&file=' . $basefile);
+ file_put_contents($fileWithoutExt . '.translation.json' , $content);
+ }
+ catch (SimpleSAML_Error_Exception $e) {
+ echo 'Translation unavailable for ' . $basefile;
+ SimpleSAML_Logger::warning("Translation unavailable for $basefile in $base: " . $e->getMessage());
+ }
break;
case 'push':
@@ -189,4 +195,4 @@ function json_format($data, $indentation = '') {
return $ret;
}
-?> \ No newline at end of file
+?>