X Strike Force X.Org X11 SVN commit: r3942 - in trunk/driver/xserver-xorg-input-evdev/debian: . patches
Author: dparsons
Date: 2006-11-05 05:31:54 -0500 (Sun, 05 Nov 2006)
New Revision: 3942
Added:
trunk/driver/xserver-xorg-input-evdev/debian/patches/40-close-fd.patch
Modified:
trunk/driver/xserver-xorg-input-evdev/debian/changelog
trunk/driver/xserver-xorg-input-evdev/debian/patches/series
Log:
Also apply 40-close-fd.patch, as the last "trivial" patch from
upstream before the major changes of 1.1.3.
Modified: trunk/driver/xserver-xorg-input-evdev/debian/changelog
===================================================================
--- trunk/driver/xserver-xorg-input-evdev/debian/changelog 2006-11-04 05:31:47 UTC (rev 3941)
+++ trunk/driver/xserver-xorg-input-evdev/debian/changelog 2006-11-05 10:31:54 UTC (rev 3942)
@@ -1,9 +1,11 @@
-xserver-xorg-input-evdev (1:1.1.2-6) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:1.1.2-6) unstable; urgency=low
* Apply upstream patch 30-absolute-axis.patch to avert potential
crashes in the absolute axis setup.
+ * Also apply 40-close-fd.patch, as the last "trivial" patch from
+ upstream before the major changes of 1.1.3.
- -- Drew Parsons <dparsons@debian.org> Wed, 1 Nov 2006 21:59:06 +1100
+ -- Drew Parsons <dparsons@debian.org> Sun, 5 Nov 2006 21:26:57 +1100
xserver-xorg-input-evdev (1:1.1.2-5) unstable; urgency=low
Added: trunk/driver/xserver-xorg-input-evdev/debian/patches/40-close-fd.patch
===================================================================
--- trunk/driver/xserver-xorg-input-evdev/debian/patches/40-close-fd.patch (rev 0)
+++ trunk/driver/xserver-xorg-input-evdev/debian/patches/40-close-fd.patch 2006-11-05 10:31:54 UTC (rev 3942)
@@ -0,0 +1,18 @@
+From: Zephaniah E. Hull <warp@agamemnon.b5>
+Date: Tue, 11 Jul 2006 07:08:30 +0000 (-0400)
+Subject: Set pInfo->fd to -1 when we close it in EvdevProc.
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-evdev.git;a=commitdiff;h=eba5ea8d5a19f2b1984cbf20c95d22e243f19567
+
+Set pInfo->fd to -1 when we close it in EvdevProc.
+---
+
+--- a/src/evdev.c
++++ b/src/evdev.c
+@@ -200,6 +200,7 @@ EvdevProc(DeviceIntPtr device, int what)
+ RemoveEnabledDevice (pInfo->fd);
+ xf86RemoveSIGIOHandler (pInfo->fd);
+ close (pInfo->fd);
++ pInfo->fd = -1;
+
+ if (pEvdev->state.axes)
+ EvdevAxesOff (device);
Modified: trunk/driver/xserver-xorg-input-evdev/debian/patches/series
===================================================================
--- trunk/driver/xserver-xorg-input-evdev/debian/patches/series 2006-11-04 05:31:47 UTC (rev 3941)
+++ trunk/driver/xserver-xorg-input-evdev/debian/patches/series 2006-11-05 10:31:54 UTC (rev 3942)
@@ -2,3 +2,4 @@
11-bitops-fixes.patch
20-add-inotify-architectures.patch
30-absolute-axis.patch
+40-close-fd.patch
Reply to: