This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from e0ebbb9 whitespace clean in x2goserver.spec new adf494b Continue development on LTS release branch... new d4521c0 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 master in repository x2goserver. commit d4521c0cab0c5cdf00dd101531371d66651ac1b2 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 0e9acb4..0f5e41a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -287,7 +287,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 b897ee7..edce98b 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -170,10 +170,10 @@ while [ "$OUTPUT" != "inserted" ]; do fi 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"` if [ -n "$SHADREQ_USER" ]; then $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "initializing new shadow session with ID $SESSION_NAME" -- 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 master in repository x2goserver. commit adf494bf317ac513c781f172da788b7ac97ff44a 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 9850a69..0e9acb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -285,6 +285,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
-
git-admin＠x2go.org