rpms/bluez-utils/devel bluez-utils-3.9-input.patch, NONE, 1.1 bluez-utils.spec, 1.55, 1.56

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/bluez-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7877

Modified Files:
	bluez-utils.spec 
Added Files:
	bluez-utils-3.9-input.patch 
Log Message:
fix loop polling on closed fd (#232813)


bluez-utils-3.9-input.patch:
 device.c |    0 
 server.c |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE bluez-utils-3.9-input.patch ---
diff --git a/input/device.c b/input/device.c
diff --git a/input/server.c b/input/server.c
index b140bb6..911fc8e 100644
--- a/input/server.c
+++ b/input/server.c
@@ -69,7 +69,7 @@ static struct session_data *find_session(bdaddr_t *src, bdaddr_t *dst)
 
 static gboolean session_event(GIOChannel *chan, GIOCondition cond, gpointer data)
 {
-	if (cond & (G_IO_HUP | G_IO_ERR))
+	if (cond & (G_IO_HUP | G_IO_ERR | G_IO_NVAL))
 		return FALSE;
 
 	return TRUE;
@@ -133,7 +133,7 @@ static void create_watch(int sk, struct session_data *session)
 	io = g_io_channel_unix_new(sk);
 	g_io_channel_set_close_on_unref(io, TRUE);
 
-	g_io_add_watch(io, G_IO_IN | G_IO_HUP | G_IO_ERR,
+	g_io_add_watch(io, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
 						session_event, session);
 
 	g_io_channel_unref(io);


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- bluez-utils.spec	30 Jan 2007 12:00:52 -0000	1.55
+++ bluez-utils.spec	4 Apr 2007 05:54:48 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
 Version: 3.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -14,6 +14,7 @@
 Source8: hidd.conf
 Source9: bluetooth.conf
 Patch0: bluez-utils-2.3-conf.patch
+Patch1: bluez-utils-3.9-input.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -54,6 +55,7 @@
 
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --with-bluez-libs=%{_libdir} --enable-pie --enable-debug \
@@ -120,6 +122,9 @@
 %{_libdir}/cups/backend/bluetooth
 
 %changelog
+* Tue Jan 30 2007 David Woodhouse <dwmw2 at infradead.org> 3.9-2
+- Handle HUP or ERR results from poll() instead of looping (#232813)
+
 * Tue Jan 30 2007 David Woodhouse <dwmw2 at infradead.org> 3.9-1
 - Update to bluez-utils 3.9