[maemo-commits] [maemo-commits] r15535 - projects/connectivity/bluez-utils-debian/trunk/patches

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Fri May 9 12:32:26 EEST 2008 
Author: jh
Date: 2008-05-09 12:32:24 +0300 (Fri, 09 May 2008)
New Revision: 15535

Added:
   projects/connectivity/bluez-utils-debian/trunk/patches/003_audio_conf.patch
   projects/connectivity/bluez-utils-debian/trunk/patches/004_linkkeys.patch
   projects/connectivity/bluez-utils-debian/trunk/patches/005_no_sdp_cache.patch
Removed:
   projects/connectivity/bluez-utils-debian/trunk/patches/003_audio_autostart.patch
   projects/connectivity/bluez-utils-debian/trunk/patches/004_audio_conf.patch
   projects/connectivity/bluez-utils-debian/trunk/patches/005_linkkeys.patch
   projects/connectivity/bluez-utils-debian/trunk/patches/006_no_sdp_cache.patch
   projects/connectivity/bluez-utils-debian/trunk/patches/007_sco_routing_fix.patch
   projects/connectivity/bluez-utils-debian/trunk/patches/008_mem_full.patch
Log:
Update patches for 3.31

Deleted: projects/connectivity/bluez-utils-debian/trunk/patches/003_audio_autostart.patch
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/patches/003_audio_autostart.patch	2008-05-09 09:08:44 UTC (rev 15534)
+++ projects/connectivity/bluez-utils-debian/trunk/patches/003_audio_autostart.patch	2008-05-09 09:32:24 UTC (rev 15535)
@@ -1,8 +0,0 @@
---- audio/audio.service	2007-10-15 14:29:45.000000000 +0000
-+++ audio/audio.service	2007-10-19 08:48:09.000000000 +0000
-@@ -2,4 +2,4 @@
- Identifier=audio
- Name=Audio service
- Description=Bluetooth Audio service
--Autostart=false
-+Autostart=true

Copied: projects/connectivity/bluez-utils-debian/trunk/patches/003_audio_conf.patch (from rev 15534, projects/connectivity/bluez-utils-debian/trunk/patches/004_audio_conf.patch)

Deleted: projects/connectivity/bluez-utils-debian/trunk/patches/004_audio_conf.patch
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/patches/004_audio_conf.patch	2008-05-09 09:08:44 UTC (rev 15534)
+++ projects/connectivity/bluez-utils-debian/trunk/patches/004_audio_conf.patch	2008-05-09 09:32:24 UTC (rev 15535)
@@ -1,21 +0,0 @@
---- audio/audio.conf	2008-03-10 18:28:35.000000000 +0000
-+++ audio/audio.conf	2008-03-10 18:28:41.000000000 +0000
-@@ -5,15 +5,15 @@
- [General]
- 
- # Switch to master role for incoming connections (defaults to true)
--#Master=true
-+Master=true
- 
- # If we want to disable support for specific services
- # Defaults to supporting all implemented services
--#Disable=Control,Source
-+Disable=Control,Sink,Source
- 
- # SCO routing. Either PCM or HCI (in which case audio is routed to/from ALSA)
- # Defaults to HCI
--#SCORouting=PCM
-+SCORouting=PCM
- 
- # Headset interface specific options (i.e. options which affect how the audio
- # service interacts with remote headset devices)

Copied: projects/connectivity/bluez-utils-debian/trunk/patches/004_linkkeys.patch (from rev 15534, projects/connectivity/bluez-utils-debian/trunk/patches/005_linkkeys.patch)

Deleted: projects/connectivity/bluez-utils-debian/trunk/patches/005_linkkeys.patch
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/patches/005_linkkeys.patch	2008-05-09 09:08:44 UTC (rev 15534)
+++ projects/connectivity/bluez-utils-debian/trunk/patches/005_linkkeys.patch	2008-05-09 09:32:24 UTC (rev 15535)
@@ -1,11 +0,0 @@
---- hcid/storage.c	2007-10-26 08:21:00.000000000 +0000
-+++ hcid/storage.c	2007-10-26 08:20:56.000000000 +0000
-@@ -445,7 +445,7 @@
- 
- 	create_filename(filename, PATH_MAX, local, "linkkeys");
- 
--	create_file(filename, S_IRUSR | S_IWUSR);
-+	create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
- 
- 	ba2str(peer, addr);
- 

Copied: projects/connectivity/bluez-utils-debian/trunk/patches/005_no_sdp_cache.patch (from rev 15534, projects/connectivity/bluez-utils-debian/trunk/patches/006_no_sdp_cache.patch)

Deleted: projects/connectivity/bluez-utils-debian/trunk/patches/006_no_sdp_cache.patch
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/patches/006_no_sdp_cache.patch	2008-05-09 09:08:44 UTC (rev 15534)
+++ projects/connectivity/bluez-utils-debian/trunk/patches/006_no_sdp_cache.patch	2008-05-09 09:32:24 UTC (rev 15535)
@@ -1,29 +0,0 @@
---- hcid/dbus-sdp.c	2007-12-10 09:25:36.000000000 +0000
-+++ hcid/dbus-sdp.c	2007-12-10 09:26:59.000000000 +0000
-@@ -358,25 +358,7 @@
- 
- static int sdp_store_record(const char *src, const char *dst, uint32_t handle, uint8_t *buf, size_t size)
- {
--	char filename[PATH_MAX + 1], key[28], *value;
--	int i, err;
--
--	create_name(filename, PATH_MAX, STORAGEDIR, src, "sdp");
--
--	create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
--
--	snprintf(key, sizeof(key), "%17s#%08X", dst, handle);
--
--	value = g_malloc0(size * 2 + 1);
--
--	for (i = 0; i < size; i++)
--		sprintf(value + (i * 2), "%02X", buf[i]);
--
--	err = textfile_put(filename, key, value);
--
--	g_free(value);
--
--	return err;
-+	return 0;
- }
- 
- static void transaction_context_free(void *udata, gboolean cache)

Deleted: projects/connectivity/bluez-utils-debian/trunk/patches/007_sco_routing_fix.patch
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/patches/007_sco_routing_fix.patch	2008-05-09 09:08:44 UTC (rev 15534)
+++ projects/connectivity/bluez-utils-debian/trunk/patches/007_sco_routing_fix.patch	2008-05-09 09:32:24 UTC (rev 15535)
@@ -1,20 +0,0 @@
---- audio/manager.c	2008-03-05 22:18:02.000000000 +0200
-+++ audio/manager.c	2008-03-12 16:15:53.000000000 +0200
-@@ -1594,6 +1594,8 @@
- 	g_io_add_watch(hs_server, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
- 				(GIOFunc) ag_io_cb, NULL);
- 
-+	features = headset_config_init(config);
-+
- 	if (!hfp)
- 		return 0;
- 
-@@ -1603,8 +1605,6 @@
- 	if (!hf_server)
- 		return -1;
- 
--	features = headset_config_init(config);
--
- 	if (hfp_ag_record(&buf, chan, features) < 0) {
- 		error("Unable to allocate new service record");
- 		return -1;

Deleted: projects/connectivity/bluez-utils-debian/trunk/patches/008_mem_full.patch
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/patches/008_mem_full.patch	2008-05-09 09:08:44 UTC (rev 15534)
+++ projects/connectivity/bluez-utils-debian/trunk/patches/008_mem_full.patch	2008-05-09 09:32:24 UTC (rev 15535)
@@ -1,79 +0,0 @@
---- hcid/security.c.orig	2008-03-12 14:24:18.000000000 +0000
-+++ hcid/security.c	2008-04-15 13:35:04.000000000 +0000
-@@ -187,6 +187,38 @@
- 	hci_req_queue_process(dev_id);
- }
- 
-+static int get_handle(int dev, bdaddr_t *sba, bdaddr_t *dba, uint16_t *handle)
-+{
-+	struct hci_conn_list_req *cl;
-+	struct hci_conn_info *ci;
-+	char addr[18];
-+	int i;
-+
-+	cl = g_malloc0(10 * sizeof(*ci) + sizeof(*cl));
-+
-+	ba2str(sba, addr);
-+	cl->dev_id = hci_devid(addr);
-+	cl->conn_num = 10;
-+	ci = cl->conn_info;
-+
-+	if (ioctl(dev, HCIGETCONNLIST, (void *) cl) < 0) {
-+		g_free(cl);
-+		return -EIO;
-+	}
-+
-+	for (i = 0; i < cl->conn_num; i++, ci++) {
-+		if (bacmp(&ci->bdaddr, dba) == 0) {
-+			*handle = ci->handle;
-+			g_free(cl);
-+			return 0;
-+		}
-+	}
-+
-+	g_free(cl);
-+
-+	return -ENOENT;
-+}
-+
- static inline int get_bdaddr(int dev, bdaddr_t *sba, uint16_t handle, bdaddr_t *dba)
- {
- 	struct hci_conn_list_req *cl;
-@@ -270,17 +309,34 @@
- 	evt_link_key_notify *evt = ptr;
- 	bdaddr_t *dba = &evt->bdaddr;
- 	char sa[18], da[18];
--	int dev_id;
-+	int dev_id, err;
- 
- 	ba2str(sba, sa); ba2str(dba, da);
- 	info("link_key_notify (sba=%s, dba=%s)", sa, da);
- 
- 	dev_id = hci_devid(sa);
- 
--	write_link_key(sba, dba, evt->link_key, evt->key_type,
-+	err = write_link_key(sba, dba, evt->link_key, evt->key_type,
- 						io_data[dev_id].pin_length);
-+	if (err < 0) {
-+		uint16_t handle;
-+
-+		error("write_link_key: %s (%d)", strerror(-err), -err);
- 
--	hcid_dbus_bonding_process_complete(sba, dba, 0);
-+		hcid_dbus_bonding_process_complete(sba, dba, HCI_MEMORY_FULL);
-+
-+		if (get_handle(dev, sba, dba, &handle) == 0) {
-+			disconnect_cp cp;
-+
-+			memset(&cp, 0, sizeof(cp));
-+			cp.handle = htobs(handle);
-+			cp.reason = HCI_OE_LOW_RESOURCES;
-+
-+			hci_send_cmd(dev, OGF_LINK_CTL, OCF_DISCONNECT,
-+					DISCONNECT_CP_SIZE, &cp);
-+		}
-+	} else
-+		hcid_dbus_bonding_process_complete(sba, dba, 0);
- 
- 	io_data[dev_id].pin_length = -1;
- }
More information about the maemo-commits mailing list