X Strike Force X.Org X11 SVN commit: r1036 - in trunk/debian: . patches patches/general
Author: dnusinow
Date: 2006-01-08 19:46:48 -0500 (Sun, 08 Jan 2006)
New Revision: 1036
Added:
trunk/debian/patches/general/020_acpi_event_loop_fix.diff
Modified:
trunk/debian/changelog
trunk/debian/patches/series
Log:
* Add general/020_acpi_event_loop_fix.diff. This corrects a problem when the
acpid is shut down while server is running. Thanks Mattia Dongili.
(closes: #345537)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-01-09 00:30:32 UTC (rev 1035)
+++ trunk/debian/changelog 2006-01-09 00:46:48 UTC (rev 1036)
@@ -22,8 +22,11 @@
drivers for some people. (closes: #274862)
* Hurd patch and MANIFEST updates. Thanks Samuel Thibault and Michael Banck.
(closes: #346500)
+ * Add general/020_acpi_event_loop_fix.diff. This corrects a problem when the
+ acpid is shut down while server is running. Thanks Mattia Dongili.
+ (closes: #345537)
- -- David Nusinow <dnusinow@debian.org> Sun, 8 Jan 2006 19:30:10 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 8 Jan 2006 19:44:49 -0500
xorg-x11 (6.9.0.dfsg.1-2) unstable; urgency=low
Added: trunk/debian/patches/general/020_acpi_event_loop_fix.diff
===================================================================
--- trunk/debian/patches/general/020_acpi_event_loop_fix.diff 2006-01-09 00:30:32 UTC (rev 1035)
+++ trunk/debian/patches/general/020_acpi_event_loop_fix.diff 2006-01-09 00:46:48 UTC (rev 1036)
@@ -0,0 +1,39 @@
+$Id$
+
+This fixes issues with the server choking when it's listening to acpid and
+acpid is shut down. See https://bugs.freedesktop.org/show_bug.cgi?id=5140
+and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=345537.
+
+This patch by Mattia Dongili.
+
+Index: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_acpi.c
+===================================================================
+RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_acpi.c,v
+retrieving revision 1.2
+diff -u -r1.2 lnx_acpi.c
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_acpi.c 31 Oct 2005 05:45:40 -0000 1.2
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_acpi.c 2 Jan 2006 17:17:29 -0000
+@@ -45,6 +45,13 @@
+ memset(ev, 0, LINE_LENGTH);
+
+ n = read( fd, ev, LINE_LENGTH );
++ if (n <= 0) {
++ /* can only happen when reading from acpid socket */
++ xf86MsgVerb(X_WARNING,3,"ACPI Event handler disappeared, reopening.\n");
++ lnxCloseACPI();
++ lnxACPIOpen();
++ return 0;
++ }
+
+ /* Check that we have a video event */
+ if (strstr(ev, "video") == ev) {
+@@ -160,6 +167,9 @@
+ #ifdef DEBUG
+ ErrorF("ACPI: Closing device\n");
+ #endif
++ xf86PMGetEventFromOs = NULL;
++ xf86PMConfirmEventToOs = NULL;
++
+ if (ACPIihPtr) {
+ fd = xf86RemoveInputHandler(ACPIihPtr);
+ shutdown(fd, 2);
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2006-01-09 00:30:32 UTC (rev 1035)
+++ trunk/debian/patches/series 2006-01-09 00:46:48 UTC (rev 1036)
@@ -19,6 +19,7 @@
general/017_fix_Xlib_depend_target.diff -p0
general/018_mesa_debug_fglrx.diff -p0
general/019_iso8859-15_Compose_fix.diff -p0
+general/020_acpi_event_loop_fix.diff -p0
general/022_disable_xmh.diff
general/023_specs_doc_fixes.diff -p0
general/025b_xkb_README_typos.diff -p0
Reply to: