This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 2d2ca69b0f4b841b31c1ac21a80346ff7d891bec (commit)
via 7352b92b1763c72c680eac25d15992bc5d0bf469 (commit)
via a67964142eb3c5af2453351e0fdb4c411fffad20 (commit)
from ab3bcf69dfd80c56fb7f161c05dcf82854833754 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2d2ca69b0f4b841b31c1ac21a80346ff7d891bec
Merge: ab3bcf6 7352b92
Author: Roland Mas <[email protected]>
Date: Sat May 30 22:52:49 2015 +0200
Merge branch '6.0'
-----------------------------------------------------------------------
Summary of changes:
src/common/include/account.php | 2 +-
src/www/account/editsshkeys.php | 4 ++--
tests/buildbot/common-functions | 12 ++----------
tests/buildbot/fusionforge-build-and-test.sh | 4 ++--
4 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/common/include/account.php b/src/common/include/account.php
index ce5dded..9a83ab2 100644
--- a/src/common/include/account.php
+++ b/src/common/include/account.php
@@ -321,7 +321,7 @@ function checkKeys($keys) {
/* The encoded key is made of 0-9, A-Z ,a-z, +, / (base
64) characters,
ends with zero or up to three '=' and the length must
be >= 512 bits (157 base64 characters).
The whole key ends with an optional comment. */
- if (
preg_match("@^(((no-port-forwarding|no-X11-forwarding|no-agent-forwarding|no-pty|command=\"[^\"]+\"|from=\"?[A-Za-z0-9\.-]+\"?),?)*\s+)?ssh-(rsa|dss)\s+[A-Za-z0-9+/]{157,}={0,2}(\s+.*)?$@",
$key) === 0 ) { // Warning: we must use === for the test
+ if (
preg_match("@^(((no-port-forwarding|no-X11-forwarding|no-agent-forwarding|no-pty|command=\"[^\"]+\"|from=\"?[A-Za-z0-9\.-]+\"?),?)*\s+)?ssh-(ed25519|ecdsa|rsa|dss)\s+[A-Za-z0-9+/]{157,}={0,2}(\s+.*)?$@",
$key) === 0 ) { // Warning: we must use === for the test
$error_msg = sprintf(_('The following key has a
wrong format: |%s|. Please, correct it by going back to the previous page.'),
htmlspecialchars($key));
session_redirect('/account/');
diff --git a/src/www/account/editsshkeys.php b/src/www/account/editsshkeys.php
index 1e2a184..b400c51 100644
--- a/src/www/account/editsshkeys.php
+++ b/src/www/account/editsshkeys.php
@@ -65,10 +65,10 @@ if (count($sshKeysArray)) {
echo $HTML->openForm(array('action' =>
util_make_uri('/account/?action=addsshkey'), 'method' => 'post', 'enctype' =>
'multipart/form-data'));
echo html_e('h2', array(), _('Add a new ssh key'));
echo html_e('p', array(), _('To avoid having to type your password every time
for your SSH developer account, you may upload your public key(s) here and they
will be placed on the server in your ~/.ssh/authorized_keys file. Uploaded SSH
keys are effective <em>immediately</em>.'));
-echo html_e('p', array(), _('To generate a public key, run the program
\'ssh-keygen\' (you can use both protocol 1 or 2). The public key will be
placed at \'~/.ssh/identity.pub\' (protocol version 1) and
\'~/.ssh/id_dsa.pub\' or \'~/.ssh/id_rsa.pub\' (protocol version 2). Read the
ssh documentation for further information on sharing keys.'));
+echo html_e('p', array(), _('To generate a public key, run the program
\'ssh-keygen\' (you can use both protocol 1 or 2). The public key will be
placed at \'~/.ssh/identity.pub\' (protocol version 1) and
\'~/.ssh/id_dsa.pub\', \'~/.ssh/id_rsa.pub\', \'~/.ssh/id_ecdsa.pub\' or
\'~/.ssh/id_ed25519.pub\' (protocol version 2). Read the ssh documentation for
further information on sharing keys.'));
echo html_e('p', array(), html_e('em', array(), _('Important: Make sure there
are no line breaks. After submitting, verify that the number of keys in your
file is what you expected.')));
echo html_e('textarea', array('rows' => 10, 'cols' => 80, 'name' =>
'authorized_key', 'style' => 'width:90%;'), '', false);
-echo html_e('p', array(), _('Or upload your \'~/.ssh/identity.pub\' (protocol
version 1) or \'~/.ssh/id_dsa.pub\' or \'~/.ssh/id_rsa.pub\' (protocol version
2)'));
+echo html_e('p', array(), _('Or upload your \'~/.ssh/identity.pub\' (protocol
version 1) or \'~/.ssh/id_dsa.pub\', \'~/.ssh/id_rsa.pub\',
\'~/.ssh/id_ecdsa.pub\' or \'~/.ssh/id_ed25519.pub\' (protocol version 2)'));
echo html_e('input', array('type' => 'file', 'name' => 'uploaded_filekey'));
echo html_e('p', array(), html_e('input', array('type' => 'submit', 'name' =>
'submit', 'value' => _('Add'))));
echo $HTML->closeForm();
diff --git a/tests/buildbot/common-functions b/tests/buildbot/common-functions
index e4d91e6..c9ea983 100644
--- a/tests/buildbot/common-functions
+++ b/tests/buildbot/common-functions
@@ -24,16 +24,8 @@ prepare_workspace()
export BUILDRESULT=$WORKSPACE/build/packages
mkdir -p $BUILDRESULT
export BUILDERDIR=${BUILDERDIR:-$HOME/builder}
- # Delete existing packages
- if [ -d $WORKSPACE/build/packages ]
- then
- rm -fr $WORKSPACE/build/packages/*
- fi
- # Create place to build package if necessary
- [ ! -d $WORKSPACE/build/packages ] || mkdir -p $WORKSPACE/build/packages
- # Erase config
- [ ! -d $WORKSPACE/build/config ] || rm -fr $WORKSPACE/build/config
- mkdir -p $WORKSPACE/build/config
+ # Create place to store built packages
+ [ ! -d $WORKSPACE/packages ] || mkdir -p $WORKSPACE/packages
# Erase reports
[ ! -d $WORKSPACE/reports ] || rm -fr $WORKSPACE/reports
mkdir -p $WORKSPACE/reports/coverage
diff --git a/tests/buildbot/fusionforge-build-and-test.sh
b/tests/buildbot/fusionforge-build-and-test.sh
index afe2f40..6961257 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -100,10 +100,10 @@ copy_logs
case $INSTALL_METHOD in
deb)
- rsync -av root@$HOST:/usr/src/debian-repository/local
$WORKSPACE/repository
+ rsync -av --delete root@$HOST:/usr/src/debian-repository/local/
$WORKSPACE/packages/
;;
rpm)
- rsync -av root@$HOST:/usr/src/fusionforge/build/RPMS
$WORKSPACE/repository
+ rsync -av --delete root@$HOST:/usr/src/fusionforge/build/RPMS/
$WORKSPACE/packages/
;;
esac
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
