[X2Go-Commits] [nx-libs] 01/11: nx-X11: Backport: Bug 51375: Xorg doesn't set status for RRGetOutputInfo

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.5.0.x
in repository nx-libs.

commit 257825c88dd670eec2772109a0f48c78f4b5b190
Author: Jaroslav Šmíd <jardasmid at gmail.com>
Date:   Fri Jul 3 22:21:44 2015 +0200

    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 at oracle.com>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Tested-by: Daniel Stone <daniel at 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)
---
 debian/changelog                                   |    8 ++++++
 ...51375-Xorg-doesn_t-set-status-for-RR.full.patch |   30 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2544fbd..65cdefe 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 at 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 0000000..1e440c2
--- /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 at 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 at oracle.com>
+    Reviewed-by: Keith Packard <keithp at keithp.com>
+    Tested-by: Daniel Stone <daniel at 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 e504d7e..2664161 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

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