connman: downgrade to connman 1.23

dhcp is fucked up in all 4.2/4.9x/5.0 builds

ref #3536
ref #3457

packages/network/connman/package.mk

@@ -17,7 +17,8 @@
 ################################################################################
 
 PKG_NAME="connman"
-PKG_VERSION="1.27"
+# DO NOT UPGRADE!!
+PKG_VERSION="1.23"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/network/connman/patches/connman-01-do-not-cleanup-routes.patch

@@ -0,0 +1,13 @@
+diff --git a/src/device.c b/src/device.c
+index 0fda950..eb09e53 100644
+--- a/src/device.c
++++ b/src/device.c
+@@ -1247,8 +1247,6 @@ int __connman_device_init(const char *device, const char *nodevice)
+ 	if (nodevice != NULL)
+ 		nodevice_filter = g_strsplit(nodevice, ",", -1);
+ 
+-	cleanup_devices();
+-
+ 	return 0;
+ }
+ 

packages/network/connman/patches/connman-01_do-not-cleanup-routes.patch

@@ -1,25 +0,0 @@
-From b7923c77913d8f8047b694a03494b2bb092337e1 Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Sat, 13 Dec 2014 14:32:41 +0200
-Subject: [PATCH 1/5] do not cleanup routes
-
----
- src/device.c |    2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/device.c b/src/device.c
-index c0683ab..8ecfc86 100644
---- a/src/device.c
-+++ b/src/device.c
-@@ -1445,8 +1445,6 @@ int __connman_device_init(const char *device, const char *nodevice)
- 	if (nodevice)
- 		nodevice_filter = g_strsplit(nodevice, ",", -1);
- 
--	cleanup_devices();
--
- 	return 0;
- }
- 
--- 
-1.7.10.4
-

packages/network/connman/patches/connman-02-disable-wispr.patch

@@ -1,18 +1,5 @@
-From 868447475d81b852c728a2df0e4b8df7200426ec Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Sat, 13 Dec 2014 14:33:10 +0200
-Subject: [PATCH 2/5] disable wispr
-
----
- Makefile.am   |    1 +
- configure.ac  |    3 +++
- src/main.c    |    4 ++++
- src/service.c |   16 ++++++++++++++++
- src/wpad.c    |    4 ++++
- 5 files changed, 28 insertions(+)
-
 diff --git a/Makefile.am b/Makefile.am
-index 09a0d6b..41efc1f 100644
+index 5efa811..054d7ee 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -184,6 +184,7 @@ endif
@@ -24,10 +11,10 @@ index 09a0d6b..41efc1f 100644
  				-DCONNMAN_PLUGIN_BUILTIN \
  				-DSTATEDIR=\""$(statedir)"\" \
 diff --git a/configure.ac b/configure.ac
-index e3326ad..5e07f83 100644
+index 27add27..808611c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -348,12 +348,15 @@ AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no")
+@@ -345,12 +345,15 @@ AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no")
  if (test "${enable_wispr}" != "no"); then
  	PKG_CHECK_MODULES(GNUTLS, gnutls, dummy=yes,
  				AC_MSG_ERROR(GnuTLS library is required))
@@ -44,10 +31,10 @@ index e3326ad..5e07f83 100644
  if (test "${enable_loopback}" != "no"); then
  	AC_CHECK_HEADERS(sys/inotify.h, dummy=yes,
 diff --git a/src/main.c b/src/main.c
-index ba09eb6..7941aa1 100644
+index 5eeade5..20653d3 100644
 --- a/src/main.c
 +++ b/src/main.c
-@@ -678,7 +678,9 @@ int main(int argc, char *argv[])
+@@ -681,7 +681,9 @@ int main(int argc, char *argv[])
  	__connman_dhcp_init();
  	__connman_dhcpv6_init();
  	__connman_wpad_init();
@@ -55,23 +42,23 @@ index ba09eb6..7941aa1 100644
  	__connman_wispr_init();
 +#endif
  	__connman_rfkill_init();
- 	__connman_machine_init();
  
-@@ -694,7 +696,9 @@ int main(int argc, char *argv[])
+ 	g_free(option_config);
+@@ -695,7 +697,9 @@ int main(int argc, char *argv[])
+ 	g_source_remove(signal);
  
- 	__connman_machine_cleanup();
  	__connman_rfkill_cleanup();
 +#ifdef ENABLE_WISPR
  	__connman_wispr_cleanup();
 +#endif
  	__connman_wpad_cleanup();
  	__connman_dhcpv6_cleanup();
- 	__connman_session_cleanup();
+ 	__connman_dhcp_cleanup();
 diff --git a/src/service.c b/src/service.c
-index 9bba227..43e668e 100644
+index 45d817e..94cb197 100644
 --- a/src/service.c
 +++ b/src/service.c
-@@ -3266,6 +3266,7 @@ static DBusMessage *set_property(DBusConnection *conn,
+@@ -3164,6 +3164,7 @@ static DBusMessage *set_property(DBusConnection *conn,
  		update_nameservers(service);
  		dns_configuration_changed(service);
  
@@ -79,7 +66,7 @@ index 9bba227..43e668e 100644
  		if (__connman_service_is_connected_state(service,
  						CONNMAN_IPCONFIG_TYPE_IPV4))
  			__connman_wispr_start(service,
-@@ -3275,6 +3276,7 @@ static DBusMessage *set_property(DBusConnection *conn,
+@@ -3173,6 +3174,7 @@ static DBusMessage *set_property(DBusConnection *conn,
  						CONNMAN_IPCONFIG_TYPE_IPV6))
  			__connman_wispr_start(service,
  						CONNMAN_IPCONFIG_TYPE_IPV6);
@@ -87,7 +74,7 @@ index 9bba227..43e668e 100644
  
  		service_save(service);
  	} else if (g_str_equal(name, "Timeservers.Configuration")) {
-@@ -4415,7 +4417,9 @@ static void service_free(gpointer user_data)
+@@ -4352,7 +4354,9 @@ static void service_free(gpointer user_data)
  	__connman_notifier_service_remove(service);
  	service_schedule_removed(service);
  
@@ -97,7 +84,7 @@ index 9bba227..43e668e 100644
  	stats_stop(service);
  
  	service->path = NULL;
-@@ -5382,7 +5386,9 @@ static int service_indicate_state(struct connman_service *service)
+@@ -5331,7 +5335,9 @@ static int service_indicate_state(struct connman_service *service)
  
  		default_changed();
  
@@ -107,7 +94,7 @@ index 9bba227..43e668e 100644
  
  		__connman_wpad_stop(service);
  
-@@ -5555,7 +5561,11 @@ static void check_proxy_setup(struct connman_service *service)
+@@ -5498,7 +5504,11 @@ static void check_proxy_setup(struct connman_service *service)
  	return;
  
  done:
@@ -119,7 +106,7 @@ index 9bba227..43e668e 100644
  }
  
  /*
-@@ -5611,6 +5621,7 @@ static void service_rp_filter(struct connman_service *service,
+@@ -5554,6 +5564,7 @@ static void service_rp_filter(struct connman_service *service,
  		connected_networks_count, original_rp_filter);
  }
  
@@ -127,7 +114,7 @@ index 9bba227..43e668e 100644
  static gboolean redo_wispr(gpointer user_data)
  {
  	struct connman_service *service = user_data;
-@@ -5626,6 +5637,7 @@ static gboolean redo_wispr(gpointer user_data)
+@@ -5569,6 +5580,7 @@ static gboolean redo_wispr(gpointer user_data)
  
  	return FALSE;
  }
@@ -135,7 +122,7 @@ index 9bba227..43e668e 100644
  
  int __connman_service_online_check_failed(struct connman_service *service,
  					enum connman_ipconfig_type type)
-@@ -5648,7 +5660,9 @@ int __connman_service_online_check_failed(struct connman_service *service,
+@@ -5591,7 +5603,9 @@ int __connman_service_online_check_failed(struct connman_service *service,
  	 * necessary IPv6 router advertisement messages that might have
  	 * DNS data etc.
  	 */
@@ -145,7 +132,7 @@ index 9bba227..43e668e 100644
  
  	return EAGAIN;
  }
-@@ -5709,7 +5723,9 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
+@@ -5646,7 +5660,9 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
  			service_rp_filter(service, true);
  		} else {
  			service->online_check_count = 1;
@@ -181,6 +168,3 @@ index d40959b..62faf92 100644
  }
  
  int __connman_wpad_start(struct connman_service *service)
--- 
-1.7.10.4
-

packages/network/connman/patches/connman-04-do-not-add-default-gw-as-timeserver.patch

@@ -1,17 +1,17 @@
-From 9bbb9dfd95797ec793f6c9fab7430c36d392b70e Mon Sep 17 00:00:00 2001
+From 0b595ee514797c75663a9ddc4ddc81c6c82dc64a Mon Sep 17 00:00:00 2001
 From: Stefan Saraev <stefan@saraev.ca>
 Date: Sat, 7 Sep 2013 15:11:36 +0300
-Subject: [PATCH 3/5] do not add default gw as timeserver
+Subject: [PATCH] do not add default gw as timeserver
 
 *always* adding default gw to timeserver list is a horrible idea
 
 this reverts http://git.kernel.org/cgit/network/connman/connman.git/commit/?id=bbd19813c457227a2861c05e9ebc676f8feb7f10
 ---
  src/timeserver.c |   13 -------------
- 1 file changed, 13 deletions(-)
+ 1 files changed, 0 insertions(+), 13 deletions(-)
 
 diff --git a/src/timeserver.c b/src/timeserver.c
-index f0d33e5..d8914e8 100644
+index 6440611..6386521 100644
 --- a/src/timeserver.c
 +++ b/src/timeserver.c
 @@ -179,11 +179,9 @@ GSList *__connman_timeserver_add_list(GSList *server_list,
@@ -45,5 +45,5 @@ index f0d33e5..d8914e8 100644
  	timeservers = load_timeservers();
  
 -- 
-1.7.10.4
+1.7.2.5
 

packages/network/connman/patches/connman-04-ipv6-disabled-by-default.patch

@@ -1,17 +1,14 @@
-From 6bfcac5ebe1c29c78176d9560268f256512a0436 Mon Sep 17 00:00:00 2001
+commit 707a0d73d7231b1821072712a7771c7aef140e21
-From: Stefan Saraev <stefan@saraev.ca>
+Author: Stefan Saraev <stefan@saraev.ca>
-Date: Sat, 13 Dec 2014 14:36:08 +0200
+Date:   Tue Jul 23 11:28:10 2013 +0300
-Subject: [PATCH 4/5] ipv6 disabled by default
 
----
+    ipv6 disabled by default
- src/ipconfig.c |    5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/src/ipconfig.c b/src/ipconfig.c
-index 3d0c387..e45480e 100644
+index fbeff8f..3eb61c4 100644
 --- a/src/ipconfig.c
 +++ b/src/ipconfig.c
-@@ -1149,10 +1149,7 @@ static struct connman_ipconfig *create_ipv6config(int index)
+@@ -1123,10 +1123,7 @@ static struct connman_ipconfig *create_ipv6config(int index)
  	ipv6config->enabled = false;
  	ipv6config->type = CONNMAN_IPCONFIG_TYPE_IPV6;
  
@@ -22,7 +19,4 @@ index 3d0c387..e45480e 100644
 +	ipv6config->method = CONNMAN_IPCONFIG_METHOD_OFF;
  
  	ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
- 	if (ipdevice)
+ 	if (ipdevice != NULL)
--- 
-1.7.10.4
-