[X2Go-Commits] nx-libs.git - build-main (branch) updated: redist-server/3.5.0.14-3-gb42268b

[X2Go dev team]

The branch, build-main has been updated
       via  b42268b13cf1ecccc88e33c243dc5d1c2c819041 (commit)
      from  7b3d592e637910cd0b16beca7db090bc0115a366 (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                                  |    5 ++++-
 debian/patches/020_add-nxagent-wrapper.full.patch |    9 +++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a002072..1fe61e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 nx-libs (2:3.5.0.15-0) UNRELEASED; urgency=low
 
-  * Continue development...
+  * Improve 020_add-nxagent-wrapper.full.patch: Properly set NX_TEMP, make
+    sure nxagent launches even with pam_tmpdir.so being in use.
+  * Improve 023_add-x2goagent-wrapper.full.patch: Properly set NX_TEMP, make
+    sure x2goagent launches even with pam_tmpdir.so being in use.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 28 Jun 2012 14:54:51 +0200
 
diff --git a/debian/patches/020_add-nxagent-wrapper.full.patch b/debian/patches/020_add-nxagent-wrapper.full.patch
index daee69d..59d056b 100644
--- a/debian/patches/020_add-nxagent-wrapper.full.patch
+++ b/debian/patches/020_add-nxagent-wrapper.full.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/bin/nxagent
-@@ -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/nxagent "$@"


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