[X2Go-Commits] [nx-libs] 03/24: FHS path fix for SecurityPolicy file (102_xserver-xext_set-securitypolicy-path.full.patch).

git-admin at x2go.org git-admin at x2go.org
Tue Feb 10 21:50:49 CET 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 057999efabe7f1d857f6a94116bcafdeaa309fcf
Author: Marcelo Boveto Shima <marceloshima at gmail.com>
Date:   Tue Feb 10 18:52:39 2015 +0100

    FHS path fix for SecurityPolicy file (102_xserver-xext_set-securitypolicy-path.full.patch).
    
      This patch is needed for Tarball installation mode of NX (redistributed)
      only, not reporting this path change to upstream.
---
 ...xserver-xext_set-securitypolicy-path.full.patch |   19 -------------------
 debian/patches/series                              |    1 -
 nx-X11/programs/Xserver/Xext/security.c            |    2 +-
 3 files changed, 1 insertion(+), 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 9d27a37..0000000
--- 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 at gmail.com>.
-Forwarded: not-needed
-Author: Mike Gabriel <mike.gabriel at 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 ceeaa8a..d84cbd8 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 2139425..8e97a7e 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
 

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list