connman: make 0002-resolve-musl-does-not-implement-res_ninit.patch libc-agnostic

The patch is reworked to take musl-specific path only if the functions are
undefined by libc (which can be checked via __RES, as explained in
https://www.openwall.com/lists/musl/2020/10/23/16 ).

This should make it more suitable for upstream submission.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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 aefdd3aa065bf464e7f5d6d5c29c5545cc8ec43a..71efd9035e9a7a336286061187d0c6e2c78c75c8 100644 (file)
--- 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,75 +1,88 @@
-From 01974865e4d331eeaf25248bee1bb96539c450d9 Mon Sep 17 00:00:00 2001
+From 60783f0d885c9a0db8b6f1d528786321e53f1512 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] resolve: musl does not implement res_ninit
+Subject: [PATCH] gweb/gresolv.c: make use of res_ninit optional and subject to
+ __RES
 
-ported from
+Not all libc implementation have those functions, and the way to determine
+if they do is to check __RES which is explained in resolv.h thusly:
+
+/*
+ * Revision information.  This is the release date in YYYYMMDD format.
+ * It can change every day so the right thing to do with it is use it
+ * in preprocessor commands such as "#if (__RES > 19931104)".  Do not
+ * compare for equality; rather, use it to determine whether your resolver
+ * is new enough to contain a certain feature.
+ */
+
+Indeed, it needs to be at least 19991006.
+
+The portion of the patch that implements a fallback is ported from
+Alpine Linux:
 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 | 34 +++++++++++++---------------------
- 1 file changed, 13 insertions(+), 21 deletions(-)
+ gweb/gresolv.c | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
 
 diff --git a/gweb/gresolv.c b/gweb/gresolv.c
-index 954e7cf..2a9bc51 100644
+index 8101d71..9f1477c 100644
 --- a/gweb/gresolv.c
 +++ b/gweb/gresolv.c
-@@ -878,8 +879,6 @@ GResolv *g_resolv_new(int index)
+@@ -879,7 +879,9 @@ GResolv *g_resolv_new(int index)
        resolv->index = index;
        resolv->nameserver_list = NULL;
  
--      res_ninit(&resolv->res);
--
++#if (__RES >= 19991006)
+       res_ninit(&resolv->res);
++#endif
+ 
        return resolv;
  }
- 
-@@ -919,8 +918,6 @@ void g_resolv_unref(GResolv *resolv)
+@@ -920,7 +922,9 @@ void g_resolv_unref(GResolv *resolv)
  
        flush_nameservers(resolv);
  
--      res_nclose(&resolv->res);
--
++#if (__RES >= 19991006)
+       res_nclose(&resolv->res);
++#endif
+ 
        g_free(resolv);
  }
- 
-@@ -1023,24 +1020,19 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname,
+@@ -1024,6 +1028,7 @@ 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 (__RES >= 19991006)
+               int i;
+ 
+               for (i = 0; i < resolv->res.nscount; i++) {
+@@ -1043,6 +1048,22 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname,
+                       if (inet_ntop(family, sa_addr, buf, sizeof(buf)))
+                               g_resolv_add_nameserver(resolv, buf, 53, 0);
                }
++#else
++                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);
++                        }
++                        fclose(f);
++                }
++#endif
  
                if (!resolv->nameserver_list)
+                       g_resolv_add_nameserver(resolv, "127.0.0.1", 53, 0);
+-- 
+2.39.2
+

diff --git a/meta/recipes-connectivity/connman/connman_1.42.bb b/meta/recipes-connectivity/connman/connman_1.42.bb
index 91ab9895ac86fcd9d1039c08473d4fcbf7197319..5c60b9cb83a76b340bf2cf17ccb9dfb77a8eaf59 100644 (file)
--- a/meta/recipes-connectivity/connman/connman_1.42.bb
+++ b/meta/recipes-connectivity/connman/connman_1.42.bb
@@ -7,9 +7,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
            file://no-version-scripts.patch \
            file://0001-vpn-Adding-support-for-latest-pppd-2.5.0-release.patch \
            file://0001-src-log.c-Include-libgen.h-for-basename-API.patch \
+           file://0002-resolve-musl-does-not-implement-res_ninit.patch \
            "
 
-SRC_URI:append:libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch"
 
 SRC_URI[sha256sum] = "a3e6bae46fc081ef2e9dae3caa4f7649de892c3de622c20283ac0ca81423c2aa"