From 1ab60f466592d6d84b08dc998a64db4010de1bdb Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 5 Dec 2013 13:50:16 +0200
Subject: [PATCH] connman: update to connman-1.20

---
 packages/network/connman/package.mk           |  8 ++--
 .../connman-03-init-nat-after-tethering.patch | 48 -------------------
 2 files changed, 4 insertions(+), 52 deletions(-)
 delete mode 100644 packages/network/connman/patches/connman-03-init-nat-after-tethering.patch

diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk
index 96b9cb5ff3..8176fd2560 100644
--- a/packages/network/connman/package.mk
+++ b/packages/network/connman/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="connman"
-PKG_VERSION="1.19"
+PKG_VERSION="1.20"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -68,9 +68,9 @@ PKG_CONFIGURE_OPTS_TARGET="WPASUPPLICANT=/usr/bin/wpa_supplicant \
                            --disable-nmcompat \
                            --disable-polkit \
                            --disable-selinux \
-                           --enable-loopback=builtin \
-                           --enable-ethernet=builtin \
-                           --enable-wifi=builtin \
+                           --enable-loopback \
+                           --enable-ethernet \
+                           --enable-wifi \
                            --disable-bluetooth \
                            --disable-ofono \
                            --disable-dundee \
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
deleted file mode 100644
index bf1f373c9c..0000000000
--- a/packages/network/connman/patches/connman-03-init-nat-after-tethering.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit 2fa277df78416d75ab540ab64168e356d05ba5cc
-Author: Stefan Saraev <stefan@saraev.ca>
-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 bc7a50d..e280bd7 100644
---- a/src/connman.h
-+++ b/src/connman.h
-@@ -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 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 bf05294..8ab34d9 100644
---- a/src/firewall.c
-+++ b/src/firewall.c
-@@ -421,7 +421,8 @@ static void flush_all_tables(void)
- 
- 	flush_table("filter");
- 	flush_table("mangle");
--	flush_table("nat");
-+	if (nat_enabled)
-+		flush_table("nat");
- }
- 
- int __connman_firewall_init(void)
-diff --git a/src/nat.c b/src/nat.c
-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;
-+
- 	return __connman_firewall_enable(nat->fw);
- }
-