d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move all bluetooth related config files out of etc

Browse Source 
This helps with pkgbase by switching to CONFS so they are properly tagged as
config files.

Approved by:	will (mentor)
Differential Revision:	https://reviews.freebsd.org/D16833
This commit is contained in:
Brad Davis 2018-08-21 19:28:53 +00:00
parent cdba33f23c
commit c8e7055577
11 changed files with 13 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/Makefile
View File

@ -141,9 +141,6 @@ distribution:
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

9
etc/bluetooth/Makefile
View File

@ -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>

56
etc/bluetooth/hcsecd.conf
View File

@ -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;
}

4
etc/defaults/Makefile
View File

@ -5,8 +5,4 @@
FILES= devfs.rules
FILESDIR= /etc/defaults
.if ${MK_BLUETOOTH} != "no"
FILES+= bluetooth.device.conf
.endif
.include <bsd.prog.mk>

3
lib/libbluetooth/Makefile
View File

@ -2,6 +2,9 @@
# $FreeBSD$
PACKAGE= lib${LIB}
CONFS= hosts protocols
CONFSDIR= /etc/bluetooth
CONFSMODE_protocols= 444
LIB= bluetooth
MAN= bluetooth.3

0
etc/bluetooth/hosts → lib/libbluetooth/hosts
View File

0
etc/bluetooth/protocols → lib/libbluetooth/protocols
View File

2
usr.sbin/bluetooth/hccontrol/Makefile
View File

@ -1,6 +1,8 @@
# $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\

0
etc/defaults/bluetooth.device.conf → usr.sbin/bluetooth/hccontrol/bluetooth.device.conf
View File

2
usr.sbin/bluetooth/hcsecd/Makefile
View File

@ -1,6 +1,8 @@
# $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

20
usr.sbin/bluetooth/hcsecd/hcsecd.conf
View File

@ -1,5 +1,4 @@
#
# $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
@ -25,14 +24,14 @@
# 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;
@ -42,15 +41,8 @@ device {
}
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";
}