Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
189bfbe1
Commit
189bfbe1
authored
Sep 04, 2012
by
Mike Gabriel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure the NX_TEMP envvar gets set in all wrapper script for all nx* executables
parent
8d2827b2
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
4 deletions
+14
-4
changelog
debian/changelog
+2
-0
020_add-nxagent-wrapper.full.patch
debian/patches/020_add-nxagent-wrapper.full.patch
+1
-1
021_add-nxauth-wrapper.full.patch
debian/patches/021_add-nxauth-wrapper.full.patch
+5
-1
022_add-nxproxy-wrapper.full+lite.patch
debian/patches/022_add-nxproxy-wrapper.full+lite.patch
+5
-1
023_add-x2goagent-wrapper.full.patch
debian/patches/023_add-x2goagent-wrapper.full.patch
+1
-1
No files found.
debian/changelog
View file @
189bfbe1
...
@@ -7,6 +7,8 @@ nx-libs (2:3.5.0.15-0) UNRELEASED; urgency=low
...
@@ -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
* Add VERSION.x2goagent to package x2goagent package so x2goversion command
lists up x2goagent in the list of X2Go server-side packages.
lists up x2goagent in the list of X2Go server-side packages.
* Refresh patch: 200_nxagent_check-binary-x2go-flavour.full.patch.
* 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
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 28 Jun 2012 14:54:51 +0200
...
...
debian/patches/020_add-nxagent-wrapper.full.patch
View file @
189bfbe1
...
@@ -23,11 +23,11 @@
...
@@ -23,11 +23,11 @@
+
+
+# make sure nxagent starts properly with pam_tmpdir.so being in use
+# make sure nxagent starts properly with pam_tmpdir.so being in use
+NX_TEMP=${NX_TEMP:-/tmp}
+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
+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
+test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
+
+
+export LD_LIBRARY_PATH
+export LD_LIBRARY_PATH
+export NX_TEMP
+
+
+exec $NX_LIBS/nxagent "$@"
+exec $NX_LIBS/nxagent "$@"
debian/patches/021_add-nxauth-wrapper.full.patch
View file @
189bfbe1
--- /dev/null
--- /dev/null
+++ b/bin/nxauth
+++ b/bin/nxauth
@@ -0,0 +1,2
5
@@
@@ -0,0 +1,2
9
@@
+#!/bin/bash
+#!/bin/bash
+
+
+# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
...
@@ -22,6 +22,10 @@
...
@@ -22,6 +22,10 @@
+NX_LOCAL_LIBS=/usr/local/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
+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
+test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
+export LD_LIBRARY_PATH
+export LD_LIBRARY_PATH
+
+
...
...
debian/patches/022_add-nxproxy-wrapper.full+lite.patch
View file @
189bfbe1
--- /dev/null
--- /dev/null
+++ b/bin/nxproxy
+++ b/bin/nxproxy
@@ -0,0 +1,2
5
@@
@@ -0,0 +1,2
9
@@
+#!/bin/bash
+#!/bin/bash
+
+
+# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
...
@@ -22,6 +22,10 @@
...
@@ -22,6 +22,10 @@
+NX_LOCAL_LIBS=/usr/local/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
+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
+test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
+export LD_LIBRARY_PATH
+export LD_LIBRARY_PATH
+
+
...
...
debian/patches/023_add-x2goagent-wrapper.full.patch
View file @
189bfbe1
...
@@ -23,11 +23,11 @@
...
@@ -23,11 +23,11 @@
+
+
+# make sure nxagent starts properly with pam_tmpdir.so being in use
+# make sure nxagent starts properly with pam_tmpdir.so being in use
+NX_TEMP=${NX_TEMP:-/tmp}
+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
+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
+test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
+
+
+export LD_LIBRARY_PATH
+export LD_LIBRARY_PATH
+export NX_TEMP
+
+
+exec $NX_LIBS/../x2go/x2goagent "$@"
+exec $NX_LIBS/../x2go/x2goagent "$@"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment