From dbeed8684be7af0bdf8194993904d0cad893296a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 11 Jan 2018 08:15:54 +1000 Subject: [PATCH] Fix handling of devices with ID_INPUT=null --- ...value-detection-for-ID_INPUT-being-u.patch | 33 +++++++++++++++++++ xorg-x11-server.spec | 8 ++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch diff --git a/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch b/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch new file mode 100644 index 0000000..15ba8e7 --- /dev/null +++ b/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch @@ -0,0 +1,33 @@ +From a309323328d9d6e0bf5d9ea1d75920e53b9beef3 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Fri, 5 Jan 2018 11:58:42 +1000 +Subject: [PATCH xserver] config: fix NULL value detection for ID_INPUT being + unset + +Erroneous condition caused us to keep going with all devices that didn't have +ID_INPUT set. + +Fixes: 5aad81445c8c3d6 +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104382 +Reviewed-by: Adam Jackson +Signed-off-by: Peter Hutterer +--- + config/udev.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/udev.c b/config/udev.c +index e198e8609..3a73189e2 100644 +--- a/config/udev.c ++++ b/config/udev.c +@@ -135,7 +135,7 @@ device_added(struct udev_device *udev_device) + #endif + + value = udev_device_get_property_value(udev_device, "ID_INPUT"); +- if (value && !strcmp(value, "0")) { ++ if (!value || !strcmp(value, "0")) { + LogMessageVerb(X_INFO, 10, + "config/udev: ignoring device %s without " + "property ID_INPUT set\n", path); +-- +2.14.3 + diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 545f575..119ab79 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -45,7 +45,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.19.6 -Release: 1%{?gitdate:.%{gitdate}}%{dist} +Release: 2%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -125,6 +125,9 @@ Patch10000: 0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch # Default to xf86-video-modesetting on GeForce 8 and newer Patch10001: 0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch +# Upstream commit a309323328d9d6e0bf +Patch10002: 0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch + %global moduledir %{_libdir}/xorg/modules %global drimoduledir %{_libdir}/dri %global sdkdir %{_includedir}/xorg @@ -617,6 +620,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %changelog +* Thu Jan 11 2018 Peter Hutterer 1.19.6-2 +- Fix handling of devices with ID_INPUT=null + * Wed Dec 20 2017 Adam Jackson - 1.19.6-1 - xserver 1.19.6