[X2Go-Commits] [nx-libs] 02/02: nxcomp: Hardcode X11 and (legacy/xfs) font UNIX paths.

[git-admin at x2go.org]

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

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

commit 2c75b00f3fe8e9df4e94244ab66567cd3789f9d2
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Nov 4 08:00:32 2017 +0100

    nxcomp: Hardcode X11 and (legacy/xfs) font UNIX paths.
    
    Fixes: ArcticaProject/nx-libs#536
    
    Allowing overrides via NX_TEMP and TEMP breaks system using
    pam_tmpdir.so and most server infrastructure expects the location to be
    fixed anyway.
    
    Backported from Arctica GH 3.6.x branch.
    
    v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)
    
    Adds:
      - debian/patches/1610_nxcomp-harcode-some-UNIX-socket-path.full+lite.patch
---
 debian/changelog                                   |  9 ++++
 ...p-harcode-some-UNIX-socket-path.full+lite.patch | 60 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 70 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 06ffd2f..dc0e08f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,15 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low
     v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)
     Adds:
       - debian/patches/1600_nxcomp-handle-launchd-socket-in-Auth.full+lite.patch
+  * nxcomp: Hardcode X11 and (legacy/xfs) font UNIX paths.
+    Fixes: ArcticaProject/nx-libs#536
+    Allowing overrides via NX_TEMP and TEMP breaks system using
+    pam_tmpdir.so and most server infrastructure expects the location to be
+    fixed anyway.
+    Backported from Arctica GH 3.6.x branch.
+    v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)
+    Adds:
+      - debian/patches/1610_nxcomp-harcode-some-UNIX-socket-path.full+lite.patch
 
   [ Mike Gabriel ]
   * debian/libxinerama1.postinst.in:
diff --git a/debian/patches/1610_nxcomp-harcode-some-UNIX-socket-path.full+lite.patch b/debian/patches/1610_nxcomp-harcode-some-UNIX-socket-path.full+lite.patch
new file mode 100644
index 0000000..d6b5ec1
--- /dev/null
+++ b/debian/patches/1610_nxcomp-harcode-some-UNIX-socket-path.full+lite.patch
@@ -0,0 +1,60 @@
+From db1c2fbc5aaace3443cdecf4a1e34644f8f5f1fc Mon Sep 17 00:00:00 2001
+From: Mihai Moldovan <ionic at ionic.de>
+Date: Fri, 3 Nov 2017 12:57:25 +0100
+Subject: [PATCH] nxcomp/src/Loop.cpp: hardcode X11 and (legacy/xfs) font UNIX
+ paths.
+
+Fixes: ArcticaProject/nx-libs#536
+
+Allowing overrides via NX_TEMP and TEMP breaks system using
+pam_tmpdir.so and most server infrastructure expects the location to be
+fixed anyway.
+
+Backported from Arctica GH 3.6.x branch.
+
+v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)
+---
+ nxcomp/src/Loop.cpp | 18 +++++-------------
+ 1 file changed, 5 insertions(+), 13 deletions(-)
+
+--- a/nxcomp/Loop.cpp
++++ b/nxcomp/Loop.cpp
+@@ -4029,8 +4029,7 @@ int SetupUnixSocket()
+ 
+   char dirName[DEFAULT_STRING_LENGTH];
+ 
+-  snprintf(dirName, DEFAULT_STRING_LENGTH - 1, "%s/.X11-unix",
+-               control -> TempPath);
++  snprintf(dirName, DEFAULT_STRING_LENGTH - 1, "/tmp/.X11-unix");
+ 
+   *(dirName + DEFAULT_STRING_LENGTH - 1) = '\0';
+ 
+@@ -4295,8 +4294,7 @@ int SetupDisplaySocket(int &xServerAddrF
+ 
+     char unixSocketDir[DEFAULT_STRING_LENGTH];
+ 
+-    snprintf(unixSocketDir, DEFAULT_STRING_LENGTH - 1, "%s/.X11-unix",
+-                 control -> TempPath);
++    snprintf(unixSocketDir, DEFAULT_STRING_LENGTH - 1, "/tmp/.X11-unix");
+ 
+     #ifdef __APPLE__
+ 
+@@ -13761,14 +13759,14 @@ int ParseFontPath(char *path)
+ 
+   //
+   // Let's assume that a port specification "unix/:7100"
+-  // corresponds to "$TEMP/.font-unix/fs7100" and a port
+-  // "unix/:-1" corresponds to "$TEMP/.font-unix/fs-1".
++  // corresponds to "/tmp/.font-unix/fs7100" and a port
++  // "unix/:-1" corresponds to "/tmp/.font-unix/fs-1".
+   //
+ 
+   if (strncmp("unix/:", path, 6) == 0)
+   {
+-    snprintf(path, DEFAULT_STRING_LENGTH - 1, "%s/.font-unix/fs%s",
+-                 control -> TempPath, oldPath + 6);
++    snprintf(path, DEFAULT_STRING_LENGTH - 1, "/tmp/.font-unix/fs%s",
++                 oldPath + 6);
+ 
+     *(path + DEFAULT_STRING_LENGTH - 1) = '\0';
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a497ed2..ac1450a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -153,6 +153,7 @@
 1400_nx-X11_Render.c-Improve-situation-fo.full+lite.patch
 1500_all_propagate-optflags-to-subcompone.full+lite.patch
 1600_nxcomp-handle-launchd-socket-in-Auth.full+lite.patch
+1610_nxcomp-harcode-some-UNIX-socket-path.full+lite.patch
 9900-dxpc-license-history.full+lite.patch
 0016_nx-X11_install-location.debian.patch
 0102_xserver-xext_set-securitypolicy-path.debian.patch

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