import clean BK tree at cset 1.3670

18 files changed, 341 insertions, 2 deletions

diff --git a/packages/bluez-utils/.mtn2git_empty b/packages/bluez-utils/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bluez-utils/.mtn2git_empty
diff --git a/packages/bluez-utils/bluez-utils-dbus/.mtn2git_empty b/packages/bluez-utils/bluez-utils-dbus/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bluez-utils/bluez-utils-dbus/.mtn2git_empty
diff --git a/packages/bluez-utils/bluez-utils-dbus/dbus.patch b/packages/bluez-utils/bluez-utils-dbus/dbus.patch
index e69de29bb2..ecab56b7b4 100644
--- a/packages/bluez-utils/bluez-utils-dbus/dbus.patch
+++ b/packages/bluez-utils/bluez-utils-dbus/dbus.patch
@@ -0,0 +1,52 @@
+--- bluez-utils-2.10/acinclude.m4.old	2004-10-19 22:34:47.000000000 +0100
++++ bluez-utils-2.10/acinclude.m4	2004-10-19 22:50:47.000000000 +0100
+@@ -124,45 +124,14 @@
+ ])
+ 
+ AC_DEFUN([AC_PATH_DBUS], [
+-	dbus_prefix=${prefix}
+-
+-	AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus=DIR], [D-BUS library is installed in DIR]), [
+-		if (test "${withval}" != "yes"); then
+-			dbus_prefix=${withval}
+-		fi
+-	])
+-
+-	ac_save_CPPFLAGS=$CPPFLAGS
+-	ac_save_LDFLAGS=$LDFLAGS
+-
+-	DBUS_CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE"
+-	test -d "${dbus_prefix}/include/dbus-1.0" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/include/dbus-1.0"
+-	if (test "${prefix}" = "${bluez_prefix}"); then
+-		test -d "${libdir}/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${libdir}/dbus-1.0/include"
+-	else
+-		test -d "${dbus_prefix}/lib64/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib64/dbus-1.0/include"
+-		test -d "${dbus_prefix}/lib/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib/dbus-1.0/include"
+-	fi
+-
++	if pkg-config --exists dbus-1; then
++	dbus_found=yes ; DBUS_CFLAGS="`pkg-config --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
++	DBUS_LIBS="`pkg-config --libs dbus-1`"
+ 	CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS"
+-	AC_CHECK_HEADER(dbus/dbus.h, dbus_found=yes, dbus_found=no)
+-
+-	DBUS_LIBS=""
+-	if (test "${prefix}" = "${dbus_prefix}"); then
+-		test -d "${libdir}" && DBUS_LIBS="$DBUS_LIBS -L${libdir}"
+-	else
+-		test -d "${dbus_prefix}/lib64" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib64"
+-		test -d "${dbus_prefix}/lib" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib"
+-	fi
+-
+ 	LDFLAGS="$LDFLAGS $DBUS_LIBS"
+-	AC_CHECK_LIB(dbus-1, dbus_error_init, DBUS_LIBS="$DBUS_LIBS -ldbus-1", dbus_found=no)
+-
+-	CPPFLAGS=$ac_save_CPPFLAGS
+-	LDFLAGS=$ac_save_LDFLAGS
+-
+ 	AC_SUBST(DBUS_CFLAGS)
+ 	AC_SUBST(DBUS_LIBS)
++	fi
+ ])
+ 
+ AC_DEFUN([AC_ARG_BLUEZ], [
diff --git a/packages/bluez-utils/bluez-utils-dbus/hcid.conf b/packages/bluez-utils/bluez-utils-dbus/hcid.conf
index e69de29bb2..ab3ca2aaee 100644
--- a/packages/bluez-utils/bluez-utils-dbus/hcid.conf
+++ b/packages/bluez-utils/bluez-utils-dbus/hcid.conf
@@ -0,0 +1,72 @@
+#
+# HCI daemon configuration file.
+#
+# $Id: hcid.conf,v 1.4 2004/04/29 20:14:21 holtmann Exp $
+#
+
+# HCId options
+options {
+	# Automatically initialize new devices
+	autoinit yes;
+
+	# Security Manager mode
+	#   none - Security manager disabled
+	#   auto - Use local PIN for incoming connections
+	#   user - Always ask user for a PIN
+	#
+	security auto;
+
+	# Pairing mode
+	#   none  - Pairing disabled
+	#   multi - Allow pairing with already paired devices
+	#   once  - Pair once and deny successive attempts
+	pairing multi;
+
+	# PIN helper
+	# pin_helper /usr/bin/bluepin;
+
+	# D-Bus PIN helper
+	dbus_pin_helper;
+}
+
+# Default settings for HCI devices
+device {
+	# Local device name
+	#   %d - device id
+	#   %h - host name
+	name "%h";
+
+	# Local device class
+	class 0x120112;
+
+	# Default packet type
+	#pkt_type DH1,DM1,HV1;
+
+	# Inquiry and Page scan
+	iscan enable; pscan enable;
+
+	# Default link mode
+	#   none   - no specific policy 
+	#   accept - always accept incoming connections
+	#   master - become master on incoming connections,
+	#            deny role switch on outgoing connections
+	#
+	#lm accept,master;
+	#
+	lm accept;
+
+	# Default link policy
+	#   none    - no specific policy
+	#   rswitch - allow role switch
+	#   hold    - allow hold mode
+	#   sniff   - allow sniff mode
+	#   park    - allow park mode
+	#
+	#lp hold,sniff;
+	#
+	lp rswitch,hold,sniff,park;
+
+	# Authentication and Encryption
+	#auth enable;
+	encrypt enable;
+}
diff --git a/packages/bluez-utils/bluez-utils-dbus/smash.patch b/packages/bluez-utils/bluez-utils-dbus/smash.patch
index e69de29bb2..55cdbb7284 100644
--- a/packages/bluez-utils/bluez-utils-dbus/smash.patch
+++ b/packages/bluez-utils/bluez-utils-dbus/smash.patch
@@ -0,0 +1,11 @@
+--- bluez-utils-2.11/hcid/dbus.c.old	2004-12-31 16:35:12.000000000 +0000
++++ bluez-utils-2.11/hcid/dbus.c	2004-12-31 16:39:58.000000000 +0000
+@@ -89,6 +89,8 @@
+ 
+ 	memset(&pr, 0, sizeof(pr));
+ 	bacpy(&pr.bdaddr, &req->bda);
++	if (len > sizeof (pr.pin_code))
++		goto error;
+ 	memcpy(pr.pin_code, pin, len);
+ 	pr.pin_len = len;
+ 	hci_send_cmd(req->dev, OGF_LINK_CTL, OCF_PIN_CODE_REPLY,
diff --git a/packages/bluez-utils/bluez-utils-dbus_2.16.bb b/packages/bluez-utils/bluez-utils-dbus_2.16.bb
index e69de29bb2..f405cd5133 100644
--- a/packages/bluez-utils/bluez-utils-dbus_2.16.bb
+++ b/packages/bluez-utils/bluez-utils-dbus_2.16.bb
@@ -0,0 +1,5 @@
+include bluez-utils-common_${PV}.inc
+DEPENDS += "dbus"
+SRC_URI += "file://dbus.patch;patch=1 file://smash.patch;patch=1"
+EXTRA_OECONF += "--with-dbus"
+
diff --git a/packages/bluez-utils/bluez-utils-nodbus_2.16.bb b/packages/bluez-utils/bluez-utils-nodbus_2.16.bb
index e69de29bb2..6334a4a499 100644
--- a/packages/bluez-utils/bluez-utils-nodbus_2.16.bb
+++ b/packages/bluez-utils/bluez-utils-nodbus_2.16.bb
@@ -0,0 +1,4 @@
+include bluez-utils-common_${PV}.inc
+
+EXTRA_OECONF += "--without-dbus"
+
diff --git a/packages/bluez-utils/files/.mtn2git_empty b/packages/bluez-utils/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bluez-utils/files/.mtn2git_empty
diff --git a/packages/bluez-utils/files/blueboxes.patch b/packages/bluez-utils/files/blueboxes.patch
index e69de29bb2..c429b06c06 100644
--- a/packages/bluez-utils/files/blueboxes.patch
+++ b/packages/bluez-utils/files/blueboxes.patch
@@ -0,0 +1,18 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- bluez-utils-2.14/pcmcia/bluetooth.conf~base
++++ bluez-utils-2.14/pcmcia/bluetooth.conf
+@@ -26,6 +26,10 @@
+   version "Brain Boxes", "Bluetooth PC Card"
+   bind "serial_cs" class "bluetooth"
+ 
++card "F+ Bluetooth_Card, BCSP"
++  manfid 0x0160, 0xaba0
++  bind "serial_cs" class "bluetooth"
++
+ card "IBM Bluetooth PC Card II"
+   version "IBM", "Bluetooth PC Card II"
+   bind "serial_cs" class "bluetooth"
diff --git a/packages/bluez-utils/files/bluetooth.conf b/packages/bluez-utils/files/bluetooth.conf
index e69de29bb2..bae8fae08e 100644
--- a/packages/bluez-utils/files/bluetooth.conf
+++ b/packages/bluez-utils/files/bluetooth.conf
@@ -0,0 +1,11 @@
+#
+# additional cards for /etc/pcmcia/bluetooth.conf
+# Note for OE: This file is _appended_ to the stock
+# bluetooth.conf in bluez-utils, so no need to duplicate
+# entries for individual cards.
+#
+card "CSR BT01x0M Bluetooth CF Card"
+  version "Bluetooth BT0100M", "", ""
+  bind "serial_cs" class "bluetooth"
+
+
diff --git a/packages/bluez-utils/files/bluetooth.default b/packages/bluez-utils/files/bluetooth.default
index e69de29bb2..4817d38c60 100644
--- a/packages/bluez-utils/files/bluetooth.default
+++ b/packages/bluez-utils/files/bluetooth.default
@@ -0,0 +1,37 @@
+# Bluetooth configuraton file
+
+# Start of hcid (allowed values are "true" and "false")
+HCID_ENABLE=true
+
+# Config file for hcid
+HCID_CONFIG="/etc/bluetooth/hcid.conf"
+
+# Start sdpd (allowed values are "true" and "false")
+SDPD_ENABLE=true
+
+# Start hidd (allowed values are "true" and "false")
+HIDD_ENABLE=true
+
+# Arguments to hidd
+HIDD_OPTIONS=""
+
+# Run hid2hci (allowed values are "true" and "false")
+HID2HCI_ENABLE=true
+
+# Bind rfcomm devices (allowed values are "true" and "false")
+RFCOMM_ENABLE=true
+
+# Config file for rfcomm
+RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
+
+# Start dund (allowed values are "true" and "false")
+DUND_ENABLE=false
+
+# Arguments to dund
+DUND_OPTIONS="--listen --persist"
+
+# Start pand (allowed values are "true" and "false")
+PAND_ENABLE=false
+
+# Arguments to pand
+PAND_OPTIONS="--listen --role NAP"
diff --git a/packages/bluez-utils/files/default-manfid-0x0-to-bcps.patch b/packages/bluez-utils/files/default-manfid-0x0-to-bcps.patch
index e69de29bb2..3d993543b3 100644
--- a/packages/bluez-utils/files/default-manfid-0x0-to-bcps.patch
+++ b/packages/bluez-utils/files/default-manfid-0x0-to-bcps.patch
@@ -0,0 +1,22 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- bluez-utils-2.16/tools/hciattach.c~default-manfid-0x0-to-bcps
++++ bluez-utils-2.16/tools/hciattach.c
+@@ -796,13 +796,12 @@
+ }
+ 
+ struct uart_t uart[] = {
++        { "bcsp",       0x0000, 0x0000, HCI_UART_BCSP, 115200, 115200, 0,        bcsp     },
+ 	{ "any",        0x0000, 0x0000, HCI_UART_H4,   115200, 115200, FLOW_CTL, NULL     },
+ 	{ "ericsson",   0x0000, 0x0000, HCI_UART_H4,   57600,  115200, FLOW_CTL, ericsson },
+ 	{ "digi",       0x0000, 0x0000, HCI_UART_H4,   9600,   115200, FLOW_CTL, digi     },
+ 	{ "texas",      0x0000, 0x0000, HCI_UART_H4,   115200, 115200, FLOW_CTL, texas    },
+ 
+-	{ "bcsp",       0x0000, 0x0000, HCI_UART_BCSP, 115200, 115200, 0,        bcsp     },
+-
+ 	/* Xircom PCMCIA cards: Credit Card Adapter and Real Port Adapter */
+ 	{ "xircom",     0x0105, 0x080a, HCI_UART_H4,   115200, 115200, FLOW_CTL, NULL     },
+ 
diff --git a/packages/bluez-utils/files/hcid.conf b/packages/bluez-utils/files/hcid.conf
index 547602d4a9..44e9c46fb0 100644
--- a/packages/bluez-utils/files/hcid.conf
+++ b/packages/bluez-utils/files/hcid.conf
@@ -1,7 +1,7 @@
 #
 # HCI daemon configuration file.
 #
-# $Id$
+# $Id: hcid.conf,v 1.4 2004/04/29 20:14:21 holtmann Exp $
 #
 
 # HCId options
diff --git a/packages/bluez-utils/files/openmn/.mtn2git_empty b/packages/bluez-utils/files/openmn/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bluez-utils/files/openmn/.mtn2git_empty
diff --git a/packages/bluez-utils/files/openmn/bluetooth.default b/packages/bluez-utils/files/openmn/bluetooth.default
index e69de29bb2..06c52d7960 100644
--- a/packages/bluez-utils/files/openmn/bluetooth.default
+++ b/packages/bluez-utils/files/openmn/bluetooth.default
@@ -0,0 +1,37 @@
+# Bluetooth configuraton file
+
+# Start of hcid (allowed values are "true" and "false")
+HCID_ENABLE=true
+
+# Config file for hcid
+HCID_CONFIG="/etc/bluetooth/hcid.conf"
+
+# Start sdpd (allowed values are "true" and "false")
+SDPD_ENABLE=false
+
+# Start hidd (allowed values are "true" and "false")
+HIDD_ENABLE=false
+
+# Arguments to hidd
+HIDD_OPTIONS=""
+
+# Run hid2hci (allowed values are "true" and "false")
+HID2HCI_ENABLE=false
+
+# Bind rfcomm devices (allowed values are "true" and "false")
+RFCOMM_ENABLE=false
+
+# Config file for rfcomm
+RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
+
+# Start dund (allowed values are "true" and "false")
+DUND_ENABLE=false
+
+# Arguments to dund
+DUND_OPTIONS="--listen --persist"
+
+# Start pand (allowed values are "true" and "false")
+PAND_ENABLE=false
+
+# Arguments to pand
+PAND_OPTIONS="--listen --role NAP"
diff --git a/packages/bluez-utils/files/openmn/hcid.conf b/packages/bluez-utils/files/openmn/hcid.conf
index e69de29bb2..46a5d5fd54 100644
--- a/packages/bluez-utils/files/openmn/hcid.conf
+++ b/packages/bluez-utils/files/openmn/hcid.conf
@@ -0,0 +1,70 @@
+#
+# HCI daemon configuration file.
+#
+# $Id: hcid.conf,v 1.4 2004/04/29 20:14:21 holtmann Exp $
+#
+
+# HCId options
+options {
+	# Automatically initialize new devices
+	autoinit yes;
+
+	# Security Manager mode
+	#   none - Security manager disabled
+	#   auto - Use local PIN for incoming connections
+	#   user - Always ask user for a PIN
+	#
+	security auto;
+
+	# Pairing mode
+	#   none  - Pairing disabled
+	#   multi - Allow pairing with already paired devices
+	#   once  - Pair once and deny successive attempts
+	pairing multi;
+
+	# PIN helper
+	# pin_helper /bin/bluepin;
+
+	# D-Bus PIN helper
+	# dbus_pin_helper;
+}
+
+# Default settings for HCI devices
+device {
+	# Local device name
+	#   %d - device id
+	#   %h - host name
+	name "%h";
+
+	# Local device class
+	class 0x820100;
+
+	# Default packet type
+	#pkt_type DH1,DM1,HV1;
+
+	# Inquiry and Page scan
+	iscan enable; pscan enable;
+
+	# Default link mode
+	#   none   - no specific policy 
+	#   accept - always accept incoming connections
+	#   master - become master on incoming connections,
+	#            deny role switch on outgoing connections
+	#
+	lm accept,master;
+
+	# Default link policy
+	#   none    - no specific policy
+	#   rswitch - allow role switch
+	#   hold    - allow hold mode
+	#   sniff   - allow sniff mode
+	#   park    - allow park mode
+	#
+	#lp hold,sniff;
+	#
+	lp rswitch,hold,sniff,park;
+
+	# Authentication and Encryption
+	auth enable;
+	encrypt enable;
+}
diff --git a/packages/bluez-utils/files/openslug/.mtn2git_empty b/packages/bluez-utils/files/openslug/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bluez-utils/files/openslug/.mtn2git_empty
diff --git a/packages/bluez-utils/files/openslug/hcid.conf b/packages/bluez-utils/files/openslug/hcid.conf
index 21cf44a699..46a5d5fd54 100644
--- a/packages/bluez-utils/files/openslug/hcid.conf
+++ b/packages/bluez-utils/files/openslug/hcid.conf
@@ -1,7 +1,7 @@
 #
 # HCI daemon configuration file.
 #
-# $Id$
+# $Id: hcid.conf,v 1.4 2004/04/29 20:14:21 holtmann Exp $
 #
 
 # HCId options