rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-lid-close-crash.patch, NONE, 1.1 xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch, 1.1, 1.2 xorg-x11-server.spec, 1.194, 1.195
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Dec 11 21:22:34 UTC 2006
Author: ajackson
Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11046
Modified Files:
xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch
xorg-x11-server.spec
Added Files:
xorg-x11-server-1.1.1-lid-close-crash.patch
Log Message:
* Mon Dec 11 2006 Adam Jackson <ajax at redhat.com> 1.1.1-55
- xorg-x11-server-1.1.1-lid-close-crash.patch: Added, backport from head.
(#197921)
xorg-x11-server-1.1.1-lid-close-crash.patch:
lnx_acpi.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xorg-x11-server-1.1.1-lid-close-crash.patch ---
diff -Naur xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_acpi.c xorg-server-1.1.1-X-shouldnt-crash-when-closing-lid/hw/xfree86/os-support/linux/lnx_acpi.c
--- xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_acpi.c 2006-07-05 20:31:41.000000000 +0200
+++ xorg-server-1.1.1-X-shouldnt-crash-when-closing-lid/hw/xfree86/os-support/linux/lnx_acpi.c 2006-10-27 14:13:17.000000000 +0200
@@ -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
xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch:
lnx_init.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
Index: xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch 28 Sep 2006 16:38:24 -0000 1.1
+++ xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch 11 Dec 2006 21:22:32 -0000 1.2
@@ -1,46 +1,27 @@
---- xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_init.c.jx 2006-07-05 14:31:41.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_init.c 2006-09-26 17:53:04.000000000 -0400
-@@ -248,14 +248,37 @@
+--- xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_init.c.vt-activate 2006-07-05 14:31:41.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_init.c 2006-12-04 17:29:47.000000000 -0500
+@@ -248,14 +248,20 @@
#endif
/*
* now get the VT
+ *
+ * There's a race here, in that if someone else does a VT_ACTIVATE
+ * between our ACTIVATE/WAITACTIVE, we might never get the VT.
-+ * So, just spin until we do. There's really no fixing this,
++ * So we have to fail in that case. There's really no fixing this,
+ * it's a racy protocol.
*/
-- if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) < 0)
+ if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) < 0)
- xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed: %s\n",
- strerror(errno));
-+ while (1) {
-+ if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) < 0)
-+ FatalError(X_WARNING,
-+ "xf86OpenConsole: VT_ACTIVATE failed: %s\n",
-+ strerror(errno));
++ FatalError("xf86OpenConsole: VT_ACTIVATE failed: %s\n",
++ strerror(errno));
++
-- if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno) < 0)
+ if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno) < 0)
- xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed: %s\n",
- strerror(errno));
-+
-+ alarm(5);
-+ if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno) < 0)
-+ {
-+ if (errno == EINTR) {
-+ /* we lost the race and the alarm fired, try again */
-+ xf86Msg(X_WARNING,
-+ "Lost VT_WAITACTIVE race, retrying\n");
-+ continue;
-+ }
-+
-+ FatalError("xf86OpenConsole: VT_WAITACTIVE failed: %s\n",
-+ strerror(errno));
-+ }
-+ /* success, turn off the alarm */
-+ alarm(0);
-+
-+ break;
-+ }
++ FatalError("xf86OpenConsole: VT_WAITACTIVE failed: %s\n",
++ strerror(errno));
if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0)
FatalError("xf86OpenConsole: VT_GETMODE failed %s\n",
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- xorg-x11-server.spec 11 Dec 2006 13:49:21 -0000 1.194
+++ xorg-x11-server.spec 11 Dec 2006 21:22:32 -0000 1.195
@@ -8,7 +8,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.1.1
-Release: 54.1%{?dist}
+Release: 55%{?dist}
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X
@@ -34,6 +34,7 @@
Patch14: xorg-x11-server-1.1.1-ia64-pci-chipsets.patch
Patch15: xorg-x11-server-1.1.1-automake-1.10-fixes.patch
Patch16: xorg-x11-server-1.1.1-xkb-vidmode-switch.patch
+Patch17: xorg-x11-server-1.1.1-lid-close-crash.patch
# OpenGL compositing manager feature/optimization patches.
Patch100: xorg-x11-server-1.1.0-no-move-damage.patch
@@ -338,6 +339,7 @@
%patch14 -p1 -b .ia64-pci-chipsets
%patch15 -p1 -b .automake-1.10
%patch16 -p1 -b .xkb-vidmode-switch
+%patch17 -p1 -b .lid-close-crash
%patch100 -p0 -b .no-move-damage
%patch101 -p0 -b .dont-backfill-bg-none
@@ -681,6 +683,10 @@
# -------------------------------------------------------------------
%changelog
+* Mon Dec 11 2006 Adam Jackson <ajax at redhat.com> 1.1.1-55
+- xorg-x11-server-1.1.1-lid-close-crash.patch: Added, backport from head.
+ (#197921)
+
* Mon Dec 11 2006 Adam Tkac <atkac redhat com> 1.1.1-54.1.fc7
- fixed building against mesa-6.5.2
More information about the fedora-cvs-commits
mailing list