1
diff --git a/docs/metadata.yaml b/docs/metadata.yaml
2
index 73dacac..ff98af5 100644
3
--- a/docs/metadata.yaml
4
+++ b/docs/metadata.yaml
5
@@ -32,8 +32,6 @@ navigation:
6
32
        location: reference/pairing/outbound.md
32
        location: reference/pairing/outbound.md
7
33
      - title: Inbound Pairing
33
      - title: Inbound Pairing
8
34
        location: reference/pairing/inbound.md
34
        location: reference/pairing/inbound.md
9
35
    - title: Sending Files
10
36
      location: reference/sending-files.md
11
37
    - title: Accessing GATT Services
35
    - title: Accessing GATT Services
12
38
      location: reference/gatt-services.md
36
      location: reference/gatt-services.md
13
39
    - title: Device Enablement
37
    - title: Device Enablement
14
diff --git a/docs/reference/available-commands.md b/docs/reference/available-commands.md
15
index d29dece..01b5f1d 100644
16
--- a/docs/reference/available-commands.md
17
+++ b/docs/reference/available-commands.md
18
@@ -16,9 +16,7 @@ table lists the commands that are provided by the *bluez* snap:
19
16
| Command      | Short description                                             |
16
| Command      | Short description                                             |
20
17
|--------------|---------------------------------------------------------------|
17
|--------------|---------------------------------------------------------------|
21
18
| bluez        | The *bluetoothd* Bluetooth daemon                             |
18
| bluez        | The *bluetoothd* Bluetooth daemon                             |
22
19
| obex         | The *obexd* OBEX daemon                                       |
23
20
| bluetoothctl | A command-line interface to the BlueZ 			       |
19
| bluetoothctl | A command-line interface to the BlueZ 			       |
24
21
| obexctl      | A command-line interface to the BlueZ for file transfers      |
25
22
| hciconfig    | HCI device configuration utility                              |
20
| hciconfig    | HCI device configuration utility                              |
26
23
| hcidump      | Reads raw HCI data and prints it on screen                    |
21
| hcidump      | Reads raw HCI data and prints it on screen                    |
27
24
| hciattach    | Attach a serial UART to the BT stack as a transport interface |
22
| hciattach    | Attach a serial UART to the BT stack as a transport interface |
28
@@ -40,6 +38,6 @@ available commands:
29
40
```
38
```
30
41
$ bluez.
39
$ bluez.
31
42
bluez.bluetoothctl  bluez.hciattach     bluez.hciconfig     bluez.hcidump
40
bluez.bluetoothctl  bluez.hciattach     bluez.hciconfig     bluez.hcidump
33
43
bluez.hcitool       bluez.obexctl       bluez.sdptool       
41
bluez.hcitool       bluez.sdptool       
34
44
$ bluez.
42
$ bluez.
35
45
```
43
```
36
diff --git a/docs/reference/introduction.md b/docs/reference/introduction.md
37
index aaa4119..c72924e 100644
38
--- a/docs/reference/introduction.md
39
+++ b/docs/reference/introduction.md
40
@@ -28,6 +28,5 @@ In particular this section will discuss:
41
28
* [Prerequisites](using-prerequisites.html)
28
* [Prerequisites](using-prerequisites.html)
42
29
* [Available commands](available-commands.md)
29
* [Available commands](available-commands.md)
43
30
* [How to pair with remote devices](pairing/introduction.md)
30
* [How to pair with remote devices](pairing/introduction.md)
44
31
* [How to send files using OPP](sending-files.md)
45
32
* [Accessing the GATT services](gatt-services.md)
31
* [Accessing the GATT services](gatt-services.md)
46
33
* [Device Enablement with Bluetooth](enablement/introduction.md)
32
* [Device Enablement with Bluetooth](enablement/introduction.md)
47
diff --git a/docs/reference/sending-files.md b/docs/reference/sending-files.md
48
34
deleted file mode 100644
33
deleted file mode 100644
49
index 19d00bd..0000000
50
--- a/docs/reference/sending-files.md
51
+++ /dev/null
52
@@ -1,206 +0,0 @@
53
1
---
54
2
title: "Sending Files Using OPP"
55
3
table_of_contents: True
56
4
---
57
5
58
6
# Using Bluetooth to Send Files on Ubuntu Core
59
7
60
8
This section describes the required steps to be able to send files over
61
9
Bluetooth using an Ubuntu Core device. It will focus on the [OBEX Object
62
10
Push](https://www.bluetooth.org/docman/handlers/downloaddoc.ashx?doc_id=309007&amp;vId=346844)
63
11
profile which is a standard Bluetooth profile for such a use case.
64
12
65
13
## Prerequisites
66
14
67
15
Make sure that:
68
16
69
17
* The bluez snap is installed.
70
18
* Service is up and running.
71
19
* Both devices are paired.
72
20
73
21
Refer to the previous sections in order to learn how to do it.
74
22
75
23
The files will be sent to the server which is a Bluetooth-enabled device with
76
24
the Object Push profile enabled. If this is not fulfilled then Ubuntu Core will
77
25
fail to connect.
78
26
79
27
The minimal set of the Bluetooth profiles that must be available on the server
80
28
device is:
81
29
82
30
|   Profile        |  UUID  |
83
31
|------------------|:------:|
84
32
| GAP Service      | 0x1800 |
85
33
| GATT Server      | 0x1801 |
86
34
| OBEX Object Push | 0x1105 |
87
35
88
36
If you are unsure about which profiles are enabled, then check this using the
89
37
*sdptool* utility:
90
38
91
39
```
92
40
% sdptool browse 00:1A:7D:DA:71:0F
93
41
Browsing 00:1A:7D:DA:71:0F ...
94
42
Service Name: GAP Service
95
43
Service RecHandle: 0x10001
96
44
Service Class ID List:
97
45
  "Generic Access" (0x1800)
98
46
Protocol Descriptor List:
99
47
  "L2CAP" (0x0100)
100
48
    PSM: 31
101
49
  "ATT" (0x0007)
102
50
    uint16: 0x0001
103
51
    uint16: 0x0007
104
52
Language Base Attr List:
105
53
  code_ISO639: 0x656e
106
54
  encoding:    0x6a
107
55
  base_offset: 0x100
108
56
109
57
Service Name: GATT Server
110
58
Service RecHandle: 0x10002
111
59
Service Class ID List:
112
60
  "Generic Attribute" (0x1801)
113
61
Protocol Descriptor List:
114
62
  "L2CAP" (0x0100)
115
63
    PSM: 31
116
64
  "ATT" (0x0007)
117
65
    uint16: 0x000c
118
66
    uint16: 0x000f
119
67
Language Base Attr List:
120
68
  code_ISO639: 0x656e
121
69
  encoding:    0x6a
122
70
  base_offset: 0x100
123
71
124
72
Failed to connect to SDP server on 00:1A:7D:DA:71:0F: Connection refused
125
73
Service Name: OBEX Object Push
126
74
Service RecHandle: 0x10004
127
75
Service Class ID List:
128
76
  "OBEX Object Push" (0x1105)
129
77
Protocol Descriptor List:
130
78
  "L2CAP" (0x0100)
131
79
  "RFCOMM" (0x0003)
132
80
    Channel: 1
133
81
  "OBEX" (0x0008)
134
82
Language Base Attr List:
135
83
  code_ISO639: 0x656e
136
84
  encoding:    0x6a
137
85
  base_offset: 0x100
138
86
Profile Descriptor List:
139
87
  "OBEX Object Push" (0x1105)
140
88
    Version: 0x0102
141
89
```
142
90
143
91
## Connect OPP Profile
144
92
145
93
Make sure that the pairing is successfully completed. You can learn how to do it
146
94
on the [Pairing page](pairing/introduction.html)
147
95
148
96
Once the pairing is successfully completed, it is time to connect the OBEX
149
97
Object Push profile. To interact with OBEX, the obexctl tool is used. Open
150
98
another terminal and type
151
99
152
100
```
153
101
$ sudo bluez.obexctl
154
102
```
155
103
156
104
You will see output like this:
157
105
158
106
```
159
107
$ sudo obexctl
160
108
[NEW] Client /org/bluez/obex 
161
109
[obex]#
162
110
```
163
111
164
112
This indicates that the OBEX client has been properly initialized and is
165
113
awaiting interactive commands. The first thing to do is to get it connected to
166
114
the remote server which is the device that has been paired in the previous
167
115
step. Type:
168
116
169
117
```
170
118
[obex]# connect 00:25:56:D1:36:6B
171
119
```
172
120
173
121
You will see output like:
174
122
175
123
```
176
124
Attempting to connect to 00:25:56:D1:36:6B
177
125
[NEW] Session /org/bluez/obex/client/session4 [default]
178
126
[NEW] ObjectPush /org/bluez/obex/client/session4 
179
127
Connection successful
180
128
[00:25:56:D1:36:6B]#
181
129
```
182
130
183
131
The above indicates that the connection has been established. Check the address
184
132
of the remote device in the prompt. It is now possible to send files.
185
133
186
134
## Sending Files
187
135
188
136
In order to send files use the *send* command while connected to the OBEX Object
189
137
Push profile. For sending a file type:
190
138
191
139
```
192
140
[00:25:56:D1:36:6B]# send <path to file>
193
141
```
194
142
195
143
Note that the file you are about to send should be accessible to the snap,
196
144
therefore it must be placed in a readable location. For example:
197
145
/var/snap/bluez/current.
198
146
199
147
Also keep in mind that the regular use of the OPP shall be accomplished through
200
148
the [D-Bus OBEX
201
149
API](https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/doc/obex-api.txt)
202
150
therefore the bluez snap itself does not need access to other snaps data. 
203
151
204
152
Below is example output of sending a file:
205
153
206
154
```
207
155
[00:25:56:D1:36:6B]# send /var/snap/bluez/current/f.txt
208
156
Attempting to send /var/snap/bluez/current/f.txt to /org/bluez/obex/client/session5
209
157
[NEW] Transfer /org/bluez/obex/client/session5/transfer10 
210
158
Transfer /org/bluez/obex/client/session5/transfer10
211
159
        Status: queued
212
160
        Name: f.txt
213
161
        Size: 4
214
162
        Filename: /var/snap/bluez/current/f.txt
215
163
        Session: /org/bluez/obex/client/session5
216
164
[CHG] Transfer /org/bluez/obex/client/session5/transfer10 Status: complete
217
165
[DEL] Transfer /org/bluez/obex/client/session5/transfer10
218
166
```
219
167
220
168
## Receiving Files
221
169
222
170
By default there is no way to receive a file using Bluetooth on Ubuntu Core
223
171
unless the application snap implements the receiving side. This is because the
224
172
incoming transfer has to be allowed and the obexctl tool does not provide
225
173
such an agent. It is assumed that the application will implement this. For
226
174
reference, here is the [OBEX D-Bus Agent
227
175
API](https://git.kernel.org/cgit/bluetooth/bluez.git/tree/doc/obex-agent-api.txt)
228
176
description.
229
177
230
178
For convenience, there is a bluez-tests snap that packages the
231
179
[simple-obex-agent](https://git.kernel.org/cgit/bluetooth/bluez.git/tree/test/simple-obex-agent)
232
180
Python script that implements the mentioned API. It can be used to allow
233
181
incoming file transfers through OBEX. The script itself has small
234
182
modifications to make it compatible with Ubuntu Core specifics (Ubuntu Core uses
235
183
the system, not session bus).
236
184
237
185
This feature has not been yet released, however, it is available in the edge
238
186
channel for testing.
239
187
240
188
Install the bluez-tests snap
241
189
242
190
```
243
191
$ sudo snap install --edge bluez-tests
244
192
```
245
193
246
194
When the above operation successfully finishes, you are able to use the
247
195
simple-obex-agent and experiment with receiving file transfers. Open another
248
196
shell on the device and start the simple-obex-agent by typing:
249
197
250
198
```
251
199
$ sudo bluez-tests.simple-obex-agent
252
200
```
253
201
254
202
From now on it will listen for incoming OBEX transfers and when such transfers
255
203
happen, it will prompt for a decision: accept or deny.
256
204
257
205
Please note that the software in the edge channel is for testing purposes only,
258
206
therefore, do not hesitate to report any bugs or inconveniences found.
259
diff --git a/patch/0001-obexd-use-system-bus-for-communication.patch b/patch/0001-obexd-use-system-bus-for-communication.patch
260
207
deleted file mode 100644
0
deleted file mode 100644
261
index 488f573..0000000
262
--- a/patch/0001-obexd-use-system-bus-for-communication.patch
263
+++ /dev/null
264
@@ -1,125 +0,0 @@
265
1
From 02bc79bcd0eea1bd5d76c612f14586b8baa60517 Mon Sep 17 00:00:00 2001
266
2
From: Simon Fels <simon.fels@canonical.com>
267
3
Date: Fri, 22 Jul 2016 11:36:44 +0200
268
4
Subject: [PATCH 1/2] obexd: use system bus for communication
269
5
270
6
On snappy systems we don't nessarily have a session bus available so we
271
7
will run obexd on the system bus.
272
8
---
273
9
 obexd/client/ftp.c     | 2 +-
274
10
 obexd/client/map.c     | 2 +-
275
11
 obexd/client/opp.c     | 2 +-
276
12
 obexd/client/pbap.c    | 2 +-
277
13
 obexd/client/session.c | 2 +-
278
14
 obexd/client/sync.c    | 2 +-
279
15
 obexd/src/manager.c    | 2 +-
280
16
 tools/obexctl.c        | 2 +-
281
17
 8 files changed, 8 insertions(+), 8 deletions(-)
282
18
283
19
diff --git a/obexd/client/ftp.c b/obexd/client/ftp.c
284
20
index 5e30654..3b82f3e 100644
285
21
--- a/obexd/client/ftp.c
286
22
+++ b/obexd/client/ftp.c
287
23
@@ -476,7 +476,7 @@ int ftp_init(void)
288
24
 
289
25
 	DBG("");
290
26
 
291
27
-	conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
292
28
+	conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
293
29
 	if (!conn)
294
30
 		return -EIO;
295
31
 
296
32
diff --git a/obexd/client/map.c b/obexd/client/map.c
297
33
index 23be2d6..28e60fe 100644
298
34
--- a/obexd/client/map.c
299
35
+++ b/obexd/client/map.c
300
36
@@ -2076,7 +2076,7 @@ int map_init(void)
301
37
 
302
38
 	DBG("");
303
39
 
304
40
-	conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
305
41
+	conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
306
42
 	if (!conn)
307
43
 		return -EIO;
308
44
 
309
45
diff --git a/obexd/client/opp.c b/obexd/client/opp.c
310
46
index 92785f6..36fd4db 100644
311
47
--- a/obexd/client/opp.c
312
48
+++ b/obexd/client/opp.c
313
49
@@ -191,7 +191,7 @@ int opp_init(void)
314
50
 
315
51
 	DBG("");
316
52
 
317
53
-	conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
318
54
+	conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
319
55
 	if (!conn)
320
56
 		return -EIO;
321
57
 
322
58
diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c
323
59
index 3f5665f..e4b7d59 100644
324
60
--- a/obexd/client/pbap.c
325
61
+++ b/obexd/client/pbap.c
326
62
@@ -1314,7 +1314,7 @@ int pbap_init(void)
327
63
 
328
64
 	DBG("");
329
65
 
330
66
-	conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
331
67
+	conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
332
68
 	if (!conn)
333
69
 		return -EIO;
334
70
 
335
71
diff --git a/obexd/client/session.c b/obexd/client/session.c
336
72
index 5bd2d26..cf4cb2c 100644
337
73
--- a/obexd/client/session.c
338
74
+++ b/obexd/client/session.c
339
75
@@ -596,7 +596,7 @@ struct obc_session *obc_session_create(const char *source,
340
76
 	if (driver == NULL)
341
77
 		return NULL;
342
78
 
343
79
-	conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
344
80
+	conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
345
81
 	if (conn == NULL)
346
82
 		return NULL;
347
83
 
348
84
diff --git a/obexd/client/sync.c b/obexd/client/sync.c
349
85
index 548c318..8c30908 100644
350
86
--- a/obexd/client/sync.c
351
87
+++ b/obexd/client/sync.c
352
88
@@ -237,7 +237,7 @@ int sync_init(void)
353
89
 
354
90
 	DBG("");
355
91
 
356
92
-	conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
357
93
+	conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
358
94
 	if (!conn)
359
95
 		return -EIO;
360
96
 
361
97
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
362
98
index c172c59..9b5bdde 100644
363
99
--- a/obexd/src/manager.c
364
100
+++ b/obexd/src/manager.c
365
101
@@ -499,7 +499,7 @@ gboolean manager_init(void)
366
102
 
367
103
 	dbus_error_init(&err);
368
104
 
369
105
-	connection = g_dbus_setup_bus(DBUS_BUS_SESSION, OBEXD_SERVICE, &err);
370
106
+	connection = g_dbus_setup_bus(DBUS_BUS_SYSTEM, OBEXD_SERVICE, &err);
371
107
 	if (connection == NULL) {
372
108
 		if (dbus_error_is_set(&err) == TRUE) {
373
109
 			fprintf(stderr, "%s\n", err.message);
374
110
diff --git a/tools/obexctl.c b/tools/obexctl.c
375
111
index 0709f69..9ed336a 100644
376
112
--- a/tools/obexctl.c
377
113
+++ b/tools/obexctl.c
378
114
@@ -2152,7 +2152,7 @@ int main(int argc, char *argv[])
379
115
 	bt_shell_set_menu(&main_menu);
380
116
 	bt_shell_set_prompt(PROMPT_OFF);
381
117
 
382
118
-	dbus_conn = g_dbus_setup_bus(DBUS_BUS_SESSION, NULL, NULL);
383
119
+	dbus_conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, NULL, NULL);
384
120
 
385
121
 	client = g_dbus_client_new(dbus_conn, "org.bluez.obex",
386
122
 							"/org/bluez/obex");
387
123
-- 
388
124
2.17.1
389
125
390
diff --git a/patch/0003-Add-snappy-runtime-directory-support.patch b/patch/0003-Add-snappy-runtime-directory-support.patch
391
126
deleted file mode 100644
0
deleted file mode 100644
392
index d1f1db0..0000000
393
--- a/patch/0003-Add-snappy-runtime-directory-support.patch
394
+++ /dev/null
395
@@ -1,38 +0,0 @@
396
1
From 003384851dfff3efe5c16aafb274ef5cd3bc3078 Mon Sep 17 00:00:00 2001
397
2
From: Simon Fels <simon.fels@canonical.com>
398
3
Date: Fri, 22 Jul 2016 11:36:12 +0200
399
4
Subject: [PATCH] Add snappy runtime directory support
400
5
401
6
---
402
7
 obexd/src/main.c | 12 ++++++++++--
403
8
 1 file changed, 10 insertions(+), 2 deletions(-)
404
9
405
10
diff --git a/obexd/src/main.c b/obexd/src/main.c
406
11
index 139f141..9f6c67a 100644
407
12
--- a/obexd/src/main.c
408
13
+++ b/obexd/src/main.c
409
14
@@ -286,11 +286,19 @@ int main(int argc, char *argv[])
410
15
 	}
411
16
 
412
17
 	if (option_root == NULL) {
413
18
-		option_root = g_build_filename(g_get_user_cache_dir(), "obexd",
414
19
-									NULL);
415
20
+		option_root = getenv("SNAP_USER_DATA");
416
21
+
417
22
+		if (!option_root)
418
23
+			option_root = g_build_filename(g_get_user_cache_dir(),
419
24
+							"obexd", NULL);
420
25
 		g_mkdir_with_parents(option_root, 0700);
421
26
 	}
422
27
 
423
28
+	/*
424
29
+	 * FIXME: a relative path option_root is specified on the command line,
425
30
+	 * will not be properly re-located to $SNAP_USER_DATA. Since this is
426
31
+	 * not used in the snap's obexd service file, this should be a no-op.
427
32
+	 */
428
33
 	if (option_root[0] != '/') {
429
34
 		const char *home = getenv("HOME");
430
35
 		if (home) {
431
36
-- 
432
37
2.17.1
433
38
434
diff --git a/patch/0004-Remove-some-obex-plugins-so-we-do-not-need-libical.patch b/patch/0004-Remove-some-obex-plugins-so-we-do-not-need-libical.patch
435
39
deleted file mode 100644
0
deleted file mode 100644
436
index 2205a78..0000000
437
--- a/patch/0004-Remove-some-obex-plugins-so-we-do-not-need-libical.patch
438
+++ /dev/null
439
@@ -1,391 +0,0 @@
440
1
From cde0bec4000d561edbeab8317d6d815b84125aa5 Mon Sep 17 00:00:00 2001
441
2
From: Alfonso Sanchez-Beato <alfonso.sanchez-beato@canonical.com>
442
3
Date: Mon, 30 Mar 2020 12:28:47 +0200
443
4
Subject: [PATCH] Remove some obex plugins so we do not need libical
444
5
445
6
Remove some obex plugins so we do not need libical. This library
446
7
was in turn pulling libicu, which is a 12MB dependency. The use case
447
8
for obex pbap/irmc in IoT is not strong, so better to remove it from
448
9
the snap.
449
10
---
450
11
 Makefile.in            | 125 ++---------------------------------------
451
12
 Makefile.obexd         |  14 +----
452
13
 configure.ac           |   6 --
453
14
 obexd/client/manager.c |   2 -
454
15
 4 files changed, 7 insertions(+), 140 deletions(-)
455
16
456
17
diff --git a/Makefile.in b/Makefile.in
457
18
index 35fd6fd..64313bf 100644
458
19
--- a/Makefile.in
459
20
+++ b/Makefile.in
460
21
@@ -966,9 +966,6 @@ am__obexd_src_obexd_SOURCES_DIST = btio/btio.h btio/btio.c \
461
22
 	obexd/plugins/filesystem.c obexd/plugins/filesystem.h \
462
23
 	obexd/plugins/bluetooth.c obexd/plugins/pcsuite.c \
463
24
 	obexd/plugins/opp.c obexd/plugins/ftp.c obexd/plugins/ftp.h \
464
25
-	obexd/plugins/irmc.c obexd/plugins/pbap.c \
465
26
-	obexd/plugins/vcard.h obexd/plugins/vcard.c \
466
27
-	obexd/plugins/phonebook.h obexd/plugins/phonebook-dummy.c \
467
28
 	obexd/plugins/mas.c obexd/src/map_ap.h \
468
29
 	obexd/plugins/messages.h obexd/plugins/messages-dummy.c \
469
30
 	obexd/client/mns.c obexd/client/map-event.h obexd/src/main.c \
470
31
@@ -982,7 +979,7 @@ am__obexd_src_obexd_SOURCES_DIST = btio/btio.h btio/btio.c \
471
32
 	obexd/client/manager.c obexd/client/session.h \
472
33
 	obexd/client/session.c obexd/client/bluetooth.h \
473
34
 	obexd/client/bluetooth.c obexd/client/sync.h \
474
35
-	obexd/client/sync.c obexd/client/pbap.h obexd/client/pbap.c \
475
36
+	obexd/client/sync.c \
476
37
 	obexd/client/ftp.h obexd/client/ftp.c obexd/client/opp.h \
477
38
 	obexd/client/opp.c obexd/client/map.h obexd/client/map.c \
478
39
 	obexd/client/map-event.c obexd/client/transfer.h \
479
40
@@ -1001,10 +998,6 @@ am__objects_9 = gobex/obexd-gobex.$(OBJEXT) \
480
41
 @OBEX_TRUE@	obexd/plugins/obexd-bluetooth.$(OBJEXT) \
481
42
 @OBEX_TRUE@	$(am__objects_10) obexd/plugins/obexd-opp.$(OBJEXT) \
482
43
 @OBEX_TRUE@	obexd/plugins/obexd-ftp.$(OBJEXT) \
483
44
-@OBEX_TRUE@	obexd/plugins/obexd-irmc.$(OBJEXT) \
484
45
-@OBEX_TRUE@	obexd/plugins/obexd-pbap.$(OBJEXT) \
485
46
-@OBEX_TRUE@	obexd/plugins/obexd-vcard.$(OBJEXT) \
486
47
-@OBEX_TRUE@	obexd/plugins/obexd-phonebook-dummy.$(OBJEXT) \
487
48
 @OBEX_TRUE@	obexd/plugins/obexd-mas.$(OBJEXT) \
488
49
 @OBEX_TRUE@	obexd/plugins/obexd-messages-dummy.$(OBJEXT) \
489
50
 @OBEX_TRUE@	obexd/client/obexd-mns.$(OBJEXT)
490
51
@@ -1023,7 +1016,6 @@ am__objects_9 = gobex/obexd-gobex.$(OBJEXT) \
491
52
 @OBEX_TRUE@	obexd/client/obexd-session.$(OBJEXT) \
492
53
 @OBEX_TRUE@	obexd/client/obexd-bluetooth.$(OBJEXT) \
493
54
 @OBEX_TRUE@	obexd/client/obexd-sync.$(OBJEXT) \
494
55
-@OBEX_TRUE@	obexd/client/obexd-pbap.$(OBJEXT) \
495
56
 @OBEX_TRUE@	obexd/client/obexd-ftp.$(OBJEXT) \
496
57
 @OBEX_TRUE@	obexd/client/obexd-opp.$(OBJEXT) \
497
58
 @OBEX_TRUE@	obexd/client/obexd-map.$(OBJEXT) \
498
59
@@ -2044,7 +2036,6 @@ am__depfiles_remade = android/$(DEPDIR)/a2dp-sink.Po \
499
60
 	obexd/client/$(DEPDIR)/obexd-map.Po \
500
61
 	obexd/client/$(DEPDIR)/obexd-mns.Po \
501
62
 	obexd/client/$(DEPDIR)/obexd-opp.Po \
502
63
-	obexd/client/$(DEPDIR)/obexd-pbap.Po \
503
64
 	obexd/client/$(DEPDIR)/obexd-session.Po \
504
65
 	obexd/client/$(DEPDIR)/obexd-sync.Po \
505
66
 	obexd/client/$(DEPDIR)/obexd-transfer.Po \
506
67
@@ -2052,14 +2043,10 @@ am__depfiles_remade = android/$(DEPDIR)/a2dp-sink.Po \
507
68
 	obexd/plugins/$(DEPDIR)/obexd-bluetooth.Po \
508
69
 	obexd/plugins/$(DEPDIR)/obexd-filesystem.Po \
509
70
 	obexd/plugins/$(DEPDIR)/obexd-ftp.Po \
510
71
-	obexd/plugins/$(DEPDIR)/obexd-irmc.Po \
511
72
 	obexd/plugins/$(DEPDIR)/obexd-mas.Po \
512
73
 	obexd/plugins/$(DEPDIR)/obexd-messages-dummy.Po \
513
74
 	obexd/plugins/$(DEPDIR)/obexd-opp.Po \
514
75
-	obexd/plugins/$(DEPDIR)/obexd-pbap.Po \
515
76
 	obexd/plugins/$(DEPDIR)/obexd-pcsuite.Po \
516
77
-	obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Po \
517
78
-	obexd/plugins/$(DEPDIR)/obexd-vcard.Po \
518
79
 	obexd/src/$(DEPDIR)/obexd-log.Po \
519
80
 	obexd/src/$(DEPDIR)/obexd-main.Po \
520
81
 	obexd/src/$(DEPDIR)/obexd-manager.Po \
521
82
@@ -2750,8 +2737,6 @@ GLIB_LIBS = @GLIB_LIBS@
522
83
 GREP = @GREP@
523
84
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
524
85
 GTHREAD_LIBS = @GTHREAD_LIBS@
525
86
-ICAL_CFLAGS = @ICAL_CFLAGS@
526
87
-ICAL_LIBS = @ICAL_LIBS@
527
88
 INSTALL = @INSTALL@
528
89
 INSTALL_DATA = @INSTALL_DATA@
529
90
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
530
91
@@ -3568,15 +3553,12 @@ unit_tests = $(am__append_54) unit/test-eir unit/test-uuid \
531
92
 @SYSTEMD_TRUE@dbussessionbus_DATA = obexd/src/org.bluez.obex.service
532
93
 @OBEX_TRUE@obex_plugindir = $(libdir)/obex/plugins
533
94
 @OBEX_TRUE@obexd_builtin_modules = filesystem bluetooth \
534
95
-@OBEX_TRUE@	$(am__append_48) opp ftp irmc pbap mas mns
535
96
+@OBEX_TRUE@	$(am__append_48) opp ftp mas mns
536
97
 @OBEX_TRUE@obexd_builtin_sources = obexd/plugins/filesystem.c \
537
98
 @OBEX_TRUE@	obexd/plugins/filesystem.h \
538
99
 @OBEX_TRUE@	obexd/plugins/bluetooth.c $(am__append_49) \
539
100
 @OBEX_TRUE@	obexd/plugins/opp.c obexd/plugins/ftp.c \
540
101
-@OBEX_TRUE@	obexd/plugins/ftp.h obexd/plugins/irmc.c \
541
102
-@OBEX_TRUE@	obexd/plugins/pbap.c obexd/plugins/vcard.h \
542
103
-@OBEX_TRUE@	obexd/plugins/vcard.c obexd/plugins/phonebook.h \
543
104
-@OBEX_TRUE@	obexd/plugins/phonebook-dummy.c obexd/plugins/mas.c \
544
105
+@OBEX_TRUE@	obexd/plugins/mas.c \
545
106
 @OBEX_TRUE@	obexd/src/map_ap.h obexd/plugins/messages.h \
546
107
 @OBEX_TRUE@	obexd/plugins/messages-dummy.c obexd/client/mns.c \
547
108
 @OBEX_TRUE@	obexd/src/map_ap.h obexd/client/map-event.h
548
109
@@ -3596,7 +3578,6 @@ unit_tests = $(am__append_54) unit/test-eir unit/test-uuid \
549
110
 @OBEX_TRUE@			obexd/client/session.h obexd/client/session.c \
550
111
 @OBEX_TRUE@			obexd/client/bluetooth.h obexd/client/bluetooth.c \
551
112
 @OBEX_TRUE@			obexd/client/sync.h obexd/client/sync.c \
552
113
-@OBEX_TRUE@			obexd/client/pbap.h obexd/client/pbap.c \
553
114
 @OBEX_TRUE@			obexd/client/ftp.h obexd/client/ftp.c \
554
115
 @OBEX_TRUE@			obexd/client/opp.h obexd/client/opp.c \
555
116
 @OBEX_TRUE@			obexd/client/map.h obexd/client/map.c \
556
117
@@ -3608,11 +3589,11 @@ unit_tests = $(am__append_54) unit/test-eir unit/test-uuid \
557
118
 
558
119
 @OBEX_TRUE@obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \
559
120
 @OBEX_TRUE@			gdbus/libgdbus-internal.la \
560
121
-@OBEX_TRUE@			$(ICAL_LIBS) $(DBUS_LIBS) $(GLIB_LIBS) -ldl
561
122
+@OBEX_TRUE@			$(DBUS_LIBS) $(GLIB_LIBS) -ldl
562
123
 
563
124
 @OBEX_TRUE@obexd_src_obexd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic
564
125
 @OBEX_TRUE@obexd_src_obexd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
565
126
-@OBEX_TRUE@				$(ICAL_CFLAGS) -DOBEX_PLUGIN_BUILTIN \
566
127
+@OBEX_TRUE@				-DOBEX_PLUGIN_BUILTIN \
567
128
 @OBEX_TRUE@				-DPLUGINDIR=\""$(obex_plugindir)"\" \
568
129
 @OBEX_TRUE@				-D_FILE_OFFSET_BITS=64 \
569
130
 @OBEX_TRUE@				-I$(builddir)/lib -I$(builddir)/obexd/src
570
131
@@ -5105,15 +5086,6 @@ obexd/plugins/obexd-opp.$(OBJEXT): obexd/plugins/$(am__dirstamp) \
571
132
 	obexd/plugins/$(DEPDIR)/$(am__dirstamp)
572
133
 obexd/plugins/obexd-ftp.$(OBJEXT): obexd/plugins/$(am__dirstamp) \
573
134
 	obexd/plugins/$(DEPDIR)/$(am__dirstamp)
574
135
-obexd/plugins/obexd-irmc.$(OBJEXT): obexd/plugins/$(am__dirstamp) \
575
136
-	obexd/plugins/$(DEPDIR)/$(am__dirstamp)
576
137
-obexd/plugins/obexd-pbap.$(OBJEXT): obexd/plugins/$(am__dirstamp) \
577
138
-	obexd/plugins/$(DEPDIR)/$(am__dirstamp)
578
139
-obexd/plugins/obexd-vcard.$(OBJEXT): obexd/plugins/$(am__dirstamp) \
579
140
-	obexd/plugins/$(DEPDIR)/$(am__dirstamp)
580
141
-obexd/plugins/obexd-phonebook-dummy.$(OBJEXT):  \
581
142
-	obexd/plugins/$(am__dirstamp) \
582
143
-	obexd/plugins/$(DEPDIR)/$(am__dirstamp)
583
144
 obexd/plugins/obexd-mas.$(OBJEXT): obexd/plugins/$(am__dirstamp) \
584
145
 	obexd/plugins/$(DEPDIR)/$(am__dirstamp)
585
146
 obexd/plugins/obexd-messages-dummy.$(OBJEXT):  \
586
147
@@ -5159,8 +5131,6 @@ obexd/client/obexd-bluetooth.$(OBJEXT): obexd/client/$(am__dirstamp) \
587
148
 	obexd/client/$(DEPDIR)/$(am__dirstamp)
588
149
 obexd/client/obexd-sync.$(OBJEXT): obexd/client/$(am__dirstamp) \
589
150
 	obexd/client/$(DEPDIR)/$(am__dirstamp)
590
151
-obexd/client/obexd-pbap.$(OBJEXT): obexd/client/$(am__dirstamp) \
591
152
-	obexd/client/$(DEPDIR)/$(am__dirstamp)
592
153
 obexd/client/obexd-ftp.$(OBJEXT): obexd/client/$(am__dirstamp) \
593
154
 	obexd/client/$(DEPDIR)/$(am__dirstamp)
594
155
 obexd/client/obexd-opp.$(OBJEXT): obexd/client/$(am__dirstamp) \
595
156
@@ -6472,7 +6442,6 @@ distclean-compile:
596
157
 @AMDEP_TRUE@@am__include@ @am__quote@obexd/client/$(DEPDIR)/obexd-map.Po@am__quote@ # am--include-marker
597
158
 @AMDEP_TRUE@@am__include@ @am__quote@obexd/client/$(DEPDIR)/obexd-mns.Po@am__quote@ # am--include-marker
598
159
 @AMDEP_TRUE@@am__include@ @am__quote@obexd/client/$(DEPDIR)/obexd-opp.Po@am__quote@ # am--include-marker
599
160
-@AMDEP_TRUE@@am__include@ @am__quote@obexd/client/$(DEPDIR)/obexd-pbap.Po@am__quote@ # am--include-marker
600
161
 @AMDEP_TRUE@@am__include@ @am__quote@obexd/client/$(DEPDIR)/obexd-session.Po@am__quote@ # am--include-marker
601
162
 @AMDEP_TRUE@@am__include@ @am__quote@obexd/client/$(DEPDIR)/obexd-sync.Po@am__quote@ # am--include-marker
602
163
 @AMDEP_TRUE@@am__include@ @am__quote@obexd/client/$(DEPDIR)/obexd-transfer.Po@am__quote@ # am--include-marker
603
164
@@ -6480,14 +6449,10 @@ distclean-compile:
604
165
 @AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-bluetooth.Po@am__quote@ # am--include-marker
605
166
 @AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-filesystem.Po@am__quote@ # am--include-marker
606
167
 @AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-ftp.Po@am__quote@ # am--include-marker
607
168
-@AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-irmc.Po@am__quote@ # am--include-marker
608
169
 @AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-mas.Po@am__quote@ # am--include-marker
609
170
 @AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-messages-dummy.Po@am__quote@ # am--include-marker
610
171
 @AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-opp.Po@am__quote@ # am--include-marker
611
172
-@AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-pbap.Po@am__quote@ # am--include-marker
612
173
 @AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-pcsuite.Po@am__quote@ # am--include-marker
613
174
-@AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Po@am__quote@ # am--include-marker
614
175
-@AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-vcard.Po@am__quote@ # am--include-marker
615
176
 @AMDEP_TRUE@@am__include@ @am__quote@obexd/src/$(DEPDIR)/obexd-log.Po@am__quote@ # am--include-marker
616
177
 @AMDEP_TRUE@@am__include@ @am__quote@obexd/src/$(DEPDIR)/obexd-main.Po@am__quote@ # am--include-marker
617
178
 @AMDEP_TRUE@@am__include@ @am__quote@obexd/src/$(DEPDIR)/obexd-manager.Po@am__quote@ # am--include-marker
618
179
@@ -7834,62 +7799,6 @@ obexd/plugins/obexd-ftp.obj: obexd/plugins/ftp.c
619
180
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
620
181
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/plugins/obexd-ftp.obj `if test -f 'obexd/plugins/ftp.c'; then $(CYGPATH_W) 'obexd/plugins/ftp.c'; else $(CYGPATH_W) '$(srcdir)/obexd/plugins/ftp.c'; fi`
621
182
 
622
183
-obexd/plugins/obexd-irmc.o: obexd/plugins/irmc.c
623
184
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/plugins/obexd-irmc.o -MD -MP -MF obexd/plugins/$(DEPDIR)/obexd-irmc.Tpo -c -o obexd/plugins/obexd-irmc.o `test -f 'obexd/plugins/irmc.c' || echo '$(srcdir)/'`obexd/plugins/irmc.c
624
185
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) obexd/plugins/$(DEPDIR)/obexd-irmc.Tpo obexd/plugins/$(DEPDIR)/obexd-irmc.Po
625
186
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='obexd/plugins/irmc.c' object='obexd/plugins/obexd-irmc.o' libtool=no @AMDEPBACKSLASH@
626
187
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
627
188
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/plugins/obexd-irmc.o `test -f 'obexd/plugins/irmc.c' || echo '$(srcdir)/'`obexd/plugins/irmc.c
628
189
-
629
190
-obexd/plugins/obexd-irmc.obj: obexd/plugins/irmc.c
630
191
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/plugins/obexd-irmc.obj -MD -MP -MF obexd/plugins/$(DEPDIR)/obexd-irmc.Tpo -c -o obexd/plugins/obexd-irmc.obj `if test -f 'obexd/plugins/irmc.c'; then $(CYGPATH_W) 'obexd/plugins/irmc.c'; else $(CYGPATH_W) '$(srcdir)/obexd/plugins/irmc.c'; fi`
631
192
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) obexd/plugins/$(DEPDIR)/obexd-irmc.Tpo obexd/plugins/$(DEPDIR)/obexd-irmc.Po
632
193
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='obexd/plugins/irmc.c' object='obexd/plugins/obexd-irmc.obj' libtool=no @AMDEPBACKSLASH@
633
194
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
634
195
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/plugins/obexd-irmc.obj `if test -f 'obexd/plugins/irmc.c'; then $(CYGPATH_W) 'obexd/plugins/irmc.c'; else $(CYGPATH_W) '$(srcdir)/obexd/plugins/irmc.c'; fi`
635
196
-
636
197
-obexd/plugins/obexd-pbap.o: obexd/plugins/pbap.c
637
198
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/plugins/obexd-pbap.o -MD -MP -MF obexd/plugins/$(DEPDIR)/obexd-pbap.Tpo -c -o obexd/plugins/obexd-pbap.o `test -f 'obexd/plugins/pbap.c' || echo '$(srcdir)/'`obexd/plugins/pbap.c
638
199
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) obexd/plugins/$(DEPDIR)/obexd-pbap.Tpo obexd/plugins/$(DEPDIR)/obexd-pbap.Po
639
200
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='obexd/plugins/pbap.c' object='obexd/plugins/obexd-pbap.o' libtool=no @AMDEPBACKSLASH@
640
201
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
641
202
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/plugins/obexd-pbap.o `test -f 'obexd/plugins/pbap.c' || echo '$(srcdir)/'`obexd/plugins/pbap.c
642
203
-
643
204
-obexd/plugins/obexd-pbap.obj: obexd/plugins/pbap.c
644
205
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/plugins/obexd-pbap.obj -MD -MP -MF obexd/plugins/$(DEPDIR)/obexd-pbap.Tpo -c -o obexd/plugins/obexd-pbap.obj `if test -f 'obexd/plugins/pbap.c'; then $(CYGPATH_W) 'obexd/plugins/pbap.c'; else $(CYGPATH_W) '$(srcdir)/obexd/plugins/pbap.c'; fi`
645
206
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) obexd/plugins/$(DEPDIR)/obexd-pbap.Tpo obexd/plugins/$(DEPDIR)/obexd-pbap.Po
646
207
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='obexd/plugins/pbap.c' object='obexd/plugins/obexd-pbap.obj' libtool=no @AMDEPBACKSLASH@
647
208
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
648
209
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/plugins/obexd-pbap.obj `if test -f 'obexd/plugins/pbap.c'; then $(CYGPATH_W) 'obexd/plugins/pbap.c'; else $(CYGPATH_W) '$(srcdir)/obexd/plugins/pbap.c'; fi`
649
210
-
650
211
-obexd/plugins/obexd-vcard.o: obexd/plugins/vcard.c
651
212
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/plugins/obexd-vcard.o -MD -MP -MF obexd/plugins/$(DEPDIR)/obexd-vcard.Tpo -c -o obexd/plugins/obexd-vcard.o `test -f 'obexd/plugins/vcard.c' || echo '$(srcdir)/'`obexd/plugins/vcard.c
652
213
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) obexd/plugins/$(DEPDIR)/obexd-vcard.Tpo obexd/plugins/$(DEPDIR)/obexd-vcard.Po
653
214
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='obexd/plugins/vcard.c' object='obexd/plugins/obexd-vcard.o' libtool=no @AMDEPBACKSLASH@
654
215
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
655
216
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/plugins/obexd-vcard.o `test -f 'obexd/plugins/vcard.c' || echo '$(srcdir)/'`obexd/plugins/vcard.c
656
217
-
657
218
-obexd/plugins/obexd-vcard.obj: obexd/plugins/vcard.c
658
219
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/plugins/obexd-vcard.obj -MD -MP -MF obexd/plugins/$(DEPDIR)/obexd-vcard.Tpo -c -o obexd/plugins/obexd-vcard.obj `if test -f 'obexd/plugins/vcard.c'; then $(CYGPATH_W) 'obexd/plugins/vcard.c'; else $(CYGPATH_W) '$(srcdir)/obexd/plugins/vcard.c'; fi`
659
220
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) obexd/plugins/$(DEPDIR)/obexd-vcard.Tpo obexd/plugins/$(DEPDIR)/obexd-vcard.Po
660
221
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='obexd/plugins/vcard.c' object='obexd/plugins/obexd-vcard.obj' libtool=no @AMDEPBACKSLASH@
661
222
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
662
223
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/plugins/obexd-vcard.obj `if test -f 'obexd/plugins/vcard.c'; then $(CYGPATH_W) 'obexd/plugins/vcard.c'; else $(CYGPATH_W) '$(srcdir)/obexd/plugins/vcard.c'; fi`
663
224
-
664
225
-obexd/plugins/obexd-phonebook-dummy.o: obexd/plugins/phonebook-dummy.c
665
226
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/plugins/obexd-phonebook-dummy.o -MD -MP -MF obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Tpo -c -o obexd/plugins/obexd-phonebook-dummy.o `test -f 'obexd/plugins/phonebook-dummy.c' || echo '$(srcdir)/'`obexd/plugins/phonebook-dummy.c
666
227
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Tpo obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Po
667
228
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='obexd/plugins/phonebook-dummy.c' object='obexd/plugins/obexd-phonebook-dummy.o' libtool=no @AMDEPBACKSLASH@
668
229
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
669
230
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/plugins/obexd-phonebook-dummy.o `test -f 'obexd/plugins/phonebook-dummy.c' || echo '$(srcdir)/'`obexd/plugins/phonebook-dummy.c
670
231
-
671
232
-obexd/plugins/obexd-phonebook-dummy.obj: obexd/plugins/phonebook-dummy.c
672
233
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/plugins/obexd-phonebook-dummy.obj -MD -MP -MF obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Tpo -c -o obexd/plugins/obexd-phonebook-dummy.obj `if test -f 'obexd/plugins/phonebook-dummy.c'; then $(CYGPATH_W) 'obexd/plugins/phonebook-dummy.c'; else $(CYGPATH_W) '$(srcdir)/obexd/plugins/phonebook-dummy.c'; fi`
673
234
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Tpo obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Po
674
235
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='obexd/plugins/phonebook-dummy.c' object='obexd/plugins/obexd-phonebook-dummy.obj' libtool=no @AMDEPBACKSLASH@
675
236
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
676
237
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/plugins/obexd-phonebook-dummy.obj `if test -f 'obexd/plugins/phonebook-dummy.c'; then $(CYGPATH_W) 'obexd/plugins/phonebook-dummy.c'; else $(CYGPATH_W) '$(srcdir)/obexd/plugins/phonebook-dummy.c'; fi`
677
238
-
678
239
 obexd/plugins/obexd-mas.o: obexd/plugins/mas.c
679
240
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/plugins/obexd-mas.o -MD -MP -MF obexd/plugins/$(DEPDIR)/obexd-mas.Tpo -c -o obexd/plugins/obexd-mas.o `test -f 'obexd/plugins/mas.c' || echo '$(srcdir)/'`obexd/plugins/mas.c
680
241
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) obexd/plugins/$(DEPDIR)/obexd-mas.Tpo obexd/plugins/$(DEPDIR)/obexd-mas.Po
681
242
@@ -8114,20 +8023,6 @@ obexd/client/obexd-sync.obj: obexd/client/sync.c
682
243
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
683
244
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/client/obexd-sync.obj `if test -f 'obexd/client/sync.c'; then $(CYGPATH_W) 'obexd/client/sync.c'; else $(CYGPATH_W) '$(srcdir)/obexd/client/sync.c'; fi`
684
245
 
685
246
-obexd/client/obexd-pbap.o: obexd/client/pbap.c
686
247
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/client/obexd-pbap.o -MD -MP -MF obexd/client/$(DEPDIR)/obexd-pbap.Tpo -c -o obexd/client/obexd-pbap.o `test -f 'obexd/client/pbap.c' || echo '$(srcdir)/'`obexd/client/pbap.c
687
248
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) obexd/client/$(DEPDIR)/obexd-pbap.Tpo obexd/client/$(DEPDIR)/obexd-pbap.Po
688
249
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='obexd/client/pbap.c' object='obexd/client/obexd-pbap.o' libtool=no @AMDEPBACKSLASH@
689
250
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
690
251
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/client/obexd-pbap.o `test -f 'obexd/client/pbap.c' || echo '$(srcdir)/'`obexd/client/pbap.c
691
252
-
692
253
-obexd/client/obexd-pbap.obj: obexd/client/pbap.c
693
254
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/client/obexd-pbap.obj -MD -MP -MF obexd/client/$(DEPDIR)/obexd-pbap.Tpo -c -o obexd/client/obexd-pbap.obj `if test -f 'obexd/client/pbap.c'; then $(CYGPATH_W) 'obexd/client/pbap.c'; else $(CYGPATH_W) '$(srcdir)/obexd/client/pbap.c'; fi`
694
255
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) obexd/client/$(DEPDIR)/obexd-pbap.Tpo obexd/client/$(DEPDIR)/obexd-pbap.Po
695
256
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='obexd/client/pbap.c' object='obexd/client/obexd-pbap.obj' libtool=no @AMDEPBACKSLASH@
696
257
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
697
258
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/client/obexd-pbap.obj `if test -f 'obexd/client/pbap.c'; then $(CYGPATH_W) 'obexd/client/pbap.c'; else $(CYGPATH_W) '$(srcdir)/obexd/client/pbap.c'; fi`
698
259
-
699
260
 obexd/client/obexd-ftp.o: obexd/client/ftp.c
700
261
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/client/obexd-ftp.o -MD -MP -MF obexd/client/$(DEPDIR)/obexd-ftp.Tpo -c -o obexd/client/obexd-ftp.o `test -f 'obexd/client/ftp.c' || echo '$(srcdir)/'`obexd/client/ftp.c
701
262
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) obexd/client/$(DEPDIR)/obexd-ftp.Tpo obexd/client/$(DEPDIR)/obexd-ftp.Po
702
263
@@ -10584,7 +10479,6 @@ distclean: distclean-am
703
264
 	-rm -f obexd/client/$(DEPDIR)/obexd-map.Po
704
265
 	-rm -f obexd/client/$(DEPDIR)/obexd-mns.Po
705
266
 	-rm -f obexd/client/$(DEPDIR)/obexd-opp.Po
706
267
-	-rm -f obexd/client/$(DEPDIR)/obexd-pbap.Po
707
268
 	-rm -f obexd/client/$(DEPDIR)/obexd-session.Po
708
269
 	-rm -f obexd/client/$(DEPDIR)/obexd-sync.Po
709
270
 	-rm -f obexd/client/$(DEPDIR)/obexd-transfer.Po
710
271
@@ -10592,14 +10486,10 @@ distclean: distclean-am
711
272
 	-rm -f obexd/plugins/$(DEPDIR)/obexd-bluetooth.Po
712
273
 	-rm -f obexd/plugins/$(DEPDIR)/obexd-filesystem.Po
713
274
 	-rm -f obexd/plugins/$(DEPDIR)/obexd-ftp.Po
714
275
-	-rm -f obexd/plugins/$(DEPDIR)/obexd-irmc.Po
715
276
 	-rm -f obexd/plugins/$(DEPDIR)/obexd-mas.Po
716
277
 	-rm -f obexd/plugins/$(DEPDIR)/obexd-messages-dummy.Po
717
278
 	-rm -f obexd/plugins/$(DEPDIR)/obexd-opp.Po
718
279
-	-rm -f obexd/plugins/$(DEPDIR)/obexd-pbap.Po
719
280
 	-rm -f obexd/plugins/$(DEPDIR)/obexd-pcsuite.Po
720
281
-	-rm -f obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Po
721
282
-	-rm -f obexd/plugins/$(DEPDIR)/obexd-vcard.Po
722
283
 	-rm -f obexd/src/$(DEPDIR)/obexd-log.Po
723
284
 	-rm -f obexd/src/$(DEPDIR)/obexd-main.Po
724
285
 	-rm -f obexd/src/$(DEPDIR)/obexd-manager.Po
725
286
@@ -11170,7 +11060,6 @@ maintainer-clean: maintainer-clean-am
726
287
 	-rm -f obexd/client/$(DEPDIR)/obexd-map.Po
727
288
 	-rm -f obexd/client/$(DEPDIR)/obexd-mns.Po
728
289
 	-rm -f obexd/client/$(DEPDIR)/obexd-opp.Po
729
290
-	-rm -f obexd/client/$(DEPDIR)/obexd-pbap.Po
730
291
 	-rm -f obexd/client/$(DEPDIR)/obexd-session.Po
731
292
 	-rm -f obexd/client/$(DEPDIR)/obexd-sync.Po
732
293
 	-rm -f obexd/client/$(DEPDIR)/obexd-transfer.Po
733
294
@@ -11178,14 +11067,10 @@ maintainer-clean: maintainer-clean-am
734
295
 	-rm -f obexd/plugins/$(DEPDIR)/obexd-bluetooth.Po
735
296
 	-rm -f obexd/plugins/$(DEPDIR)/obexd-filesystem.Po
736
297
 	-rm -f obexd/plugins/$(DEPDIR)/obexd-ftp.Po
737
298
-	-rm -f obexd/plugins/$(DEPDIR)/obexd-irmc.Po
738
299
 	-rm -f obexd/plugins/$(DEPDIR)/obexd-mas.Po
739
300
 	-rm -f obexd/plugins/$(DEPDIR)/obexd-messages-dummy.Po
740
301
 	-rm -f obexd/plugins/$(DEPDIR)/obexd-opp.Po
741
302
-	-rm -f obexd/plugins/$(DEPDIR)/obexd-pbap.Po
742
303
 	-rm -f obexd/plugins/$(DEPDIR)/obexd-pcsuite.Po
743
304
-	-rm -f obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Po
744
305
-	-rm -f obexd/plugins/$(DEPDIR)/obexd-vcard.Po
745
306
 	-rm -f obexd/src/$(DEPDIR)/obexd-log.Po
746
307
 	-rm -f obexd/src/$(DEPDIR)/obexd-main.Po
747
308
 	-rm -f obexd/src/$(DEPDIR)/obexd-manager.Po
748
309
diff --git a/Makefile.obexd b/Makefile.obexd
749
310
index 73004a3..7119ac9 100644
750
311
--- a/Makefile.obexd
751
312
+++ b/Makefile.obexd
752
313
@@ -33,15 +33,6 @@ obexd_builtin_sources += obexd/plugins/opp.c
753
314
 obexd_builtin_modules += ftp
754
315
 obexd_builtin_sources += obexd/plugins/ftp.c obexd/plugins/ftp.h
755
316
 
756
317
-obexd_builtin_modules += irmc
757
318
-obexd_builtin_sources += obexd/plugins/irmc.c
758
319
-
759
320
-obexd_builtin_modules += pbap
760
321
-obexd_builtin_sources += obexd/plugins/pbap.c \
761
322
-				obexd/plugins/vcard.h obexd/plugins/vcard.c \
762
323
-				obexd/plugins/phonebook.h \
763
324
-				obexd/plugins/phonebook-dummy.c
764
325
-
765
326
 obexd_builtin_modules += mas
766
327
 obexd_builtin_sources += obexd/plugins/mas.c obexd/src/map_ap.h \
767
328
 				obexd/plugins/messages.h \
768
329
@@ -68,7 +59,6 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \
769
330
 			obexd/client/session.h obexd/client/session.c \
770
331
 			obexd/client/bluetooth.h obexd/client/bluetooth.c \
771
332
 			obexd/client/sync.h obexd/client/sync.c \
772
333
-			obexd/client/pbap.h obexd/client/pbap.c \
773
334
 			obexd/client/ftp.h obexd/client/ftp.c \
774
335
 			obexd/client/opp.h obexd/client/opp.c \
775
336
 			obexd/client/map.h obexd/client/map.c \
776
337
@@ -79,12 +69,12 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \
777
338
 			obexd/src/map_ap.h
778
339
 obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \
779
340
 			gdbus/libgdbus-internal.la \
780
341
-			$(ICAL_LIBS) $(DBUS_LIBS) $(GLIB_LIBS) -ldl
781
342
+			$(DBUS_LIBS) $(GLIB_LIBS) -ldl
782
343
 
783
344
 obexd_src_obexd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic
784
345
 
785
346
 obexd_src_obexd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
786
347
-				$(ICAL_CFLAGS) -DOBEX_PLUGIN_BUILTIN \
787
348
+				-DOBEX_PLUGIN_BUILTIN \
788
349
 				-DPLUGINDIR=\""$(obex_plugindir)"\" \
789
350
 				-D_FILE_OFFSET_BITS=64 \
790
351
 				-I$(builddir)/lib -I$(builddir)/obexd/src
791
352
diff --git a/configure.ac b/configure.ac
792
353
index b7452fa..70677ea 100644
793
354
--- a/configure.ac
794
355
+++ b/configure.ac
795
356
@@ -249,12 +249,6 @@ fi
796
357
 
797
358
 AC_ARG_ENABLE(obex, AC_HELP_STRING([--disable-obex],
798
359
 		[disable OBEX profile support]), [enable_obex=${enableval}])
799
360
-if (test "${enable_obex}" != "no"); then
800
361
-	PKG_CHECK_MODULES(ICAL, libical, dummy=yes,
801
362
-					AC_MSG_ERROR(libical is required))
802
363
-	AC_SUBST(ICAL_CFLAGS)
803
364
-	AC_SUBST(ICAL_LIBS)
804
365
-fi
805
366
 AM_CONDITIONAL(OBEX, test "${enable_obex}" != "no")
806
367
 
807
368
 AC_ARG_ENABLE(btpclient, AC_HELP_STRING([--enable-btpclient],
808
369
diff --git a/obexd/client/manager.c b/obexd/client/manager.c
809
370
index fbcad6d..ad4a9ff 100644
810
371
--- a/obexd/client/manager.c
811
372
+++ b/obexd/client/manager.c
812
373
@@ -42,7 +42,6 @@
813
374
 #include "bluetooth.h"
814
375
 #include "opp.h"
815
376
 #include "ftp.h"
816
377
-#include "pbap.h"
817
378
 #include "sync.h"
818
379
 #include "map.h"
819
380
 #include "manager.h"
820
381
@@ -262,7 +261,6 @@ static struct obc_module {
821
382
 	{ "bluetooth", bluetooth_init, bluetooth_exit },
822
383
 	{ "opp", opp_init, opp_exit },
823
384
 	{ "ftp", ftp_init, ftp_exit },
824
385
-	{ "pbap", pbap_init, pbap_exit },
825
386
 	{ "sync", sync_init, sync_exit },
826
387
 	{ "map", map_init, map_exit },
827
388
 	{ }
828
389
-- 
829
390
2.17.1
830
391
831
diff --git a/patch/0005-obexd-don-t-free-environment-variable.patch b/patch/0005-obexd-don-t-free-environment-variable.patch
832
392
deleted file mode 100644
0
deleted file mode 100644
833
index c66c68d..0000000
834
--- a/patch/0005-obexd-don-t-free-environment-variable.patch
835
+++ /dev/null
836
@@ -1,31 +0,0 @@
837
1
From 8ef25c6ffef5786529b6dd292f6f5597c1dbfd4f Mon Sep 17 00:00:00 2001
838
2
From: Dan Dedrick <dan_dedrick@jabil.com>
839
3
Date: Wed, 9 Dec 2020 11:57:36 -0500
840
4
Subject: [PATCH] obexd: don't free environment variable
841
5
842
6
Use g_strdup for option_root since it is expected to be freeable. When
843
7
this was assigned to an environement variable it would then be passed to
844
8
g_free and cause a crash because it wasn't memory that had been
845
9
malloced.
846
10
---
847
11
 obexd/src/main.c | 4 +++-
848
12
 1 file changed, 3 insertions(+), 1 deletion(-)
849
13
850
14
diff --git a/obexd/src/main.c b/obexd/src/main.c
851
15
index 118b5a1a9..ddea9fbd5 100644
852
16
--- a/obexd/src/main.c
853
17
+++ b/obexd/src/main.c
854
18
@@ -285,7 +285,9 @@ int main(int argc, char *argv[])
855
19
 	}
856
20
 
857
21
 	if (option_root == NULL) {
858
22
-		option_root = getenv("SNAP_USER_DATA");
859
23
+		const char * root_env = getenv("SNAP_USER_DATA");
860
24
+		if (root_env)
861
25
+			option_root = g_strdup(root_env);
862
26
 
863
27
 		if (!option_root)
864
28
 			option_root = g_build_filename(g_get_user_cache_dir(),
865
29
-- 
866
30
2.29.2
867
31
868
diff --git a/run-tests.sh b/run-tests.sh
869
index 3fd257c..b5a4d11 100755
870
--- a/run-tests.sh
871
+++ b/run-tests.sh
872
@@ -94,4 +94,4 @@ done < <(yq eval '.backends.qemu.systems[]' spread.yaml | sed -e '/^ /d' -e 's/:
873
94
echo "INFO: Executing tests runner"
94
echo "INFO: Executing tests runner"
874
95
# shellcheck disable=SC2086
95
# shellcheck disable=SC2086
875
96
cd $TESTS_EXTRAS_PATH &&
96
cd $TESTS_EXTRAS_PATH &&
877
97
    ./tests-runner.sh "$@" --snap="$snap" "$backends" $EXTRA_ARGS
97
    ./tests-runner.sh "$@" --channel=edge --snap="$snap" "$backends" $EXTRA_ARGS
878
diff --git a/snapcraft.yaml b/snapcraft.yaml
879
index 2b6512e..3c39703 100644
880
--- a/snapcraft.yaml
881
+++ b/snapcraft.yaml
882
@@ -1,5 +1,5 @@
883
1
name: bluez
1
name: bluez
885
2
version: 5.53-7-dev
2
version: 5.64-dev
886
3
type: app
3
type: app
887
4
summary: Bluetooth tools and daemons
4
summary: Bluetooth tools and daemons
888
5
description: |
5
description: |
889
@@ -9,8 +9,8 @@ description: |
890
9
 License (GPL). See the project homepage for more details:
9
 License (GPL). See the project homepage for more details:
891
10
 https://code.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/bluez
10
 https://code.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/bluez
892
11
confinement: strict
11
confinement: strict
895
12
grade: stable
12
grade: devel
896
13
base: core20
13
base: core22
897
14
14
898
15
layout:
15
layout:
899
16
  /usr/var/lib/bluetooth:
16
  /usr/var/lib/bluetooth:
900
@@ -22,18 +22,12 @@ apps:
901
22
  bluetoothctl:
22
  bluetoothctl:
902
23
    command: bin/client-wrapper usr/bin/bluetoothctl
23
    command: bin/client-wrapper usr/bin/bluetoothctl
903
24
    plugs: [client, uhid]
24
    plugs: [client, uhid]
904
25
  obexctl:
905
26
    command: bin/client-wrapper usr/bin/obexctl
906
27
    plugs: [client]
907
28
  bluez:
25
  bluez:
908
29
    command: bin/bluetoothd-wrapper
26
    command: bin/bluetoothd-wrapper
910
30
    daemon: simple
27
    daemon: dbus
911
28
    bus-name: org.bluez
912
31
    slots: [service]
29
    slots: [service]
913
32
    plugs: [uhid, uinput, kernel-crypto-api]
30
    plugs: [uhid, uinput, kernel-crypto-api]
914
33
  obex:
915
34
    command: "usr/lib/bluetooth/obexd"
916
35
    daemon: simple
917
36
    slots: [service]
918
37
  hciconfig:
31
  hciconfig:
919
38
    command: usr/bin/hciconfig
32
    command: usr/bin/hciconfig
920
39
    plugs: [bluetooth-control]
33
    plugs: [bluetooth-control]
921
@@ -58,9 +52,6 @@ apps:
922
58
  btmgmt:
52
  btmgmt:
923
59
    command: usr/bin/btmgmt
53
    command: usr/bin/btmgmt
924
60
    plugs: [bluetooth-control, network-control]
54
    plugs: [bluetooth-control, network-control]
925
61
  meshctl:
926
62
    command: usr/bin/meshctl
927
63
    plugs: [bluetooth-control, network-control]
928
64
55
929
65
plugs:
56
plugs:
930
66
  client:
57
  client:
931
@@ -96,9 +87,9 @@ parts:
932
96
    build-packages:
87
    build-packages:
933
97
      - dpkg-dev
88
      - dpkg-dev
934
98
      - git
89
      - git
935
90
      - python3-docutils
936
99
    stage-packages:
91
    stage-packages:
937
100
      - bluez
92
      - bluez
938
101
      - bluez-obexd
939
102
      - bluez-hcidump
93
      - bluez-hcidump
940
103
    override-build: |
94
    override-build: |
941
104
      set -ex
95
      set -ex
942
@@ -110,7 +101,6 @@ parts:
943
110
      cp build-tools/* "$SNAPCRAFT_PART_INSTALL"/build-tools
101
      cp build-tools/* "$SNAPCRAFT_PART_INSTALL"/build-tools
944
111
    prime:
102
    prime:
945
112
      - usr/share/doc/bluez
103
      - usr/share/doc/bluez
946
113
      - usr/share/doc/bluez-obexd
947
114
      - usr/share/doc/bluez-hcidump
104
      - usr/share/doc/bluez-hcidump
948
115
105
949
116
  bluez:
106
  bluez:
950
@@ -118,19 +108,17 @@ parts:
951
118
    plugin: autotools
108
    plugin: autotools
952
119
    source: https://git.launchpad.net/ubuntu/+source/bluez
109
    source: https://git.launchpad.net/ubuntu/+source/bluez
953
120
    source-type: git
110
    source-type: git
955
121
    source-branch: applied/ubuntu/focal-updates
111
    source-branch: applied/ubuntu/jammy
956
122
    autotools-configure-parameters:
112
    autotools-configure-parameters:
957
123
      - --prefix=/usr
113
      - --prefix=/usr
958
124
      - --libexec=/usr/lib/
114
      - --libexec=/usr/lib/
959
125
      - --enable-experimental
115
      - --enable-experimental
960
126
      - --enable-threads
116
      - --enable-threads
961
127
      - --disable-cups
117
      - --disable-cups
962
128
      - --enable-obex
963
129
      - --disable-systemd
118
      - --disable-systemd
964
130
      - --disable-silent-rules
119
      - --disable-silent-rules
965
131
      - --enable-test
120
      - --enable-test
966
132
      - --enable-deprecated
121
      - --enable-deprecated
967
133
      - --enable-mesh
968
134
    build-packages:
122
    build-packages:
969
135
      - flex
123
      - flex
970
136
      - bison
124
      - bison
971
@@ -145,9 +133,7 @@ parts:
972
145
      - check
133
      - check
973
146
    prime:
134
    prime:
974
147
      - usr/lib/bluetooth/bluetoothd
135
      - usr/lib/bluetooth/bluetoothd
975
148
      - usr/lib/bluetooth/obexd
976
149
      - usr/bin/bluetoothctl
136
      - usr/bin/bluetoothctl
977
150
      - usr/bin/obexctl
978
151
      - usr/bin/hciconfig
137
      - usr/bin/hciconfig
979
152
      - usr/bin/hcidump
138
      - usr/bin/hcidump
980
153
      - usr/bin/hciattach
139
      - usr/bin/hciattach
981
@@ -156,7 +142,6 @@ parts:
982
156
      - usr/bin/sdptool
142
      - usr/bin/sdptool
983
157
      - usr/bin/btmon
143
      - usr/bin/btmon
984
158
      - usr/bin/btmgmt
144
      - usr/bin/btmgmt
985
159
      - usr/bin/meshctl
986
160
    override-build: |
145
    override-build: |
987
161
      set -ex
146
      set -ex
988
162
      "$SNAPCRAFT_STAGE"/build-tools/check-versions bluez yes
147
      "$SNAPCRAFT_STAGE"/build-tools/check-versions bluez yes
989
@@ -165,6 +150,5 @@ parts:
990
165
      git am "$SNAPCRAFT_PROJECT_DIR"/patch/*
150
      git am "$SNAPCRAFT_PROJECT_DIR"/patch/*
991
166
      snapcraftctl build
151
      snapcraftctl build
992
167
      cp tools/btmgmt "$SNAPCRAFT_PART_INSTALL"/usr/bin/
152
      cp tools/btmgmt "$SNAPCRAFT_PART_INSTALL"/usr/bin/
993
168
      cp tools/obexctl "$SNAPCRAFT_PART_INSTALL"/usr/bin/
994
169
      # Run all tests shiped by default
153
      # Run all tests shiped by default
996
170
      #make check
154
      make check
997
diff --git a/spread.yaml b/spread.yaml
998
index ee293b4..5a5a777 100644
999
--- a/spread.yaml
1000
+++ b/spread.yaml
1001
@@ -22,13 +22,13 @@ environment:
1002
22
    SNAP_ARCH: amd64
22
    SNAP_ARCH: amd64
1003
23
    # Allow the host to pass the channel to use for the test run
23
    # Allow the host to pass the channel to use for the test run
1004
24
    SNAP_CHANNEL: $(HOST:echo $SNAP_CHANNEL)
24
    SNAP_CHANNEL: $(HOST:echo $SNAP_CHANNEL)
1006
25
    SNAP_AUTO_ALIASES: bluetoothctl obexctl hciconfig hcidump hciattach hcitool
25
    SNAP_AUTO_ALIASES: bluetoothctl hciconfig hcidump hciattach hcitool
1007
26
26
1008
27
backends:
27
backends:
1009
28
    qemu:
28
    qemu:
1010
29
        memory: 4G
29
        memory: 4G
1011
30
        systems:
30
        systems:
1013
31
            - ubuntu-core-20:
31
            - ubuntu-core-22:
1014
32
                bios: /usr/share/OVMF/OVMF_CODE.fd
32
                bios: /usr/share/OVMF/OVMF_CODE.fd
1015
33
                username: test
33
                username: test
1016
34
                password: test
34
                password: test
1017
@@ -46,7 +46,7 @@ suites:
1018
46
    tests/main/:
46
    tests/main/:
1019
47
        summary: Full-system tests for BlueZ
47
        summary: Full-system tests for BlueZ
1020
48
        systems:
48
        systems:
1022
49
            - ubuntu-core-20
49
            - ubuntu-core-22
1023
50
        prepare: |
50
        prepare: |
1024
51
            . $TESTSLIB/prepare.sh
51
            . $TESTSLIB/prepare.sh
1025
52
        restore-each: |
52
        restore-each: |
1026
diff --git a/tests/main/aliases/task.yaml b/tests/main/aliases/task.yaml
1027
index 3813735..883624c 100644
1028
--- a/tests/main/aliases/task.yaml
1029
+++ b/tests/main/aliases/task.yaml
1030
@@ -3,7 +3,6 @@ summary: Verify aliases provided by the snap are correctly enabled
1031
3
execute: |
3
execute: |
1032
4
    . $TESTSLIB/utilities.sh
4
    . $TESTSLIB/utilities.sh
1033
5
    test -e /snap/bin/bluetoothctl
5
    test -e /snap/bin/bluetoothctl
1034
6
    test -e /snap/bin/obexctl
1035
7
    test -e /snap/bin/hciconfig
6
    test -e /snap/bin/hciconfig
1036
8
    test -e /snap/bin/hcidump
7
    test -e /snap/bin/hcidump
1037
9
    test -e /snap/bin/hciattach
8
    test -e /snap/bin/hciattach
Status:	Merged
Approved by:	Alfonso Sanchez-Beato on 2022-04-25
Approved revision:	248c79669e11e406556d7d6f7583f30f0bf3c61b
Merged at revision:	5554b6e9c2c2011972731b1554b29ad347d87e79
Proposed branch:	~valentin.david/snappy-hwe-snaps:valentindavid/core22
Merge into:	~snappy-hwe-team/snappy-hwe-snaps/+git/bluez:snap-22
Diff against target:	1037 lines (+13/-66) 8 files modified dev/null (+0/-31) docs/metadata.yaml (+0/-2) docs/reference/available-commands.md (+1/-3) docs/reference/introduction.md (+0/-1) run-tests.sh (+1/-1) snapcraft.yaml (+8/-24) spread.yaml (+3/-3) tests/main/aliases/task.yaml (+0/-1)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Alfonso Sanchez-Beato		2022-04-05	Approve on 2022-04-25
System Enablement Bot	continuous-integration		Approve on 2022-04-25
Review via email: mp+418499@code.launchpad.net