aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/patches/102_xserver-xext_set-securitypolicy-path.full.patch19
-rw-r--r--debian/patches/series1
-rw-r--r--nx-X11/programs/Xserver/Xext/security.c2
3 files changed, 1 insertions, 21 deletions
diff --git a/debian/patches/102_xserver-xext_set-securitypolicy-path.full.patch b/debian/patches/102_xserver-xext_set-securitypolicy-path.full.patch
deleted file mode 100644
index 9d27a372f..000000000
--- a/debian/patches/102_xserver-xext_set-securitypolicy-path.full.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: FHS path fix for SecurityPolicy file
- This patch is needed for Tarball installation mode of NX (redistributed)
- only, not reporting this path change to upstream.
- .
- Originally contributed by Marcelo Boveto Shima <marceloshima@gmail.com>.
-Forwarded: not-needed
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Last-Update: 2012-01-12
---- a/nx-X11/programs/Xserver/Xext/security.c
-+++ b/nx-X11/programs/Xserver/Xext/security.c
-@@ -86,7 +86,7 @@
-
- #ifdef NXAGENT_SERVER
-
--#define NX_ALTERNATIVEPOLICYFILE "/usr/lib/xserver/SecurityPolicy"
-+#define NX_ALTERNATIVEPOLICYFILE "/usr/local/share/nx/SecurityPolicy"
-
- #endif
-
diff --git a/debian/patches/series b/debian/patches/series
index ceeaa8a97..d84cbd8b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-102_xserver-xext_set-securitypolicy-path.full.patch
103_nxagent_set-X0-config-path.full.patch
105_nxagent_export-remote-keyboard-config.full.patch
106_nxagent_utf8-copy-clipboard.full.patch
diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c
index 2139425b4..8e97a7e54 100644
--- a/nx-X11/programs/Xserver/Xext/security.c
+++ b/nx-X11/programs/Xserver/Xext/security.c
@@ -86,7 +86,7 @@ extern unsigned char LbxReqCode;
#ifdef NXAGENT_SERVER
-#define NX_ALTERNATIVEPOLICYFILE "/usr/lib/xserver/SecurityPolicy"
+#define NX_ALTERNATIVEPOLICYFILE "/usr/local/share/nx/SecurityPolicy"
#endif