Fix patches for OBS

diff --git a/packaging/bluez.changes b/packaging/bluez.changes
index 91239ec..0a07cac 100644 (file)
--- a/packaging/bluez.changes
+++ b/packaging/bluez.changes
@@ -1,2 +1,5 @@
+* Tue May  8 02:02:43 UTC 2012 - tracy.graydon@intel.com
+- Fix patches for OBS 
+
 * Fri May 04 2012 Lin Yang <lin.a.yang@intel.com> - 4.98
 - test release infrastructure

diff --git a/patches/Add_BtIOMode_enum.patch b/patches/Add_BtIOMode_enum.patch
deleted file mode 100644 (file)
index 2e04c58..0000000
--- a/patches/Add_BtIOMode_enum.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit c2452f3d4577ee8d0adcc47811412dc1d1e30ccb
-Author: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-Date:   Thu Feb 2 13:57:05 2012 -0800
-
-    btio: Add BtIOMode enum to be used with BT_IO_OPT_MODE
-
-diff --git a/btio/btio.h b/btio/btio.h
-index 126d5d9..429e8c0 100644
---- a/btio/btio.h
-+++ b/btio/btio.h
-@@ -77,6 +77,14 @@ typedef enum {
-       BT_IO_SEC_HIGH,
- } BtIOSecLevel;
- 
-+typedef enum {
-+      BT_IO_MODE_BASIC = 0,
-+      BT_IO_MODE_RETRANS,
-+      BT_IO_MODE_FLOWCTL,
-+      BT_IO_MODE_ERTM,
-+      BT_IO_MODE_STREAMING
-+} BtIOMode;
-+
- typedef void (*BtIOConfirm)(GIOChannel *io, gpointer user_data);
- 
- typedef void (*BtIOConnect)(GIOChannel *io, GError *err, gpointer user_data);

diff --git a/patches/Add_KeySize_info_to_the_security_info.patch b/patches/Add_KeySize_info_to_the_security_info.patch
deleted file mode 100644 (file)
index 6af822b..0000000
--- a/patches/Add_KeySize_info_to_the_security_info.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit faa7b5c70b287f1398d4853e263d519dfbf2da5c
-Author: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
-Date:   Tue Jan 24 10:57:18 2012 -0300
-
-    lib: Add Key Size information to the security information
-    
-    Since some time the kernel has the capability to return the length of
-    the key that was used to encrypt the link.
-    
-    This patch exposes that field to userspace so more applications can take
-    decisions based on this information.
-
-diff --git a/lib/bluetooth.h b/lib/bluetooth.h
-index 5bd4f03..1dee6df 100644
---- a/lib/bluetooth.h
-+++ b/lib/bluetooth.h
-@@ -63,6 +63,7 @@ extern "C" {
- #define BT_SECURITY   4
- struct bt_security {
-       uint8_t level;
-+      uint8_t key_size;
- };
- #define BT_SECURITY_SDP               0
- #define BT_SECURITY_LOW               1

diff --git a/patches/Add_L2ERTM_type.patch b/patches/Add_L2ERTM_type.patch
deleted file mode 100644 (file)
index f1cd979..0000000
--- a/patches/Add_L2ERTM_type.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-commit 11dbefe49d06185e4c7248715d58c6550cd399da
-Author: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-Date:   Tue Jan 31 17:25:34 2012 -0800
-
-    btio: Add L2ERTM type
-    
-    L2ERTM type uses L2CAP socket in SOCK_STREAM instead of SOCK_SEQPACKET
-
-diff --git a/btio/btio.c b/btio/btio.c
-index 825907d..9781ec4 100644
---- a/btio/btio.c
-+++ b/btio/btio.c
-@@ -1161,6 +1161,7 @@ static gboolean get_valist(GIOChannel *io, BtIOType type, GError **err,
-       switch (type) {
-       case BT_IO_L2RAW:
-       case BT_IO_L2CAP:
-+      case BT_IO_L2ERTM:
-               return l2cap_get(sock, err, opt1, args);
-       case BT_IO_RFCOMM:
-               return rfcomm_get(sock, err, opt1, args);
-@@ -1223,6 +1224,7 @@ gboolean bt_io_set(GIOChannel *io, BtIOType type, GError **err,
-       switch (type) {
-       case BT_IO_L2RAW:
-       case BT_IO_L2CAP:
-+      case BT_IO_L2ERTM:
-               return l2cap_set(sock, opts.sec_level, opts.imtu, opts.omtu,
-                               opts.mode, opts.master, opts.flushable,
-                               opts.priority, err);
-@@ -1283,6 +1285,20 @@ static GIOChannel *create_io(BtIOType type, gboolean server,
-                               opts->priority, err))
-                       goto failed;
-               break;
-+      case BT_IO_L2ERTM:
-+              sock = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_L2CAP);
-+              if (sock < 0) {
-+                      ERROR_FAILED(err, "socket(STREAM, L2CAP)", errno);
-+                      return NULL;
-+              }
-+              if (l2cap_bind(sock, &opts->src, server ? opts->psm : 0,
-+                                                      opts->cid, err) < 0)
-+                      goto failed;
-+              if (!l2cap_set(sock, opts->sec_level, opts->imtu, opts->omtu,
-+                              opts->mode, opts->master, opts->flushable,
-+                              opts->priority, err))
-+                      goto failed;
-+              break;
-       case BT_IO_RFCOMM:
-               sock = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
-               if (sock < 0) {
-@@ -1353,6 +1369,7 @@ GIOChannel *bt_io_connect(BtIOType type, BtIOConnect connect,
-               err = l2cap_connect(sock, &opts.dst, 0, opts.cid);
-               break;
-       case BT_IO_L2CAP:
-+      case BT_IO_L2ERTM:
-               err = l2cap_connect(sock, &opts.dst, opts.psm, opts.cid);
-               break;
-       case BT_IO_RFCOMM:
-diff --git a/btio/btio.h b/btio/btio.h
-index 7e3e130..126d5d9 100644
---- a/btio/btio.h
-+++ b/btio/btio.h
-@@ -40,6 +40,7 @@ GQuark bt_io_error_quark(void);
- typedef enum {
-       BT_IO_L2RAW,
-       BT_IO_L2CAP,
-+      BT_IO_L2ERTM,
-       BT_IO_RFCOMM,
-       BT_IO_SCO,
- } BtIOType;

diff --git a/patches/Add_support_for_getting_KeySize.patch b/patches/Add_support_for_getting_KeySize.patch
deleted file mode 100644 (file)
index ad2e63a..0000000
--- a/patches/Add_support_for_getting_KeySize.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-commit 51886914ef77f6c7331347a5e023cf8cde65629c
-Author: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
-Date:   Tue Jan 24 10:57:19 2012 -0300
-
-    btio: Add support for getting the Encryption Key Size via btio
-    
-    Some profiles specify some restriction depending on the length
-    of the key used to encrypt the link, this adds an way to retrieve
-    that value from the kernel.
-
-diff --git a/btio/btio.c b/btio/btio.c
-index a45a9cc..77ddb1d 100644
---- a/btio/btio.c
-+++ b/btio/btio.c
-@@ -511,6 +511,21 @@ static int set_priority(int sock, uint32_t prio)
-       return 0;
- }
- 
-+static gboolean get_key_size(int sock, int *size, GError **err)
-+{
-+      struct bt_security sec;
-+      socklen_t len;
-+
-+      memset(&sec, 0, sizeof(sec));
-+      len = sizeof(sec);
-+      if (getsockopt(sock, SOL_BLUETOOTH, BT_SECURITY, &sec, &len) == 0) {
-+              *size = sec.key_size;
-+              return TRUE;
-+      }
-+
-+      return FALSE;
-+}
-+
- static gboolean l2cap_set(int sock, int sec_level, uint16_t imtu,
-                               uint16_t omtu, uint8_t mode, int master,
-                               int flushable, uint32_t priority, GError **err)
-@@ -875,6 +890,10 @@ static gboolean l2cap_get(int sock, GError **err, BtIOOption opt1,
-                                               va_arg(args, int *), err))
-                               return FALSE;
-                       break;
-+              case BT_IO_OPT_KEY_SIZE:
-+                      if (!get_key_size(sock, va_arg(args, int *), err))
-+                              return FALSE;
-+                      break;
-               case BT_IO_OPT_PSM:
-                       *(va_arg(args, uint16_t *)) = src.l2_psm ?
-                                       btohs(src.l2_psm) : btohs(dst.l2_psm);
-diff --git a/btio/btio.h b/btio/btio.h
-index ae55b61..7e3e130 100644
---- a/btio/btio.h
-+++ b/btio/btio.h
-@@ -52,6 +52,7 @@ typedef enum {
-       BT_IO_OPT_DEST_BDADDR,
-       BT_IO_OPT_DEFER_TIMEOUT,
-       BT_IO_OPT_SEC_LEVEL,
-+      BT_IO_OPT_KEY_SIZE,
-       BT_IO_OPT_CHANNEL,
-       BT_IO_OPT_SOURCE_CHANNEL,
-       BT_IO_OPT_DEST_CHANNEL,

diff --git a/patches/Remove_default_security_level.patch b/patches/Remove_default_security_level.patch
deleted file mode 100644 (file)
index 7c115aa..0000000
--- a/patches/Remove_default_security_level.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 1e4c7d437913f142d498d20fd44cd0eb214f5d41
-Author: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
-Date:   Tue Jan 24 10:57:22 2012 -0300
-
-    btio: Remove the default security level from btio
-    
-    The default value of sec_level when setting *any* option
-    using bt_io_set() was BT_SECURITY_MEDIUM. This was causing
-    the security procedure being started in some situations that
-    it should not.
-
-diff --git a/btio/btio.c b/btio/btio.c
-index 77ddb1d..825907d 100644
---- a/btio/btio.c
-+++ b/btio/btio.c
-@@ -695,7 +695,6 @@ static gboolean parse_set_opts(struct set_opts *opts, GError **err,
-       /* Set defaults */
-       opts->defer = DEFAULT_DEFER_TIMEOUT;
-       opts->master = -1;
--      opts->sec_level = BT_IO_SEC_MEDIUM;
-       opts->mode = L2CAP_MODE_BASIC;
-       opts->flushable = -1;
-       opts->priority = 0;

diff --git a/patches/Remove_support_for_hciX_addr.patch b/patches/Remove_support_for_hciX_addr.patch
deleted file mode 100644 (file)
index 49efc32..0000000
--- a/patches/Remove_support_for_hciX_addr.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 1d7a0c6997c94a09087a7fc6c509db9f0a18db8c
-Author: Marcel Holtmann <marcel@holtmann.org>
-Date:   Tue Jan 17 11:47:59 2012 +0100
-
-    btio: Remove support for hciX source addresses
-
-diff --git a/btio/btio.c b/btio/btio.c
-index 0d177a3..a45a9cc 100644
---- a/btio/btio.c
-+++ b/btio/btio.c
-@@ -33,8 +33,6 @@
- #include <bluetooth/l2cap.h>
- #include <bluetooth/rfcomm.h>
- #include <bluetooth/sco.h>
--#include <bluetooth/hci.h>
--#include <bluetooth/hci_lib.h>
- 
- #include <glib.h>
- 
-@@ -691,10 +689,7 @@ static gboolean parse_set_opts(struct set_opts *opts, GError **err,
-               switch (opt) {
-               case BT_IO_OPT_SOURCE:
-                       str = va_arg(args, const char *);
--                      if (strncasecmp(str, "hci", 3) == 0)
--                              hci_devba(atoi(str + 3), &opts->src);
--                      else
--                              str2ba(str, &opts->src);
-+                      str2ba(str, &opts->src);
-                       break;
-               case BT_IO_OPT_SOURCE_BDADDR:
-                       bacpy(&opts->src, va_arg(args, const bdaddr_t *));

diff --git a/patches/audio_conf.patch b/patches/audio_conf.patch
deleted file mode 100644 (file)
index c8fb1bf..0000000
--- a/patches/audio_conf.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- bluez-4.98_bak/audio/audio.conf    2012-02-21 17:04:03.000000000 +0800
-+++ bluez-4.98/audio/audio.conf        2012-03-27 12:36:02.200516529 +0800
-@@ -3,56 +3,4 @@
- # This section contains options which are not specific to any
- # particular interface
- [General]
--
--# Switch to master role for incoming connections (defaults to true)
--#Master=true
--
--# If we want to disable support for specific services
--# Defaults to supporting all implemented services
--#Disable=Control,Source
--
--#ifdef __TIZEN_PATCH__
--Enable=Socket
--#endif
--
--# SCO routing. Either PCM or HCI (in which case audio is routed to/from ALSA)
--#ifdef __TIZEN_PATCH__
--SCORouting=PCM
--#else
--# Defaults to HCI
--#SCORouting=PCM
--#endif
--
--# Automatically connect both A2DP and HFP/HSP profiles for incoming
--# connections. Some headsets that support both profiles will only connect the
--# other one automatically so the default setting of true is usually a good
--# idea.
--#AutoConnect=true
--
--# Headset interface specific options (i.e. options which affect how the audio
--# service interacts with remote headset devices)
--[Headset]
--
--# Set to true to support HFP, false means only HSP is supported
--# Defaults to true
--HFP=true
--
--# Maximum number of connected HSP/HFP devices per adapter. Defaults to 1
--MaxConnected=1
--
--# Set to true to enable use of fast connectable mode (faster page scanning)
--# for HFP when incomming call starts. Default settings are restored after
--# call is answered or rejected. Page scan interval is much shorter and page
--# scan type changed to interlaced. Such allows faster connection initiated
--# by a headset.
--FastConnectable=false
--
--# Just an example of potential config options for the other interfaces
--#ifdef __TIZEN_PATCH__
--[A2DP]
--SBCSources=1
--#else
--#[A2DP]
--#SBCSources=1
--#MPEG12Sources=0
--#endif
-+Enable=Gateway,Socket
---- bluez-4.98_bak/Makefile.am 2012-02-21 17:04:03.000000000 +0800
-+++ bluez-4.98/Makefile.am     2012-03-27 12:36:47.960512742 +0800
-@@ -331,6 +331,7 @@
- 
- if DATAFILES
- conf_DATA += src/main.conf
-+conf_DATA += audio/audio.conf
- endif
- 
- EXTRA_DIST += src/genbuiltin src/bluetooth.conf \

diff --git a/patches/bluetooth_conf.patch b/patches/bluetooth_conf.patch
deleted file mode 100644 (file)
index 05a7944..0000000
--- a/patches/bluetooth_conf.patch
+++ /dev/null
@@ -1,225 +0,0 @@
-diff -Nur bluez-4.98/src/bluetooth.conf bluez-4.98-new/src/bluetooth.conf
---- bluez-4.98/src/bluetooth.conf      2012-02-21 01:04:03.000000000 -0800
-+++ bluez-4.98-new/src/bluetooth.conf  2012-03-29 06:08:59.676857623 -0700
-@@ -1,104 +1,117 @@
--<?xml version="1.0"?><!--*-nxml-*-->
--
--<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
--
--<busconfig>
--      <policy user="root">
--              <allow own="org.projectx.bluetooth"/>
--              <allow send_interface="org.projectx.bluetooth"/>
--              <allow send_destination="org.projectx.bluetooth"/>
--              <allow own="org.bluez.frwk_agent"/>
--              <allow send_interface="org.bluez.frwk_agent"/>
--              <allow send_destination="org.bluez.frwk_agent"/>
--              <allow own="org.bluez.Agent"/>
--              <allow send_interface="org.bluez.Agent"/>
--              <allow send_destination="org.bluez.Agent"/>
--              <allow own="org.bluez.Adapter"/>
--              <allow send_interface="org.bluez.Adapter"/>
--              <allow send_destination="org.bluez.Adapter"/>
--              <allow own="org.bluez.Manager"/>
--              <allow send_interface="org.bluez.Manager"/>
--              <allow send_destination="org.bluez.Manager"/>
--              <allow own="org.bluez.Device"/>
--              <allow send_interface="org.bluez.Device"/>
--              <allow send_destination="org.bluez.Device"/>
--              <allow own="org.bluez.Serial"/>
--              <allow send_interface="org.bluez.Serial"/>
--              <allow send_destination="org.bluez.Serial"/>
--              <allow own="org.bluez.SerialProxyManager"/>
--              <allow send_interface="org.bluez.SerialProxyManager"/>
--              <allow send_destination="org.bluez.SerialProxyManager"/>
--              <allow own="org.bluez.SerialProxy"/>
--              <allow send_interface="org.bluez.SerialProxy"/>
--              <allow send_destination="org.bluez.SerialProxy"/>
--              <allow own="org.bluez.NetworkServer"/>
--              <allow send_interface="org.bluez.NetworkServer"/>
--              <allow send_destination="org.bluez.NetworkServer"/>
--              <allow own="org.bluez.Network"/>
--              <allow send_interface="org.bluez.Network"/>
--              <allow send_destination="org.bluez.Network"/>
--              <allow own="org.bluez.AudioSink"/>
--              <allow send_interface="org.bluez.AudioSink"/>
--              <allow send_destination="org.bluez.AudioSink"/>
--              <allow own="org.bluez.Input"/>
--              <allow send_interface="org.bluez.Input"/>
--              <allow send_destination="org.bluez.Input"/>
--      </policy>
--      <policy group="bt_use">
--              <allow send_interface="org.projectx.bluetooth"/>
--              <allow send_destination="org.projectx.bluetooth"/>
--              <allow send_interface="org.bluez.frwk_agent"/>
--              <allow send_destination="org.bluez.frwk_agent"/>
--              <allow send_interface="org.bluez.Agent"/>
--              <allow send_destination="org.bluez.Agent"/>
--              <allow send_interface="org.bluez.Adapter"/>
--              <allow send_destination="org.bluez.Adapter"/>
--              <allow send_interface="org.bluez.Manager"/>
--              <allow send_destination="org.bluez.Manager"/>
--              <allow send_interface="org.bluez.Device"/>
--              <allow send_destination="org.bluez.Device"/>
--              <allow send_interface="org.bluez.Serial"/>
--              <allow send_destination="org.bluez.Serial"/>
--              <allow send_interface="org.bluez.SerialProxyManager"/>
--              <allow send_destination="org.bluez.SerialProxyManager"/>
--              <allow send_interface="org.bluez.SerialProxy"/>
--              <allow send_destination="org.bluez.SerialProxy"/>
--              <allow send_interface="org.bluez.NetworkServer"/>
--              <allow send_destination="org.bluez.NetworkServer"/>
--              <allow send_interface="org.bluez.Network"/>
--              <allow send_destination="org.bluez.Network"/>
--              <allow send_interface="org.bluez.AudioSink"/>
--              <allow send_destination="org.bluez.AudioSink"/>
--              <allow send_interface="org.bluez.Input"/>
--              <allow send_destination="org.bluez.Input"/>
--      </policy>
--      <policy context="default">
--              <deny send_interface="org.projectx.bluetooth"/>
--              <deny send_destination="org.projectx.bluetooth"/>
--              <deny send_interface="org.bluez.frwk_agent"/>
--              <deny send_destination="org.bluez.frwk_agent"/>
--              <deny send_interface="org.bluez.Agent"/>
--              <deny send_destination="org.bluez.Agent"/>
--              <deny send_interface="org.bluez.Adapter"/>
--              <deny send_destination="org.bluez.Adapter"/>
--              <deny send_interface="org.bluez.Manager"/>
--              <deny send_destination="org.bluez.Manager"/>
--              <deny send_interface="org.bluez.Device"/>
--              <deny send_destination="org.bluez.Device"/>
--              <deny send_interface="org.bluez.Serial"/>
--              <deny send_destination="org.bluez.Serial"/>
--              <deny send_interface="org.bluez.SerialProxyManager"/>
--              <deny send_destination="org.bluez.SerialProxyManager"/>
--              <deny send_interface="org.bluez.SerialProxy"/>
--              <deny send_destination="org.bluez.SerialProxy"/>
--              <deny send_interface="org.bluez.NetworkServer"/>
--              <deny send_destination="org.bluez.NetworkServer"/>
--              <deny send_interface="org.bluez.Network"/>
--              <deny send_destination="org.bluez.Network"/>
--              <deny send_interface="org.bluez.AudioSink"/>
--              <deny send_destination="org.bluez.AudioSink"/>
--              <deny send_interface="org.bluez.Input"/>
--              <deny send_destination="org.bluez.Input"/>
--      </policy>
--</busconfig>
-+<?xml version="1.0"?><!--*-nxml-*-->\r
-+\r
-+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"\r
-+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">\r
-+\r
-+<busconfig>\r
-+      <policy user="root">\r
-+              <allow own="org.bluez"/>\r
-+              <allow send_destination="org.bluez"/>\r
-+              <allow send_interface="org.bluez.Agent"/>\r
-+              <allow send_interface="org.bluez.HandsfreeAgent"/>\r
-+              <allow send_interface="org.bluez.MediaEndpoint"/>\r
-+              <allow send_interface="org.bluez.MediaPlayer"/>\r
-+              <allow send_interface="org.bluez.Watcher"/>\r
-+              <allow send_interface="org.bluez.ThermometerWatcher"/>\r
-+              <allow own="org.projectx.bluetooth"/>\r
-+              <allow send_interface="org.projectx.bluetooth"/>\r
-+              <allow send_destination="org.projectx.bluetooth"/>\r
-+              <allow own="org.bluez.frwk_agent"/>\r
-+              <allow send_interface="org.bluez.frwk_agent"/>\r
-+              <allow send_destination="org.bluez.frwk_agent"/>\r
-+              <allow own="org.bluez.Agent"/>\r
-+              <allow send_interface="org.bluez.Agent"/>\r
-+              <allow send_destination="org.bluez.Agent"/>\r
-+              <allow own="org.bluez.Adapter"/>\r
-+              <allow send_interface="org.bluez.Adapter"/>\r
-+              <allow send_destination="org.bluez.Adapter"/>\r
-+              <allow own="org.bluez.Manager"/>\r
-+              <allow send_interface="org.bluez.Manager"/>\r
-+              <allow send_destination="org.bluez.Manager"/>\r
-+              <allow own="org.bluez.Device"/>\r
-+              <allow send_interface="org.bluez.Device"/>\r
-+              <allow send_destination="org.bluez.Device"/>\r
-+              <allow own="org.bluez.Serial"/>\r
-+              <allow send_interface="org.bluez.Serial"/>\r
-+              <allow send_destination="org.bluez.Serial"/>\r
-+              <allow own="org.bluez.SerialProxyManager"/>\r
-+              <allow send_interface="org.bluez.SerialProxyManager"/>\r
-+              <allow send_destination="org.bluez.SerialProxyManager"/>\r
-+              <allow own="org.bluez.SerialProxy"/>\r
-+              <allow send_interface="org.bluez.SerialProxy"/>\r
-+              <allow send_destination="org.bluez.SerialProxy"/>\r
-+              <allow own="org.bluez.NetworkServer"/>\r
-+              <allow send_interface="org.bluez.NetworkServer"/>\r
-+              <allow send_destination="org.bluez.NetworkServer"/>\r
-+              <allow own="org.bluez.Network"/>\r
-+              <allow send_interface="org.bluez.Network"/>\r
-+              <allow send_destination="org.bluez.Network"/>\r
-+              <allow own="org.bluez.AudioSink"/>\r
-+              <allow send_interface="org.bluez.AudioSink"/>\r
-+              <allow send_destination="org.bluez.AudioSink"/>\r
-+              <allow own="org.bluez.Input"/>\r
-+              <allow send_interface="org.bluez.Input"/>\r
-+              <allow send_destination="org.bluez.Input"/>\r
-+      </policy>\r
-+      <policy group="bt_use">\r
-+              <allow send_destination="org.bluez"/>\r
-+              <allow send_interface="org.projectx.bluetooth"/>\r
-+              <allow send_destination="org.projectx.bluetooth"/>\r
-+              <allow send_interface="org.bluez.frwk_agent"/>\r
-+              <allow send_destination="org.bluez.frwk_agent"/>\r
-+              <allow send_interface="org.bluez.Agent"/>\r
-+              <allow send_destination="org.bluez.Agent"/>\r
-+              <allow send_interface="org.bluez.Adapter"/>\r
-+              <allow send_destination="org.bluez.Adapter"/>\r
-+              <allow send_interface="org.bluez.Manager"/>\r
-+              <allow send_destination="org.bluez.Manager"/>\r
-+              <allow send_interface="org.bluez.Device"/>\r
-+              <allow send_destination="org.bluez.Device"/>\r
-+              <allow send_interface="org.bluez.Serial"/>\r
-+              <allow send_destination="org.bluez.Serial"/>\r
-+              <allow send_interface="org.bluez.SerialProxyManager"/>\r
-+              <allow send_destination="org.bluez.SerialProxyManager"/>\r
-+              <allow send_interface="org.bluez.SerialProxy"/>\r
-+              <allow send_destination="org.bluez.SerialProxy"/>\r
-+              <allow send_interface="org.bluez.NetworkServer"/>\r
-+              <allow send_destination="org.bluez.NetworkServer"/>\r
-+              <allow send_interface="org.bluez.Network"/>\r
-+              <allow send_destination="org.bluez.Network"/>\r
-+              <allow send_interface="org.bluez.AudioSink"/>\r
-+              <allow send_destination="org.bluez.AudioSink"/>\r
-+              <allow send_interface="org.bluez.Input"/>\r
-+              <allow send_destination="org.bluez.Input"/>\r
-+      </policy>\r
-+      <policy context="default">\r
-+              <deny send_destination="org.bluez"/>\r
-+              <deny send_interface="org.projectx.bluetooth"/>\r
-+              <deny send_destination="org.projectx.bluetooth"/>\r
-+              <deny send_interface="org.bluez.frwk_agent"/>\r
-+              <deny send_destination="org.bluez.frwk_agent"/>\r
-+              <deny send_interface="org.bluez.Agent"/>\r
-+              <deny send_destination="org.bluez.Agent"/>\r
-+              <deny send_interface="org.bluez.Adapter"/>\r
-+              <deny send_destination="org.bluez.Adapter"/>\r
-+              <deny send_interface="org.bluez.Manager"/>\r
-+              <deny send_destination="org.bluez.Manager"/>\r
-+              <deny send_interface="org.bluez.Device"/>\r
-+              <deny send_destination="org.bluez.Device"/>\r
-+              <deny send_interface="org.bluez.Serial"/>\r
-+              <deny send_destination="org.bluez.Serial"/>\r
-+              <deny send_interface="org.bluez.SerialProxyManager"/>\r
-+              <deny send_destination="org.bluez.SerialProxyManager"/>\r
-+              <deny send_interface="org.bluez.SerialProxy"/>\r
-+              <deny send_destination="org.bluez.SerialProxy"/>\r
-+              <deny send_interface="org.bluez.NetworkServer"/>\r
-+              <deny send_destination="org.bluez.NetworkServer"/>\r
-+              <deny send_interface="org.bluez.Network"/>\r
-+              <deny send_destination="org.bluez.Network"/>\r
-+              <deny send_interface="org.bluez.AudioSink"/>\r
-+              <deny send_destination="org.bluez.AudioSink"/>\r
-+              <deny send_interface="org.bluez.Input"/>\r
-+              <deny send_destination="org.bluez.Input"/>\r
-+      </policy>\r
-+      <policy user="pulse">\r
-+              <allow send_destination="org.bluez"/>\r
-+      </policy>\r
-+</busconfig>\r

diff --git a/patches/install-more-binary-test.patch b/patches/install-more-binary-test.patch
deleted file mode 100644 (file)
index 6a982e7..0000000
--- a/patches/install-more-binary-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- old/Makefile.tools 2011-07-11 15:24:40.506542027 +0800
-+++ new/Makefile.tools 2011-07-11 15:26:50.141636589 +0800
-@@ -151,7 +151,7 @@
- 
- bin_PROGRAMS += test/l2test test/rctest
- 
--noinst_PROGRAMS += test/gaptest test/sdptest test/scotest \
-+bin_PROGRAMS += test/gaptest test/sdptest test/scotest \
-                       test/attest test/hstest test/avtest test/ipctest \
-                                       test/lmptest test/bdaddr test/agent \
-                                       test/btiotest test/test-textfile \

diff --git a/patches/install-test-scripts.patch b/patches/install-test-scripts.patch
deleted file mode 100644 (file)
index a3cad7b..0000000
--- a/patches/install-test-scripts.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- old/Makefile.am    2011-07-11 14:58:11.468606842 +0800
-+++ new/Makefile.am    2011-07-11 15:21:42.593537802 +0800
-@@ -367,6 +367,30 @@
- EXTRA_DIST += scripts/bluetooth.rules \
-               scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules
- 
-+test_scripts = test/apitest \
-+      test/hsplay \
-+      test/hsmicro \
-+      test/list-devices \
-+      test/monitor-bluetooth \
-+      test/simple-agent \
-+      test/simple-service \
-+      test/test-adapter \
-+      test/test-audio \
-+      test/test-device \
-+      test/test-discovery \
-+      test/test-input \
-+      test/test-manager \
-+      test/test-network \
-+      test/test-serial \
-+      test/test-service \
-+      test/test-telephony
-+
-+
-+if TEST
-+testdir = ${pkglibdir}/test
-+test_SCRIPTS = ${test_scripts}
-+endif
-+
- EXTRA_DIST += doc/manager-api.txt \
-               doc/adapter-api.txt doc/device-api.txt \
-               doc/service-api.txt doc/agent-api.txt doc/attribute-api.txt \

diff --git a/patches/main_conf.patch b/patches/main_conf.patch
deleted file mode 100644 (file)
index 60bd76e..0000000
--- a/patches/main_conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- bluez-4.98/src/main.conf   2012-02-21 17:04:03.000000000 +0800
-+++ main.conf  2012-03-28 11:32:56.237679092 +0800
-@@ -10,11 +10,7 @@
- 
- # Default device class. Only the major and minor device class bits are
- # considered.
--#ifdef __TIZEN_PATCH__
--Class = 0x00020C        # Smart phone
--#else
--#Class = 0x000100
--#endif
-+Class = 0x000100
- 
- # How long to stay in discoverable mode before going back to non-discoverable
- # The value is in seconds. Default is 180, i.e. 3 minutes.