From b53be5a30c6202308885f6037b9f635b231fb963 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 22 Aug 2016 07:53:14 +1000 Subject: [PATCH] libevdev 1.5.3 --- .gitignore | 1 + ...ther-sanitizing-disabled-event-codes.patch | 37 ------------------- libevdev.spec | 10 ++--- sources | 2 +- 4 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 0001-Don-t-bother-sanitizing-disabled-event-codes.patch diff --git a/.gitignore b/.gitignore index 6cfbcc6..0a66253 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /libevdev-1.5.0.tar.xz /libevdev-1.5.1.tar.xz /libevdev-1.5.2.tar.xz +/libevdev-1.5.3.tar.xz diff --git a/0001-Don-t-bother-sanitizing-disabled-event-codes.patch b/0001-Don-t-bother-sanitizing-disabled-event-codes.patch deleted file mode 100644 index 9642b22..0000000 --- a/0001-Don-t-bother-sanitizing-disabled-event-codes.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b313c87ab188c471b356b1c3a170bec5571aee68 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 17 Aug 2016 10:48:43 +1000 -Subject: [PATCH libevdev] Don't bother sanitizing disabled event codes - -Filter them immediately instead of passing them on and relying on the actual -event handling code to filter them. - -Reproducer: if EV_ABS is disabled on an Apple MagicMouse we still get events -passed into sanitize_event(). But the code handling EV_ABS events doesn't -update the state, so we end up complaining about double tracking IDs, even -though that is not actually correct. - -https://bugzilla.redhat.com/show_bug.cgi?id=1361325 - -Signed-off-by: Peter Hutterer ---- - libevdev/libevdev.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c -index 48b49b1..43a095c 100644 ---- a/libevdev/libevdev.c -+++ b/libevdev/libevdev.c -@@ -979,6 +979,9 @@ sanitize_event(const struct libevdev *dev, - struct input_event *ev, - enum SyncState sync_state) - { -+ if (!libevdev_has_event_code(dev, ev->type, ev->code)) -+ return EVENT_FILTER_DISCARD; -+ - if (unlikely(dev->num_slots > -1 && - libevdev_event_is_code(ev, EV_ABS, ABS_MT_SLOT) && - (ev->value < 0 || ev->value >= dev->num_slots))) { --- -2.7.4 - diff --git a/libevdev.spec b/libevdev.spec index e3fa4be..2f9ddb6 100644 --- a/libevdev.spec +++ b/libevdev.spec @@ -1,6 +1,6 @@ Name: libevdev -Version: 1.5.2 -Release: 2%{?dist} +Version: 1.5.3 +Release: 1%{?dist} Summary: Kernel Evdev Device Wrapper Library Group: System Environment/Libraries @@ -8,8 +8,6 @@ License: MIT URL: http://www.freedesktop.org/wiki/Software/libevdev Source0: http://www.freedesktop.org/software/%{name}/%{name}-%{version}.tar.xz -Patch01: 0001-Don-t-bother-sanitizing-disabled-event-codes.patch - BuildRequires: automake libtool BuildRequires: python @@ -33,7 +31,6 @@ Utilities to handle and/or debug evdev devices. %prep %setup -q -n %{name}-%{version} -%patch01 -p1 %build autoreconf --force -v --install || exit 1 @@ -68,6 +65,9 @@ rm -f %{buildroot}%{_libdir}/*.la %{_bindir}/libevdev-tweak-device %changelog +* Mon Aug 22 2016 Peter Hutterer 1.5.3-1 +- libevdev 1.5.3 + * Wed Aug 17 2016 Peter Hutterer 1.5.2-2 - Fix complaints about double tracking IDs on the MagicMouse (#1361325) diff --git a/sources b/sources index 75a82c5..ee67ac6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -96ad6edb5ce5c4428f1b183cc180ff8c libevdev-1.5.2.tar.xz +60a9eb9a338c725d0dc571c0c978d2a7 libevdev-1.5.3.tar.xz