Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Tue, 17 Jul 2012 08:21:08 +0000 (10:21 +0200)
committerXavier Boudet <x-boudet@ti.com>
Tue, 17 Jul 2012 08:21:08 +0000 (10:21 +0200)
Conflicts:
debian/changelog
debian/patches/series

debian/changelog
debian/patches/228_log-format-fix.patch [moved from debian/patches/509_log-format-fix.patch with 100% similarity]
debian/patches/516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch [new file with mode: 0644]
debian/patches/series

index 34f8b7f9fa482814ae023a04ae096c7e60eef7ce..661760dbd8e44ba4c29eb520c5d2c0f3afaefdab 100644 (file)
@@ -1,9 +1,14 @@
-xorg-server (2:1.11.4-0ubuntu10.5+ti1.0) precise; urgency=low
+xorg-server (2:1.11.4-0ubuntu10.6) precise-security; urgency=low
 
-  * Rebased dri2video support on 0ubuntu10.5
-  * Add patches for driver to handle the transform
+  * Revert changes from 10.2 and 10.3 (and the unreleased SRU 10.4).  10.2
+    attempted to fix bug 968845, but this caused the xserver to crash
+    under rare conditions (1009629).  10.3 attempted to fix that crash,
+    but resulted in a more commonly seen crash such as when using GIMP.
+    (LP: #1021517)
+  * Rename patch 509_log-format-fix.patch to 228_log-format-fix.patch,
+    to reserve the 5xx numbering for input stack patches.
 
- -- Xavier Boudet <x-boudet@ti.com>  Thu, 12 Jul 2012 10:20:39 +0200
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 16 Jul 2012 10:42:25 -0700
 
 xorg-server (2:1.11.4-0ubuntu10.5) precise-security; urgency=low
 
@@ -14,6 +19,14 @@ xorg-server (2:1.11.4-0ubuntu10.5) precise-security; urgency=low
 
  -- Steve Beattie <sbeattie@ubuntu.com>  Mon, 09 Jul 2012 15:24:55 -0700
 
+xorg-server (2:1.11.4-0ubuntu10.4) precise-proposed; urgency=low
+
+  * 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)
+
+ -- 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
 
   [ Maarten Lankhorst ]
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 (file)
index 0000000..7d022e1
--- /dev/null
@@ -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;
index 123855fbbc1b9e40c2afbddacf7b0a25e90f092d..ae4891d4b1e1281b5ab7c1c3f95e68a4bd452a25 100644 (file)
 225_non-root_config_paths.patch
 226_fall_back_to_autoconfiguration.patch
 227_null_ptr_midispcur.patch
+228_log-format-fix.patch
 
-# Temporary, until it's reviewed & accepted upstream
+## Input Stack Patches (from xserver 1.12) ##
 500_pointer_barrier_thresholds.diff
 505_query_pointer_touchscreen.patch
 506_touchscreen_pointer_emulation_checks.patch
 507_touchscreen_fixes.patch
-508_device_off_release_buttons.patch
-509_log-format-fix.patch
 
-# Upstream patches
-510-dix-return-early-from-DisableDevice-if-the-device-is.patch
-511-dix-move-freeing-the-sprite-into-a-function.patch
-512-dix-free-the-sprite-when-disabling-the-device.patch
-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
+# Patch 508 attempted to fix LP: #968845, but caused regression
+# crash bug #1009629.  Patches 510-515 attempted to fix that
+# regression, but this led to the severe crash bug #1021517.
+# So, disabling the patch set until this can be studied better.
+#508_device_off_release_buttons.patch
+#510-dix-return-early-from-DisableDevice-if-the-device-is.patch
+#511-dix-move-freeing-the-sprite-into-a-function.patch
+#512-dix-free-the-sprite-when-disabling-the-device.patch
+#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