Gentoo Archives: gentoo-commits

From: "Tiziano Mueller (dev-zero)" <dev-zero@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-wireless/bluez/files/4.18: conf.d-hidd cups-location.patch bluetooth-init.d bluetooth-conf.d init.d-hidd
Date: Fri, 28 Nov 2008 21:21:38
Message-Id: E1L6AmN-0007Fz-P1@stork.gentoo.org
1 dev-zero 08/11/28 21:21:35
2
3 Added: conf.d-hidd cups-location.patch bluetooth-init.d
4 bluetooth-conf.d init.d-hidd
5 Log:
6 Initial commit, keeping the keywords the same as for bluez-libs/-utils since it's mostly the same. Most patches are taken from bluez-libs/-utils. (bug #236357)
7 (Portage version: 2.2_rc16/cvs/Linux 2.6.27.5 x86_64)
8
9 Revision Changes Path
10 1.1 net-wireless/bluez/files/4.18/conf.d-hidd
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/bluez/files/4.18/conf.d-hidd?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/bluez/files/4.18/conf.d-hidd?rev=1.1&content-type=text/plain
14
15 Index: conf.d-hidd
16 ===================================================================
17 # Bluetooth hidd daemon configuraton file
18
19 # Arguments to hidd
20 HIDD_OPTIONS="--encrypt"
21
22
23
24
25 1.1 net-wireless/bluez/files/4.18/cups-location.patch
26
27 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/bluez/files/4.18/cups-location.patch?rev=1.1&view=markup
28 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/bluez/files/4.18/cups-location.patch?rev=1.1&content-type=text/plain
29
30 Index: cups-location.patch
31 ===================================================================
32 ? cups/.deps
33 ? cups/Makefile
34 ? cups/Makefile.in
35 Index: cups/Makefile.am
36 ===================================================================
37 RCS file: /cvsroot/bluez/utils/cups/Makefile.am,v
38 retrieving revision 1.9
39 diff -u -r1.9 Makefile.am
40 --- cups/Makefile.am 20 Aug 2006 02:21:03 -0000 1.9
41 +++ cups/Makefile.am 1 Jun 2007 15:47:14 -0000
42 @@ -1,6 +1,6 @@
43
44 if CUPS
45 -cupsdir = $(libdir)/cups/backend
46 +cupsdir = `cups-config --serverbin`/backend
47
48 cups_PROGRAMS = bluetooth
49 else
50
51
52
53 1.1 net-wireless/bluez/files/4.18/bluetooth-init.d
54
55 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/bluez/files/4.18/bluetooth-init.d?rev=1.1&view=markup
56 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/bluez/files/4.18/bluetooth-init.d?rev=1.1&content-type=text/plain
57
58 Index: bluetooth-init.d
59 ===================================================================
60 #!/sbin/runscript
61 # Copyright 1999-2008 Gentoo Foundation
62 # Distributed under the terms of the GNU General Public License v2
63 # $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/4.18/bluetooth-init.d,v 1.1 2008/11/28 21:21:35 dev-zero Exp $
64
65 depend() {
66 after coldplug
67 need dbus localmount
68 }
69
70 start() {
71 ebegin "Starting Bluetooth"
72 local result=0
73
74 ebegin " Starting bluetoothd"
75 # -s enables internal sdp server
76 start-stop-daemon --start \
77 --exec /usr/sbin/bluetoothd
78 result=$?
79 eend ${result}
80
81 if [ "${HID2HCI_ENABLE}" = "true" -a -x /usr/sbin/hid2hci ]; then
82 ebegin " Running hid2hci"
83 /usr/sbin/hid2hci --tohci -q #be quiet
84 [ ${result} == 0 ] && result=$?
85 eend ${result}
86 fi
87
88 if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then
89 if [ -f "${RFCOMM_CONFIG}" ]; then
90 ebegin " Starting rfcomm"
91 /usr/bin/rfcomm -f "${RFCOMM_CONFIG}" bind all
92 [ ${result} == 0 ] && result=$?
93 eend ${result}
94 else
95 ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists"
96 fi
97 fi
98
99 eend ${result}
100 }
101
102 stop() {
103 ebegin "Shutting down Bluetooth"
104
105 start-stop-daemon --stop --quiet --exec /usr/sbin/bluetoothd
106 eend $?
107 }
108
109
110
111 1.1 net-wireless/bluez/files/4.18/bluetooth-conf.d
112
113 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/bluez/files/4.18/bluetooth-conf.d?rev=1.1&view=markup
114 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/bluez/files/4.18/bluetooth-conf.d?rev=1.1&content-type=text/plain
115
116 Index: bluetooth-conf.d
117 ===================================================================
118 # Bluetooth configuraton file
119
120 # Run hid2hci (allowed values are "true" and "false")
121 HID2HCI_ENABLE=false
122
123 # Bind rfcomm devices (allowed values are "true" and "false")
124 RFCOMM_ENABLE=true
125
126 # Config file for rfcomm
127 RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
128
129
130
131 1.1 net-wireless/bluez/files/4.18/init.d-hidd
132
133 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/bluez/files/4.18/init.d-hidd?rev=1.1&view=markup
134 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/bluez/files/4.18/init.d-hidd?rev=1.1&content-type=text/plain
135
136 Index: init.d-hidd
137 ===================================================================
138 #!/sbin/runscript
139 # Copyright 1999-2007 Gentoo Foundation
140 # Distributed under the terms of the GNU General Public License v2
141 # $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/4.18/init.d-hidd,v 1.1 2008/11/28 21:21:35 dev-zero Exp $
142
143 depend() {
144 need bluetooth
145 }
146
147 start() {
148 ebegin "Starting hidd"
149 start-stop-daemon --start --quiet \
150 --exec /usr/bin/hidd -- ${HIDD_OPTIONS} --server
151 local result="$?"
152 local service="/etc/bluetooth/input.service"
153 if [ "${result}" != "0" ] && grep -q "Autostart=true" ${service}; then
154 eerror "You have Autostart=true in ${service}."
155 eerror "Change this to false if you want to use hidd."
156 fi
157 eend ${result}
158 }
159
160 stop() {
161 ebegin "Stopping hidd"
162 hidd --killall
163 start-stop-daemon --stop --quiet --exec /usr/bin/hidd
164 eend $?
165 }