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: [PATCH] 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 -------------------
 .../{connman_1.12.bb => connman_1.13.bb}      |  6 +++---
 2 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 meta/recipes-connectivity/connman/connman/add-in.h-for-ipv6.patch
 rename meta/recipes-connectivity/connman/{connman_1.12.bb => connman_1.13.bb} (78%)

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.13.bb
similarity index 78%
rename from meta/recipes-connectivity/connman/connman_1.12.bb
rename to meta/recipes-connectivity/connman/connman_1.13.bb
index 5ba4032c45..4f235382ff 100644
--- a/meta/recipes-connectivity/connman/connman_1.12.bb
+++ b/meta/recipes-connectivity/connman/connman_1.13.bb
@@ -1,13 +1,13 @@
 require connman.inc
 
-# 1.12 tag
-SRCREV = "8397cbbc0a79d39cf3b1880f4fd3f3405b6bc6ad"
+# 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 \
-            file://add-in.h-for-ipv6.patch"
+            "
 S = "${WORKDIR}/git"
 PR = "${INC_PR}.0"