diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk index 776ef2240a..2bbe16ad0e 100644 --- a/packages/network/connman/package.mk +++ b/packages/network/connman/package.mk @@ -18,7 +18,7 @@ PKG_NAME="connman" # DO NOT UPGRADE!! -PKG_VERSION="1.31" +PKG_VERSION="1.32" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/connman/patches/connman-06-fix-lease-expiry-issues.patch b/packages/network/connman/patches/connman-06-fix-lease-expiry-issues.patch deleted file mode 100644 index 65675e604e..0000000000 --- a/packages/network/connman/patches/connman-06-fix-lease-expiry-issues.patch +++ /dev/null @@ -1,67 +0,0 @@ -From f61f547e64aaf466522cf2a92af2ab450dc1134f Mon Sep 17 00:00:00 2001 -From: nasingh -Date: Wed, 6 Jan 2016 22:19:36 -0800 -Subject: dhcp: Nameserver issue on IP address renewal after lease expiry - -After lease expiry and releasing its current IP, when device eventually -gets an IP address, DNS resolution stops working. This is because -nameserver list in service structure is empty. On lease expiry when -apply_dhcp_invalidate_on_network(dhcp) is called, it removes -nameservers from the service structure but it does not free namservers in -dhcp structure. Now next time when device gets an IP address and -apply_lease_available_on_network is called, nameserver is not updated as -compare_string_arrays(nameservers, dhcp->nameservers) would return true. -The fix for this would be to free dhcp->nameservers when lease is lost so -that on successful renewal next time, nameserver properly gets updated. ---- - src/dhcp.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/dhcp.c b/src/dhcp.c -index e4497fc..159fecb 100644 ---- a/src/dhcp.c -+++ b/src/dhcp.c -@@ -114,6 +114,8 @@ static bool apply_dhcp_invalidate_on_network(struct connman_dhcp *dhcp) - __connman_service_nameserver_remove(service, - dhcp->nameservers[i], false); - } -+ g_strfreev(dhcp->nameservers); -+ dhcp->nameservers = NULL; - } - - return true; --- -cgit v0.12 - -From ccfae23093a170ffac92bc3c633bcec5a00c974c Mon Sep 17 00:00:00 2001 -From: Patrik Flykt -Date: Mon, 11 Jan 2016 10:52:26 +0200 -Subject: dhcp: Timeserver issue on IP address renewal after lease expiry - -Similar to nameservers, timeservers are also checked against previous -values when added. When there is no change in timeservers when the DHCP -lease is lost and reacquired, the service will not be notified if the -timeservers have changed. With timeservers removed on lease lost, -timeservers are not properly updated once reacquired. - -Fix this by removing timeservers from the dhcp struct when lease is lost. ---- - src/dhcp.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/dhcp.c b/src/dhcp.c -index 159fecb..4040ad1 100644 ---- a/src/dhcp.c -+++ b/src/dhcp.c -@@ -108,6 +108,8 @@ static bool apply_dhcp_invalidate_on_network(struct connman_dhcp *dhcp) - __connman_service_timeserver_remove(service, - dhcp->timeservers[i]); - } -+ g_strfreev(dhcp->timeservers); -+ dhcp->timeservers = NULL; - } - if (dhcp->nameservers) { - for (i = 0; dhcp->nameservers[i]; i++) { --- -cgit v0.12 - diff --git a/packages/network/connman/patches/connman-99-iptables-1.6.patch b/packages/network/connman/patches/connman-99-iptables-1.6.patch deleted file mode 100644 index 30131e690b..0000000000 --- a/packages/network/connman/patches/connman-99-iptables-1.6.patch +++ /dev/null @@ -1,36 +0,0 @@ -From acea08a0e4234a4c1a87bedc087c73ff36de0c7b Mon Sep 17 00:00:00 2001 -From: Wu Zheng -Date: Thu, 28 Jan 2016 18:04:17 +0800 -Subject: iptables: Add missing function item of xtables to match iptables 1.6 - -The struct of xtables_globals has been modified in iptables 1.6. -If connman runs with iptables 1.6, it can crash. - -Program received signal SIGSEGV, Segmentation fault. -0x00000000 in ?? () -0xb7dea89c in xtables_find_target () from /usr/lib/libxtables.so.11 -0xb7deac1c in ?? () from /usr/lib/libxtables.so.11 -0xb7dea793 in xtables_find_target () from /usr/lib/libxtables.so.11 - -The the missing function item of xtables is added to xtables_globals. ---- - src/iptables.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/iptables.c b/src/iptables.c -index bc0c763..5ef757a 100644 ---- a/src/iptables.c -+++ b/src/iptables.c -@@ -1566,6 +1566,9 @@ struct xtables_globals iptables_globals = { - .option_offset = 0, - .opts = iptables_opts, - .orig_opts = iptables_opts, -+#if XTABLES_VERSION_CODE > 10 -+ .compat_rev = xtables_compatible_revision, -+#endif - }; - - static struct xtables_target *prepare_target(struct connman_iptables *table, --- -cgit v0.12 -