[pkg-remote-commits] [x2goserver] 03/04: debian/patches: Add 0001_dont-set-LD-LIBRARY-PATH-with-nx-36.patch. Cherry-picked from upstream. Avoid X11 client crashes due to non-needed and flawed LD_LIBRARY_PATH inside X2Go sessions.

[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 0df60d5a7d4b615e25a5cdee3e40dfa53a44ffa3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Apr 5 20:32:37 2017 +0200

    debian/patches: Add 0001_dont-set-LD-LIBRARY-PATH-with-nx-36.patch. Cherry-picked from upstream. Avoid X11 client crashes due to non-needed and flawed LD_LIBRARY_PATH inside X2Go sessions.
---
 .../0001_dont-set-LD-LIBRARY-PATH-with-nx-36.patch | 51 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 52 insertions(+)

diff --git a/debian/patches/0001_dont-set-LD-LIBRARY-PATH-with-nx-36.patch b/debian/patches/0001_dont-set-LD-LIBRARY-PATH-with-nx-36.patch
new file mode 100644
index 0000000..fc568df
--- /dev/null
+++ b/debian/patches/0001_dont-set-LD-LIBRARY-PATH-with-nx-36.patch
@@ -0,0 +1,51 @@
+From: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Date: Thu, 9 Mar 2017 05:57:47 +0000 (+0100)
+Subject: x2goserver/bin/x2goruncommand: stop exporting LD_LIBRARY_PATH when using Arctica... 
+X-Git-Url: https://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff_plain;h=7e0dce4aaf71b03db72c3dd21ff158ce3460532d;hp=bdf0eeb9cc6ac3725d75f4f8b1a5d8c23e9b9506
+
+x2goserver/bin/x2goruncommand: stop exporting LD_LIBRARY_PATH when using Arctica's nx-libs and its new Xinerama feature. Fixes: #1153.
+
+Cherry-picked from release/4.0.1.x branch.
+---
+
+#diff --git a/debian/changelog b/debian/changelog
+#index a87fa09..b1fd812 100644
+#--- a/debian/changelog
+#+++ b/debian/changelog
+#@@ -319,6 +319,11 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium
+#     - Delete .packlist which may be in different locations.
+#     - Sort some %files entries.
+# 
+#+  [ Mike Gabriel ]
+#+  * New upstream version (4.0.1.21):
+#+    - x2goserver/bin/x2goruncommand: stop exporting LD_LIBRARY_PATH when using
+#+      Arctica's nx-libs and its new Xinerama feature. Fixes: #1153.
+#+
+#  -- X2Go Release Manager <git-admin at x2go.org>  Sun, 20 Nov 2016 12:54:13 +0100
+# 
+# x2goserver (4.0.1.20-0x2go1) unstable; urgency=low
+--- a/x2goserver/bin/x2goruncommand
++++ b/x2goserver/bin/x2goruncommand
+@@ -69,13 +69,15 @@
+ export SSH_AUTH_SOCK="$X2GOSSH_AUTH_SOCK"
+ 
+ 
+-NX_XINERAMA_LIBS="$(x2gopath xinerama)"
+-NX_LIBS="$(x2gopath 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"
+-"$X2GO_LIB_PATH/x2gosyslog" "$0" "debug" "exporting LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
+-export LD_LIBRARY_PATH
++if ! x2gofeature X2GOAGENT_RANDRXINERAMA 1>/dev/null; then
++	NX_XINERAMA_LIBS="$(x2gopath xinerama)"
++	NX_LIBS="$(x2gopath 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"
++	"$X2GO_LIB_PATH/x2gosyslog" "$0" "debug" "exporting LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
++	export LD_LIBRARY_PATH
++fi
+ 
+ if [ "$sndsys" == "esd" ]; then
+ 	export ESPEAKER="localhost:$4"
diff --git a/debian/patches/series b/debian/patches/series
index a6eb640..cd6919c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+0001_dont-set-LD-LIBRARY-PATH-with-nx-36.patch
 1001_backport-x2goserver-x2goagent.patch
 1002_backport-x2golistshadowsessions.patch
 1003_fix-implicit-decl-execv.patch

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