debian/10-synaptics.fdi | 13
++
debian/changelog | 10
++
debian/patches/05-Fix-crash-on-kernels-with-extended-keymap-space.patch | 48
++++++++++
debian/patches/series | 1
debian/rules | 2
5 files changed, 74 insertions(+)
New commits:
commit c0edf5ab7f7dda32987f2d8461f0c61b6b4bd764
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat Aug 16 03:32:45 2008 +0200
Add patch from xorg git to fix usage of the EVIOCGBIT ioctl() (closes:
#493101).
diff --git a/debian/changelog b/debian/changelog
index fad133e..5498824 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xfree86-driver-synaptics (0.14.7~git20070706-2.1.lenny1)
UNRELEASED; urgency=low
* Add 10-synaptics.fdi, installed in /usr/share/hal/fdi/policy/20thirdparty,
to get the driver loaded automatically if a touchpad is detected
(closes: #464662).
+ * Add patch from xorg git to fix usage of the EVIOCGBIT ioctl()
+ (closes: #493101).
-- Julien Cristau <[EMAIL PROTECTED]> Sat, 16 Aug 2008 03:14:21 +0200
diff --git
a/debian/patches/05-Fix-crash-on-kernels-with-extended-keymap-space.patch
b/debian/patches/05-Fix-crash-on-kernels-with-extended-keymap-space.patch
new file mode 100644
index 0000000..dc85d12
--- /dev/null
+++ b/debian/patches/05-Fix-crash-on-kernels-with-extended-keymap-space.patch
@@ -0,0 +1,48 @@
+From 89b1add387b52ef55f5a8f87603153d27207e2f6 Mon Sep 17 00:00:00 2001
+From: Dmitry Torokhov <[EMAIL PROTECTED]>
+Date: Fri, 1 Aug 2008 22:58:14 +0200
+Subject: [PATCH] Fix crash on kernels with extended keymap space
+
+The len argument of EVIOCGBIT(ev,len) is the size of the receiving
+buffer in bytes, not maximim number of bits to retrieve.
+
+Signed-off-by: Dmitry Torokhov <[EMAIL PROTECTED]>
+Signed-off-by: Julien Cristau <[EMAIL PROTECTED]>
+---
+ src/eventcomm.c | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/eventcomm.c b/src/eventcomm.c
+index 36c4c9e..e654102 100644
+--- a/src/eventcomm.c
++++ b/src/eventcomm.c
+@@ -79,7 +79,7 @@ event_query_is_touchpad(int fd)
+
+ /* Check for ABS_X, ABS_Y, ABS_PRESSURE and BTN_TOOL_FINGER */
+
+- SYSCALL(ret = ioctl(fd, EVIOCGBIT(0, EV_MAX), evbits));
++ SYSCALL(ret = ioctl(fd, EVIOCGBIT(0, sizeof(evbits)), evbits));
+ if (ret < 0)
+ return FALSE;
+ if (!TEST_BIT(EV_SYN, evbits) ||
+@@ -87,7 +87,7 @@ event_query_is_touchpad(int fd)
+ !TEST_BIT(EV_KEY, evbits))
+ return FALSE;
+
+- SYSCALL(ret = ioctl(fd, EVIOCGBIT(EV_ABS, KEY_MAX), evbits));
++ SYSCALL(ret = ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(evbits)), evbits));
+ if (ret < 0)
+ return FALSE;
+ if (!TEST_BIT(ABS_X, evbits) ||
+@@ -95,7 +95,7 @@ event_query_is_touchpad(int fd)
+ !TEST_BIT(ABS_PRESSURE, evbits))
+ return FALSE;
+
+- SYSCALL(ret = ioctl(fd, EVIOCGBIT(EV_KEY, KEY_MAX), evbits));
++ SYSCALL(ret = ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(evbits)), evbits));
+ if (ret < 0)
+ return FALSE;
+ if (!TEST_BIT(BTN_TOOL_FINGER, evbits))
+--
+1.5.6.3
+
diff --git a/debian/patches/series b/debian/patches/series
index d67b33b..494bf32 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
02-scandir-dev-input.patch
03-escape-dashes-in-manpages.patch
04-delibcwrap.patch
+05-Fix-crash-on-kernels-with-extended-keymap-space.patch
commit f97e0071d7e3d29353f1e17086acc4440746a712
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat Aug 16 03:24:26 2008 +0200
Add 10-synaptics.fdi
Install it in /usr/share/hal/fdi/policy/20thirdparty, to get the
driver loaded automatically if a touchpad is detected
(closes: #464662).
diff --git a/debian/10-synaptics.fdi b/debian/10-synaptics.fdi
new file mode 100644
index 0000000..05c8428
--- /dev/null
+++ b/debian/10-synaptics.fdi
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<deviceinfo version="0.2">
+ <device>
+ <match key="info.capabilities" contains="input.touchpad">
+ <match key="info.product" contains="Synaptics TouchPad">
+ <merge key="input.x11_driver" type="string">synaptics</merge>
+ </match>
+ <match key="info.product" contains="AlpsPS/2 ALPS">
+ <merge key="input.x11_driver" type="string">synaptics</merge>
+ </match>
+ </match>
+ </device>
+</deviceinfo>
diff --git a/debian/changelog b/debian/changelog
index b78855e..fad133e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xfree86-driver-synaptics (0.14.7~git20070706-2.1.lenny1) UNRELEASED;
urgency=low
+
+ * Add 10-synaptics.fdi, installed in /usr/share/hal/fdi/policy/20thirdparty,
+ to get the driver loaded automatically if a touchpad is detected
+ (closes: #464662).
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Sat, 16 Aug 2008 03:14:21 +0200
+
xfree86-driver-synaptics (0.14.7~git20070706-2.1) unstable; urgency=low
* Non-maintainer upload, with Mattia's agreement.
diff --git a/debian/rules b/debian/rules
index 8e79feb..40c18e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,8 @@ install: build
# install the package into debian/xserver-xorg-input-synaptics
$(MAKE) install BUILD_MODULAR=y PREFIX=/usr
DESTDIR=$(CURDIR)/debian/xserver-xorg-input-synaptics
+ install -d
debian/xserver-xorg-input-synaptics/usr/share/hal/fdi/policy/20thirdparty
+ install debian/10-synaptics.fdi
debian/xserver-xorg-input-synaptics/usr/share/hal/fdi/policy/20thirdparty/
# Build architecture-independent files here.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
