x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2goserver.git - master (branch) updated: 3.1.1.3-97-ga49082a
by git-admin＠x2go.org 23 Nov '12

23 Nov '12

The branch, master has been updated via a49082addab34ae907fe7de688f540e5f0b80225 (commit) from 3b277bdecf2e517b5af746755848b999456197dc (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 a49082addab34ae907fe7de688f540e5f0b80225 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 23 15:32:39 2012 +0100 release 3.1.1.9 (cherry-picked from release branch, updates changelog) Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 751c65f..f6164bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,13 +32,13 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 03 Jul 2012 10:03:28 +0200 -x2goserver (3.1.1.9-0~x2go1) UNRELEASED; urgency=low +x2goserver (3.1.1.9-0~x2go1) unstable; urgency=low - * New upstream release (3.1.1.9): + * New bugfix release (3.1.1.9): - Fix x2godesktopsharing, we had added to many quotation marks in x2gostartagent. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 12:06:40 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 15:32:11 +0100 x2goserver (3.1.1.8-0~x2go1) unstable; urgency=low hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-main (branch) updated: 3.1.1.8-4-g6d8d5d4
by git-admin＠x2go.org 23 Nov '12

23 Nov '12

The branch, build-main has been updated via 6d8d5d4779f8da210e0261c0bc7d9721a252c54f (commit) via 191012c93d89d61bc01fb9018ff8d5b13ab0c0a6 (commit) via cc11577f9ccb4a7589e8f97c916fbf45409b8e95 (commit) via ee963a1ee7311fc770ce5950440eea66ced97b13 (commit) from 4218318fd0d5fe281be98eede39ef284da410a7f (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 6d8d5d4779f8da210e0261c0bc7d9721a252c54f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 23 15:32:39 2012 +0100 release 3.1.1.9 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- x2goserver/bin/x2gostartagent | 17 +++++++++-------- 9 files changed, 24 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6e5e93e..7263072 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +x2goserver (3.1.1.9-0~x2go1) unstable; urgency=low + + * New bugfix release (3.1.1.9): + - Fix x2godesktopsharing, we had added to many quotation marks in + x2gostartagent. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 15:32:11 +0100 + x2goserver (3.1.1.8-0~x2go1) unstable; urgency=low * New bugfix release (3.1.1.8): diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index bb994f9..3a154d4 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index bb994f9..3a154d4 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index bb994f9..3a154d4 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index bb994f9..3a154d4 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index bb994f9..3a154d4 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index bb994f9..3a154d4 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index bb994f9..3a154d4 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index c049566..5499d15 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -32,7 +32,7 @@ export NX_ROOT=$X2GO_ROOT REMOTE=localhost -X2GO_CLIENT=`echo "$SSH_CLIENT" | awk '{print $1}'` +X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'` $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "client announced itself as ,,$X2GO_CLIENT''" X2GO_GEOMETRY="$1"; shift @@ -51,9 +51,9 @@ XAUTHORITY=${XAUTHORITY:-"$HOME/.Xauthority"} if [ "$X2GO_STYPE" == "S" ]; then - SHADOW_MODE=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[1]}'` - SHADOW_USER=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[2]}'` - SHADOW_DESKTOP=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[3]}'` + SHADOW_MODE=`echo $X2GO_CMD |awk '{split($0,a,"XSHAD"); print a[1]}'` + SHADOW_USER=`echo $X2GO_CMD |awk '{split($0,a,"XSHAD"); print a[2]}'` + SHADOW_DESKTOP=`echo $X2GO_CMD |awk '{split($0,a,"XSHAD"); print a[3]}'` test -z $1 && { @@ -77,8 +77,9 @@ if [ "$X2GO_STYPE" == "S" ]; then $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: user $SHADOW_USER denied desktop sharing session" exit -1 fi - X2GO_COOKIE=`echo "$OUTPUT" | awk '{print $2}'` - X2GO_PORT=`echo "$OUTPUT" | awk '{print $1}'` + X2GO_COOKIE=`echo $OUTPUT | awk '{print $2}'` + X2GO_PORT=`echo $OUTPUT | awk '{print $1}'` + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "received shadow session information: cookie: $X2GO_COOKIE, port: $X2GO_PORT" xauth -f "$XAUTHORITY" add "${HOSTNAME}/unix:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" xauth -f "$XAUTHORITY" add "${HOSTNAME}:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" @@ -95,7 +96,7 @@ if [ "$X2GO_STYPE" == "S" ]; then fi LIMIT=`x2gosessionlimit` -LWORD=`echo "$LIMIT" | awk '{print $1}'` +LWORD=`echo $LIMIT | awk '{print $1}'` if [ "$LWORD" == "LIMIT" ]; then echo $LIMIT 1>&2 @@ -104,7 +105,7 @@ fi export NX_CLIENT="$X2GO_LIB_PATH/x2gosuspend-agent" -COLORDEPTH=`echo "$X2GO_TYPE"|awk '{split($0,a,"-depth_"); print a[2]}'` +COLORDEPTH=`echo $X2GO_TYPE | awk '{split($0,a,"-depth_"); print a[2]}'` SESSION_TYPE="D" NOEXITPARAM="" hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-89-g384130b
by git-admin＠x2go.org 23 Nov '12

23 Nov '12

The branch, master has been updated via 384130ba3e22a2ea7c3c4d021f1e7e22a072727b (commit) from 78a8ce92518502a16c909b84a7987e1a3f858523 (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 384130ba3e22a2ea7c3c4d021f1e7e22a072727b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 23 15:24:41 2012 +0100 mark a session startup as PENDING asap ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index a511ed9..c7bda03 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1754,6 +1754,8 @@ class X2goSession(object): @raise Exception: any exception that occurs during published application menu retrieval is passed through """ + self.terminal_session = 'PENDING' + # initialize a dummy event to avoid many if clauses further down in the code self.reset_progress_status() _dummy_event = threading.Event() @@ -1763,7 +1765,6 @@ class X2goSession(object): self._progress_status = 1 progress_event.set() - self.terminal_session = 'PENDING' _new_session = False if self.session_name is None: self.session_name = session_name @@ -2026,6 +2027,8 @@ class X2goSession(object): @raise X2goSessionException: if the available desktop session appears to be dead, in fact """ + self.terminal_session = 'PENDING' + # initialize a dummy event to avoid many if clauses further down in the code self.reset_progress_status() _dummy_event = threading.Event() @@ -2035,8 +2038,6 @@ class X2goSession(object): self._progress_status = 5 progress_event.set() - self.terminal_session = 'PENDING' - _desktop = desktop or '%s@%s' % (user, display) if check_desktop_list: if not _desktop in self._X2goSession__list_desktops(): hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

x2goserver.git - release/3.1.1.x (branch) updated: 3.1.1.8-3-g191012c
by git-admin＠x2go.org 23 Nov '12

23 Nov '12

The branch, release/3.1.1.x has been updated via 191012c93d89d61bc01fb9018ff8d5b13ab0c0a6 (commit) from cc11577f9ccb4a7589e8f97c916fbf45409b8e95 (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 191012c93d89d61bc01fb9018ff8d5b13ab0c0a6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 23 15:22:53 2012 +0100 remove debug code ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2gostartagent | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index d7a5f1d..5499d15 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -78,10 +78,7 @@ if [ "$X2GO_STYPE" == "S" ]; then exit -1 fi X2GO_COOKIE=`echo $OUTPUT | awk '{print $2}'` - X2GO_PORT=`echo $OUTPUT | awk '{print $1}' - echo "==================" - echo "X2GO_PORT: $X2GO_PORT" -` echo "==================" + X2GO_PORT=`echo $OUTPUT | awk '{print $1}'` $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "received shadow session information: cookie: $X2GO_COOKIE, port: $X2GO_PORT" xauth -f "$XAUTHORITY" add "${HOSTNAME}/unix:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-96-g3b277bd
by git-admin＠x2go.org 23 Nov '12

23 Nov '12

The branch, master has been updated via 3b277bdecf2e517b5af746755848b999456197dc (commit) from 6543a391c5932332dbfe82d51a8cd2c3a4f8d62e (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 3b277bdecf2e517b5af746755848b999456197dc Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 23 15:22:53 2012 +0100 remove debug code ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2gostartagent | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index d7a5f1d..5499d15 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -78,10 +78,7 @@ if [ "$X2GO_STYPE" == "S" ]; then exit -1 fi X2GO_COOKIE=`echo $OUTPUT | awk '{print $2}'` - X2GO_PORT=`echo $OUTPUT | awk '{print $1}' - echo "==================" - echo "X2GO_PORT: $X2GO_PORT" -` echo "==================" + X2GO_PORT=`echo $OUTPUT | awk '{print $1}'` $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "received shadow session information: cookie: $X2GO_COOKIE, port: $X2GO_PORT" xauth -f "$XAUTHORITY" add "${HOSTNAME}/unix:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-95-g6543a39
by git-admin＠x2go.org 23 Nov '12

23 Nov '12

The branch, master has been updated via 6543a391c5932332dbfe82d51a8cd2c3a4f8d62e (commit) from 9ae33c2c9546557c6915906627129ef7e9c5c7e2 (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 6543a391c5932332dbfe82d51a8cd2c3a4f8d62e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 23 15:19:23 2012 +0100 Fix x2godesktopsharing, we had added to many quotation marks in x2gostartagent. Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ x2goserver/bin/x2gostartagent | 20 ++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e7c6bf8..751c65f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,14 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 03 Jul 2012 10:03:28 +0200 +x2goserver (3.1.1.9-0~x2go1) UNRELEASED; urgency=low + + * New upstream release (3.1.1.9): + - Fix x2godesktopsharing, we had added to many quotation marks in + x2gostartagent. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 12:06:40 +0100 + x2goserver (3.1.1.8-0~x2go1) unstable; urgency=low * New bugfix release (3.1.1.8): diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index c049566..d7a5f1d 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -32,7 +32,7 @@ export NX_ROOT=$X2GO_ROOT REMOTE=localhost -X2GO_CLIENT=`echo "$SSH_CLIENT" | awk '{print $1}'` +X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'` $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "client announced itself as ,,$X2GO_CLIENT''" X2GO_GEOMETRY="$1"; shift @@ -51,9 +51,9 @@ XAUTHORITY=${XAUTHORITY:-"$HOME/.Xauthority"} if [ "$X2GO_STYPE" == "S" ]; then - SHADOW_MODE=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[1]}'` - SHADOW_USER=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[2]}'` - SHADOW_DESKTOP=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[3]}'` + SHADOW_MODE=`echo $X2GO_CMD |awk '{split($0,a,"XSHAD"); print a[1]}'` + SHADOW_USER=`echo $X2GO_CMD |awk '{split($0,a,"XSHAD"); print a[2]}'` + SHADOW_DESKTOP=`echo $X2GO_CMD |awk '{split($0,a,"XSHAD"); print a[3]}'` test -z $1 && { @@ -77,8 +77,12 @@ if [ "$X2GO_STYPE" == "S" ]; then $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: user $SHADOW_USER denied desktop sharing session" exit -1 fi - X2GO_COOKIE=`echo "$OUTPUT" | awk '{print $2}'` - X2GO_PORT=`echo "$OUTPUT" | awk '{print $1}'` + X2GO_COOKIE=`echo $OUTPUT | awk '{print $2}'` + X2GO_PORT=`echo $OUTPUT | awk '{print $1}' + echo "==================" + echo "X2GO_PORT: $X2GO_PORT" +` echo "==================" + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "received shadow session information: cookie: $X2GO_COOKIE, port: $X2GO_PORT" xauth -f "$XAUTHORITY" add "${HOSTNAME}/unix:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" xauth -f "$XAUTHORITY" add "${HOSTNAME}:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" @@ -95,7 +99,7 @@ if [ "$X2GO_STYPE" == "S" ]; then fi LIMIT=`x2gosessionlimit` -LWORD=`echo "$LIMIT" | awk '{print $1}'` +LWORD=`echo $LIMIT | awk '{print $1}'` if [ "$LWORD" == "LIMIT" ]; then echo $LIMIT 1>&2 @@ -104,7 +108,7 @@ fi export NX_CLIENT="$X2GO_LIB_PATH/x2gosuspend-agent" -COLORDEPTH=`echo "$X2GO_TYPE"|awk '{split($0,a,"-depth_"); print a[2]}'` +COLORDEPTH=`echo $X2GO_TYPE | awk '{split($0,a,"-depth_"); print a[2]}'` SESSION_TYPE="D" NOEXITPARAM="" hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - release/3.1.1.x (branch) updated: 3.1.1.8-2-gcc11577
by git-admin＠x2go.org 23 Nov '12

23 Nov '12

The branch, release/3.1.1.x has been updated via cc11577f9ccb4a7589e8f97c916fbf45409b8e95 (commit) from ee963a1ee7311fc770ce5950440eea66ced97b13 (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 cc11577f9ccb4a7589e8f97c916fbf45409b8e95 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 23 15:19:23 2012 +0100 Fix x2godesktopsharing, we had added to many quotation marks in x2gostartagent. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- x2goserver/bin/x2gostartagent | 20 ++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 962a2c5..e96a35c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ x2goserver (3.1.1.9-0~x2go1) UNRELEASED; urgency=low * New upstream release (3.1.1.9): - - Continue development... + - Fix x2godesktopsharing, we had added to many quotation marks in + x2gostartagent. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 12:06:40 +0100 diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index c049566..d7a5f1d 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -32,7 +32,7 @@ export NX_ROOT=$X2GO_ROOT REMOTE=localhost -X2GO_CLIENT=`echo "$SSH_CLIENT" | awk '{print $1}'` +X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'` $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "client announced itself as ,,$X2GO_CLIENT''" X2GO_GEOMETRY="$1"; shift @@ -51,9 +51,9 @@ XAUTHORITY=${XAUTHORITY:-"$HOME/.Xauthority"} if [ "$X2GO_STYPE" == "S" ]; then - SHADOW_MODE=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[1]}'` - SHADOW_USER=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[2]}'` - SHADOW_DESKTOP=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[3]}'` + SHADOW_MODE=`echo $X2GO_CMD |awk '{split($0,a,"XSHAD"); print a[1]}'` + SHADOW_USER=`echo $X2GO_CMD |awk '{split($0,a,"XSHAD"); print a[2]}'` + SHADOW_DESKTOP=`echo $X2GO_CMD |awk '{split($0,a,"XSHAD"); print a[3]}'` test -z $1 && { @@ -77,8 +77,12 @@ if [ "$X2GO_STYPE" == "S" ]; then $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: user $SHADOW_USER denied desktop sharing session" exit -1 fi - X2GO_COOKIE=`echo "$OUTPUT" | awk '{print $2}'` - X2GO_PORT=`echo "$OUTPUT" | awk '{print $1}'` + X2GO_COOKIE=`echo $OUTPUT | awk '{print $2}'` + X2GO_PORT=`echo $OUTPUT | awk '{print $1}' + echo "==================" + echo "X2GO_PORT: $X2GO_PORT" +` echo "==================" + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "received shadow session information: cookie: $X2GO_COOKIE, port: $X2GO_PORT" xauth -f "$XAUTHORITY" add "${HOSTNAME}/unix:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" xauth -f "$XAUTHORITY" add "${HOSTNAME}:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" @@ -95,7 +99,7 @@ if [ "$X2GO_STYPE" == "S" ]; then fi LIMIT=`x2gosessionlimit` -LWORD=`echo "$LIMIT" | awk '{print $1}'` +LWORD=`echo $LIMIT | awk '{print $1}'` if [ "$LWORD" == "LIMIT" ]; then echo $LIMIT 1>&2 @@ -104,7 +108,7 @@ fi export NX_CLIENT="$X2GO_LIB_PATH/x2gosuspend-agent" -COLORDEPTH=`echo "$X2GO_TYPE"|awk '{split($0,a,"-depth_"); print a[2]}'` +COLORDEPTH=`echo $X2GO_TYPE | awk '{split($0,a,"-depth_"); print a[2]}'` SESSION_TYPE="D" NOEXITPARAM="" hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-94-g9ae33c2
by git-admin＠x2go.org 23 Nov '12

23 Nov '12

The branch, master has been updated via 9ae33c2c9546557c6915906627129ef7e9c5c7e2 (commit) from 2ec814c564c6f8c035a83538d8a0f1f95f4bf9f1 (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 9ae33c2c9546557c6915906627129ef7e9c5c7e2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 23 12:01:17 2012 +0100 release 3.1.1.8 (cherry-picked from release branch, changelog update) Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fdcdfaf..e7c6bf8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,12 +32,12 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 03 Jul 2012 10:03:28 +0200 -x2goserver (3.1.1.8-0~x2go2) UNRELEASED; urgency=low +x2goserver (3.1.1.8-0~x2go1) unstable; urgency=low * New bugfix release (3.1.1.8): - Fix startup of GNOME and UNITY sessions (issue introduced with 3.1.1.7). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 11:59:37 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 12:01:01 +0100 x2goserver (3.1.1.7-0~x2go1) unstable; urgency=low hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-93-g2ec814c
by git-admin＠x2go.org 23 Nov '12

23 Nov '12

The branch, master has been updated via 2ec814c564c6f8c035a83538d8a0f1f95f4bf9f1 (commit) via 43cdc2f98561d12773ab00bbb7f05e4468182cf3 (commit) from 7901b02cf5fb9e41283398844be19911c90671ec (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 2ec814c564c6f8c035a83538d8a0f1f95f4bf9f1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 23 12:00:30 2012 +0100 Fix startup of GNOME and UNITY sessions (issue introduced with 3.1.1.7). commit 43cdc2f98561d12773ab00bbb7f05e4468182cf3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Nov 22 18:11:30 2012 +0100 release 3.1.1.7 Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 11 +++++++++-- x2goserver/bin/x2goruncommand | 12 ++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f99c57e..fdcdfaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,7 +32,14 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 03 Jul 2012 10:03:28 +0200 -x2goserver (3.1.1.7-0~x2go1) UNRELEASED; urgency=low +x2goserver (3.1.1.8-0~x2go2) UNRELEASED; urgency=low + + * New bugfix release (3.1.1.8): + - Fix startup of GNOME and UNITY sessions (issue introduced with 3.1.1.7). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 11:59:37 +0100 + +x2goserver (3.1.1.7-0~x2go1) unstable; urgency=low * New upstream+bufix release (3.1.1.7): - Use DISTRIB_RELEASE to query Ubuntu release versions and detect Unity launch @@ -41,7 +48,7 @@ x2goserver (3.1.1.7-0~x2go1) UNRELEASED; urgency=low and by using the bc command for comparing versions. - Do not fail if source_environment() cannot find the file to be sourced. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Nov 2012 09:28:32 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 22 Nov 2012 18:11:15 +0100 x2goserver (3.1.1.6-0~x2go1) unstable; urgency=low diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 0724ca8..27bb3b5 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -91,13 +91,13 @@ fi if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE >= 11.10 | bc); then + if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE >= 11.10" | bc); then export DESKTOP_SESSION="gnome-fallback" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE == 11.04 | bc); then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE == 11.04" | bc); then export DESKTOP_SESSION="2d-gnome" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE <= 10.10 | bc); then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE <= 10.10" | bc); then export DESKTOP_SESSION="gnome" elif cat /etc/debian_version | egrep "^(squeeze|6\.).*" >/dev/null; then export DESKTOP_SESSION="gnome" @@ -108,13 +108,13 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE >= 12.10 | bc); then + if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE" >= 12.10 | bc); then export DESKTOP_SESSION="ubuntu" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ $(echo $DISTRIB_RELEASE == 11.10 | bc) || $(echo $DISTRIB_RELEASE == 12.04 | bc) ]; then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ $(echo "$DISTRIB_RELEASE" == 11.10 | bc) || $(echo $DISTRIB_RELEASE == 12.04 | bc) ]; then export DESKTOP_SESSION="ubuntu-2d" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE == 11.04 | bc); then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE" == 11.04 | bc); then export DESKTOP_SESSION="2d-ubuntu" args=" --session=$DESKTOP_SESSION" fi hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - release/3.1.1.x (branch) updated: 3.1.1.8-1-gee963a1
by git-admin＠x2go.org 23 Nov '12

23 Nov '12

The branch, release/3.1.1.x has been updated via ee963a1ee7311fc770ce5950440eea66ced97b13 (commit) from 4218318fd0d5fe281be98eede39ef284da410a7f (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 ee963a1ee7311fc770ce5950440eea66ced97b13 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 23 12:07:07 2012 +0100 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 8 files changed, 14 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6e5e93e..962a2c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x2goserver (3.1.1.9-0~x2go1) UNRELEASED; urgency=low + + * New upstream release (3.1.1.9): + - Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 12:06:40 +0100 + x2goserver (3.1.1.8-0~x2go1) unstable; urgency=low * New bugfix release (3.1.1.8): diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index bb994f9..3a154d4 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index bb994f9..3a154d4 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index bb994f9..3a154d4 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index bb994f9..3a154d4 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index bb994f9..3a154d4 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index bb994f9..3a154d4 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index bb994f9..3a154d4 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits