connman: Fix build with musl

(From OE-Core rev: d08f9d7145ba14ce9fbf320719c05560be69212f)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 77 insertions, 0 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
new file mode 100644
index 0000000000..0593427710
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
@@ -0,0 +1,77 @@
+From 10b0d16d04b811b1ccd1f9b0cfe757bce8d876a1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 6 Apr 2015 23:02:21 -0700
+Subject: [PATCH 2/3] resolve: musl does not implement res_ninit
+
+ported from
+http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gweb/gresolv.c | 33 ++++++++++++---------------------
+ 1 file changed, 12 insertions(+), 21 deletions(-)
+
+diff --git a/gweb/gresolv.c b/gweb/gresolv.c
+index 5cf7a9a..3ad8e70 100644
+--- a/gweb/gresolv.c
++++ b/gweb/gresolv.c
+@@ -875,8 +875,6 @@ GResolv *g_resolv_new(int index)
+        resolv->index = index;
+        resolv->nameserver_list = NULL;
+ 
+-       res_ninit(&resolv->res);
+-
+        return resolv;
+ }
+ 
+@@ -916,8 +914,6 @@ void g_resolv_unref(GResolv *resolv)
+ 
+        flush_nameservers(resolv);
+ 
+-       res_nclose(&resolv->res);
+-
+        g_free(resolv);
+ }
+ 
+@@ -1020,24 +1016,19 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname,
+        debug(resolv, "hostname %s", hostname);
+ 
+        if (!resolv->nameserver_list) {
+-               int i;
+-
+-               for (i = 0; i < resolv->res.nscount; i++) {
+-                       char buf[100];
+-                       int family = resolv->res.nsaddr_list[i].sin_family;
+-                       void *sa_addr = &resolv->res.nsaddr_list[i].sin_addr;
+-
+-                       if (family != AF_INET &&
+-                                       resolv->res._u._ext.nsaddrs[i]) {
+-                               family = AF_INET6;
+-                               sa_addr = &resolv->res._u._ext.nsaddrs[i]->sin6_addr;
++               FILE *f = fopen("/etc/resolv.conf", "r");
++               if (f) {
++                       char line[256], *s;
++                       int i;
++                       while (fgets(line, sizeof(line), f)) {
++                               if (strncmp(line, "nameserver", 10) || !isspace(line[10]))
++                                       continue;
++                               for (s = &line[11]; isspace(s[0]); s++);
++                               for (i = 0; s[i] && !isspace(s[i]); i++);
++                               s[i] = 0;
++                               g_resolv_add_nameserver(resolv, s, 53, 0);
+                        }
+-
+-                       if (family != AF_INET && family != AF_INET6)
+-                               continue;
+-
+-                       if (inet_ntop(family, sa_addr, buf, sizeof(buf)))
+-                               g_resolv_add_nameserver(resolv, buf, 53, 0);
++                       fclose(f);
+                }
+ 
+                if (!resolv->nameserver_list)
+-- 
+2.5.1
+