mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Merge pull request #1570 from chewitt/connman_8
connman: update to 1.34 and drop patches
This commit is contained in:
commit
7e2ccb295d
@ -17,7 +17,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="connman"
|
PKG_NAME="connman"
|
||||||
PKG_VERSION="1.33"
|
PKG_VERSION="1.34"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://www.connman.net"
|
PKG_SITE="http://www.connman.net"
|
||||||
|
@ -1,42 +0,0 @@
|
|||||||
From ff413a83164b2398549ed9e94277addb9bbc36f8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Sam Nazarko <email@samnazarko.co.uk>
|
|
||||||
Date: Thu, 21 Jul 2016 15:59:48 +0100
|
|
||||||
Subject: [PATCH] [package] [connman-osmc] Fix an issue where DNS servers and
|
|
||||||
search domains are added in the reverse order
|
|
||||||
|
|
||||||
Signed-off-by: Sam Nazarko <email@samnazarko.co.uk>
|
|
||||||
---
|
|
||||||
src/resolver.c | 8 ++++----
|
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/resolver.c b/src/resolver.c
|
|
||||||
index fbe4be7..c4adbc6 100644
|
|
||||||
--- a/src/resolver.c
|
|
||||||
+++ b/src/resolver.c
|
|
||||||
@@ -100,9 +100,9 @@ static int resolvfile_export(void)
|
|
||||||
* MAXDNSRCH/MAXNS entries are used.
|
|
||||||
*/
|
|
||||||
|
|
||||||
- for (count = 0, list = g_list_last(resolvfile_list);
|
|
||||||
+ for (count = 0, list = g_list_first(resolvfile_list);
|
|
||||||
list && (count < MAXDNSRCH);
|
|
||||||
- list = g_list_previous(list)) {
|
|
||||||
+ list = g_list_next(list)) {
|
|
||||||
struct resolvfile_entry *entry = list->data;
|
|
||||||
|
|
||||||
if (!entry->domain)
|
|
||||||
@@ -118,9 +118,9 @@ static int resolvfile_export(void)
|
|
||||||
if (count)
|
|
||||||
g_string_append_printf(content, "\n");
|
|
||||||
|
|
||||||
- for (count = 0, list = g_list_last(resolvfile_list);
|
|
||||||
+ for (count = 0, list = g_list_first(resolvfile_list);
|
|
||||||
list && (count < MAXNS);
|
|
||||||
- list = g_list_previous(list)) {
|
|
||||||
+ list = g_list_next(list)) {
|
|
||||||
struct resolvfile_entry *entry = list->data;
|
|
||||||
|
|
||||||
if (!entry->server)
|
|
||||||
--
|
|
||||||
2.7.4
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
|||||||
From 4f9abd3aebb1694d6a412d31d322cf1b5244a71c Mon Sep 17 00:00:00 2001
|
|
||||||
From: MilhouseVH <milhouseVH.github@nmacleod.com>
|
|
||||||
Date: Sat, 22 Apr 2017 02:55:33 +0100
|
|
||||||
Subject: [PATCH] ip_forward: sysctl now ignores non-zero offset writes in
|
|
||||||
latest kernels
|
|
||||||
|
|
||||||
---
|
|
||||||
src/nat.c | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/src/nat.c b/src/nat.c
|
|
||||||
index 33ae6df..27e0d18 100644
|
|
||||||
--- a/src/nat.c
|
|
||||||
+++ b/src/nat.c
|
|
||||||
@@ -54,6 +54,7 @@ static int enable_ip_forward(bool enable)
|
|
||||||
if (!value) {
|
|
||||||
if (read(f, &value, sizeof(value)) < 0)
|
|
||||||
value = 0;
|
|
||||||
+ lseek(f, 0, SEEK_SET); // reset file pos for subsequent write
|
|
||||||
}
|
|
||||||
|
|
||||||
if (enable) {
|
|
||||||
--
|
|
||||||
2.7.4
|
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user