From 5cb01c1222de90aeac10d190bb234ec4967ed6e5 Mon Sep 17 00:00:00 2001
From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
Date: Wed, 24 Apr 2013 15:26:14 +0100
Subject: connman: update to 1.13

- Removed upstream commited patch
- Updated git tag srcrev

(From OE-Core rev: 04c119d36f2a6157ba3a86106e555e79739961b6)

Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../connman/connman/add-in.h-for-ipv6.patch          | 20 --------------------
 meta/recipes-connectivity/connman/connman_1.12.bb    | 14 --------------
 meta/recipes-connectivity/connman/connman_1.13.bb    | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 34 deletions(-)
 delete mode 100644 meta/recipes-connectivity/connman/connman/add-in.h-for-ipv6.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman_1.12.bb
 create mode 100644 meta/recipes-connectivity/connman/connman_1.13.bb

diff --git a/meta/recipes-connectivity/connman/connman/add-in.h-for-ipv6.patch b/meta/recipes-connectivity/connman/connman/add-in.h-for-ipv6.patch
deleted file mode 100644
index 8ee0b6f543..0000000000
--- a/meta/recipes-connectivity/connman/connman/add-in.h-for-ipv6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-
-The 3.8 Kernel headers for if_bridge.h uses the in6_addr struct
-which is defined by netinet/in.h which is not included prior.
-
-Upstream-Status: Pending
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-Index: git/src/tethering.c
-===================================================================
---- git.orig/src/tethering.c
-+++ git/src/tethering.c
-@@ -35,6 +35,7 @@
- #include <string.h>
- #include <fcntl.h>
- #include <linux/if_tun.h>
-+#include <netinet/in.h>
- #include <linux/if_bridge.h>
- 
- #include "connman.h"
diff --git a/meta/recipes-connectivity/connman/connman_1.12.bb b/meta/recipes-connectivity/connman/connman_1.12.bb
deleted file mode 100644
index 5ba4032c45..0000000000
--- a/meta/recipes-connectivity/connman/connman_1.12.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require connman.inc
-
-# 1.12 tag
-SRCREV = "8397cbbc0a79d39cf3b1880f4fd3f3405b6bc6ad"
-SRC_URI  = "git://git.kernel.org/pub/scm/network/connman/connman.git \
-            file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
-            file://add_xuser_dbus_permission.patch \
-            file://connman \
-            file://inet-fix-ip-cleanup-functions.patch \
-            file://add-in.h-for-ipv6.patch"
-S = "${WORKDIR}/git"
-PR = "${INC_PR}.0"
-
-RRECOMMENDS_${PN} = "connman-conf"
diff --git a/meta/recipes-connectivity/connman/connman_1.13.bb b/meta/recipes-connectivity/connman/connman_1.13.bb
new file mode 100644
index 0000000000..4f235382ff
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman_1.13.bb
@@ -0,0 +1,14 @@
+require connman.inc
+
+# 1.13 tag
+SRCREV = "96fcd8871531c9012135110769618d65a3523b4d"
+SRC_URI  = "git://git.kernel.org/pub/scm/network/connman/connman.git \
+            file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
+            file://add_xuser_dbus_permission.patch \
+            file://connman \
+            file://inet-fix-ip-cleanup-functions.patch \
+            "
+S = "${WORKDIR}/git"
+PR = "${INC_PR}.0"
+
+RRECOMMENDS_${PN} = "connman-conf"
-- 
cgit v1.2.3-54-g00ecf