Merge branch 'ubuntu'

Conflicts:
	debian/changelog
	debian/patches/series

3 files changed, 45 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 887fec6..d448761 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-xorg-server (2:1.11.4-0ubuntu10.3+ti1.0) precise; urgency=low
+xorg-server (2:1.11.4-0ubuntu10.4) precise-proposed; urgency=low
 
-  * Rebased dri2video support on 0ubuntu10.3
-  * Add patches for driver to handle the transform
+  * Add 516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch
+    from upstream 1.12.2. Fixes the server from entering in an infinite
+    loop in certain situations. (LP: #921236)
 
- -- Xavier Boudet <x-boudet@ti.com>  Tue, 03 Jul 2012 19:04:38 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Thu, 05 Jul 2012 23:07:06 +0300
 
 xorg-server (2:1.11.4-0ubuntu10.3) precise-proposed; urgency=low
 
diff --git a/debian/patches/516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch b/debian/patches/516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch
new file mode 100644
index 0000000..7d022e1
--- /dev/null
+++ b/debian/patches/516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch
@@ -0,0 +1,39 @@
+commit b53cdf4c53f0787ed41281278877e0405fcb2674
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Apr 27 16:31:17 2012 +1000
+
+    dix: don't emulate scroll events for non-existing axes (#47281)
+    
+    Test case:
+    - create a device with REL_HWHEEL and ABS_X and ABS_Y. evdev 2.7.0 will set
+      that up as device with 1 relative axis
+    - move pointer to VGA1
+    - xrandr --output VGA1 --off
+    
+    Warps the pointer to the new spot and calls GPE with the x/y mask bits set.
+    When running through the loop to check for scroll event, this overruns the
+    axes and may try to emulate scroll events based on random garbage in the
+    memory. If that memory contained non-zero for the scroll type but near-zero
+    for the increment field, the server would hang in an infinite loop.
+    
+    This was the trigger for this suggested, never-merged, patch here:
+    http://patchwork.freedesktop.org/patch/9543/
+    
+    X.Org Bug 47281 <http://bugs.freedesktop.org/show_bug.cgi?id=47281>
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
+    (cherry picked from commit af88b43f9e604157b74270d609c08bdfa256a792)
+
+--- a/dix/getevents.c
++++ b/dix/getevents.c
+@@ -1593,6 +1593,9 @@
+     /* Now turn the smooth-scrolling axes back into emulated button presses
+      * for legacy clients, based on the integer delta between before and now */
+     for (i = 0; i < valuator_mask_size(&mask); i++) {
++        if (i >= pDev->valuator->numAxes)
++            break;
++
+         if (!valuator_mask_isset(&mask, i))
+             continue;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 9c2df79..6d6a64c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -46,6 +46,7 @@
 513-dix-disable-non-sprite-owners-first-when-disabling-p.patch
 514-Xi-drop-forced-unpairing-when-changing-the-hierarchy.patch
 515-dix-disable-all-devices-before-shutdown.patch
+516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch
 
 #Rotation patches
 1001-xfree86-modes-Let-the-driver-handle-the-transform.patch