aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2015-07-04 00:53:37 +0200
committerMihai Moldovan <ionic@ionic.de>2015-07-04 01:29:22 +0200
commitab58e5781d4e64169b8f6931bf7535cbcf439573 (patch)
tree10df92e521eeeb209a451b62c20b8d4152482fb5 /debian
parentf3079befb8bb33cb1c3221143dfa93baee5a4248 (diff)
downloadnx-libs-ab58e5781d4e64169b8f6931bf7535cbcf439573.tar.gz
nx-libs-ab58e5781d4e64169b8f6931bf7535cbcf439573.tar.bz2
nx-libs-ab58e5781d4e64169b8f6931bf7535cbcf439573.zip
nx-X11: Backport: randr: Fix REQUEST vs. REQUEST_SIZE_MATCH mismatch
ProcRRGetScreenSizeRange uses REQUEST(xRRGetScreenSizeRangeReq) followed by REQUEST_SIZE_MATCH(xRRGetScreenInfoReq). This happens to work out because both requests have the same size, so this is not a functional change, just a cosmetic one. Signed-off-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Keith Packard <keithp@keithp.com> Backported from Arctica GH 3.6.x branch. v2: backport to nx-libs 3.6.x (Ulrich Sibiller) v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/1257_nx-X11_randr-Fix-REQUEST-vs-REQUEST_SIZE_MATCH-.full.patch33
-rw-r--r--debian/patches/series1
3 files changed, 40 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 4cfcaca08..a0babafc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -305,6 +305,12 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)
Adds:
- 1256_nx-X11_ProcRRGetScreenInfo-swap-configTimestamp.full.patch
+ * nx-X11: randr: Fix REQUEST vs. REQUEST_SIZE_MATCH mismatch
+ Backported from Arctica GH 3.6.x branch.
+ v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
+ v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)
+ Adds:
+ - 1257_nx-X11_randr-Fix-REQUEST-vs-REQUEST_SIZE_MATCH-.full.patch
-- X2Go Release Manager <git-admin@x2go.org> Tue, 17 Mar 2015 19:19:32 +0100
diff --git a/debian/patches/1257_nx-X11_randr-Fix-REQUEST-vs-REQUEST_SIZE_MATCH-.full.patch b/debian/patches/1257_nx-X11_randr-Fix-REQUEST-vs-REQUEST_SIZE_MATCH-.full.patch
new file mode 100644
index 000000000..175156118
--- /dev/null
+++ b/debian/patches/1257_nx-X11_randr-Fix-REQUEST-vs-REQUEST_SIZE_MATCH-.full.patch
@@ -0,0 +1,33 @@
+commit 9e2ac01a4e9bd39e5127b35bc263d5544c6de7a2
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Fri Jun 29 13:33:58 2012 -0700
+
+ Backport: randr: Fix REQUEST vs. REQUEST_SIZE_MATCH mismatch
+
+ ProcRRGetScreenSizeRange uses REQUEST(xRRGetScreenSizeRangeReq) followed by
+ REQUEST_SIZE_MATCH(xRRGetScreenInfoReq). This happens to work out because both
+ requests have the same size, so this is not a functional change, just a cosmetic
+ one.
+
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+ Backported from Arctica GH 3.6.x branch.
+
+ v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
+ v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)
+
+diff --git a/nx-X11/programs/Xserver/randr/rrscreen.c b/nx-X11/programs/Xserver/randr/rrscreen.c
+index 011b97f..e0eb076 100644
+--- a/nx-X11/programs/Xserver/randr/rrscreen.c
++++ b/nx-X11/programs/Xserver/randr/rrscreen.c
+@@ -228,7 +228,7 @@ ProcRRGetScreenSizeRange (ClientPtr client)
+ rrScrPrivPtr pScrPriv;
+ int rc;
+
+- REQUEST_SIZE_MATCH(xRRGetScreenInfoReq);
++ REQUEST_SIZE_MATCH(xRRGetScreenSizeRangeReq);
+ #ifndef NXAGENT_SERVER
+ rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
+ #else
diff --git a/debian/patches/series b/debian/patches/series
index e4817ac02..38fa1072b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -143,6 +143,7 @@
1254_nx-X11_randr-fix-server-crash-in-RRGetScreenInf.full.patch
1255_nx-X11_RRModeCreate-plug-memory-leak-of-newMode.full.patch
1256_nx-X11_ProcRRGetScreenInfo-swap-configTimestamp.full.patch
+1257_nx-X11_randr-Fix-REQUEST-vs-REQUEST_SIZE_MATCH-.full.patch
9900-dxpc-license-history.full+lite.patch
0016_nx-X11_install-location.debian.patch
0102_xserver-xext_set-securitypolicy-path.debian.patch