nx-X11: use the "old", non-NX header location.

Affects: - 1270_nx-X11_CVE-2017-2624-Use-timingsafe_memcmp-to-c.full.patch

nx-X11: use the "old", non-NX header location.
fb55fc3e · Mihai Moldovan · 4537ad4c · fb55fc3e · fb55fc3e
Commit fb55fc3e authored Mar 09, 2017 by Mihai Moldovan
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

changelog debian/changelog +3 -0

1270_nx-X11_CVE-2017-2624-Use-timingsafe_memcmp-to-c.full.patch ...x-X11_CVE-2017-2624-Use-timingsafe_memcmp-to-c.full.patch +1 -1

No files found.
--- 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:

--- 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