From 1f503ece3a6ec4130771000e11113eb0b6e16a79 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Tue, 23 Jul 2013 11:41:26 +0300
Subject: [PATCH] connman: update to connman-d052eb3

---
 packages/network/connman/meta                    |  2 +-
 .../connman-03-init-nat-after-tethering.patch    | 16 ++++++++--------
 .../connman-04-ipv6-disabled-by-default.patch    | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/network/connman/meta b/packages/network/connman/meta
index 6e722aa2ed..143f46db64 100644
--- a/packages/network/connman/meta
+++ b/packages/network/connman/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="connman"
-PKG_VERSION="8b952da"
+PKG_VERSION="d052eb3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/network/connman/patches/connman-03-init-nat-after-tethering.patch b/packages/network/connman/patches/connman-03-init-nat-after-tethering.patch
index a769f2499b..bf1f373c9c 100644
--- a/packages/network/connman/patches/connman-03-init-nat-after-tethering.patch
+++ b/packages/network/connman/patches/connman-03-init-nat-after-tethering.patch
@@ -1,26 +1,26 @@
-commit f5f3c66721ca595976def1a43195d6a64525e6ed
+commit 2fa277df78416d75ab540ab64168e356d05ba5cc
 Author: Stefan Saraev <stefan@saraev.ca>
-Date:   Tue Jul 9 19:06:36 2013 +0300
+Date:   Tue Jul 23 11:31:22 2013 +0300
 
     do not touch nat table before enabling tethering
     
     TODO: remove when upstream does a better fix
 
 diff --git a/src/connman.h b/src/connman.h
-index 6846b92..6cd24e2 100644
+index bc7a50d..e280bd7 100644
 --- a/src/connman.h
 +++ b/src/connman.h
-@@ -912,6 +912,8 @@ int __connman_nat_enable(const char *name, const char *address,
+@@ -913,6 +913,8 @@ int __connman_nat_enable(const char *name, const char *address,
  				unsigned char prefixlen);
  void __connman_nat_disable(const char *name);
  
-+static connman_bool_t nat_enabled = FALSE;
++static bool nat_enabled = false;
 +
  struct firewall_context;
  
  struct firewall_context *__connman_firewall_create(void);
 diff --git a/src/firewall.c b/src/firewall.c
-index c235d86..1e7dfa9 100644
+index bf05294..8ab34d9 100644
 --- a/src/firewall.c
 +++ b/src/firewall.c
 @@ -421,7 +421,8 @@ static void flush_all_tables(void)
@@ -34,14 +34,14 @@ index c235d86..1e7dfa9 100644
  
  int __connman_firewall_init(void)
 diff --git a/src/nat.c b/src/nat.c
-index 9308059..b198cf5 100644
+index 8d307eb..11c9def 100644
 --- a/src/nat.c
 +++ b/src/nat.c
 @@ -81,6 +81,8 @@ static int enable_nat(struct connman_nat *nat)
  	if (err < 0)
  		return err;
  
-+	nat_enabled = TRUE;
++	nat_enabled = true;
 +
  	return __connman_firewall_enable(nat->fw);
  }
diff --git a/packages/network/connman/patches/connman-04-ipv6-disabled-by-default.patch b/packages/network/connman/patches/connman-04-ipv6-disabled-by-default.patch
index db9fafadb4..9199ec54e6 100644
--- a/packages/network/connman/patches/connman-04-ipv6-disabled-by-default.patch
+++ b/packages/network/connman/patches/connman-04-ipv6-disabled-by-default.patch
@@ -1,18 +1,18 @@
-commit 7b130774c0a0a31879218eedb680ed732a1ee94a
+commit 707a0d73d7231b1821072712a7771c7aef140e21
 Author: Stefan Saraev <stefan@saraev.ca>
-Date:   Thu Jul 4 22:43:17 2013 +0300
+Date:   Tue Jul 23 11:28:10 2013 +0300
 
     ipv6 disabled by default
 
 diff --git a/src/ipconfig.c b/src/ipconfig.c
-index a97a6f3..2b43935 100644
+index fbeff8f..3eb61c4 100644
 --- a/src/ipconfig.c
 +++ b/src/ipconfig.c
-@@ -1118,10 +1118,7 @@ static struct connman_ipconfig *create_ipv6config(int index)
- 	ipv6config->enabled = FALSE;
+@@ -1123,10 +1123,7 @@ static struct connman_ipconfig *create_ipv6config(int index)
+ 	ipv6config->enabled = false;
  	ipv6config->type = CONNMAN_IPCONFIG_TYPE_IPV6;
  
--	if (is_ipv6_supported == FALSE)
+-	if (!is_ipv6_supported)
 -		ipv6config->method = CONNMAN_IPCONFIG_METHOD_OFF;
 -	else
 -		ipv6config->method = CONNMAN_IPCONFIG_METHOD_AUTO;