debian/changelog | 10 ++++++++++
debian/control | 9 ++-------
debian/copyright | 4 ++--
src/xf86libinput.c | 3 +++
4 files changed, 17 insertions(+), 9 deletions(-)
New commits:
commit b3737e608e0537af9927a4a99408bdde6c6dfa32
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Thu Jan 12 12:26:13 2017 +0100
Bump Standards-Version to 3.9.8.
diff --git a/debian/changelog b/debian/changelog
index f3f11c0..68c4cd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-input-libinput (0.23.0-2) UNRELEASED;
urgency=medium
from upstream master branch (Closes: #829386).
* Switch URLs to https.
* Move URL from description to Homepage field.
+ * Bump Standards-Version to 3.9.8.
-- Andreas Boll <andreas.boll....@gmail.com> Thu, 12 Jan 2017 12:12:20 +0100
diff --git a/debian/control b/debian/control
index 20639ce..7950f88 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
x11proto-input-dev (>= 2.2),
xserver-xorg-dev (>= 2:1.15.99),
xutils-dev,
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
Homepage: https://www.x.org
Vcs-Git:
https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-libinput.git
Vcs-Browser:
https://anonscm.debian.org/cgit/pkg-xorg/driver/xserver-xorg-input-libinput.git
commit f923ea151df196ccde9457e6f1ce7419c8ae22d8
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Thu Jan 12 12:25:49 2017 +0100
Move URL from description to Homepage field.
diff --git a/debian/changelog b/debian/changelog
index 47ffebe..f3f11c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-libinput (0.23.0-2) UNRELEASED;
urgency=medium
* Cherry-pick commit f47f78e (Ignore LED updates for disabled devices)
from upstream master branch (Closes: #829386).
* Switch URLs to https.
+ * Move URL from description to Homepage field.
-- Andreas Boll <andreas.boll....@gmail.com> Thu, 12 Jan 2017 12:12:20 +0100
diff --git a/debian/control b/debian/control
index a8fdeca..20639ce 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends:
xserver-xorg-dev (>= 2:1.15.99),
xutils-dev,
Standards-Version: 3.9.7
+Homepage: https://www.x.org
Vcs-Git:
https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-libinput.git
Vcs-Browser:
https://anonscm.debian.org/cgit/pkg-xorg/driver/xserver-xorg-input-libinput.git
@@ -30,9 +31,6 @@ Description: X.Org X server -- libinput input driver
It can handle keyboards, mice and touchpads, and essentially replaces the
separate -evdev and -synaptics drivers.
.
- More information about X.Org can be found at:
- <URL:https://www.X.org>
- .
This package is built from the X.org xf86-input-libinput driver module.
Package: xserver-xorg-input-libinput-dev
@@ -46,9 +44,6 @@ Description: X.Org X server -- libinput input driver
(development headers)
found in xserver-xorg-input-libinput. Non-developers likely have little use
for this package.
.
- More information about X.Org can be found at:
- <URL:https://www.X.org>
- .
This package is built from the X.org xf86-input-libinput driver module.
commit dedd4eb78f57006698d24a717b8687494286c3d4
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Thu Jan 12 12:22:06 2017 +0100
Switch URLs to https.
diff --git a/debian/changelog b/debian/changelog
index 496d5ad..47ffebe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-libinput (0.23.0-2) UNRELEASED;
urgency=medium
* Cherry-pick commit f47f78e (Ignore LED updates for disabled devices)
from upstream master branch (Closes: #829386).
+ * Switch URLs to https.
-- Andreas Boll <andreas.boll....@gmail.com> Thu, 12 Jan 2017 12:12:20 +0100
diff --git a/debian/control b/debian/control
index d7aded2..a8fdeca 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Description: X.Org X server -- libinput input driver
separate -evdev and -synaptics drivers.
.
More information about X.Org can be found at:
- <URL:http://www.X.org>
+ <URL:https://www.X.org>
.
This package is built from the X.org xf86-input-libinput driver module.
@@ -47,7 +47,7 @@ Description: X.Org X server -- libinput input driver
(development headers)
for this package.
.
More information about X.Org can be found at:
- <URL:http://www.X.org>
+ <URL:https://www.X.org>
.
This package is built from the X.org xf86-input-libinput driver module.
diff --git a/debian/copyright b/debian/copyright
index eeac254..da4af0f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-name: xf86-input-libinput
-Source: http://xorg.freedesktop.org/releases/individual/driver/
+Source: https://xorg.freedesktop.org/releases/individual/driver/
Files: *
Copyright: 2013-2014 Red Hat, Inc.
commit 7ef6d9dddba05fc62efde6ea7dc99490b22d8e0c
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Thu Jan 12 12:12:55 2017 +0100
Document the cherry-pick in debian/changelog
diff --git a/debian/changelog b/debian/changelog
index a17b40c..496d5ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-libinput (0.23.0-2) UNRELEASED; urgency=medium
+
+ * Cherry-pick commit f47f78e (Ignore LED updates for disabled devices)
+ from upstream master branch (Closes: #829386).
+
+ -- Andreas Boll <andreas.boll....@gmail.com> Thu, 12 Jan 2017 12:12:20 +0100
+
xserver-xorg-input-libinput (0.23.0-1) unstable; urgency=medium
* New upstream release.
commit 001335c42009c680a1845e2794fc0403474f2d9c
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Tue Dec 20 15:36:55 2016 +1000
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.hutte...@who-t.net>
Reviewed-by: Hans de Goede <hdego...@redhat.com>
(cherry picked from commit f47f78eb0bd9fba455f01c8c6dead3bd75242b2b)
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;
