ChangeLog | 24 ++++++++++++++++++++++++
configure | 20 ++++++++++----------
configure.ac | 2 +-
debian/changelog | 10 ++++++++++
src/evdev.c | 3 ++-
5 files changed, 47 insertions(+), 12 deletions(-)
New commits:
commit 488b129cb23f953037032dfa8ccdee1cb448bb26
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon Aug 4 13:06:06 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 36f8f4d..42ec6cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.0.3-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.0.3-1) unstable; urgency=low
* New upstream release, incorporates the two fixes from our previous
version.
@@ -6,7 +6,7 @@ xserver-xorg-input-evdev (1:2.0.3-1) UNRELEASED; urgency=low
- Print the device name when we get a read error
- Actually close the fd on DEVICE_CLOSE
- -- Julien Cristau <[EMAIL PROTECTED]> Mon, 04 Aug 2008 12:53:54 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Mon, 04 Aug 2008 13:05:52 +0200
xserver-xorg-input-evdev (1:2.0.2-1.lenny1) unstable; urgency=low
commit 22c76cb100767bcf8ea60e5aa1fa006a5b0e0df3
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon Aug 4 13:05:27 2008 +0200
update changelogs and autoreconf
diff --git a/ChangeLog b/ChangeLog
index 5bf67af..ed586b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+commit ef607b6cce8e1feb6632c6bc1e7f322095ce54d9
+Author: Julien Cristau <[EMAIL PROTECTED]>
+Date: Mon Aug 4 09:16:53 2008 +0930
+
+ Actually close the fd on DEVICE_CLOSE (bug#16948)
+
+ Fixes file descriptor leak.
+
+ Signed-off-by: Peter Hutterer <[EMAIL PROTECTED]>
+ (cherry picked from commit d9097df01b01afaf946fa04fca8ae8ab7108ff21)
+
+commit 906a5d6add75d3bf3077d0542352534256b734d4
+Author: Julien Cristau <[EMAIL PROTECTED]>
+Date: Wed Jul 30 10:40:47 2008 +0200
+
+ Print the device name when we get a read error
+ (cherry picked from commit 5c074af5a9abba138023e3bc6954d1062f7c36dd)
+
+commit 5152d616cab6912a45e09c37c0330064d2f412f2
+Author: Peter Hutterer <[EMAIL PROTECTED]>
+Date: Fri Aug 1 17:29:24 2008 +0930
+
+ evdev 2.0.3
+
commit 2e9a71df5f8e8cdcdb80eec9e17501a75d5bd669
Author: Michel Dänzer <[EMAIL PROTECTED]>
Date: Tue Jul 29 10:06:07 2008 +0200
diff --git a/configure b/configure
index 4580e5f..334131b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-input-evdev 2.0.2.
+# Generated by GNU Autoconf 2.61 for xf86-input-evdev 2.0.3.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-input-evdev'
PACKAGE_TARNAME='xf86-input-evdev'
-PACKAGE_VERSION='2.0.2'
-PACKAGE_STRING='xf86-input-evdev 2.0.2'
+PACKAGE_VERSION='2.0.3'
+PACKAGE_STRING='xf86-input-evdev 2.0.3'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1416,7 +1416,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-input-evdev 2.0.2 to adapt to many kinds of
systems.
+\`configure' configures xf86-input-evdev 2.0.3 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1486,7 +1486,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-evdev 2.0.2:";;
+ short | recursive ) echo "Configuration of xf86-input-evdev 2.0.3:";;
esac
cat <<\_ACEOF
@@ -1598,7 +1598,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-evdev configure 2.0.2
+xf86-input-evdev configure 2.0.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1612,7 +1612,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-input-evdev $as_me 2.0.2, which was
+It was created by xf86-input-evdev $as_me 2.0.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2304,7 +2304,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-input-evdev'
- VERSION='2.0.2'
+ VERSION='2.0.3'
cat >>confdefs.h <<_ACEOF
@@ -21712,7 +21712,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-input-evdev $as_me 2.0.2, which was
+This file was extended by xf86-input-evdev $as_me 2.0.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21765,7 +21765,7 @@ Report bugs to <[EMAIL PROTECTED]>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-input-evdev config.status 2.0.2
+xf86-input-evdev config.status 2.0.3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/debian/changelog b/debian/changelog
index 35e14e6..36f8f4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xserver-xorg-input-evdev (1:2.0.3-1) UNRELEASED; urgency=low
+
+ * New upstream release, incorporates the two fixes from our previous
+ version.
+ * Pull from evdev-2.0-branch:
+ - Print the device name when we get a read error
+ - Actually close the fd on DEVICE_CLOSE
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Mon, 04 Aug 2008 12:53:54 +0200
+
xserver-xorg-input-evdev (1:2.0.2-1.lenny1) unstable; urgency=low
* Pull two fixes from upstream
commit ef607b6cce8e1feb6632c6bc1e7f322095ce54d9
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon Aug 4 09:16:53 2008 +0930
Actually close the fd on DEVICE_CLOSE (bug#16948)
Fixes file descriptor leak.
Signed-off-by: Peter Hutterer <[EMAIL PROTECTED]>
(cherry picked from commit d9097df01b01afaf946fa04fca8ae8ab7108ff21)
diff --git a/src/evdev.c b/src/evdev.c
index 45b0e5d..164346a 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -864,6 +864,7 @@ EvdevProc(DeviceIntPtr device, int what)
case DEVICE_CLOSE:
xf86Msg(X_INFO, "%s: Close\n", pInfo->name);
+ close(pInfo->fd);
break;
}
commit 906a5d6add75d3bf3077d0542352534256b734d4
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Jul 30 10:40:47 2008 +0200
Print the device name when we get a read error
(cherry picked from commit 5c074af5a9abba138023e3bc6954d1062f7c36dd)
diff --git a/src/evdev.c b/src/evdev.c
index 0cd016a..45b0e5d 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -162,7 +162,7 @@ EvdevReadInput(InputInfoPtr pInfo)
if (len != sizeof ev) {
/* The kernel promises that we always only read a complete
* event, so len != sizeof ev is an error. */
- xf86Msg(X_ERROR, "Read error: %s\n", strerror(errno));
+ xf86Msg(X_ERROR, "%s: Read error: %s\n", pInfo->name,
strerror(errno));
break;
}
commit 5152d616cab6912a45e09c37c0330064d2f412f2
Author: Peter Hutterer <[EMAIL PROTECTED]>
Date: Fri Aug 1 17:29:24 2008 +0930
evdev 2.0.3
diff --git a/configure.ac b/configure.ac
index c9a58c8..251c431 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-evdev],
- 2.0.2,
+ 2.0.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-evdev)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
