[X2Go-Commits] nx-libs.git - build-baikal (branch) updated: redist-server/3.5.0.14-2-g7b3d592
X2Go dev team
git-admin at x2go.org
Fri Aug 30 16:25:29 CEST 2013
The branch, build-baikal has been updated
via 7b3d592e637910cd0b16beca7db090bc0115a366 (commit)
from 6af3d3b802171532b5b8472ab1d389b9964ec552 (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:
.../patches/023_add-x2goagent-wrapper.full.patch | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/patches/023_add-x2goagent-wrapper.full.patch b/debian/patches/023_add-x2goagent-wrapper.full.patch
index d23d3f0..d349840 100644
--- a/debian/patches/023_add-x2goagent-wrapper.full.patch
+++ b/debian/patches/023_add-x2goagent-wrapper.full.patch
@@ -1,6 +1,6 @@
--- /dev/null
+++ b/bin/x2goagent
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Copyright (C) 2012 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
@@ -20,9 +20,14 @@
+
+NX_LIBS=/usr/lib/nx
+NX_LOCAL_LIBS=/usr/local/lib/nx
-+LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH
+
++# make sure nxagent starts properly with pam_tmpdir.so being in use
++NX_TEMP=${NX_TEMP:-/tmp}
++
++LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH
+test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
++
+export LD_LIBRARY_PATH
++export NX_TEMP
+
+exec $NX_LIBS/../x2go/x2goagent "$@"
hooks/post-receive
--
nx-libs.git (NX (redistributed))
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 "nx-libs.git" (NX (redistributed)).
More information about the x2go-commits
mailing list