rpms/xorg-x11-server/F-9 xserver-1.5.0-hal-closedown.patch, NONE, 1.1 xorg-x11-server.spec, 1.330, 1.331
Adam Jackson (ajax)
fedora-extras-commits at redhat.com
Mon May 5 18:39:03 UTC 2008
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-server/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31111
Modified Files:
xorg-x11-server.spec
Added Files:
xserver-1.5.0-hal-closedown.patch
Log Message:
* Mon May 05 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-27.20080415
- xserver-1.5.0-hal-closedown.patch: Fix a crash in the hal code when
closing a device.
xserver-1.5.0-hal-closedown.patch:
--- NEW FILE xserver-1.5.0-hal-closedown.patch ---
>From 7985ebda80acb02f2d763904743665e470300d6c Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Mon, 5 May 2008 14:37:07 -0400
Subject: [PATCH] Fix hal shutdown crash
---
config/hal.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/config/hal.c b/config/hal.c
index 1575422..6534408 100644
--- a/config/hal.c
+++ b/config/hal.c
@@ -63,7 +63,7 @@ remove_device(DeviceIntPtr dev)
static void
device_removed(LibHalContext *ctx, const char *udi)
{
- DeviceIntPtr dev;
+ DeviceIntPtr dev, next;
char *value;
value = xalloc(strlen(udi) + 5); /* "hal:" + NULL */
@@ -71,11 +71,13 @@ device_removed(LibHalContext *ctx, const char *udi)
return;
sprintf(value, "hal:%s", udi);
- for (dev = inputInfo.devices; dev; dev = dev->next) {
+ for (dev = inputInfo.devices; dev; dev = next) {
+ next = dev->next;
if (dev->config_info && strcmp(dev->config_info, value) == 0)
remove_device(dev);
}
- for (dev = inputInfo.off_devices; dev; dev = dev->next) {
+ for (dev = inputInfo.off_devices; dev; dev = next) {
+ next = dev->next;
if (dev->config_info && strcmp(dev->config_info, value) == 0)
remove_device(dev);
}
--
1.5.4.5
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xorg-x11-server.spec,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -r1.330 -r1.331
--- xorg-x11-server.spec 24 Apr 2008 19:38:40 -0000 1.330
+++ xorg-x11-server.spec 5 May 2008 18:38:15 -0000 1.331
@@ -20,7 +20,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.4.99.901
-Release: 26.%{gitdate}%{?dist}
+Release: 27.%{gitdate}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@@ -55,6 +55,7 @@
Patch3000: xserver-1.5.0-stenciled-visuals.patch
Patch3001: xserver-1.5.0-glcore-swap-no-crashy.patch
Patch3002: xserver-1.5.0-f-spot-screws-glx.patch
+Patch3003: xserver-1.5.0-hal-closedown.patch
# Trivial things to never merge upstream ever
# Don't merge this without protecting the gccisms.
@@ -516,6 +517,10 @@
%changelog
+* Mon May 05 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-27.20080415
+- xserver-1.5.0-hal-closedown.patch: Fix a crash in the hal code when
+ closing a device.
+
* Thu Apr 24 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-26.20080415
- xserver-1.5.0-no-evdev-keyboards-kthnx.patch: Disable evdev for keyboards
even on combo devices. This means combo devices will go through the old
More information about the fedora-extras-commits
mailing list