summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-05-03 16:25:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-05 12:19:54 (GMT)
commit576da5a88e9e1c5d13e8f627fa24b7d373827f3e (patch)
tree7902fbcf3eea10d0246baffe02f9a487389e4bdb /meta/recipes-connectivity/connman
parent2345bdf57193e111c92eb4bc916f5e0e52e05983 (diff)
downloadpoky-576da5a88e9e1c5d13e8f627fa24b7d373827f3e.tar.gz
connman: update to 1.38
Drop a patch merged upstream. (From OE-Core rev: ce2948af5293258a69a9cfefba9e883cefecac87) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc1
-rw-r--r--meta/recipes-connectivity/connman/connman/0001-gweb-fix-segfault-with-musl-v1.1.21.patch34
-rw-r--r--meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch20
-rw-r--r--meta/recipes-connectivity/connman/connman_1.37.bb17
-rw-r--r--meta/recipes-connectivity/connman/connman_1.38.bb16
5 files changed, 26 insertions, 62 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index d3eeb3b..b60178c 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -53,6 +53,7 @@ PACKAGECONFIG[nftables] = "--with-firewall=nftables ,,libmnl libnftnl,,kernel-mo
53PACKAGECONFIG[iptables] = "--with-firewall=iptables ,,iptables,iptables" 53PACKAGECONFIG[iptables] = "--with-firewall=iptables ,,iptables,iptables"
54PACKAGECONFIG[nfc] = "--enable-neard, --disable-neard, neard, neard" 54PACKAGECONFIG[nfc] = "--enable-neard, --disable-neard, neard, neard"
55PACKAGECONFIG[client] = "--enable-client,--disable-client,readline" 55PACKAGECONFIG[client] = "--enable-client,--disable-client,readline"
56PACKAGECONFIG[wireguard] = "--enable-wireguard,--disable-wireguard,libmnl"
56 57
57INITSCRIPT_NAME = "connman" 58INITSCRIPT_NAME = "connman"
58INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." 59INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
diff --git a/meta/recipes-connectivity/connman/connman/0001-gweb-fix-segfault-with-musl-v1.1.21.patch b/meta/recipes-connectivity/connman/connman/0001-gweb-fix-segfault-with-musl-v1.1.21.patch
deleted file mode 100644
index 30f1432..0000000
--- a/meta/recipes-connectivity/connman/connman/0001-gweb-fix-segfault-with-musl-v1.1.21.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From f0a8c69971b30ea7ca255bb885fdd1179fa5d298 Mon Sep 17 00:00:00 2001
2From: Nicola Lunghi <nick83ola@gmail.com>
3Date: Thu, 23 May 2019 07:55:25 +0100
4Subject: [PATCH] gweb: fix segfault with musl v1.1.21
5
6In musl > v1.1.21 freeaddrinfo() implementation changed and
7was causing a segmentation fault on recent Yocto using musl.
8
9See this commit:
10
11 https://git.musl-libc.org/cgit/musl/commit/src/network/freeaddrinfo.c?id=d1395c43c019aec6b855cf3c656bf47c8a719e7f
12
13Upstream-Status: Submitted
14---
15 gweb/gweb.c | 3 ++-
16 1 file changed, 2 insertions(+), 1 deletion(-)
17
18diff --git a/gweb/gweb.c b/gweb/gweb.c
19index 393afe0a..12fcb1d8 100644
20--- a/gweb/gweb.c
21+++ b/gweb/gweb.c
22@@ -1274,7 +1274,8 @@ static bool is_ip_address(const char *host)
23 addr = NULL;
24
25 result = getaddrinfo(host, NULL, &hints, &addr);
26- freeaddrinfo(addr);
27+ if(!result)
28+ freeaddrinfo(addr);
29
30 return result == 0;
31 }
32--
332.19.1
34
diff --git a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
index 639ccfa..942b9c9 100644
--- a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
+++ b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
@@ -1,7 +1,7 @@
1From 10b0d16d04b811b1ccd1f9b0cfe757bce8d876a1 Mon Sep 17 00:00:00 2001 1From c7734e1547db967eccf242fe4b9e8a30b9ff141c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Apr 2015 23:02:21 -0700 3Date: Mon, 6 Apr 2015 23:02:21 -0700
4Subject: [PATCH 2/3] resolve: musl does not implement res_ninit 4Subject: [PATCH] resolve: musl does not implement res_ninit
5 5
6ported from 6ported from
7http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch 7http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch
@@ -9,12 +9,13 @@ http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch
9Upstream-Status: Pending 9Upstream-Status: Pending
10 10
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
12--- 13---
13 gweb/gresolv.c | 33 ++++++++++++--------------------- 14 gweb/gresolv.c | 34 +++++++++++++---------------------
14 1 file changed, 12 insertions(+), 21 deletions(-) 15 1 file changed, 13 insertions(+), 21 deletions(-)
15 16
16diff --git a/gweb/gresolv.c b/gweb/gresolv.c 17diff --git a/gweb/gresolv.c b/gweb/gresolv.c
17index 5cf7a9a..3ad8e70 100644 18index 38a554e..a9e8740 100644
18--- a/gweb/gresolv.c 19--- a/gweb/gresolv.c
19+++ b/gweb/gresolv.c 20+++ b/gweb/gresolv.c
20@@ -36,6 +36,7 @@ 21@@ -36,6 +36,7 @@
@@ -25,7 +26,7 @@ index 5cf7a9a..3ad8e70 100644
25 26
26 #include "gresolv.h" 27 #include "gresolv.h"
27 28
28@@ -875,8 +875,6 @@ GResolv *g_resolv_new(int index) 29@@ -877,8 +878,6 @@ GResolv *g_resolv_new(int index)
29 resolv->index = index; 30 resolv->index = index;
30 resolv->nameserver_list = NULL; 31 resolv->nameserver_list = NULL;
31 32
@@ -34,7 +35,7 @@ index 5cf7a9a..3ad8e70 100644
34 return resolv; 35 return resolv;
35 } 36 }
36 37
37@@ -916,8 +914,6 @@ void g_resolv_unref(GResolv *resolv) 38@@ -918,8 +917,6 @@ void g_resolv_unref(GResolv *resolv)
38 39
39 flush_nameservers(resolv); 40 flush_nameservers(resolv);
40 41
@@ -43,7 +44,7 @@ index 5cf7a9a..3ad8e70 100644
43 g_free(resolv); 44 g_free(resolv);
44 } 45 }
45 46
46@@ -1020,24 +1016,19 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname, 47@@ -1022,24 +1019,19 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname,
47 debug(resolv, "hostname %s", hostname); 48 debug(resolv, "hostname %s", hostname);
48 49
49 if (!resolv->nameserver_list) { 50 if (!resolv->nameserver_list) {
@@ -80,6 +81,3 @@ index 5cf7a9a..3ad8e70 100644
80 } 81 }
81 82
82 if (!resolv->nameserver_list) 83 if (!resolv->nameserver_list)
83--
842.5.1
85
diff --git a/meta/recipes-connectivity/connman/connman_1.37.bb b/meta/recipes-connectivity/connman/connman_1.37.bb
deleted file mode 100644
index 00852bf..0000000
--- a/meta/recipes-connectivity/connman/connman_1.37.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1require connman.inc
2
3SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
4 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
5 file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \
6 file://0001-gweb-fix-segfault-with-musl-v1.1.21.patch \
7 file://connman \
8 file://no-version-scripts.patch \
9"
10
11SRC_URI_append_libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch"
12
13SRC_URI[md5sum] = "75012084f14fb63a84b116e66c6e94fb"
14SRC_URI[sha256sum] = "6ce29b3eb0bb16a7387bc609c39455fd13064bdcde5a4d185fab3a0c71946e16"
15
16RRECOMMENDS_${PN} = "connman-conf"
17RCONFLICTS_${PN} = "networkmanager"
diff --git a/meta/recipes-connectivity/connman/connman_1.38.bb b/meta/recipes-connectivity/connman/connman_1.38.bb
new file mode 100644
index 0000000..027c41e
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman_1.38.bb
@@ -0,0 +1,16 @@
1require connman.inc
2
3SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
4 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
5 file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \
6 file://connman \
7 file://no-version-scripts.patch \
8 "
9
10SRC_URI_append_libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch"
11
12SRC_URI[md5sum] = "1ed8745354c7254bdfd4def54833ee94"
13SRC_URI[sha256sum] = "cb30aca97c2f79ccaed8802aa2909ac5100a3969de74c0af8a9d73b85fc4932b"
14
15RRECOMMENDS_${PN} = "connman-conf"
16RCONFLICTS_${PN} = "networkmanager"