summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2015-04-28 12:03:17 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-03 11:43:52 +0100
commitdbdf1ed58d393f564e9333272383d813eba50059 (patch)
treec034a29624f63dbb8747a6edef04ed41410c3e34 /meta/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch
parent11981a5c591c22fe4e08fa9c6ac855a371da2f1f (diff)
downloadpoky-dbdf1ed58d393f564e9333272383d813eba50059.tar.gz
bluez: remove bluez4 recipes
BlueZ 4.x and associated recipes are now obsolete. (bluez4,bluez-hcidump, gst-plugin-bluetooth). Will be moved into recipes-connectivity collection of meta-openembedded. BlueZ 4.x is still usable in poky/YP. (From OE-Core rev: 7d298ecf733c1698e9f42ba79937eca394930b55) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch')
-rw-r--r--meta/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch110
1 files changed, 0 insertions, 110 deletions
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch b/meta/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch
deleted file mode 100644
index 1bc390f35a..0000000000
--- a/meta/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch
+++ /dev/null
@@ -1,110 +0,0 @@
1Avoid namepspace collision with encrypt function from libc
2
3Upstream-Status: Pending
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6Index: bluez-4.101/test/l2test.c
7===================================================================
8--- bluez-4.101.orig/test/l2test.c
9+++ bluez-4.101/test/l2test.c
10@@ -107,7 +107,7 @@ static char *filename = NULL;
11 static int rfcmode = 0;
12 static int master = 0;
13 static int auth = 0;
14-static int encrypt = 0;
15+static int encryption_request = 0;
16 static int secure = 0;
17 static int socktype = SOCK_SEQPACKET;
18 static int linger = 0;
19@@ -340,7 +340,7 @@ static int do_connect(char *svr)
20 opt |= L2CAP_LM_MASTER;
21 if (auth)
22 opt |= L2CAP_LM_AUTH;
23- if (encrypt)
24+ if (encryption_request)
25 opt |= L2CAP_LM_ENCRYPT;
26 if (secure)
27 opt |= L2CAP_LM_SECURE;
28@@ -475,7 +475,7 @@ static void do_listen(void (*handler)(in
29 opt |= L2CAP_LM_MASTER;
30 if (auth)
31 opt |= L2CAP_LM_AUTH;
32- if (encrypt)
33+ if (encryption_request)
34 opt |= L2CAP_LM_ENCRYPT;
35 if (secure)
36 opt |= L2CAP_LM_SECURE;
37@@ -1407,7 +1407,7 @@ int main(int argc, char *argv[])
38 break;
39
40 case 'E':
41- encrypt = 1;
42+ encryption_request = 1;
43 break;
44
45 case 'S':
46Index: bluez-4.101/test/rctest.c
47===================================================================
48--- bluez-4.101.orig/test/rctest.c
49+++ bluez-4.101/test/rctest.c
50@@ -79,7 +79,7 @@ static char *filename = NULL;
51
52 static int master = 0;
53 static int auth = 0;
54-static int encrypt = 0;
55+static int encryption_request = 0;
56 static int secure = 0;
57 static int socktype = SOCK_STREAM;
58 static int linger = 0;
59@@ -200,7 +200,7 @@ static int do_connect(const char *svr)
60 opt |= RFCOMM_LM_MASTER;
61 if (auth)
62 opt |= RFCOMM_LM_AUTH;
63- if (encrypt)
64+ if (encryption_request)
65 opt |= RFCOMM_LM_ENCRYPT;
66 if (secure)
67 opt |= RFCOMM_LM_SECURE;
68@@ -291,7 +291,7 @@ static void do_listen(void (*handler)(in
69 opt |= RFCOMM_LM_MASTER;
70 if (auth)
71 opt |= RFCOMM_LM_AUTH;
72- if (encrypt)
73+ if (encryption_request)
74 opt |= RFCOMM_LM_ENCRYPT;
75 if (secure)
76 opt |= RFCOMM_LM_SECURE;
77@@ -701,7 +701,7 @@ int main(int argc, char *argv[])
78 break;
79
80 case 'E':
81- encrypt = 1;
82+ encryption_request = 1;
83 break;
84
85 case 'S':
86Index: bluez-4.101/src/textfile.h
87===================================================================
88--- bluez-4.101.orig/src/textfile.h
89+++ bluez-4.101/src/textfile.h
90@@ -24,6 +24,8 @@
91 #ifndef __TEXTFILE_H
92 #define __TEXTFILE_H
93
94+#include <sys/types.h>
95+
96 int create_dirs(const char *filename, const mode_t mode);
97 int create_file(const char *filename, const mode_t mode);
98 int create_name(char *buf, size_t size, const char *path,
99Index: bluez-4.101/test/attest.c
100===================================================================
101--- bluez-4.101.orig/test/attest.c
102+++ bluez-4.101/test/attest.c
103@@ -34,6 +34,7 @@
104 #include <termios.h>
105 #include <sys/ioctl.h>
106 #include <sys/socket.h>
107+#include <sys/select.h>
108
109 #include <bluetooth/bluetooth.h>
110 #include <bluetooth/rfcomm.h>