[maemo-commits] [maemo-commits] r16252 - in projects/connectivity/bluez-debian/trunk: . patches

[From: subversion at stage.maemo.org]

Author: jh
Date: 2008-09-29 09:59:59 +0300 (Mon, 29 Sep 2008)
New Revision: 16252

Removed:
   projects/connectivity/bluez-debian/trunk/patches/004_pairing_crash.patch
Modified:
   projects/connectivity/bluez-debian/trunk/changelog
   projects/connectivity/bluez-debian/trunk/libbluetooth3.shlibs
Log:
Prepare for 4.8

Modified: projects/connectivity/bluez-debian/trunk/changelog
===================================================================
--- projects/connectivity/bluez-debian/trunk/changelog	2008-09-29 06:48:55 UTC (rev 16251)
+++ projects/connectivity/bluez-debian/trunk/changelog	2008-09-29 06:59:59 UTC (rev 16252)
@@ -1,3 +1,14 @@
+bluez (4.8-0maemo1) unstable; urgency=low
+
+  * New upstream version (includes patches in 4.7-0maemo2)
+  * Changes from ChangeLog since 4.7:
+     * Fix retrieving of formfactor value.
+     * Fix retrieving of local and remote extended features.
+     * Fix potential NULL pointer dereference during pairing.
+     * Fix crash with browsing due to a remotely initated pairing.
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Mon, 29 Sep 2008 06:48:46 +0000
+
 bluez (4.7-0maemo2) unstable; urgency=low
 
   * Backport two bluetoothd crasher fixes (related to pairing) from git.

Modified: projects/connectivity/bluez-debian/trunk/libbluetooth3.shlibs
===================================================================
--- projects/connectivity/bluez-debian/trunk/libbluetooth3.shlibs	2008-09-29 06:48:55 UTC (rev 16251)
+++ projects/connectivity/bluez-debian/trunk/libbluetooth3.shlibs	2008-09-29 06:59:59 UTC (rev 16252)
@@ -1 +1 @@
-libbluetooth 3 libbluetooth3 (>= 4.7)
+libbluetooth 3 libbluetooth3 (>= 4.8)

Deleted: projects/connectivity/bluez-debian/trunk/patches/004_pairing_crash.patch
===================================================================
--- projects/connectivity/bluez-debian/trunk/patches/004_pairing_crash.patch	2008-09-29 06:48:55 UTC (rev 16251)
+++ projects/connectivity/bluez-debian/trunk/patches/004_pairing_crash.patch	2008-09-29 06:59:59 UTC (rev 16252)
@@ -1,30 +0,0 @@
---- src/dbus-hci.c	2008-09-26 05:39:55.000000000 +0000
-+++ src/dbus-hci.c	2008-09-28 20:57:42.000000000 +0000
-@@ -518,7 +518,7 @@
- 
- 	bonding = adapter_get_bonding_info(adapter);
- 
--	if (bacmp(&bonding->bdaddr, peer))
-+	if (bonding && bacmp(&bonding->bdaddr, peer))
- 		bonding = NULL;
- 
- 	if (status == 0) {
---- src/device.c	2008-09-26 05:39:55.000000000 +0000
-+++ src/device.c	2008-09-28 20:56:59.000000000 +0000
-@@ -857,6 +857,7 @@
- 
- static void services_changed(struct browse_req *req)
- {
-+	DBusConnection *conn = get_dbus_connection();
- 	struct btd_device *device = req->device;
- 	char **uuids;
- 	GSList *l;
-@@ -866,7 +867,7 @@
- 	for (i = 0, l = device->uuids; l; l = l->next, i++)
- 		uuids[i] = l->data;
- 
--	dbus_connection_emit_property_changed(req->conn, device->path,
-+	dbus_connection_emit_property_changed(conn, device->path,
- 					DEVICE_INTERFACE, "UUIDs",
- 					DBUS_TYPE_ARRAY, &uuids);
-