Index: head/etc/bluetooth/protocols
===================================================================
--- head/etc/bluetooth/protocols	(revision 338154)
+++ head/etc/bluetooth/protocols	(nonexistent)
@@ -1,22 +0,0 @@
-# $Id: protocols,v 1.2 2003/05/21 22:17:14 max Exp $
-# $FreeBSD$
-#
-# Bluetooth Protocol/Service Multiplexor (PSM) names and numbers
-#
-# See also
-# https://www.bluetooth.org/foundry/assignnumb/document/assigned_numbers
-#
-# Protocol       PSM Alias         Reference
-
-sdp              1   SDP           # Service Discovery Protocol
-rfcomm           3   RFCOMM        # RFCOMM with TS 07.10
-tcs-bin          5   TCS-BIN       # Telephony Control Specification
-tcs-bin-cordless 7   TCS-BIN-CORDLESS # Telephony Control Specification
-bnep             15  BNEP          # Bluetooth Network Encapsulation Protocol
-hid-control      17  HID-Control   # Human Interface Device (control)
-hid-interrupt    19  HID-Interrupt # Human Interface Device (interrupt)
-upnp             21  UPnP          # See ESDP, Bluetooth SIG
-avctp            23  AVCTP         # Audio/Video Control Transport Protocol
-avdtp            25  AVDTP         # Audio/Video Distribution Transport Protocol
-udi-c-plane      29  UDI-C-Plane   # Unrestricted Digital Information Profile
-

Property changes on: head/etc/bluetooth/protocols
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/etc/bluetooth/hosts
===================================================================
--- head/etc/bluetooth/hosts	(revision 338154)
+++ head/etc/bluetooth/hosts	(nonexistent)
@@ -1,10 +0,0 @@
-# $Id: hosts,v 1.1 2003/05/21 17:48:40 max Exp $
-# $FreeBSD$
-#
-# Bluetooth Host Database
-#
-# This file should contain the Bluetooth addresses and aliases for hosts.
-#
-# BD_ADDR               Name [ alias0 alias1 ... ]
-
-# 00:11:22:33:44:55	phone

Property changes on: head/etc/bluetooth/hosts
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/etc/bluetooth/Makefile
===================================================================
--- head/etc/bluetooth/Makefile	(revision 338154)
+++ head/etc/bluetooth/Makefile	(nonexistent)
@@ -1,9 +0,0 @@
-# $Id: Makefile,v 1.2 2003/10/21 22:22:27 max Exp $
-# $FreeBSD$
-
-FILESDIR=		/etc/bluetooth
-FILES=			hcsecd.conf hosts protocols
-FILESMODE_hcsecd.conf=	600
-FILESMODE_hosts=	644
-
-.include <bsd.prog.mk>

Property changes on: head/etc/bluetooth/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/etc/bluetooth/hcsecd.conf
===================================================================
--- head/etc/bluetooth/hcsecd.conf	(revision 338154)
+++ head/etc/bluetooth/hcsecd.conf	(nonexistent)
@@ -1,56 +0,0 @@
-# $Id: hcsecd.conf,v 1.1 2003/05/26 22:50:47 max Exp $
-# $FreeBSD$
-#
-# HCI security daemon configuration file
-#
-# Format:
-#
-# device {
-#	option	value ;
-# }
-#
-# Possible options and values
-#
-# Options	Values
-# ----------------------------------
-# bdaddr	xx:xx:xx:xx:xx:xx ;  	- remote device BD_ADDR
-# name 		"any char" ;		- to set user friendly device name
-# key		0x11223344 | nokey ;	- to set link key for the device
-# pin		"secret" | nopin ;	- to PIN code for the device
-#
-# Notes:
-#
-#	Currently there is no way to select keys/PIN code based on which
-#	local device received the request. Everything is based on remote
-#	device BD_ADDR.
-#
-#	"nokey"	means that no link key has been defined and we should
-#		send Link_Key_Negative_Reply command to the device.
-#
-#	"nopin"	means that no PIN code has been defined and we should
-#		send PIN_Code_Negative_Reply command to the device
-#
-
-# Default entry is applied if no better match found
-# It MUST have 00:00:00:00:00:00 as bdaddr
-device {
-	bdaddr	00:00:00:00:00:00;
-	name	"Default entry";
-	key	nokey;
-	pin	nopin;
-}
-
-device {
-	bdaddr	00:01:02:03:04:05;
-	name	"Dummy";
-	key	nokey;
-	pin	"0000";
-}
-
-device {
-	bdaddr	00:11:22:33:44:55;
-	name	"Dummy";
-	key	0x00112233445566778899aabbccddeeff; # 16 bytes key (hex string)
-	pin	nopin;
-}
-

Property changes on: head/etc/bluetooth/hcsecd.conf
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/etc/Makefile
===================================================================
--- head/etc/Makefile	(revision 338154)
+++ head/etc/Makefile	(revision 338155)
@@ -1,310 +1,307 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 FILESGROUPS=	FILES
 
 # No need as it is empty and just causes rebuilds since this file does so much.
 UPDATE_DEPENDFILE=	no
 
 .if ${MK_SENDMAIL} != "no"
 SUBDIR+=sendmail
 .endif
 
 BIN1=	crontab \
 	devfs.conf \
 	dhclient.conf \
 	disktab \
 	fbtab \
 	gettytab \
 	group \
 	hosts \
 	hosts.allow \
 	hosts.equiv \
 	libalias.conf \
 	libmap.conf \
 	login.access \
 	login.conf \
 	mac.conf \
 	motd \
 	netconfig \
 	networks \
 	nsswitch.conf \
 	phones \
 	protocols \
 	rc.bsdextended \
 	rc.firewall \
 	remote \
 	rpc \
 	services \
 	termcap.small
 
 .if exists(${.CURDIR}/etc.${MACHINE}/ttys)
 BIN1+=	etc.${MACHINE}/ttys
 .elif exists(${.CURDIR}/etc.${MACHINE_ARCH}/ttys)
 BIN1+=	etc.${MACHINE_ARCH}/ttys
 .elif exists(${.CURDIR}/etc.${MACHINE_CPUARCH}/ttys)
 BIN1+=	etc.${MACHINE_CPUARCH}/ttys
 .else
 .error etc.MACHINE/ttys missing
 .endif
 
 # NB: keep these sorted by MK_* knobs
 
 .if ${MK_AMD} != "no"
 BIN1+= amd.map
 .endif
 
 .if ${MK_LOCATE} != "no"
 BIN1+=	${SRCTOP}/usr.bin/locate/locate/locate.rc
 .endif
 
 .if ${MK_LPR} != "no"
 BIN1+=	hosts.lpd printcap
 .endif
 
 .if ${MK_MAIL} != "no"
 BIN1+=	${SRCTOP}/usr.bin/mail/misc/mail.rc
 .endif
 
 .if ${MK_OPENSSL} != "no"
 SSL=	${SRCTOP}/crypto/openssl/apps/openssl.cnf
 .endif
 
 .if ${MK_SENDMAIL} != "no"
 BIN1+=	rc.sendmail
 .endif
 
 .if ${MK_WIRELESS} != "no"
 BIN1+= regdomain.xml
 .endif
 
 .if ${MK_SENDMAIL} == "no"
 ETCMAIL=mailer.conf aliases
 .else
 ETCMAIL=Makefile README mailer.conf access.sample virtusertable.sample \
 	mailertable.sample aliases
 .endif
 
 # Special top level files for FreeBSD
 FREEBSD=COPYRIGHT
 
 # Sanitize DESTDIR
 DESTDIR:=	${DESTDIR:C://*:/:g}
 
 afterinstall:
 .if ${MK_MAN} != "no"
 	${_+_}cd ${SRCTOP}/share/man; ${MAKE} makedb
 .endif
 
 distribute:
 	# Avoid installing tests here; "make distribution" will do this and
 	# correctly place them in the right location.
 	${_+_}cd ${.CURDIR} ; ${MAKE} MK_TESTS=no install \
 	    DESTDIR=${DISTDIR}/${DISTRIBUTION}
 	${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION}
 
 .include <bsd.endian.mk>
 
 .if defined(NO_ROOT)
 METALOG.add?=	cat -l >> ${METALOG}
 .endif
 
 distribution:
 .if !defined(DESTDIR)
 	@echo "set DESTDIR before running \"make ${.TARGET}\""
 	@false
 .endif
 	cd ${.CURDIR}; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		${BIN1} ${DESTDIR}/etc; \
 	    cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 		master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
 
 .if ${MK_SERVICESDB} != "no"
 	cd ${.CURDIR}; \
 	    services_mkdb ${CAP_MKDB_ENDIAN} -q -o ${DESTDIR}/var/db/services.db \
 		${DESTDIR}/etc/services;
 .endif
 
 .if ${MK_TCSH} == "no"
 	sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
 .endif
 	pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
 .if defined(NO_ROOT)
 	( \
 		echo "./etc/login.conf.db type=file mode=0644 uname=root gname=wheel"; \
 		echo "./etc/passwd type=file mode=0644 uname=root gname=wheel"; \
 		echo "./etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \
 		echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \
 		echo "./var/db/services.db type=file mode=0644 uname=root gname=wheel"; \
 	) | ${METALOG.add}
 .endif
-.if ${MK_BLUETOOTH} != "no"
-	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
-.endif
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
 	${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
 	${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
 	${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
 	${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
 .if ${MK_UNBOUND} != "no"
 	if [ ! -e ${DESTDIR}/etc/unbound ]; then \
 		${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \
 	fi
 .endif
 .if ${MK_SENDMAIL} != "no"
 	${_+_}cd ${.CURDIR}/sendmail; ${MAKE} distribution
 .endif
 .if ${MK_OPENSSL} != "no"
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${SSL} ${DESTDIR}/etc/ssl
 .endif
 .if ${MK_KERBEROS} != "no"
 	cd ${.CURDIR}/root; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		dot.k5login ${DESTDIR}/root/.k5login;
 .endif
 	cd ${.CURDIR}/root; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		dot.profile ${DESTDIR}/root/.profile; \
 	    rm -f ${DESTDIR}/.profile; \
 	    ${INSTALL_LINK} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
 .if ${MK_TCSH} != "no"
 	cd ${.CURDIR}/root; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		dot.cshrc ${DESTDIR}/root/.cshrc; \
 	    rm -f ${DESTDIR}/.cshrc; \
 	    ${INSTALL_LINK} ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc
 .endif
 
 .if ${MK_MAIL} != "no"
 	cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${ETCMAIL} ${DESTDIR}/etc/mail
 	if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \
 	      ! -f ${DESTDIR}/etc/aliases ]; then \
 		${INSTALL_SYMLINK} mail/aliases ${DESTDIR}/etc/aliases; \
 	fi
 .endif
 .if ${MK_LOCATE} != "no"
 	${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \
 	    ${DESTDIR}/var/db/locate.database
 .endif
 	cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${FREEBSD} ${DESTDIR}/
 .if ${MK_BOOT} != "no"
 .if exists(${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints)
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints \
 	    ${DESTDIR}/boot/device.hints
 .endif
 .endif
 .if ${MK_NIS} == "no"
 	sed -i "" -e 's/.*_compat:/# &/' -e 's/compat$$/files/' \
 		${DESTDIR}/etc/nsswitch.conf
 .endif
 
 MTREE_CMD?=	mtree
 
 MTREES=		mtree/BSD.root.dist		/		\
 		mtree/BSD.var.dist		/var		\
 		mtree/BSD.usr.dist		/usr		\
 		mtree/BSD.include.dist		/usr/include	\
 		mtree/BSD.debug.dist		/usr/lib
 .if ${MK_LIB32} != "no"
 MTREES+=	mtree/BSD.lib32.dist		/usr
 MTREES+=	mtree/BSD.lib32.dist		/usr/lib/debug/usr
 .endif
 .if ${MK_LIBSOFT} != "no"
 MTREES+=	mtree/BSD.libsoft.dist		/usr
 MTREES+=	mtree/BSD.libsoft.dist		/usr/lib/debug/usr
 .endif
 .if ${MK_TESTS} != "no"
 MTREES+=	mtree/BSD.tests.dist		${TESTSBASE}
 MTREES+=	mtree/BSD.tests.dist		/usr/lib/debug/${TESTSBASE}
 .endif
 .if ${MK_SENDMAIL} != "no"
 MTREES+=	mtree/BSD.sendmail.dist		/
 .endif
 .for mtree in ${LOCAL_MTREE}
 MTREES+=	../${mtree}			/
 .endfor
 
 # Clean up some directories that where mistakenly created as files that
 # should not have been as part of the nvi update in r281994.
 # This should be removed after 11.0-RELEASE.
 DISTRIB_CLEANUP_SHARE_FILES=	${SHAREDIR}/doc/usd/10.exref ${SHAREDIR}/doc/usd/11.edit
 DISTRIB_CLEANUP_SHARE_FILES+=	${SHAREDIR}/doc/usd/12.vi ${SHAREDIR}/doc/usd/13.viref
 distrib-cleanup: .PHONY
 	for file in ${DISTRIB_CLEANUP_SHARE_FILES}; do \
 		if [ -f ${DESTDIR}/$${file} ]; then \
 			rm -f ${DESTDIR}/$${file}; \
 		fi; \
 	done
 
 distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY
 	@set ${MTREES}; \
 	while test $$# -ge 2; do \
 		m=${.CURDIR}/$$1; \
 		shift; \
 		d=${DESTDIR}$$1; \
 		shift; \
 		test -d $$d || mkdir -p $$d; \
 		${ECHO} ${MTREE_CMD} -deU ${MTREE_FSCHG} \
 		    ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \
 		${MTREE_FILTER} $$m | \
 		${MTREE_CMD} -deU ${MTREE_FSCHG} ${MTREE_FOLLOWS_SYMLINKS} \
 		    -p $$d; \
 	done; true
 .if defined(NO_ROOT)
 	@set ${MTREES}; \
 	while test $$# -ge 2; do \
 		m=${.CURDIR}/$$1; \
 		shift; \
 		d=$$1; \
 		test "$$d" == "/" && d=""; \
 		d=${DISTBASE}$$d; \
 		shift; \
 		test -d ${DESTDIR}/$$d || mkdir -p ${DESTDIR}/$$d; \
 		${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K all | " \
 		    "sed s#^\.#.$$d# | ${METALOG.add}" ; \
 		${MTREE_FILTER} $$m | \
 		${MTREE_CMD:N-W} -C -K all | sed s#^\.#.$$d# | \
 		    ${METALOG.add} ; \
 	done; true
 .endif
 .if ${MK_NLS} != "no"
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
 	while [ $$# -gt 0 ] ; do \
 		${INSTALL_SYMLINK} "$$2" "${DESTDIR}${SHAREDIR}/nls/$$1"; \
 		shift; shift; \
 	done
 .endif
 
 etc-examples-install: ${META_DEPS}
 	cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${BIN1} ${BIN2} nsmb.conf opieaccess \
 	    ${DESTDIR}${SHAREDIR}/examples/etc
 
 etc-examples: etc-examples-install
 	${_+_}cd ${.CURDIR}/defaults; \
 	    ${MAKE} ${${MK_STAGING} == "yes":?all:install} \
 	    DESTDIR=${DESTDIR}${SHAREDIR}/examples
 
 .include <bsd.prog.mk>
 
 .if ${MK_INSTALL_AS_USER} == "yes" && ${_uid} != 0
 MTREE_FILTER= sed -e 's,\([gu]\)name=,\1id=,g' \
 	-e 's,\(uid=\)[^ ]* ,\1${_uid} ,' \
 	-e 's,\(gid=\)[^ ]* ,\1${_gid} ,' \
 	-e 's,\(uid=\)[^ ]*$$,\1${_uid},' \
 	-e 's,\(gid=\)[^ ]*$$,\1${_gid},'
 .else
 MTREE_FILTER= cat
 .if !defined(NO_FSCHG)
 MTREE_FSCHG=	-i
 .endif
 .endif
Index: head/etc/defaults/bluetooth.device.conf
===================================================================
--- head/etc/defaults/bluetooth.device.conf	(revision 338154)
+++ head/etc/defaults/bluetooth.device.conf	(nonexistent)
@@ -1,111 +0,0 @@
-# Copyright (c) 2005 Maksim Yevmenkin <m_evmenkin@yahoo.com>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-
-# The authentication_enable parameter controls if the device requires to
-# authenticate the remote device at connection setup. At connection setup,
-# only the devices with the authentication_enable parameter enabled will
-# try to authenticate the other device.
-#
-# Possible values:
-#
-# NO  or 0	authentication disabled (default);
-# YES or 1	authentication enabled.
-
-# authentication_enable="NO"
-
-# The class parameter is used to indicate the capabilities of the device to
-# other devices.
-#
-# For more details see "Assigned Numbers - Bluetooth Baseband" document
-#
-# Possible value:
-#
-# xx:xx:xx	where xx is a hex number
-
-# class="ff:01:0c"
-
-# The connectable parameter controls whether or not the device should
-# periodically scan for page attempts from other devices.
-#
-# Possible values:
-#
-# NO  or 0	do not scan for page attempts;
-# YES or 1	scan for page attempts (default).
-
-# connectable="YES"
-
-# The discoverable parameter controls whether or not the device should
-# periodically scan for inquiry requests from other devices.
-#
-# Possible values:
-#
-# NO  or 0	do not scan for inquiry requests;
-# YES or 1	scan for inquiry requests (default).
-
-# discoverable="NO"
-
-# The encryption_mode parameter controls if the device requires encryption
-# to the remote device at connection setup. At connection setup, only the
-# devices with the authentication_enable parameter enabled and encryption_mode
-# parameter enabled will try to encrypt the connection to the other device.
-#
-# Possible values:
-#
-# NONE or 0	encryption disabled (default);
-# P2P  or 1	encryption only for point-to-point packets;
-# ALL  or 2	encryption for both point-to-point and broadcast packets.
-
-# encryption_mode="NONE"
-
-# HCI node debug level. Higher values mean more verbose output.
-#
-# Possible values: 0 - 4
-
-# hci_debug_level="3"
-
-# L2CAP node debug level. Higher values mean more verbose output.
-#
-# Possible values: 0 - 4
-
-# l2cap_debug_level="3"
-
-# The local_name parameter provides the ability to modify the user friendly
-# name for the device.
-
-# local_name="My device"
-
-# The role_switch parameter controls whether the local device should perform
-# role switch. By default, if role switch is supported, the local device will
-# try to perform role switch and become Master on incoming connection. Some
-# devices do not support role switch and thus incoming connections from such
-# devices will fail. If role switch is disabled then accepting device will
-# remain Slave.
-#
-# NO  or 0	do not perform role switch;
-# YES or 1	perform role switch (default).
-
-# role_switch="YES"
-

Property changes on: head/etc/defaults/bluetooth.device.conf
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/etc/defaults/Makefile
===================================================================
--- head/etc/defaults/Makefile	(revision 338154)
+++ head/etc/defaults/Makefile	(revision 338155)
@@ -1,12 +1,8 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 FILES=	devfs.rules
 FILESDIR= /etc/defaults
 
-.if ${MK_BLUETOOTH} != "no"
-FILES+=	bluetooth.device.conf
-.endif
-
 .include <bsd.prog.mk>
Index: head/lib/libbluetooth/Makefile
===================================================================
--- head/lib/libbluetooth/Makefile	(revision 338154)
+++ head/lib/libbluetooth/Makefile	(revision 338155)
@@ -1,54 +1,57 @@
 # $Id: Makefile,v 1.5 2003/07/22 18:38:04 max Exp $
 # $FreeBSD$
 
 PACKAGE=	lib${LIB}
+CONFS=		hosts protocols
+CONFSDIR=	/etc/bluetooth
+CONFSMODE_protocols=	444
 LIB=		bluetooth
 MAN=		bluetooth.3
 
 WARNS?=		2
 CFLAGS+=	-I${.CURDIR} -I${SRCTOP}/sys
 
 SHLIB_MAJOR=	4
 
 SRCS=		bluetooth.c dev.c hci.c
 INCS=		bluetooth.h
 
 MLINKS+=	bluetooth.3 bt_gethostbyname.3
 MLINKS+=	bluetooth.3 bt_gethostbyaddr.3
 MLINKS+=	bluetooth.3 bt_gethostent.3
 MLINKS+=	bluetooth.3 bt_sethostent.3
 MLINKS+=	bluetooth.3 bt_endhostent.3
 
 MLINKS+=	bluetooth.3 bt_getprotobyname.3
 MLINKS+=	bluetooth.3 bt_getprotobynumber.3
 MLINKS+=	bluetooth.3 bt_getprotoent.3
 MLINKS+=	bluetooth.3 bt_setprotoent.3
 MLINKS+=	bluetooth.3 bt_endprotoent.3
 
 MLINKS+=	bluetooth.3 bt_ntoa.3
 MLINKS+=	bluetooth.3 bt_aton.3
 
 MLINKS+=	bluetooth.3 bt_devaddr.3
 MLINKS+=	bluetooth.3 bt_devname.3
 
 MLINKS+=	bluetooth.3 bt_devinfo.3
 MLINKS+=	bluetooth.3 bt_devenum.3
 
 MLINKS+=	bluetooth.3 bt_devopen.3
 MLINKS+=	bluetooth.3 bt_devclose.3
 MLINKS+=	bluetooth.3 bt_devsend.3
 MLINKS+=	bluetooth.3 bt_devreq.3
 MLINKS+=	bluetooth.3 bt_devfilter.3
 MLINKS+=	bluetooth.3 bt_devfilter_pkt_set.3
 MLINKS+=	bluetooth.3 bt_devfilter_pkt_clr.3
 MLINKS+=	bluetooth.3 bt_devfilter_pkt_tst.3
 MLINKS+=	bluetooth.3 bt_devfilter_evt_set.3
 MLINKS+=	bluetooth.3 bt_devfilter_evt_clr.3
 MLINKS+=	bluetooth.3 bt_devfilter_evt_tst.3
 MLINKS+=	bluetooth.3 bt_devinquiry.3
 
 MLINKS+=	bluetooth.3 bdaddr_same.3
 MLINKS+=	bluetooth.3 bdaddr_any.3
 MLINKS+=	bluetooth.3 bdaddr_copy.3
 
 .include <bsd.lib.mk>
Index: head/lib/libbluetooth/hosts
===================================================================
--- head/lib/libbluetooth/hosts	(nonexistent)
+++ head/lib/libbluetooth/hosts	(revision 338155)
@@ -0,0 +1,10 @@
+# $Id: hosts,v 1.1 2003/05/21 17:48:40 max Exp $
+# $FreeBSD$
+#
+# Bluetooth Host Database
+#
+# This file should contain the Bluetooth addresses and aliases for hosts.
+#
+# BD_ADDR               Name [ alias0 alias1 ... ]
+
+# 00:11:22:33:44:55	phone

Property changes on: head/lib/libbluetooth/hosts
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: head/lib/libbluetooth/protocols
===================================================================
--- head/lib/libbluetooth/protocols	(nonexistent)
+++ head/lib/libbluetooth/protocols	(revision 338155)
@@ -0,0 +1,22 @@
+# $Id: protocols,v 1.2 2003/05/21 22:17:14 max Exp $
+# $FreeBSD$
+#
+# Bluetooth Protocol/Service Multiplexor (PSM) names and numbers
+#
+# See also
+# https://www.bluetooth.org/foundry/assignnumb/document/assigned_numbers
+#
+# Protocol       PSM Alias         Reference
+
+sdp              1   SDP           # Service Discovery Protocol
+rfcomm           3   RFCOMM        # RFCOMM with TS 07.10
+tcs-bin          5   TCS-BIN       # Telephony Control Specification
+tcs-bin-cordless 7   TCS-BIN-CORDLESS # Telephony Control Specification
+bnep             15  BNEP          # Bluetooth Network Encapsulation Protocol
+hid-control      17  HID-Control   # Human Interface Device (control)
+hid-interrupt    19  HID-Interrupt # Human Interface Device (interrupt)
+upnp             21  UPnP          # See ESDP, Bluetooth SIG
+avctp            23  AVCTP         # Audio/Video Control Transport Protocol
+avdtp            25  AVDTP         # Audio/Video Distribution Transport Protocol
+udi-c-plane      29  UDI-C-Plane   # Unrestricted Digital Information Profile
+

Property changes on: head/lib/libbluetooth/protocols
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: head/usr.sbin/bluetooth/hccontrol/Makefile
===================================================================
--- head/usr.sbin/bluetooth/hccontrol/Makefile	(revision 338154)
+++ head/usr.sbin/bluetooth/hccontrol/Makefile	(revision 338155)
@@ -1,13 +1,15 @@
 # $Id: Makefile,v 1.7 2003/08/14 20:06:17 max Exp $
 # $FreeBSD$
 
+CONFS=		bluetooth.device.conf
+CONFSDIR=	/etc/defaults
 PROG=		hccontrol
 MAN=		hccontrol.8
 SRCS=		send_recv.c link_policy.c link_control.c le.c\
 		host_controller_baseband.c info.c status.c node.c hccontrol.c \
 		util.c
 WARNS?=		2
 
 LIBADD=		bluetooth
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/bluetooth/hccontrol/bluetooth.device.conf
===================================================================
--- head/usr.sbin/bluetooth/hccontrol/bluetooth.device.conf	(nonexistent)
+++ head/usr.sbin/bluetooth/hccontrol/bluetooth.device.conf	(revision 338155)
@@ -0,0 +1,111 @@
+# Copyright (c) 2005 Maksim Yevmenkin <m_evmenkin@yahoo.com>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+
+# The authentication_enable parameter controls if the device requires to
+# authenticate the remote device at connection setup. At connection setup,
+# only the devices with the authentication_enable parameter enabled will
+# try to authenticate the other device.
+#
+# Possible values:
+#
+# NO  or 0	authentication disabled (default);
+# YES or 1	authentication enabled.
+
+# authentication_enable="NO"
+
+# The class parameter is used to indicate the capabilities of the device to
+# other devices.
+#
+# For more details see "Assigned Numbers - Bluetooth Baseband" document
+#
+# Possible value:
+#
+# xx:xx:xx	where xx is a hex number
+
+# class="ff:01:0c"
+
+# The connectable parameter controls whether or not the device should
+# periodically scan for page attempts from other devices.
+#
+# Possible values:
+#
+# NO  or 0	do not scan for page attempts;
+# YES or 1	scan for page attempts (default).
+
+# connectable="YES"
+
+# The discoverable parameter controls whether or not the device should
+# periodically scan for inquiry requests from other devices.
+#
+# Possible values:
+#
+# NO  or 0	do not scan for inquiry requests;
+# YES or 1	scan for inquiry requests (default).
+
+# discoverable="NO"
+
+# The encryption_mode parameter controls if the device requires encryption
+# to the remote device at connection setup. At connection setup, only the
+# devices with the authentication_enable parameter enabled and encryption_mode
+# parameter enabled will try to encrypt the connection to the other device.
+#
+# Possible values:
+#
+# NONE or 0	encryption disabled (default);
+# P2P  or 1	encryption only for point-to-point packets;
+# ALL  or 2	encryption for both point-to-point and broadcast packets.
+
+# encryption_mode="NONE"
+
+# HCI node debug level. Higher values mean more verbose output.
+#
+# Possible values: 0 - 4
+
+# hci_debug_level="3"
+
+# L2CAP node debug level. Higher values mean more verbose output.
+#
+# Possible values: 0 - 4
+
+# l2cap_debug_level="3"
+
+# The local_name parameter provides the ability to modify the user friendly
+# name for the device.
+
+# local_name="My device"
+
+# The role_switch parameter controls whether the local device should perform
+# role switch. By default, if role switch is supported, the local device will
+# try to perform role switch and become Master on incoming connection. Some
+# devices do not support role switch and thus incoming connections from such
+# devices will fail. If role switch is disabled then accepting device will
+# remain Slave.
+#
+# NO  or 0	do not perform role switch;
+# YES or 1	perform role switch (default).
+
+# role_switch="YES"
+

Property changes on: head/usr.sbin/bluetooth/hccontrol/bluetooth.device.conf
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: head/usr.sbin/bluetooth/hcsecd/Makefile
===================================================================
--- head/usr.sbin/bluetooth/hcsecd/Makefile	(revision 338154)
+++ head/usr.sbin/bluetooth/hcsecd/Makefile	(revision 338155)
@@ -1,12 +1,14 @@
 # $Id: Makefile,v 1.8 2003/08/14 20:06:20 max Exp $
 # $FreeBSD$
 
+CONFS=		hcsecd.conf
+CONFSMODE_hcsecd.conf=	600
 PROG=		hcsecd
 MAN=		hcsecd.8 hcsecd.conf.5
 SRCS=		hcsecd.c lexer.l parser.y
 WARNS?=		2
 CFLAGS+=	-I${.CURDIR}
 
 LIBADD=		bluetooth
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/bluetooth/hcsecd/hcsecd.conf
===================================================================
--- head/usr.sbin/bluetooth/hcsecd/hcsecd.conf	(revision 338154)
+++ head/usr.sbin/bluetooth/hcsecd/hcsecd.conf	(revision 338155)
@@ -1,64 +1,56 @@
-#
-# $Id: hcsecd.conf,v 1.1 2002/11/24 20:22:39 max Exp $
+# $Id: hcsecd.conf,v 1.1 2003/05/26 22:50:47 max Exp $
 # $FreeBSD$
 #
 # HCI security daemon configuration file
 #
 # Format:
 #
 # device {
 #	option	value ;
 # }
 #
 # Possible options and values
 #
 # Options	Values
 # ----------------------------------
 # bdaddr	xx:xx:xx:xx:xx:xx ;  	- remote device BD_ADDR
 # name 		"any char" ;		- to set user friendly device name
 # key		0x11223344 | nokey ;	- to set link key for the device
 # pin		"secret" | nopin ;	- to PIN code for the device
 #
 # Notes:
 #
 #	Currently there is no way to select keys/PIN code based on which
 #	local device received the request. Everything is based on remote
 #	device BD_ADDR.
 #
-#	"nokey"	means that no link key has been defined and we should 
+#	"nokey"	means that no link key has been defined and we should
 #		send Link_Key_Negative_Reply command to the device.
 #
-#	"nopin"	means that no PIN code has been defined and we should 
+#	"nopin"	means that no PIN code has been defined and we should
 #		send PIN_Code_Negative_Reply command to the device
 #
 
-# Default entry applied if no better match found 
+# Default entry is applied if no better match found
 # It MUST have 00:00:00:00:00:00 as bdaddr
 device {
 	bdaddr	00:00:00:00:00:00;
 	name	"Default entry";
 	key	nokey;
 	pin	nopin;
 }
 
 device {
-	bdaddr	00:80:37:5e:4d:d4;
-	name	"Ericsson T68 phone";
-	key	nokey;
-	pin	"0000"; # PIN code (string up to 16 character)
-}
-
-device {
-	bdaddr	00:01:03:fc:6e:ec;
-	name	"3COM PCCARD";
+	bdaddr	00:01:02:03:04:05;
+	name	"Dummy";
 	key	nokey;
 	pin	"0000";
 }
 
 device {
 	bdaddr	00:11:22:33:44:55;
 	name	"Dummy";
 	key	0x00112233445566778899aabbccddeeff; # 16 bytes key (hex string)
 	pin	nopin;
 }