This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.1.x in repository x2goserver. from 90aeaf1 Continue development on release branch... new 41a3da8 Continue development on LTS release branch... new 1ca9183 Use perl instead of sed for search+replace in session names sanitizing. (Fixes: #404). The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 8 ++++++++ x2goserver/bin/x2gostartagent | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 41a3da81e5a613d32d23794f430e859f3fe609b3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jan 7 18:43:39 2014 +0100 Continue development on LTS release branch... Conflicts (resolved by Mike Gabriel): debian/changelog x2goserver-compat/VERSION.x2goserver-compat x2goserver-extensions/VERSION.x2goserver-extensions x2goserver-fmbindings/VERSION.x2goserver-fmbindings x2goserver-printing/VERSION.x2goserver-printing x2goserver-pyhoca/VERSION.x2goserver-pyhoca x2goserver-xsession/VERSION.x2goserver-xsession x2goserver/VERSION.x2goserver --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 64de019..c724cc1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -194,6 +194,12 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 07 Jun 2013 23:07:40 +0200 +x2goserver (4.0.0.11-0x2go1) UNRELEASED; urgency=low + + * Continue development on LTS release branch... + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Jan 2014 18:43:03 +0100 + x2goserver (4.0.0.10-0x2go1) unstable; urgency=low * New upstream version (4.0.0.10): -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 1ca9183be379d272ee31442749a8cd899903c1a9 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jan 20 13:52:44 2014 +0100 Use perl instead of sed for search+replace in session names sanitizing. (Fixes: #404). --- debian/changelog | 4 +++- x2goserver/bin/x2gostartagent | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c724cc1..4b9893b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -196,7 +196,9 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low x2goserver (4.0.0.11-0x2go1) UNRELEASED; urgency=low - * Continue development on LTS release branch... + * New upstream version (4.0.0.11): + - Use perl instead of sed for search+replace in session names sanitizing. + (Fixes: #404). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Jan 2014 18:43:03 +0100 diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 285c472..a25fda1 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -165,10 +165,10 @@ while [ "$OUTPUT" != "inserted" ]; do SESSION_NAME="${USER}-${X2GO_PORT}-`date +\"%s\"`" if [ "$COLORDEPTH" != "" ]; then SESSION_NAME="${SESSION_NAME}_st${SESSION_TYPE}${X2GO_CMD}_dp${COLORDEPTH}" - SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/:/PP/g"` + SESSION_NAME=`echo "$SESSION_NAME" | perl -pe "s/:/PP/g"` fi # sanitize session name - SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/[^a-zA-Z0-9\.\_\-]//g"` + SESSION_NAME=`echo "$SESSION_NAME" | perl -pe "s/[^a-zA-Z0-9\.\_\-]//g"` OUTPUT=`$X2GO_LIB_PATH/x2goinsertsession "$X2GO_PORT" "$HOSTNAME" "$SESSION_NAME"` fi -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org