rpms/xorg-x11-server/FC-6 xserver-1.1.1-lid-crash.patch, NONE, 1.1 xorg-x11-server.spec, 1.190, 1.191

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv24444

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.1.1-lid-crash.patch 
Log Message:
* Mon Jun 18 2007 Adam Jackson <ajax at redhat.com> 1.1.1-47.10
- xserver-1.1.1-lid-crash.patch: Fix a crash on ACPI lid events. (#242802)


xserver-1.1.1-lid-crash.patch:
 lnx_acpi.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xserver-1.1.1-lid-crash.patch ---
--- xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_acpi.c.jx	2006-07-05 14:31:41.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_acpi.c	2007-06-18 11:50:42.000000000 -0400
@@ -65,7 +65,7 @@
 	char *data = NULL; /* doesn't appear to be used in the kernel */
 	unsigned long int notify_l, data_l;
 
-	video = strtok(ev, "video");
+	video = strtok(ev, " ");
 
 	GFX = strtok(NULL, " ");
 #if 0


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-6/xorg-x11-server.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- xorg-x11-server.spec	11 Apr 2007 17:43:40 -0000	1.190
+++ xorg-x11-server.spec	18 Jun 2007 16:07:10 -0000	1.191
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.1
-Release:   47.9%{?dist}
+Release:   47.10%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -65,6 +65,7 @@
 Patch2007:  xorg-x11-server-1.1.1-aiglx-locking.patch
 Patch2008:  xorg-x11-server-1.1.1-edid-hex-dump.patch
 Patch2009:  xserver-1.1.1-int10-update.patch
+Patch2010:  xserver-1.1.1-lid-crash.patch
 
 # autoconfiguration feature patches
 Patch3001:  xorg-x11-server-1.1.0-edid-mode-injection-1.patch
@@ -395,6 +396,7 @@
 %patch2007 -p1 -b .aiglx-locking
 %patch2008 -p1 -b .hexdump
 %patch2009 -p1 -b .int10-update
+%patch2010 -p1 -b .lid-crash
 
 %patch3001 -p1 -b .edid1
 %patch3002 -p1 -b .edid2
@@ -745,6 +747,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Jun 18 2007 Adam Jackson <ajax at redhat.com> 1.1.1-47.10
+- xserver-1.1.1-lid-crash.patch: Fix a crash on ACPI lid events. (#242802)
+
 * Wed Apr 11 2007 Adam Jackson <ajax at redhat.com> 1.1.1-47.9
 - xserver-1.1.1-int10-update.patch: Backport various important int10 and
   x86emu updates from git. (#216927, among others)