[X2Go-Commits] [nx-libs] 01/01: nx-X11: use the "old", non-NX header location.

[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 fb55fc3ef5a037ba881c5d18f782f9f988b48fe3
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Mar 9 10:32:45 2017 +0100

    nx-X11: use the "old", non-NX header location.
    
    Affects:
      - 1270_nx-X11_CVE-2017-2624-Use-timingsafe_memcmp-to-c.full.patch
---
 debian/changelog                                                       | 3 +++
 .../1270_nx-X11_CVE-2017-2624-Use-timingsafe_memcmp-to-c.full.patch    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 204d37d..eaaa292 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,9 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low
   * Refresh:
     - 0016_nx-X11_install-location.debian.patch
     - 9900-dxpc-license-history.full+lite.patch
+  * nx-X11: use the "old", non-NX header location.
+    Affects:
+    - 1270_nx-X11_CVE-2017-2624-Use-timingsafe_memcmp-to-c.full.patch
 
   [ Mike Gabriel ]
   * debian/libxinerama1.postinst.in:
diff --git a/debian/patches/1270_nx-X11_CVE-2017-2624-Use-timingsafe_memcmp-to-c.full.patch b/debian/patches/1270_nx-X11_CVE-2017-2624-Use-timingsafe_memcmp-to-c.full.patch
index 799777c..2528ebb 100644
--- a/debian/patches/1270_nx-X11_CVE-2017-2624-Use-timingsafe_memcmp-to-c.full.patch
+++ b/debian/patches/1270_nx-X11_CVE-2017-2624-Use-timingsafe_memcmp-to-c.full.patch
@@ -131,7 +131,7 @@ Date:   Sat Mar 4 16:10:38 2017 +0100
 +
 +#include <limits.h>
 +#include <string.h>
-+#include <nx-X11/Xfuncproto.h>
++#include <X11/Xfuncproto.h>
 +#include "os.h"
 +
 +int

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