aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJaroslav Šmíd <jardasmid@gmail.com>2015-07-03 22:21:44 +0200
committerMihai Moldovan <ionic@ionic.de>2015-07-04 01:26:07 +0200
commit257825c88dd670eec2772109a0f48c78f4b5b190 (patch)
treed956c8c9aed387284784333117f76171a3bdbf86 /debian
parent46de1b0721e4280a0d0d8ec7856b1acb22399968 (diff)
downloadnx-libs-257825c88dd670eec2772109a0f48c78f4b5b190.tar.gz
nx-libs-257825c88dd670eec2772109a0f48c78f4b5b190.tar.bz2
nx-libs-257825c88dd670eec2772109a0f48c78f4b5b190.zip
nx-X11: Backport: Bug 51375: Xorg doesn't set status for RRGetOutputInfo
https://bugs.freedesktop.org/show_bug.cgi?id=51375 https://bugs.freedesktop.org/attachment.cgi?id=63397 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Keith Packard <keithp@keithp.com> Tested-by: Daniel Stone <daniel@fooishbar.org> 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/changelog8
-rw-r--r--debian/patches/1250_nx-X11_Bug-51375-Xorg-doesn_t-set-status-for-RR.full.patch30
-rw-r--r--debian/patches/series1
3 files changed, 39 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 2544fbdf9..65cdefeb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -262,6 +262,14 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
- 0009_nxproxy_add-man-page.full+lite.patch
- 0209_x2goagent_add-man-page.full.patch
+ [ Ulrich Sibiller ]
+ * nx-X11: Bug 51375: Xorg doesn't set status for RRGetOutputInfo
+ 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:
+ - 1250_nx-X11_Bug-51375-Xorg-doesn_t-set-status-for-RR.full.patch
+
-- X2Go Release Manager <git-admin@x2go.org> Tue, 17 Mar 2015 19:19:32 +0100
nx-libs (2:3.5.0.31-0x2go1) unstable; urgency=low
diff --git a/debian/patches/1250_nx-X11_Bug-51375-Xorg-doesn_t-set-status-for-RR.full.patch b/debian/patches/1250_nx-X11_Bug-51375-Xorg-doesn_t-set-status-for-RR.full.patch
new file mode 100644
index 000000000..1e440c29c
--- /dev/null
+++ b/debian/patches/1250_nx-X11_Bug-51375-Xorg-doesn_t-set-status-for-RR.full.patch
@@ -0,0 +1,30 @@
+commit 8fd0b52f20e28759a88e1202716f60e773b11dd3
+Author: Jaroslav Šmíd <jardasmid@gmail.com>
+Date: Mon Jul 9 19:12:42 2012 -0700
+
+ Backport: Bug 51375: Xorg doesn't set status for RRGetOutputInfo
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=51375
+ https://bugs.freedesktop.org/attachment.cgi?id=63397
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Tested-by: Daniel Stone <daniel@fooishbar.org>
+
+ 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/rroutput.c b/nx-X11/programs/Xserver/randr/rroutput.c
+index 1ecde31..693f5a5 100644
+--- a/nx-X11/programs/Xserver/randr/rroutput.c
++++ b/nx-X11/programs/Xserver/randr/rroutput.c
+@@ -456,6 +456,7 @@ ProcRRGetOutputInfo (ClientPtr client)
+ pScrPriv = rrGetScrPriv(pScreen);
+
+ rep.type = X_Reply;
++ rep.status = RRSetConfigSuccess;
+ rep.sequenceNumber = client->sequence;
+ rep.length = OutputInfoExtra >> 2;
+ rep.timestamp = pScrPriv->lastSetTime.milliseconds;
diff --git a/debian/patches/series b/debian/patches/series
index e504d7e88..266416119 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -136,6 +136,7 @@
1104-xkb-Check-strings-length-against-request-size.full.patch
1200-CVE-2013-7439-MakeBigReq-don-t-move-the-last-wo.full.patch
1210-CVE-2015-3418-dix-Allow-zero-height-PutImage-re.full.patch
+1250_nx-X11_Bug-51375-Xorg-doesn_t-set-status-for-RR.full.patch
9900-dxpc-license-history.full+lite.patch
0016_nx-X11_install-location.debian.patch
0102_xserver-xext_set-securitypolicy-path.debian.patch