libinput 0.24.0

This commit is contained in:
Peter Hutterer 2017-02-09 16:24:35 +10:00
parent ff66f3eef0
commit 2139c004d2
5 changed files with 7 additions and 76 deletions

1
.gitignore vendored
View File

@ -21,3 +21,4 @@
/xf86-input-libinput-0.20.0.tar.bz2 /xf86-input-libinput-0.20.0.tar.bz2
/xf86-input-libinput-0.22.0.tar.bz2 /xf86-input-libinput-0.22.0.tar.bz2
/xf86-input-libinput-0.23.0.tar.bz2 /xf86-input-libinput-0.23.0.tar.bz2
/xf86-input-libinput-0.24.0.tar.bz2

View File

@ -1,38 +0,0 @@
From f47f78eb0bd9fba455f01c8c6dead3bd75242b2b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 20 Dec 2016 15:36:55 +1000
Subject: [PATCH xf86-input-libinput] Ignore LED updates for disabled devices
If an XKB AccessX timeout is set and a VT switch is triggered, the
AccessXTimeoutExpire function may be called after the device has already been
disabled. This can cause a null-pointer dereference as our shared libinput
device may have been released by then.
In the legacy drivers this would've simply caused a write to an invalid fd
(-1), not a crash. Here we need to be more careful.
https://bugs.freedesktop.org/show_bug.cgi?id=98464
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
src/xf86libinput.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/xf86libinput.c b/src/xf86libinput.c
index b130a77..fd38c3b 100644
--- a/src/xf86libinput.c
+++ b/src/xf86libinput.c
@@ -785,6 +785,9 @@ xf86libinput_kbd_ctrl(DeviceIntPtr device, KeybdCtrl *ctrl)
struct xf86libinput *driver_data = pInfo->private;
struct libinput_device *ldevice = driver_data->shared_device->device;
+ if (!device->enabled)
+ return;
+
while (bits[i].xbit) {
if (ctrl->leds & bits[i].xbit)
leds |= bits[i].code;
--
2.9.3

View File

@ -1,31 +0,0 @@
From c4f0a9bcb846f70b85a285e8acea8fe086abdccb Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 1 Nov 2016 10:06:03 +1000
Subject: [PATCH xf86-input-libinput] conf: match against tablets too
Now that we sort below the xf86-input-wacom driver anyway, there's no good
reason to ignore tablets anymore.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
conf/40-libinput.conf | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/conf/40-libinput.conf b/conf/40-libinput.conf
index 97afd07..7b7162e 100644
--- a/conf/40-libinput.conf
+++ b/conf/40-libinput.conf
@@ -26,3 +26,10 @@ Section "InputClass"
MatchDevicePath "/dev/input/event*"
Driver "libinput"
EndSection
+
+Section "InputClass"
+ Identifier "libinput tablet catchall"
+ MatchIsTablet "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "libinput"
+EndSection
--
2.9.3

View File

@ -1 +1 @@
SHA512 (xf86-input-libinput-0.23.0.tar.bz2) = 11aeeb2d8db67371d530dd06fc83d3ded6a6e3dfd4311e69738ff748b5684dc98af7ba81643d7837f988314265f93d7ddb016a4781d69957dba4046533352223 SHA512 (xf86-input-libinput-0.24.0.tar.bz2) = f885cbf1554feb306023c3a355b06d90c7686eb1a01d9a87835cb9677200acb3a031fc690a475938e360db62865cde9f7dbe26fbbe3ee8fac43375bdf351c8f4

View File

@ -7,8 +7,8 @@
Summary: Xorg X11 libinput input driver Summary: Xorg X11 libinput input driver
Name: xorg-x11-drv-libinput Name: xorg-x11-drv-libinput
Version: 0.23.0 Version: 0.24.0
Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
@ -19,9 +19,6 @@ Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
%endif %endif
Source1: 71-libinput-overrides-wacom.conf Source1: 71-libinput-overrides-wacom.conf
Patch01: 0001-conf-match-against-tablets-too.patch
Patch02: 0001-Ignore-LED-updates-for-disabled-devices.patch
ExcludeArch: s390 s390x ExcludeArch: s390 s390x
BuildRequires: autoconf automake libtool BuildRequires: autoconf automake libtool
@ -43,7 +40,6 @@ supporting all devices.
%prep %prep
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
%patch01 -p1 01
%build %build
autoreconf --force -v --install || exit 1 autoreconf --force -v --install || exit 1
@ -79,6 +75,9 @@ Xorg X11 libinput input driver development files.
%{_includedir}/xorg/libinput-properties.h %{_includedir}/xorg/libinput-properties.h
%changelog %changelog
* Thu Feb 09 2017 Peter Hutterer <peter.hutterer@redhat.com> 0.24.0-1
- libinput 0.24.0
* Wed Dec 21 2016 Peter Hutterer <peter.hutterer@redhat.com> 0.23.0-2 * Wed Dec 21 2016 Peter Hutterer <peter.hutterer@redhat.com> 0.23.0-2
- Ignore LED updates for disabled devices, avoids a null-pointer dereference - Ignore LED updates for disabled devices, avoids a null-pointer dereference
when an AccessX timeout is set when an AccessX timeout is set