xorg-server: Changes to 'debian-unstable'
debian/changelog | 8 ++
debian/patches/50_Make-RandRQueryVersion-return-1.1-for-swapped-client.patch | 31 ++++++++++
debian/patches/series | 1
3 files changed, 40 insertions(+)
New commits:
commit a7bbbfd0d9ef43f0ac47fe867eab7cc37b4082a4
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Aug 24 17:47:20 2008 +0200
Make RandRQueryVersion return 1.1 for swapped clients
Don't pretend we support randr 1.2 when queried by swapped clients.
The dispatch code for RandR 1.2 requests would return BadImplementation
anyway.
diff --git a/debian/changelog b/debian/changelog
index 61681c0..54b1a7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.4.2-5) UNRELEASED; urgency=low
+
+ * Don't pretend we support randr 1.2 when queried by swapped clients. The
+ dispatch code for RandR 1.2 requests would return BadImplementation anyway
+ (closes: #495833).
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 23 Aug 2008 14:58:14 +0200
+
xorg-server (2:1.4.2-4) unstable; urgency=low
* Re-enable patch 47_fbdevhw_magic_numbers.diff, fixes xen framebuffer
diff --git a/debian/patches/50_Make-RandRQueryVersion-return-1.1-for-swapped-client.patch b/debian/patches/50_Make-RandRQueryVersion-return-1.1-for-swapped-client.patch
new file mode 100644
index 0000000..d2b76e9
--- /dev/null
+++ b/debian/patches/50_Make-RandRQueryVersion-return-1.1-for-swapped-client.patch
@@ -0,0 +1,31 @@
+From 40090eca032d602c78223abaa13ca4702db86b74 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Sun, 24 Aug 2008 17:44:10 +0200
+Subject: [PATCH] Make RandRQueryVersion return 1.1 for swapped clients
+
+Don't pretend we support randr 1.2 when queried by swapped clients.
+The dispatch code for RandR 1.2 requests would return BadImplementation
+anyway.
+---
+ randr/rrdispatch.c | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/randr/rrdispatch.c b/randr/rrdispatch.c
+index 5525427..83deb6b 100644
+--- a/randr/rrdispatch.c
++++ b/randr/rrdispatch.c
+@@ -55,6 +55,11 @@ ProcRRQueryVersion (ClientPtr client)
+ rep.majorVersion = SERVER_RANDR_MAJOR;
+ rep.minorVersion = SERVER_RANDR_MINOR;
+ if (client->swapped) {
++ /*
++ * We return BadImplementation for swapped clients on 1.2 requests,
++ * let's not do that
++ */
++ rep.minorVersion = 1;
+ swaps(&rep.sequenceNumber, n);
+ swapl(&rep.length, n);
+ swapl(&rep.majorVersion, n);
+--
+1.5.6.3
+
diff --git a/debian/patches/series b/debian/patches/series
index 5252460..c6c3dbc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,6 +23,7 @@
47_fbdevhw_magic_numbers.diff
48_xaa_nooffscreenpixmaps.diff
49_x86emu_int1a_fix.diff
+50_Make-RandRQueryVersion-return-1.1-for-swapped-client.patch
91_ttf2pt1
91_ttf2pt1_updates
92_xprint-security-holes-fix.patch
Reply to: