Fix broken ButtonMapping option (regression in 2.7.2)

0001-Fix-broken-ButtonMapping-option-53168.patch

@@ -0,0 +1,40 @@
+From 33e7831b5fabc5c9dcc0224800a04761086952a7 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 7 Aug 2012 14:32:17 +1000
+Subject: [PATCH evdev] Fix broken ButtonMapping option (#53168)
+
+Regression introduced in 8af0e6f1ebaf327f735bca507134b34bb24b26c6.
+s is now initialized to NULL, so we never entered the loop.
+
+X.Org Bug 53168 <http://bugs.freedesktop.org/show_bug.cgi?id=53168>
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/evdev.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/evdev.c b/src/evdev.c
+index b832d98..ced6561 100644
+--- a/src/evdev.c
++++ b/src/evdev.c
+@@ -1671,7 +1671,7 @@ EvdevInitButtonMapping(InputInfoPtr pInfo)
+ 
+         xf86IDrvMsg(pInfo, X_CONFIG, "ButtonMapping '%s'\n", mapping);
+         map = mapping;
+-        while (s && *s != '\0' && nbuttons < EVDEV_MAXBUTTONS)
++        do
+         {
+             btn = strtol(map, &s, 10);
+ 
+@@ -1685,7 +1685,7 @@ EvdevInitButtonMapping(InputInfoPtr pInfo)
+ 
+             pEvdev->btnmap[nbuttons++] = btn;
+             map = s;
+-        }
++        } while (s && *s != '\0' && nbuttons < EVDEV_MAXBUTTONS);
+         free(mapping);
+     }
+ 
+-- 
+1.7.10.4
+

xorg-x11-drv-evdev.spec

@@ -8,7 +8,7 @@
 Summary:    Xorg X11 evdev input driver
 Name:       xorg-x11-drv-evdev
 Version:    2.7.2
-Release:    5%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
+Release:    6%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
 URL:        http://www.x.org
 License:    MIT
 Group:      User Interface/X Hardware Support
@@ -25,6 +25,8 @@ Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Patch02: 0001-Allow-relative-scroll-valuators-on-absolute-devices.patch
 # Only disable device on ENODEV to avoid free in sighandler
 Patch03: 0001-Don-t-delete-the-device-on-ENODEV.patch
+# FDO 53168 - Option ButtonMapping is broken
+Patch04: 0001-Fix-broken-ButtonMapping-option-53168.patch
 
 ExcludeArch: s390 s390x %{?rhel:ppc ppc64}
 
@@ -45,6 +47,7 @@ X.Org X11 evdev input driver.
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 %patch02 -p1 -b .relscroll
 %patch03 -p1 -b .enodev
+%patch04 -p1 -b .buttonmapping
 
 %build
 autoreconf --force -v --install || exit 1
@@ -86,6 +89,9 @@ X.Org X11 evdev input driver development files.
 
 
 %changelog
+* Wed Aug 08 2012 Peter Hutterer <peter.hutterer@redhat.com> 2.7.2-6
+- Fix broken ButtonMapping option (regression in 2.7.2)
+
 * Mon Aug 06 2012 Peter Hutterer <peter.hutterer@redhat.com> 2.7.2-5
 - Drop libxkbfile-devel BuildRequires, not needed anymore