[X2go-Commits] x2goserver.git - build-main (branch) updated: 3.1.1.8-4-g6d8d5d4

X2Go dev team git-admin at x2go.org
Fri Nov 23 15:33:52 CET 2012


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 at 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 at 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).




More information about the x2go-commits mailing list