aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-06-28 22:22:00 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-06-28 22:22:00 +0200
commitb42268b13cf1ecccc88e33c243dc5d1c2c819041 (patch)
treee3b279edf59f07290937772e59cc3e4bdf4b5d7f /debian
parent7b3d592e637910cd0b16beca7db090bc0115a366 (diff)
downloadnx-libs-b42268b13cf1ecccc88e33c243dc5d1c2c819041.tar.gz
nx-libs-b42268b13cf1ecccc88e33c243dc5d1c2c819041.tar.bz2
nx-libs-b42268b13cf1ecccc88e33c243dc5d1c2c819041.zip
Improve 020_add-nxagent-wrapper.full.patch: Properly set NX_TEMP, make sure nxagent launches even with pam_tmpdir.so being in use.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/020_add-nxagent-wrapper.full.patch9
2 files changed, 11 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index a002072a4..1fe61e1bd 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@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 daee69d36..59d056b9b 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@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 "$@"