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

[From: subversion at stage.maemo.org]

Author: jh
Date: 2008-06-24 12:15:42 +0300 (Tue, 24 Jun 2008)
New Revision: 15678

Added:
   projects/connectivity/bluez-utils-debian/trunk/patches/002_audio_conf.patch
   projects/connectivity/bluez-utils-debian/trunk/patches/003_linkkeys.patch
   projects/connectivity/bluez-utils-debian/trunk/patches/004_no_sdp_cache.patch
Removed:
   projects/connectivity/bluez-utils-debian/trunk/patches/002_remote_info.patch
   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
Log:
Update patches

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

Deleted: projects/connectivity/bluez-utils-debian/trunk/patches/002_remote_info.patch
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/patches/002_remote_info.patch	2008-06-24 09:11:54 UTC (rev 15677)
+++ projects/connectivity/bluez-utils-debian/trunk/patches/002_remote_info.patch	2008-06-24 09:15:42 UTC (rev 15678)
@@ -1,40 +0,0 @@
---- hcid/security.c	2008-05-09 12:24:51.000000000 +0300
-+++ hcid/security.c	2008-05-09 12:30:09.000000000 +0300
-@@ -671,10 +671,8 @@
- static inline void conn_complete(int dev, int dev_id, bdaddr_t *sba, void *ptr)
- {
- 	evt_conn_complete *evt = ptr;
--	char filename[PATH_MAX];
- 	remote_name_req_cp cp_name;
- 	struct hci_req_data *data;
--	char local_addr[18], peer_addr[18], *str;
- 
- 	if (evt->link_type != ACL_LINK)
- 		return;
-@@ -697,26 +695,6 @@
- 				&cp_name, REMOTE_NAME_REQ_CP_SIZE);
- 
- 	hci_req_queue_append(data);
--
--	/* check if the remote version needs be requested */
--	ba2str(sba, local_addr);
--	ba2str(&evt->bdaddr, peer_addr);
--
--	create_name(filename, sizeof(filename), STORAGEDIR, local_addr, "manufacturers");
--
--	str = textfile_get(filename, peer_addr);
--	if (!str) {
--		read_remote_version_cp cp;
--
--		cp.handle = evt->handle;
--
--		data = hci_req_data_new(dev_id, &evt->bdaddr, OGF_LINK_CTL,
--					OCF_READ_REMOTE_VERSION, EVT_READ_REMOTE_VERSION_COMPLETE,
--					&cp, READ_REMOTE_VERSION_CP_SIZE);
--
--		hci_req_queue_append(data);
--	} else
--		free(str);
- }
- 
- static inline void disconn_complete(int dev, bdaddr_t *sba, void *ptr)

Deleted: projects/connectivity/bluez-utils-debian/trunk/patches/003_audio_conf.patch
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/patches/003_audio_conf.patch	2008-06-24 09:11:54 UTC (rev 15677)
+++ projects/connectivity/bluez-utils-debian/trunk/patches/003_audio_conf.patch	2008-06-24 09:15:42 UTC (rev 15678)
@@ -1,30 +0,0 @@
---- audio/audio.conf.orig	2008-05-27 08:51:41.000000000 +0000
-+++ audio/audio.conf	2008-05-27 08:52:22.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=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)
-@@ -21,7 +21,7 @@
- 
- # Set to true to support HFP (in addition to HSP only which is the default)
- # Defaults to false
--HFP=false
-+HFP=true
- 
- # HFP Gateway features
- # Defaults to false

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

Deleted: projects/connectivity/bluez-utils-debian/trunk/patches/004_linkkeys.patch
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/patches/004_linkkeys.patch	2008-06-24 09:11:54 UTC (rev 15677)
+++ projects/connectivity/bluez-utils-debian/trunk/patches/004_linkkeys.patch	2008-06-24 09:15:42 UTC (rev 15678)
@@ -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/004_no_sdp_cache.patch (from rev 15676, projects/connectivity/bluez-utils-debian/trunk/patches/005_no_sdp_cache.patch)

Deleted: projects/connectivity/bluez-utils-debian/trunk/patches/005_no_sdp_cache.patch
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/patches/005_no_sdp_cache.patch	2008-06-24 09:11:54 UTC (rev 15677)
+++ projects/connectivity/bluez-utils-debian/trunk/patches/005_no_sdp_cache.patch	2008-06-24 09:15:42 UTC (rev 15678)
@@ -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)