rpms/bluez-utils/devel bluez-utils-2.25-invalid-timeval.patch, NONE, 1.1 bluez-utils.spec, 1.42, 1.43

[fedora-cvs-commits at redhat.com]

Author: dwmw2

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

Modified Files:
	bluez-utils.spec 
Added Files:
	bluez-utils-2.25-invalid-timeval.patch 
Log Message:
fix invalid timeval

bluez-utils-2.25-invalid-timeval.patch:
 dbus.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE bluez-utils-2.25-invalid-timeval.patch ---
--- bluez-utils-2.25/hcid/dbus.c~	2006-01-08 02:03:05.000000000 +0000
+++ bluez-utils-2.25/hcid/dbus.c	2006-04-21 18:07:41.000000000 +0100
@@ -54,7 +54,7 @@ static DBusConnection *connection;
 static int default_dev = -1;
 
 #define TIMEOUT				(30 * 1000)		/* 30 seconds */
-#define DBUS_RECONNECT_TIMER		(5 * 1000 * 1000)	/* 5 sec */
+#define DBUS_RECONNECT_TIMER		5			/* 5 sec */
 #define MAX_PATH_LENGTH			64
 #define MAX_CONN_NUMBER			10
 
@@ -1262,12 +1262,12 @@ static void reconnect_timer_start(void)
 	sigaction(SIGALRM, &sa, NULL);
 
 	/* expire after X  msec... */
-	timer.it_value.tv_sec = 0;
-	timer.it_value.tv_usec = DBUS_RECONNECT_TIMER;
+	timer.it_value.tv_sec = DBUS_RECONNECT_TIMER;
+	timer.it_value.tv_usec = 0;
 
 	/* ... and every x msec after that. */
-	timer.it_interval.tv_sec = 0;
-	timer.it_interval.tv_usec = DBUS_RECONNECT_TIMER;
+	timer.it_interval.tv_sec = DBUS_RECONNECT_TIMER;
+	timer.it_interval.tv_usec = 0;
 
 	setitimer(ITIMER_REAL, &timer, NULL);
 }


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- bluez-utils.spec	18 Apr 2006 01:08:13 -0000	1.42
+++ bluez-utils.spec	21 Apr 2006 17:09:43 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
 Version: 2.25
-Release: 6
+Release: 7
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -15,6 +15,7 @@
 Source9: bluetooth.conf
 Patch0: bluez-utils-2.3-conf.patch
 Patch1: bluez-utils-2.25-poll-timeout.patch
+Patch2: bluez-utils-2.25-invalid-timeval.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
 BuildRequires: bluez-libs-devel >= %{version}
@@ -54,6 +55,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 aclocal
@@ -119,6 +121,9 @@
 %{_libdir}/cups/backend/bluetooth
 
 %changelog
+* Fri Apr 21 2006 David Woodhouse <dwmw2 at redhat.com> - 2.25-7
+- Fix invalid timeval in reconnect_timer_start()
+
 * Mon Apr 17 2006 Peter Jones <pjones at redhat.com> - 2.25-6
 - Clean up initscripts.
 - Clean up specfile.