[PATCH 07/48] connman: upgrade 1.43 -> 1.44

[Richard Purdie <richard.purdie@linuxfoundation.org>]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 ...stop-systemd-resolved-when-we-use-co.patch |  7 ++---
 ...visibility-to-default-for-debug-symb.patch | 12 +++------
 ...ve-musl-does-not-implement-res_ninit.patch |  5 +---
 .../connman/connman/no-version-scripts.patch  | 26 ++++++++++++++++---
 .../{connman_1.43.bb => connman_1.44.bb}      |  2 +-
 5 files changed, 31 insertions(+), 21 deletions(-)
 rename meta/recipes-connectivity/connman/{connman_1.43.bb => connman_1.44.bb} (84%)

diff --git a/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-resolved-when-we-use-co.patch b/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-resolved-when-we-use-co.patch
index 8e2e0bd02d5..4597fe68fcd 100644
--- a/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-resolved-when-we-use-co.patch
+++ b/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-resolved-when-we-use-co.patch
@@ -1,4 +1,4 @@
-From 9f70b94ebf18f52c115634642652830fa77f27a1 Mon Sep 17 00:00:00 2001
+From 19aff57e4da920d9ca972903582305b4efe81ef3 Mon Sep 17 00:00:00 2001
 From: "Maxin B. John" <maxin.john@intel.com>
 Date: Mon, 12 Jun 2017 16:52:39 +0300
 Subject: [PATCH] connman.service: stop systemd-resolved when we use connman
@@ -13,7 +13,7 @@ Signed-off-by: Maxin B. John <maxin.john@intel.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/src/connman.service.in b/src/connman.service.in
-index 9f5c10f..dab48bc 100644
+index 7376346..79e75d6 100644
 --- a/src/connman.service.in
 +++ b/src/connman.service.in
 @@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman
@@ -24,6 +24,3 @@ index 9f5c10f..dab48bc 100644
  
  [Service]
  Type=dbus
--- 
-2.4.0
-
diff --git a/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch b/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch
index e6f03e632ea..a68707b2fa6 100644
--- a/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch
+++ b/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch
@@ -1,4 +1,4 @@
-From 4ddaf78dad5a9ee4a0658235f71b75132192123e Mon Sep 17 00:00:00 2001
+From c254226d4ebbd846c1f8169d70413a0d32d7ae77 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 7 Apr 2012 18:52:12 -0700
 Subject: [PATCH] plugin.h: Change visibility to default for debug symbols
@@ -8,14 +8,13 @@ have hidden visibility
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
-
 Upstream-Status: Pending
 ---
- include/plugin.h |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ include/plugin.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/include/plugin.h b/include/plugin.h
-index 692a4e5..a9361c3 100644
+index 8d2bb08..a12a6be 100644
 --- a/include/plugin.h
 +++ b/include/plugin.h
 @@ -89,9 +89,9 @@ struct connman_plugin_desc {
@@ -30,6 +29,3 @@ index 692a4e5..a9361c3 100644
  		extern struct connman_plugin_desc connman_plugin_desc \
  				__attribute__ ((visibility("default"))); \
  		struct connman_plugin_desc connman_plugin_desc = { \
--- 
-1.7.5.4
-
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 9e2cc34995a..2c612039ee8 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 @@
-From 60783f0d885c9a0db8b6f1d528786321e53f1512 Mon Sep 17 00:00:00 2001
+From 4e726a5aaa75d60fab6a56bc37dbec48be53ff79 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] gweb/gresolv.c: make use of res_ninit optional and subject to
@@ -83,6 +83,3 @@ index 8101d71..9f1477c 100644
  
  		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/no-version-scripts.patch b/meta/recipes-connectivity/connman/connman/no-version-scripts.patch
index e96e38bcf91..3667a166f69 100644
--- a/meta/recipes-connectivity/connman/connman/no-version-scripts.patch
+++ b/meta/recipes-connectivity/connman/connman/no-version-scripts.patch
@@ -1,3 +1,8 @@
+From 67f37aafcc8ef5d2eb006387e7bec21f74518727 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Tue, 9 Aug 2016 12:12:02 +0100
+Subject: [PATCH] connman: disable version-scripts to fix crashes at startup
+
 With binutils 2.27 on at least MIPS, connmand will crash on startup.  This
 appears to be due to the symbol visibilty scripts hiding symbols that stdio
 looks up at runtime, resulting in it segfaulting.
@@ -12,16 +17,31 @@ remove the scripts to work around the problem until binutils is fixed.
 
 Upstream-Status: Inappropriate
 Signed-off-by: Ross Burton <ross.burton@intel.com>
+---
+ Makefile.am | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index d70725c..76ae432 100644
+index 3dc3bb5..3be5ccb 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -132,2 +132 @@ src_connmand_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
+@@ -143,8 +143,7 @@ src_connmand_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
+ 			@GIO_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @GNUTLS_LIBS@ \
+ 			-lresolv -ldl -lrt
+ 
 -src_connmand_LDFLAGS = -Wl,--export-dynamic \
 -				-Wl,--version-script=$(srcdir)/src/connman.ver
 +src_connmand_LDFLAGS = -Wl,--export-dynamic
-@@ -166,2 +165 @@ vpn_connman_vpnd_LDADD = gdbus/libgdbus-internal.la $(builtin_vpn_libadd) \
+ 
+ src_connmand_wait_online_SOURCES = src/connmand-wait-online.c
+ 
+@@ -187,8 +186,7 @@ vpn_connman_vpnd_LDADD = gdbus/libgdbus-internal.la $(builtin_vpn_libadd) \
+ 				@GIO_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @GNUTLS_LIBS@ \
+ 				-lresolv -ldl
+ 
 -vpn_connman_vpnd_LDFLAGS = -Wl,--export-dynamic \
 -				-Wl,--version-script=$(srcdir)/vpn/vpn.ver
 +vpn_connman_vpnd_LDFLAGS = -Wl,--export-dynamic
+ endif
+ 
+ BUILT_SOURCES = $(local_headers) src/builtin.h $(service_files) \
diff --git a/meta/recipes-connectivity/connman/connman_1.43.bb b/meta/recipes-connectivity/connman/connman_1.44.bb
similarity index 84%
rename from meta/recipes-connectivity/connman/connman_1.43.bb
rename to meta/recipes-connectivity/connman/connman_1.44.bb
index 1100599490a..396d8bc5ce2 100644
--- a/meta/recipes-connectivity/connman/connman_1.43.bb
+++ b/meta/recipes-connectivity/connman/connman_1.44.bb
@@ -9,7 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
            "
 
 
-SRC_URI[sha256sum] = "1257cebe327e7900b7e2b84c0fb330aa90815e455898cd2f941f4308ed2be3bc"
+SRC_URI[sha256sum] = "2be2b00321632b775f9eff713acd04ef21e31fbf388f6ebf45512ff4289574ff"
 
 RRECOMMENDS:${PN} = "connman-conf"
 RCONFLICTS:${PN} = "networkmanager"