jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

connman: update to connman-1.27

Browse Source
This commit is contained in:
Stefan Saraev 2014-12-13 14:39:30 +02:00 committed by Stephan Raue
parent aa9dac15b5
commit 21fb5ceb4f
8 changed files with 104 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/network/connman/package.mk
View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="connman" PKG_NAME="connman"
PKG_VERSION="1.26" PKG_VERSION="1.27"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

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

@ -1,13 +0,0 @@
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;
}

25
packages/network/connman/patches/connman-01_do-not-cleanup-routes.patch Normal file
View File

@ -0,0 +1,25 @@
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

54
packages/network/connman/patches/connman-02-disable-wispr.patch → packages/network/connman/patches/connman-02_disable-wispr.patch
View File

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

10
packages/network/connman/patches/connman-04-do-not-add-default-gw-as-timeserver.patch → packages/network/connman/patches/connman-03_do-not-add-default-gw-as-timeserver.patch
View File

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

20
packages/network/connman/patches/connman-04-ipv6-disabled-by-default.patch → packages/network/connman/patches/connman-04_ipv6-disabled-by-default.patch
View File

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

25
packages/network/connman/patches/connman-05_link-against-ncurses.patch Normal file
View File

@ -0,0 +1,25 @@
From 59bd0267cc8a581ff6f3388756a5524159a75b3b Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 13 Dec 2014 14:36:57 +0200
Subject: [PATCH 5/5] link against ncurses
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 41efc1f..d1d3ddc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -252,7 +252,7 @@ client_connmanctl_SOURCES = client/dbus_helpers.h client/dbus_helpers.c \
client/main.c
client_connmanctl_LDADD = gdbus/libgdbus-internal.la @DBUS_LIBS@ @GLIB_LIBS@ \
- -lreadline -ldl
+ -lreadline -lncurses -ldl
endif
noinst_PROGRAMS += unit/test-pbkdf2-sha1 unit/test-prf-sha1 unit/test-ippool
--
1.7.10.4

12
packages/network/connman/patches/connman-link_against_ncurses.patch
View File

@ -1,12 +0,0 @@
diff -Naur connman-1.25/Makefile.am connman-1.25.patch/Makefile.am
--- connman-1.25/Makefile.am 2014-08-18 14:20:06.000000000 +0200
+++ connman-1.25.patch/Makefile.am 2014-09-24 19:25:39.972371273 +0200
@@ -250,7 +250,7 @@
client/main.c
client_connmanctl_LDADD = gdbus/libgdbus-internal.la @DBUS_LIBS@ @GLIB_LIBS@ \
- -lreadline -ldl
+ -lreadline -lncurses -ldl
endif
noinst_PROGRAMS += unit/test-pbkdf2-sha1 unit/test-prf-sha1 unit/test-ippool