From e580f147c863d740cd7190461695a03927240bf4 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Fri, 26 Sep 2008 13:03:53 +0000
Subject: [PATCH] - Update to 4.7

---
 .cvsignore                     |  2 +-
 bluez-bluetoothd-crasher.patch | 57 ----------------------------------
 bluez.spec                     | 11 +++----
 sources                        |  2 +-
 4 files changed, 7 insertions(+), 65 deletions(-)
 delete mode 100644 bluez-bluetoothd-crasher.patch

diff --git a/.cvsignore b/.cvsignore
index 97d5c34..1f44e4b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-bluez-4.6.tar.gz
+bluez-4.7.tar.gz
diff --git a/bluez-bluetoothd-crasher.patch b/bluez-bluetoothd-crasher.patch
deleted file mode 100644
index 8d4b2a4..0000000
--- a/bluez-bluetoothd-crasher.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/src/security.c b/src/security.c
-index fd2535f..6a9a5c4 100644
---- a/src/security.c
-+++ b/src/security.c
-@@ -46,6 +46,7 @@
- 
- #include <dbus/dbus.h>
- 
-+#include "hcid.h"
- #include "logging.h"
- #include "textfile.h"
- 
-@@ -789,6 +790,27 @@ static inline void conn_request(int dev, bdaddr_t *sba, void *ptr)
- 	write_remote_class(sba, &evt->bdaddr, class);
- }
- 
-+static void delete_channel(GIOChannel *chan)
-+{
-+	gint i, found;
-+
-+	/* Look for the GIOChannel in the table */
-+	found = -1;
-+	for (i = 0; i < HCI_MAX_DEV; i++) {
-+		if (io_data[i].channel == chan) {
-+			found = i;
-+			break;
-+		}
-+	}
-+
-+	if (found == -1) {
-+		g_warning("IO channel not found in the io_data table");
-+		return;
-+	}
-+
-+	stop_security_manager(i);
-+}
-+
- static gboolean io_security_event(GIOChannel *chan, GIOCondition cond, gpointer data)
- {
- 	unsigned char buf[HCI_MAX_EVENT_SIZE], *ptr = buf;
-@@ -799,14 +821,14 @@ static gboolean io_security_event(GIOChannel *chan, GIOCondition cond, gpointer
- 	GIOError err;
- 
- 	if (cond & (G_IO_NVAL | G_IO_HUP | G_IO_ERR)) {
--		g_io_channel_unref(chan);
-+		delete_channel(chan);
- 		return FALSE;
- 	}
- 
- 	if ((err = g_io_channel_read(chan, (gchar *) buf, sizeof(buf), &len))) {
- 		if (err == G_IO_ERROR_AGAIN)
- 			return TRUE;
--		g_io_channel_unref(chan);
-+		delete_channel(chan);
- 		return FALSE;
- 	}
- 
diff --git a/bluez.spec b/bluez.spec
index 56123f0..cb8f690 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,16 +1,13 @@
-%define _default_patch_fuzz 2
-
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.6
-Release: 4%{?dist}
+Version: 4.7
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
 Source1: bluetooth.init
 Source2: bluetooth.conf
 Patch1: bluez-utils-oui-usage.patch
-Patch2: bluez-bluetoothd-crasher.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -99,7 +96,6 @@ use in Bluetooth applications.
 
 %setup -q
 %patch1 -p0 -b .oui
-%patch2 -p1 -b .security
 
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
@@ -185,6 +181,9 @@ fi
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Fri Sep 26 2008 - Bastien Nocera <bnocera@redhat.com> - 4.7-1
+- Update to 4.7
+
 * Wed Sep 24 2008 - Bastien Nocera <bnocera@redhat.com> - 4.6-4
 - Fix patch application
 
diff --git a/sources b/sources
index 694c727..0700423 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c10774d08fb04af4b4a6d148ffcb820a  bluez-4.6.tar.gz
+2aa806940d2c841e57a9b2ab7302b750  bluez-4.7.tar.gz