From 2b428f455db79de95a3a13bd3a5ac6b9bcbbfb96 Mon Sep 17 00:00:00 2001
From: Cristian Iorga <cristian.iorga@intel.com>
Date: Mon, 9 Dec 2013 17:51:59 +0200
Subject: [PATCH] connman: upgrade to 1.20

Fix issue with fallback nameservers not being used!
Fix various other issues.
Add support for NTP v3 protocol.

(From OE-Core rev: a01febdeacd08c7ab7983ad7555368a17b937907)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-connectivity/connman/connman.inc                 | 2 ++
 .../connman/{connman_1.19.bb => connman_1.20.bb}              | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename meta/recipes-connectivity/connman/{connman_1.19.bb => connman_1.20.bb} (68%)

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 12f3edd648..f2c42fcd19 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -66,6 +66,8 @@ SYSTEMD_SERVICE_${PN} = "connman.service"
 SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service"
 SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup"
 
+UNKNOWN_CONFIGURE_WHITELIST += "--disable-gtk-doc-pdf --disable-gtk-doc-html"
+
 inherit autotools gtk-doc pkgconfig systemd update-rc.d
 
 do_configure_append () {
diff --git a/meta/recipes-connectivity/connman/connman_1.19.bb b/meta/recipes-connectivity/connman/connman_1.20.bb
similarity index 68%
rename from meta/recipes-connectivity/connman/connman_1.19.bb
rename to meta/recipes-connectivity/connman/connman_1.20.bb
index c63dfe4a19..4af71e28bb 100644
--- a/meta/recipes-connectivity/connman/connman_1.19.bb
+++ b/meta/recipes-connectivity/connman/connman_1.20.bb
@@ -6,7 +6,7 @@ SRC_URI  = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
             file://connman \
             "
 
-SRC_URI[md5sum] = "47cce1d17a693dc307e6796c81991bd0"
-SRC_URI[sha256sum] = "7e4e624cadf42feed18e783351b10f81ef23d7e298bddc7ffe26fe5e69f25b8b"
+SRC_URI[md5sum] = "15f5e0d89e01b81c79306f54a2014efd"
+SRC_URI[sha256sum] = "4e638443be959913a5ce0d51df10018448ed08d06e4f8a47ce4b3c705bc78ac1"
 
 RRECOMMENDS_${PN} = "connman-conf"