From 97025adff6a238a3fe42cc13aa1f006858699dbd Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 14 Oct 2013 14:46:05 +0300 Subject: [PATCH] connman: update to connman-1.19 --- packages/network/connman/package.mk | 2 +- .../patches/connman-02-disable-wispr.patch | 61 ++++++++++--------- 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk index 80b6532a1c..f8dfbda816 100644 --- a/packages/network/connman/package.mk +++ b/packages/network/connman/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="connman" -PKG_VERSION="1.18" +PKG_VERSION="1.19" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/connman/patches/connman-02-disable-wispr.patch b/packages/network/connman/patches/connman-02-disable-wispr.patch index f5d6a818e9..0b38ee094a 100644 --- a/packages/network/connman/patches/connman-02-disable-wispr.patch +++ b/packages/network/connman/patches/connman-02-disable-wispr.patch @@ -1,8 +1,8 @@ diff --git a/Makefile.am b/Makefile.am -index 4b1b6c2..d518d5d 100644 +index 5efa811..054d7ee 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -172,6 +172,7 @@ endif +@@ -184,6 +184,7 @@ endif endif AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \ @@ -11,10 +11,10 @@ index 4b1b6c2..d518d5d 100644 -DCONNMAN_PLUGIN_BUILTIN \ -DSTATEDIR=\""$(statedir)"\" \ diff --git a/configure.ac b/configure.ac -index cff8b47..626137a 100644 +index 27add27..808611c 100644 --- a/configure.ac +++ b/configure.ac -@@ -357,13 +357,17 @@ 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)) @@ -26,17 +26,15 @@ index cff8b47..626137a 100644 fi AC_SUBST(GNUTLS_CFLAGS) AC_SUBST(GNUTLS_LIBS) - +AC_SUBST(WISPR_CFLAGS) -+ + if (test "${enable_loopback}" != "no"); then AC_CHECK_HEADERS(sys/inotify.h, dummy=yes, - AC_MSG_ERROR(inotify header files are required)) diff --git a/src/main.c b/src/main.c -index 0d58fc4..9c3b79e 100644 +index 5eeade5..20653d3 100644 --- a/src/main.c +++ b/src/main.c -@@ -689,7 +689,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(); @@ -46,7 +44,7 @@ index 0d58fc4..9c3b79e 100644 __connman_rfkill_init(); g_free(option_config); -@@ -703,7 +705,9 @@ int main(int argc, char *argv[]) +@@ -695,7 +697,9 @@ int main(int argc, char *argv[]) g_source_remove(signal); __connman_rfkill_cleanup(); @@ -57,10 +55,10 @@ index 0d58fc4..9c3b79e 100644 __connman_dhcpv6_cleanup(); __connman_dhcp_cleanup(); diff --git a/src/service.c b/src/service.c -index bba548e..39ffda2 100644 +index 45d817e..94cb197 100644 --- a/src/service.c +++ b/src/service.c -@@ -3155,6 +3155,7 @@ static DBusMessage *set_property(DBusConnection *conn, +@@ -3164,6 +3164,7 @@ static DBusMessage *set_property(DBusConnection *conn, update_nameservers(service); dns_configuration_changed(service); @@ -68,15 +66,15 @@ index bba548e..39ffda2 100644 if (__connman_service_is_connected_state(service, CONNMAN_IPCONFIG_TYPE_IPV4)) __connman_wispr_start(service, -@@ -3164,6 +3165,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); +#endif service_save(service); - } else if (g_str_equal(name, "Timeservers.Configuration") == TRUE) { -@@ -4272,7 +4274,9 @@ static void service_free(gpointer user_data) + } else if (g_str_equal(name, "Timeservers.Configuration")) { +@@ -4352,7 +4354,9 @@ static void service_free(gpointer user_data) __connman_notifier_service_remove(service); service_schedule_removed(service); @@ -86,18 +84,17 @@ index bba548e..39ffda2 100644 stats_stop(service); service->path = NULL; -@@ -5236,8 +5240,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(); +#ifdef ENABLE_WISPR __connman_wispr_stop(service); -- +#endif + __connman_wpad_stop(service); - update_nameservers(service); -@@ -5386,7 +5391,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: @@ -109,28 +106,34 @@ index bba548e..39ffda2 100644 } /* -@@ -5448,7 +5457,9 @@ static gboolean redo_wispr(gpointer user_data) - - DBG(""); +@@ -5554,6 +5564,7 @@ static void service_rp_filter(struct connman_service *service, + connected_networks_count, original_rp_filter); + } +#ifdef ENABLE_WISPR - __connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV6); -+#endif + static gboolean redo_wispr(gpointer user_data) + { + struct connman_service *service = user_data; +@@ -5569,6 +5580,7 @@ static gboolean redo_wispr(gpointer user_data) return FALSE; } -@@ -5474,7 +5485,9 @@ int __connman_service_online_check_failed(struct connman_service *service, ++#endif + + int __connman_service_online_check_failed(struct connman_service *service, + enum connman_ipconfig_type type) +@@ -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. */ +#ifdef ENABLE_WISPR - g_timeout_add_seconds(1, redo_wispr, service); + g_timeout_add_seconds(1, redo_wispr, connman_service_ref(service)); +#endif return EAGAIN; } -@@ -5529,7 +5542,9 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service, - service_rp_filter(service, TRUE); +@@ -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; +#ifdef ENABLE_WISPR @@ -140,7 +143,7 @@ index bba548e..39ffda2 100644 break; case CONNMAN_SERVICE_STATE_ONLINE: diff --git a/src/wpad.c b/src/wpad.c -index 4e5834e..8be310f 100644 +index d40959b..62faf92 100644 --- a/src/wpad.c +++ b/src/wpad.c @@ -85,8 +85,10 @@ static void wpad_result(GResolvResultStatus status,