[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.1.1.9-9-gd38f6b8

[X2Go dev team]

The branch, build-main has been updated
       via  d38f6b8b69ee54e504446d8dd63bf78a1439a284 (commit)
      from  54ced06113c3e1d60d279d438ec485bbc040d310 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog               |   12 ++++++++++++
 x2goserver/Makefile            |    4 ++++
 x2goserver/bin/x2gostartagent  |   12 ++++++++++--
 x2goserver/etc/nxagent.options |   15 +++++++++++++++
 4 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 x2goserver/etc/nxagent.options

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5b97a08..fb95147 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,6 @@
+   -- Reinhard Tartler <siretart at tauware.de>  Thu, 20 Dec 2012 10:15:26 +0100
+
+>>>>>>> d7f1087... Introduce /etc/x2go/nxagent.options to allow overriding nxagent options
 x2goserver (3.1.1.10-0~x2go1) UNRELEASED; urgency=low
 
   [ Jan Engelhardt ]
@@ -20,6 +23,15 @@ x2goserver (3.1.1.10-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (3.1.1.10):
     - Fix SSHFS mounting from Ubuntu clients
 
+  [ Reinhard Tartler ]
+  * New upstream version (3.1.1.10):
+    - Introduce /etc/x2go/nxagent.options to allow overriding nxagent
+      options. This new configuration file specifies default options
+      that clients can override.
+    - Disable XFIXES and GLX. Both are known to cause certain
+      problems. Hopefully we find better solutions so that we can reenable
+      them soon.
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 23 Nov 2012 15:35:48 +0100
 
 x2goserver (3.1.1.9-0~x2go1) unstable; urgency=low
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index 4f93d24..62cd30c 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -75,7 +75,11 @@ install_config:
 	$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql
 	$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords
 	$(INSTALL_FILE) etc/x2goserver.conf     $(DESTDIR)$(ETCDIR)/
+	$(INSTALL_FILE) etc/nxagent.options $(DESTDIR)$(ETCDIR)/
 	$(INSTALL_FILE) etc/x2gosql/sql         $(DESTDIR)$(ETCDIR)/x2gosql
+	$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2go_logout.d
+	$(INSTALL_FILE) etc/x2go_logout     $(DESTDIR)$(ETCDIR)/
+	$(INSTALL_FILE) etc/x2go_logout.d/* $(DESTDIR)$(ETCDIR)/x2go_logout.d/
 
 install_man:
 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index fae66ab..b8f0087 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -30,6 +30,14 @@ SSH_PORT=30000 #First ssh port 30001
 X2GO_ROOT="${HOME}/.x2go"
 export NX_ROOT=$X2GO_ROOT
 
+if [ -r /etc/x2go/nxagent.options ]; then
+    source /etc/x2go/nxagent.options
+fi
+
+if [ -z "$X2GO_NXAGENT_OPTIONS" ]; then
+    X2GO_NXAGENT_OPTIONS="$X2GO_NXAGENT_DEFAULT_OPTIONS"
+fi
+
 REMOTE=localhost
 
 X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'`
@@ -263,10 +271,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 $NOLISTOPT $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 $X2GO_NXAGENT_OPTIONS $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 $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  "${NX_AGENT}" 2>"${SESSION_LOG}" &
+	NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  "${NX_AGENT}" 2>"${SESSION_LOG}" &
 fi
 
 X2GO_AGENT_PID=$!
diff --git a/x2goserver/etc/nxagent.options b/x2goserver/etc/nxagent.options
new file mode 100644
index 0000000..afe12f9
--- /dev/null
+++ b/x2goserver/etc/nxagent.options
@@ -0,0 +1,15 @@
+#
+# This file can be used to specify default options that are passed to nxagent
+# These options can be overriden by the client!
+
+X2GO_NXAGENT_DEFAULT_OPTIONS=""
+
+# Disable XFIXES.
+# Workaround for https://bugs.launchpad.net/ubuntu/+source/libxfixes/+bug/985202
+#
+X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension XFIXES"
+
+# Disable GLX, the old mesa version is hopelessly outdated anyways.
+# Unbreaks the gnome3 control center
+#
+X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension GLX"


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