diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-06-15 10:12:19 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-06-17 00:07:05 +0100 |
commit | a4c38eb05a91b6610e942f792b48ba9f1cb4a6cd (patch) | |
tree | ab3e45a2287fdd7fd639fb192598190d87ad9d8b /meta/recipes-connectivity/connman/connman | |
parent | 096f60d490891a88a539f096a50fd3fa7ec333b9 (diff) | |
download | poky-a4c38eb05a91b6610e942f792b48ba9f1cb4a6cd.tar.gz |
connman: update 1.39 -> 1.40
(From OE-Core rev: a23c6374ad3112f8b0a4bc259c67eb7dd2ae9097)
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/connman')
-rw-r--r-- | meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch | 10 |
1 files changed, 5 insertions, 5 deletions
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 942b9c97b6..9dca21a02f 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,4 +1,4 @@ | |||
1 | From c7734e1547db967eccf242fe4b9e8a30b9ff141c Mon Sep 17 00:00:00 2001 | 1 | From 01974865e4d331eeaf25248bee1bb96539c450d9 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 6 Apr 2015 23:02:21 -0700 | 3 | Date: Mon, 6 Apr 2015 23:02:21 -0700 |
4 | Subject: [PATCH] resolve: musl does not implement res_ninit | 4 | Subject: [PATCH] resolve: musl does not implement res_ninit |
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
15 | 1 file changed, 13 insertions(+), 21 deletions(-) | 15 | 1 file changed, 13 insertions(+), 21 deletions(-) |
16 | 16 | ||
17 | diff --git a/gweb/gresolv.c b/gweb/gresolv.c | 17 | diff --git a/gweb/gresolv.c b/gweb/gresolv.c |
18 | index 38a554e..a9e8740 100644 | 18 | index 954e7cf..2a9bc51 100644 |
19 | --- a/gweb/gresolv.c | 19 | --- a/gweb/gresolv.c |
20 | +++ b/gweb/gresolv.c | 20 | +++ b/gweb/gresolv.c |
21 | @@ -36,6 +36,7 @@ | 21 | @@ -36,6 +36,7 @@ |
@@ -26,7 +26,7 @@ index 38a554e..a9e8740 100644 | |||
26 | 26 | ||
27 | #include "gresolv.h" | 27 | #include "gresolv.h" |
28 | 28 | ||
29 | @@ -877,8 +878,6 @@ GResolv *g_resolv_new(int index) | 29 | @@ -878,8 +879,6 @@ GResolv *g_resolv_new(int index) |
30 | resolv->index = index; | 30 | resolv->index = index; |
31 | resolv->nameserver_list = NULL; | 31 | resolv->nameserver_list = NULL; |
32 | 32 | ||
@@ -35,7 +35,7 @@ index 38a554e..a9e8740 100644 | |||
35 | return resolv; | 35 | return resolv; |
36 | } | 36 | } |
37 | 37 | ||
38 | @@ -918,8 +917,6 @@ void g_resolv_unref(GResolv *resolv) | 38 | @@ -919,8 +918,6 @@ void g_resolv_unref(GResolv *resolv) |
39 | 39 | ||
40 | flush_nameservers(resolv); | 40 | flush_nameservers(resolv); |
41 | 41 | ||
@@ -44,7 +44,7 @@ index 38a554e..a9e8740 100644 | |||
44 | g_free(resolv); | 44 | g_free(resolv); |
45 | } | 45 | } |
46 | 46 | ||
47 | @@ -1022,24 +1019,19 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname, | 47 | @@ -1023,24 +1020,19 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname, |
48 | debug(resolv, "hostname %s", hostname); | 48 | debug(resolv, "hostname %s", hostname); |
49 | 49 | ||
50 | if (!resolv->nameserver_list) { | 50 | if (!resolv->nameserver_list) { |