Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/
Date: Fri, 14 Sep 2018 21:43:59
Message-Id: 1536961419.7bb29d39a859f037992da6f485f3171adf17315e.pacho@gentoo
1 commit: 7bb29d39a859f037992da6f485f3171adf17315e
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 14 21:43:39 2018 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 14 21:43:39 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb29d39
7
8 net-wireless/bluez: Drop obsolete files (#664044 by iamnr3)
9
10 Package-Manager: Portage-2.3.43, Repoman-2.3.10
11
12 .../0002-autopair-Don-t-handle-the-iCade.patch | 47 ----------------------
13 net-wireless/bluez/files/rfcomm-init.d-r2 | 34 ----------------
14 2 files changed, 81 deletions(-)
15
16 diff --git a/net-wireless/bluez/files/0002-autopair-Don-t-handle-the-iCade.patch b/net-wireless/bluez/files/0002-autopair-Don-t-handle-the-iCade.patch
17 deleted file mode 100644
18 index 68751ae7b60..00000000000
19 --- a/net-wireless/bluez/files/0002-autopair-Don-t-handle-the-iCade.patch
20 +++ /dev/null
21 @@ -1,47 +0,0 @@
22 -From c16ae7041c7511d8d1ed8441f696716fa6a9117e Mon Sep 17 00:00:00 2001
23 -From: Bastien Nocera <hadess@××××××.net>
24 -Date: Tue, 19 Nov 2013 14:11:39 +0100
25 -Subject: [PATCH 2/5] autopair: Don't handle the iCade
26 -
27 -We can't easily enter digits other than 1 through 4 (inclusive)
28 -so leave it up to the agent to figure out a good passcode
29 -for the iCade.
30 -
31 -Note that we can not use the VID/PID of the device, as it is not
32 -yet known at that point.
33 ----
34 - plugins/autopair.c | 12 +++++++++++-
35 - 1 file changed, 11 insertions(+), 1 deletion(-)
36 -
37 -diff --git a/plugins/autopair.c b/plugins/autopair.c
38 -index 8c98c12..5d2f6f7 100644
39 ---- a/plugins/autopair.c
40 -+++ b/plugins/autopair.c
41 -@@ -57,13 +57,23 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter,
42 - {
43 - char addr[18];
44 - char pinstr[7];
45 -+ char name[25];
46 - uint32_t class;
47 -
48 - ba2str(device_get_address(device), addr);
49 -
50 - class = btd_device_get_class(device);
51 -
52 -- DBG("device %s 0x%x", addr, class);
53 -+ device_get_name(device, name, sizeof(name));
54 -+ name[sizeof(name) - 1] = 0;
55 -+
56 -+ DBG("device %s (%s) 0x%x", addr, name, class);
57 -+
58 -+ g_message ("vendor 0x%X product: 0x%X", btd_device_get_vendor (device), btd_device_get_product (device));
59 -+
60 -+ /* The iCade shouldn't use random PINs like normal keyboards */
61 -+ if (name != NULL && strstr(name, "iCade") != NULL)
62 -+ return 0;
63 -
64 - /* This is a class-based pincode guesser. Ignore devices with an
65 - * unknown class.
66 ---
67 -1.8.4.2
68 -
69
70 diff --git a/net-wireless/bluez/files/rfcomm-init.d-r2 b/net-wireless/bluez/files/rfcomm-init.d-r2
71 deleted file mode 100644
72 index 3bfb010d60b..00000000000
73 --- a/net-wireless/bluez/files/rfcomm-init.d-r2
74 +++ /dev/null
75 @@ -1,34 +0,0 @@
76 -#!/sbin/openrc-run
77 -# Copyright 1999-2014 Gentoo Foundation
78 -# Distributed under the terms of the GNU General Public License v2
79 -
80 -depend() {
81 - need bluetooth
82 -}
83 -
84 -checkconfig() {
85 - if [ -z "${ADDRESS}" ]; then
86 - eerror "ADDRESS must be set"
87 - return 1
88 - fi
89 -
90 - return 0
91 -}
92 -
93 -start() {
94 - local DEVICE=${RC_SVCNAME#*.}
95 -
96 - checkconfig || return 1
97 -
98 - ebegin "Starting ${RC_SVCNAME}"
99 - rfcomm bind "${DEVICE}" "${ADDRESS}" ${CHANNEL}
100 - eend $?
101 -}
102 -
103 -stop() {
104 - local DEVICE=${RC_SVCNAME#*.}
105 -
106 - ebegin "Shutting down ${RC_SVCNAME}"
107 - rfcomm release "${DEVICE}"
108 - eend $?
109 -}