diff --git a/.gitignore b/.gitignore index f689597..385fbdf 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /libinput-1.9.901.tar.xz /libinput-1.9.902.tar.xz /libinput-1.10.0.tar.xz +/libinput-1.10.1.tar.xz diff --git a/0001-evdev-fail-before-open_restricted-if-the-devnode-doe.patch b/0001-evdev-fail-before-open_restricted-if-the-devnode-doe.patch deleted file mode 100644 index 4494695..0000000 --- a/0001-evdev-fail-before-open_restricted-if-the-devnode-doe.patch +++ /dev/null @@ -1,47 +0,0 @@ -From cb186abc17ad9e525609dc32385b0a7992e949a9 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 9 Feb 2018 19:24:15 +1000 -Subject: [PATCH libinput] evdev: fail before open_restricted if the devnode - doesn't exist - -https://bugzilla.redhat.com/show_bug.cgi?id=1536633 -https://bugzilla.redhat.com/show_bug.cgi?id=1539046 -https://bugzilla.redhat.com/show_bug.cgi?id=1539783 -https://bugzilla.redhat.com/show_bug.cgi?id=1540662 -https://bugs.freedesktop.org/show_bug.cgi?id=104278 - -Debugged-by: Jeff Smith -Signed-off-by: Peter Hutterer ---- - src/evdev.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/evdev.c b/src/evdev.c -index d1ca243d..63b93ec3 100644 ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -1917,6 +1917,11 @@ evdev_device_create(struct libinput_seat *seat, - const char *devnode = udev_device_get_devnode(udev_device); - const char *sysname = udev_device_get_sysname(udev_device); - -+ if (!devnode) { -+ log_info(libinput, "%s: no device node associated\n", sysname); -+ return NULL; -+ } -+ - if (udev_device_should_be_ignored(udev_device)) { - log_debug(libinput, "%s: device is ignored\n", sysname); - return NULL; -@@ -2434,6 +2439,9 @@ evdev_device_resume(struct evdev_device *device) - return -ENODEV; - - devnode = udev_device_get_devnode(device->udev_device); -+ if (!devnode) -+ return -ENODEV; -+ - fd = open_restricted(libinput, devnode, - O_RDWR | O_NONBLOCK | O_CLOEXEC); - --- -2.14.3 - diff --git a/libinput.spec b/libinput.spec index 1a9bd4a..a7e6445 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.10.0 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.10.1 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -18,8 +18,6 @@ Source2: commitid Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz %endif -Patch01: 0001-evdev-fail-before-open_restricted-if-the-devnode-doe.patch - BuildRequires: git-core BuildRequires: gcc BuildRequires: meson @@ -111,6 +109,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Wed Feb 28 2018 Peter Hutterer 1.10.1-1 +- libinput 1.10.1 + * Tue Feb 13 2018 Peter Hutterer 1.10.0-2 - Fix crasher due to missing devnode after resume (#1536633) diff --git a/sources b/sources index 71cbd0e..f3c1e8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.10.0.tar.xz) = 173f72f454c534dee755b6121c4577900ae9b8a129ac41de69410c3195950a6d149d6148892c4976f013eeabca66117d53fa67e352cc005960863a5576696928 +SHA512 (libinput-1.10.1.tar.xz) = 69e7cd12f3d686d1b09afd93fe072ddd6f8c9a1f04c0a651c7dd02c5a20b3f8163c5b787b41bf3ae91db0da7d3e2958d315d6c9a2875259c62b0d290ac89d1fb