[pkg-remote-commits] [x2goserver] 02/06: debian/patches: Add 1004_dbus-launch-every-desktop-session.patch. An X2Go Session really needs to be isolated from user DBus.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository x2goserver.

commit d4d47781dfa48e1cc0d7f4f17c1f16752bda5adc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Oct 26 01:10:43 2017 +0200

    debian/patches: Add 1004_dbus-launch-every-desktop-session.patch. An X2Go Session really needs to be isolated from user DBus.
---
 .../patches/1004_dbus-launch-every-desktop-session.patch   | 14 ++++++++++++++
 debian/patches/series                                      |  1 +
 2 files changed, 15 insertions(+)

diff --git a/debian/patches/1004_dbus-launch-every-desktop-session.patch b/debian/patches/1004_dbus-launch-every-desktop-session.patch
new file mode 100644
index 0000000..fa85a8b
--- /dev/null
+++ b/debian/patches/1004_dbus-launch-every-desktop-session.patch
@@ -0,0 +1,14 @@
+Description: An X2Go Session really needs to be isolated from user DBus
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/x2goserver/bin/x2goruncommand
++++ b/x2goserver/bin/x2goruncommand
+@@ -315,7 +315,7 @@
+ 	if x2gofeature X2GO_XSESSION &>/dev/null && [ "x$X2GO_SESS_TYPE" = "xD" ]; then
+ 		STARTUP="$cmd$args"
+ 		"$X2GO_LIB_PATH/x2gosyslog" "$0" "notice" "launching session with Xsession-x2go mechanism, using STARTUP=\"$STARTUP\""
+-		XSESSION_EXEC="$cmd" STARTUP="/usr/bin/env LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ${STARTUP}" /etc/x2go/Xsession >> "$MESSAGE_FILE" 2>&1
++		XSESSION_EXEC="$cmd" STARTUP="/usr/bin/env LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ${STARTUP}" dbus-launch /etc/x2go/Xsession >> "$MESSAGE_FILE" 2>&1
+ 	else
+ 		"$X2GO_LIB_PATH/x2gosyslog" "$0" "debug" "executing command \"$cmd$args\"..."
+ 
diff --git a/debian/patches/series b/debian/patches/series
index cd6919c..bd16d39 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,5 @@
 1001_backport-x2goserver-x2goagent.patch
 1002_backport-x2golistshadowsessions.patch
 1003_fix-implicit-decl-execv.patch
+1004_dbus-launch-every-desktop-session.patch
 2001_drop-pyhoca-and-compat-pkgs.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/x2goserver.git