diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/020_add-nxagent-wrapper.full.patch | 2 | ||||
| -rw-r--r-- | debian/patches/021_add-nxauth-wrapper.full.patch | 6 | ||||
| -rw-r--r-- | debian/patches/022_add-nxproxy-wrapper.full+lite.patch | 6 | ||||
| -rw-r--r-- | debian/patches/023_add-x2goagent-wrapper.full.patch | 2 |
5 files changed, 14 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 58984a927..2d38eb9f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ nx-libs (2:3.5.0.15-0) UNRELEASED; urgency=low * Add VERSION.x2goagent to package x2goagent package so x2goversion command lists up x2goagent in the list of X2Go server-side packages. * Refresh patch: 200_nxagent_check-binary-x2go-flavour.full.patch. + * Make sure the NX_TEMP envvar gets set in all wrapper script for all nx* + execubles. -- 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 59d056b9b..05d944b00 100644 --- a/debian/patches/020_add-nxagent-wrapper.full.patch +++ b/debian/patches/020_add-nxagent-wrapper.full.patch @@ -23,11 +23,11 @@ + +# make sure nxagent starts properly with pam_tmpdir.so being in use +NX_TEMP=${NX_TEMP:-/tmp} ++export NX_TEMP + +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 "$@" diff --git a/debian/patches/021_add-nxauth-wrapper.full.patch b/debian/patches/021_add-nxauth-wrapper.full.patch index 6e3ea8389..80bcde643 100644 --- a/debian/patches/021_add-nxauth-wrapper.full.patch +++ b/debian/patches/021_add-nxauth-wrapper.full.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/bin/nxauth -@@ -0,0 +1,25 @@ +@@ -0,0 +1,29 @@ +#!/bin/bash + +# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> @@ -22,6 +22,10 @@ +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} ++export NX_TEMP ++ +test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS +export LD_LIBRARY_PATH + diff --git a/debian/patches/022_add-nxproxy-wrapper.full+lite.patch b/debian/patches/022_add-nxproxy-wrapper.full+lite.patch index df603fd0c..6e4ee9f95 100644 --- a/debian/patches/022_add-nxproxy-wrapper.full+lite.patch +++ b/debian/patches/022_add-nxproxy-wrapper.full+lite.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/bin/nxproxy -@@ -0,0 +1,25 @@ +@@ -0,0 +1,29 @@ +#!/bin/bash + +# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> @@ -22,6 +22,10 @@ +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} ++export NX_TEMP ++ +test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS +export LD_LIBRARY_PATH + diff --git a/debian/patches/023_add-x2goagent-wrapper.full.patch b/debian/patches/023_add-x2goagent-wrapper.full.patch index d349840c2..ccc4aafdf 100644 --- a/debian/patches/023_add-x2goagent-wrapper.full.patch +++ b/debian/patches/023_add-x2goagent-wrapper.full.patch @@ -23,11 +23,11 @@ + +# make sure nxagent starts properly with pam_tmpdir.so being in use +NX_TEMP=${NX_TEMP:-/tmp} ++export NX_TEMP + +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 "$@" |