rpms/hal/F-8 hal-0.5.10-fix-input-spin.patch, NONE, 1.1 hal.spec, 1.142, 1.143

[David Zeuthen (davidz)]

Author: davidz

Update of /cvs/pkgs/rpms/hal/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29840

Modified Files:
	hal.spec 
Added Files:
	hal-0.5.10-fix-input-spin.patch 
Log Message:
* Fri Jul 18 2008 David Zeuthen <davidz at redhat.com> - 0.5.10-4
- fix runaway input add-on (#452557)



hal-0.5.10-fix-input-spin.patch:

--- NEW FILE hal-0.5.10-fix-input-spin.patch ---
# Description: Avoid spinning on already invalidated/closed file
#  descriptors in the input addon. This fixes "hal takes 100% CPU and
#  breaks input device handling" on a lot of machines.
# Ubuntu: https://launchpad.net/bugs/203679
--- ubuntu/hald/linux/addons/addon-input.c	2008-03-17 22:25:12.000000000 +0100
+++ ubuntu.new/hald/linux/addons/addon-input.c	2008-04-21 10:33:16.000000000 +0200
@@ -210,7 +210,7 @@
 	GError *gerror = NULL;
 	gsize read_bytes;
 
-	if (condition & (G_IO_HUP | G_IO_ERR))
+	if (condition & (G_IO_HUP | G_IO_ERR | G_IO_NVAL))
 		return FALSE;
 
 	/** tbh, we can probably assume every time we read we have a whole
@@ -383,7 +383,7 @@
 
 	g_hash_table_insert (inputs, g_strdup(udi), channel);
 	g_io_add_watch_full (channel,
-			     G_PRIORITY_DEFAULT, G_IO_IN | G_IO_ERR | G_IO_HUP,
+			     G_PRIORITY_DEFAULT, G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
 			     event_io, data, (GDestroyNotify) destroy_data);
 }
 


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/F-8/hal.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- hal.spec	16 Jun 2008 11:59:03 -0000	1.142
+++ hal.spec	18 Jul 2008 18:07:01 -0000	1.143
@@ -26,12 +26,13 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Patch0: hal-0.5.10-acltool-serialize.patch
 Patch1: hal-0.5.10-int_outof-fix.patch
 Patch2: hal-0.5.10-fix-memory-leaks.patch
+Patch3: hal-0.5.10-fix-input-spin.patch
 
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -126,6 +127,7 @@
 %patch0 -p1 -b .serialize-acl
 %patch1 -p1 -b .int_outof-fix
 %patch2 -p1 -b .memory-leaks-fix
+%patch3 -p1 -b .input-spin
 
 %build
 %configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} --with-os-type=redhat --enable-console-kit --enable-policy-kit --enable-acl-management --enable-umount-helper --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject
@@ -238,6 +240,9 @@
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Fri Jul 18 2008 David Zeuthen <davidz at redhat.com> - 0.5.10-4
+- fix runaway input add-on (#452557)
+
 * Mon Jun 16 2008 Richard Hughes <rhughes at redhat.com> - 0.5.10-3
 - Plug a couple of memory leaks which have already been fixed in git master