[X2go-Commits] x2goserver.git - build-main (branch) updated: 3.1.1.3-21-g7dced61

X2Go dev team git-admin at x2go.org
Tue Sep 25 13:16:31 CEST 2012


The branch, build-main has been updated
       via  7dced6158846f4cd2a7f1c9f2f94eef8225ff387 (commit)
       via  504167bac89b55b9f21047676ddde3a5deeceb95 (commit)
       via  973db626cf5d84e7c62bb6dc58c094f86512db1a (commit)
       via  3b891b928323f52e8a539e2f165fc06712e2124f (commit)
       via  a41afc38aa2e342dfb8c592a674ff3a9f52c54d4 (commit)
       via  0b3c71ca7b6e3681a2ade80346621b22ffa7f255 (commit)
       via  98512000e2b0208849d93b97f0e9a216f0c18c28 (commit)
       via  1590476de31766028725fa1272dfcc50b7d1305e (commit)
       via  22ede8d3f939d849856feeaad0e777738fbeea9b (commit)
       via  df4c17c9ef5337a453323b0f933039a4b8cac9a5 (commit)
       via  0c3542c4b6710d97ad11f182e0ec8c0f5198b9e4 (commit)
       via  452498574b305425ec8a2e81b82ea86e4c5f67d4 (commit)
       via  2b68ff4432efb0f7058da0e4c8c3f2dfb446d459 (commit)
       via  df13257d3fe83b4e12f9117f39e82b05276c44a1 (commit)
       via  48ccfe5706cb5192fc0a4a83938db827b5565ee0 (commit)
       via  6b41cef9e10da4dee9f16c36f273c3d723208953 (commit)
       via  96046134086d5c2fc2fdb1345df32cc2af37e773 (commit)
       via  a35b196a82b523f24430b6977c61bc8d702f9d93 (commit)
       via  ead0462ea08a768e361aad48ebc0fb913c5c826d (commit)
       via  d70b136ab99623678f34c12f2175570a856eaa77 (commit)
       via  15f93bffe63a7d9eea3a7cb1fe12d531e92c113f (commit)
      from  1bbfded0225f0790c727cbf2e13e41aa19bee92d (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 7dced6158846f4cd2a7f1c9f2f94eef8225ff387
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Sep 25 13:15:52 2012 +0200

    release 3.1.1.4

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |   31 ++++++++++++++++++++
 debian/control                                     |   27 +++++++++--------
 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/Makefile                                |    2 +-
 x2goserver/VERSION.x2goserver                      |    2 +-
 x2goserver/bin/x2goruncommand                      |   20 +++++++++++--
 x2goserver/bin/x2gosessionlimit                    |   22 ++++++++++----
 x2goserver/bin/x2gostartagent                      |    6 ++--
 13 files changed, 91 insertions(+), 31 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e69b220..48f929a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+x2goserver (3.1.1.4-0~x2go1) unstable; urgency=low
+
+  [ Jan Engelhardt ]
+  * New upstream version (3.1.1.4):
+    - Add -pie as linker flag. Fixes non-position-independent-executable
+      (x2gosqlitewrapper.c). The executable is now completely position
+      independent.
+
+  [ Mike Gabriel ]
+  * New upstream version (3.1.1.4):
+    - Fix x2gosessionlimit script.
+    - Wrap padsp around rdesktop calls if pulse is used as audio protocol.
+    - Add option ,,-r sound:local'' to rdesktop calls if pulse is enabled.
+    - Proxy X2Go client-side shares into remote desktop session.
+    - For applications inside of a session, use NX's Xrandr library instead
+      of Xorg's Xrandr library (partially closes #28).
+    - Make sure when launching desktop session through the Xsession mechanism
+      that the LD_LIBRARY_PATH variable stays intact. Closes #29.
+    - Only extend LD_LIBRARY_PATH by Xrandr extension for KDE. Breaks GNOME.
+  * /debian/control:
+    + Maintainer change in package: X2Go Developers <x2go-dev at lists.berlios.de>.
+    + Depend on nx-libs (>=3.5.0.15-0~) which has the Xrandr symlinks folder.
+    + Add rdesktop and pulseaudio-utils to Suggests.
+    + Priority: optional.
+
+  [ Oleksandr Shneyder ]
+  * New upstream version (3.1.1.4):
+    - Remove "-nolisten tcp" option with XDMCP sessions.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 25 Sep 2012 13:15:11 +0200
+
 x2goserver (3.1.1.3-0~x2go1) unstable; urgency=low
 
   [ Jan Engelhardt ]
diff --git a/debian/control b/debian/control
index 0b73ef4..4cfca15 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,10 @@
 Source: x2goserver
 Section: x11
-Priority: extra
-Maintainer: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+Priority: optional 
+Maintainer: X2Go Developers <x2go-dev at lists.berlios.de>
 Uploaders:
- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+ Mike Gabriel <mike.gabriel at das-netzwerkteam.de>,
+ Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>,
 Build-Depends: 
  debhelper (>= 7.0.50~),
  man2html-base | man2html
@@ -17,7 +18,7 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
- x2goagent (>= 2:3.5.0.12),
+ x2goagent (>= 2:3.5.0.15-0~),
  lsof,
  openssh-client,
  openssh-server,
@@ -44,7 +45,9 @@ Suggests:
  x2goserver-compat (= ${source:Version}),
  x2goserver-xsession (= ${source:Version}),
  x2goserver-fmbindings (= ${source:Version}),
- x2goserver-pyhoca (= ${source:Version})
+ x2goserver-pyhoca (= ${source:Version}),
+ rdesktop,
+ pulseaudio-utils
 Breaks:
  x2goserver-one,
  x2goserver-home,
@@ -54,7 +57,7 @@ Replaces:
 Description: X2Go server daemon scripts
  X2Go is a server based computing environment with
     - session resuming
-    - low bandwith support
+    - low bandwidth support
     - LDAP support
     - client side mass storage mounting support
     - audio support
@@ -86,7 +89,7 @@ Suggests:
 Description: X2Go server daemon scripts (printing)
  X2Go is a server based computing environment with
     - session resuming
-    - low bandwith support
+    - low bandwidth support
     - LDAP support
     - client side mass storage mounting support
     - audio support
@@ -113,7 +116,7 @@ Depends:
 Description: X2Go server daemon scripts (backwards compatitbity to old client versions)
  X2Go is a server based computing environment with
     - session resuming
-    - low bandwith support
+    - low bandwidth support
     - LDAP support
     - client side mass storage mounting support
     - audio support
@@ -131,7 +134,7 @@ Depends:
 Description: X2Go server daemon scripts (extensions)
  X2Go is a server based computing environment with
     - session resuming
-    - low bandwith support
+    - low bandwidth support
     - LDAP support
     - client side mass storage mounting support
     - audio support
@@ -154,7 +157,7 @@ Depends:
 Description: X2Go server daemon scripts (Xsession runner)
  X2Go is a server based computing environment with
     - session resuming
-    - low bandwith support
+    - low bandwidth support
     - LDAP support
     - client side mass storage mounting support
     - audio support
@@ -178,7 +181,7 @@ Depends:
 Description: Generic (freedesktop-based) file manager bindings for X2Go
  X2Go is a server based computing environment with
     - session resuming
-    - low bandwith support
+    - low bandwidth support
     - LDAP support
     - client side mass storage mounting support
     - audio support
@@ -203,7 +206,7 @@ Depends:
 Description: X2Go server daemon scripts (add-ons for pyhoca client)
  X2Go is a server based computing environment with
     - session resuming
-    - low bandwith support
+    - low bandwidth support
     - LDAP support
     - client side mass storage mounting support
     - audio support
diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat
index c7271d2..f927970 100644
--- a/x2goserver-compat/VERSION.x2goserver-compat
+++ b/x2goserver-compat/VERSION.x2goserver-compat
@@ -1 +1 @@
-3.1.1.3
\ No newline at end of file
+3.1.1.4
\ No newline at end of file
diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions
index c7271d2..f927970 100644
--- a/x2goserver-extensions/VERSION.x2goserver-extensions
+++ b/x2goserver-extensions/VERSION.x2goserver-extensions
@@ -1 +1 @@
-3.1.1.3
\ No newline at end of file
+3.1.1.4
\ No newline at end of file
diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings
index c7271d2..f927970 100644
--- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings
+++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings
@@ -1 +1 @@
-3.1.1.3
\ No newline at end of file
+3.1.1.4
\ No newline at end of file
diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing
index c7271d2..f927970 100644
--- a/x2goserver-printing/VERSION.x2goserver-printing
+++ b/x2goserver-printing/VERSION.x2goserver-printing
@@ -1 +1 @@
-3.1.1.3
\ No newline at end of file
+3.1.1.4
\ No newline at end of file
diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
index c7271d2..f927970 100644
--- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
+++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
@@ -1 +1 @@
-3.1.1.3
\ No newline at end of file
+3.1.1.4
\ No newline at end of file
diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession
index c7271d2..f927970 100644
--- a/x2goserver-xsession/VERSION.x2goserver-xsession
+++ b/x2goserver-xsession/VERSION.x2goserver-xsession
@@ -1 +1 @@
-3.1.1.3
\ No newline at end of file
+3.1.1.4
\ No newline at end of file
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index 115c929..979283b 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -37,7 +37,7 @@ build: build-arch build-indep
 build-arch: build_setgidwrappers
 
 build_setgidwrappers:
-	gcc -fPIE -o x2gosqlitewrapper x2gosqlitewrapper.c
+	gcc -fPIE -pie -o x2gosqlitewrapper x2gosqlitewrapper.c
 
 build-indep: build_man2html
 
diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver
index c7271d2..f927970 100644
--- a/x2goserver/VERSION.x2goserver
+++ b/x2goserver/VERSION.x2goserver
@@ -1 +1 @@
-3.1.1.3
\ No newline at end of file
+3.1.1.4
\ No newline at end of file
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 6e62709..d783a3a 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -54,7 +54,9 @@ IMEXIT="false"
 
 NX_XINERAMA_LIBS=/usr/lib/nx/X11/Xinerama
 NX_LIBS=/usr/lib/nx/X11
-test -n "$LD_LIBRARY_PATH" && LD_LIBRARY_PATH=$NX_XINERAMA_LIBS:$NX_LIBS:$LD_LIBRARY_PATH || LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS"
+test -n "$LD_LIBRARY_PATH" && \
+  LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS:$LD_LIBRARY_PATH" || \
+  LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS"
 $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "exporting LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
 export LD_LIBRARY_PATH
 
@@ -117,6 +119,10 @@ elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then
 
 elif [ "$cmd" == "KDE" ]; then
 	cmd="/usr/bin/startkde"
+	NX_XRANDR_LIBS=/usr/lib/nx/X11/Xrandr
+	LD_LIBRARY_PATH="$NX_XRANDR_LIBS:$LD_LIBRARY_PATH"
+	$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "extending LD_LIBRARY_PATH=$LD_LIBRARY_PATH by Xrandr extension"
+	export LD_LIBRARY_PATH
 elif [ "$cmd" == "XFCE4" ]; then
 	cmd="/usr/bin/xfce4-session"
 elif [ "$cmd" == "LXDE" ]; then
@@ -179,11 +185,19 @@ if [ "$cmd" == "TERMINAL" ]; then
 fi
 
 EXEC=`which $cmd`
+EXEC_WRAPPER=""
 
 BNAME=`basename "$EXEC"`
 if [ "$BNAME" == "rdesktop" ]
 then
 	IMEXIT="true"
+	if which padsp >/dev/null; then
+		EXEC_WRAPPER="padsp"
+		args=" -r sound:local"
+	fi
+	if [ -d "$HOME/media" ]; then
+		args+=" -r disk:X2GoMedia=$HOME/media"
+	fi
 fi
 
 if [ "$X2GO_SESS_TYPE" == "P" ]
@@ -205,10 +219,10 @@ if [ "$EXEC" != "" ] && [ -x $EXEC ]; then
 	x2gofeature X2GO_XSESSION &>/dev/null && [ "x$X2GO_SESS_TYPE" = "xD" ] && {
 		STARTUP="$cmd$args"
 		$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "launching session with Xsession-x2go mechanism, using STARTUP=\"$STARTUP\""
-		STARTUP="$STARTUP" /etc/x2go/Xsession
+		STARTUP="/usr/bin/env LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ${STARTUP}" /etc/x2go/Xsession
 	} || {
 		$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command \"$cmd$args\"..."
-		$cmd$args
+		$EXEC_WRAPPER $cmd$args
 	}
 
 	#### some applications can quit immediately, we will wait here as long as x2goagent exists
diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit
index 0287fc4..91f747b 100755
--- a/x2goserver/bin/x2gosessionlimit
+++ b/x2goserver/bin/x2gosessionlimit
@@ -33,7 +33,7 @@ setlogmask( LOG_UPTO(x2gologlevel()) );
 
 syslog('info', "x2gosessionlimit has been called");
 
-my $maxlimit=0;
+my $maxlimit=-1;
 my $Config = new Config::Simple(syntax=>'ini');
 $Config->read('/etc/x2go/x2goserver.conf' );
 
@@ -69,14 +69,16 @@ if($strlimit ne "")
 	if ($strlimit == 0)
 	{
 		print "0\n";
+		closelog;
 		exit 0;
 	}
-	if ($strlimit <= $scount)
+	if ($scount < $strlimit)
 	{
 		print "$strlimit\n";
+		closelog;
 		exit 0;
 	}
-	print "$strlimit\n";
+	print "LIMIT\n";
 	exit 0;
 }
 
@@ -99,12 +101,20 @@ while (my ($name, $passwd, $gid, $members)  = getgrent())
 	}
 }
 
-if ($maxlimit <= $scount)
+
+if ($scount < $maxlimit)
 {
 	print "$maxlimit\n";
+	closelog;
+	exit 0;
+}
+
+if ($maxlimit != -1) {
+	print "LIMIT\n";
+	closelog;
 	exit 0;
 }
-print "$maxlimit\n";
 
 # closing syslog 
-closelog;
\ No newline at end of file
+closelog;
+
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index abf1422..c049566 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -247,8 +247,10 @@ else
 	X2GODPIOPTION_="-dpi $X2GODPI"
 fi
 
+NOLISTOPT=""
 if [ "$X2GOXDMCP" == "" ] ;then
 	XDMCPOPT=""
+	NOLISTOPT="-nolisten tcp"
 else
 	XDMCPOPT="-query $X2GOXDMCP"
 fi
@@ -260,10 +262,10 @@ SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}"
 
 if  [ "$X2GO_STYPE" == "S" ]; then
 	# set NX_TEMP to /tmp, make sure x2goagent starts when pam_tmpdir.so is in use
-	NX_TEMP=/tmp x2goagent -nolisten tcp $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  "${NX_AGENT}" 2>"${SESSION_LOG}" &
+	NX_TEMP=/tmp x2goagent $NOLISTOPT $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  "${NX_AGENT}" 2>"${SESSION_LOG}" &
 else
 	# set NX_TEMP to /tmp, make sure x2goagent starts when pam_tmpdir.so is in use
-	NX_TEMP=/tmp x2goagent -nolisten tcp $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  "${NX_AGENT}" 2>"${SESSION_LOG}" &
+	NX_TEMP=/tmp x2goagent $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  "${NX_AGENT}" 2>"${SESSION_LOG}" &
 fi
 
 X2GO_AGENT_PID=$!


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