aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--debian/patches/1270_nx-X11_CVE-2017-2624-Use-timingsafe_memcmp-to-c.full.patch2
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 204d37ddd..eaaa29294 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 799777c42..2528ebbbd 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