diff options
author | Maxin B. John <maxin.john@intel.com> | 2016-05-12 16:16:52 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-14 23:05:12 +0100 |
commit | ad03e92c79496e82818c4fd0a9c000b5d46b5762 (patch) | |
tree | af467403c08619f57c36cd8e2e327cb7636602d9 /meta/recipes-connectivity/connman/connman | |
parent | 0ff3f495ca4fb22a49791bf484416ac2e486d854 (diff) | |
download | poky-ad03e92c79496e82818c4fd0a9c000b5d46b5762.tar.gz |
connman: update to version 1.32
Removed following upstreamed/backported patches:
a) 0001-Detect-backtrace-API-availability-before-using-it.patch
b) 0001-iptables-Add-missing-function-item-of-xtables-to-mat.patch
Rearranged musl related patches.
(From OE-Core rev: 5d1b1d9cc20ee69832e8d95579dcfa99419dfed5)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman/connman')
2 files changed, 0 insertions, 97 deletions
diff --git a/meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch b/meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch deleted file mode 100644 index 5dc6fd634b..0000000000 --- a/meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | From 00d4447395725abaa651e12ed40095081e04011e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 13 Sep 2015 13:22:01 -0700 | ||
4 | Subject: [PATCH 1/3] Detect backtrace() API availability before using it | ||
5 | |||
6 | C libraries besides glibc do not have backtrace() implemented | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Upstream-Status: Pending | ||
11 | |||
12 | configure.ac | 2 ++ | ||
13 | src/log.c | 5 ++--- | ||
14 | 2 files changed, 4 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 69c0eeb..90099f2 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -171,6 +171,8 @@ fi | ||
21 | AM_CONDITIONAL(PPTP, test "${enable_pptp}" != "no") | ||
22 | AM_CONDITIONAL(PPTP_BUILTIN, test "${enable_pptp}" = "builtin") | ||
23 | |||
24 | +AC_CHECK_HEADERS([execinfo.h]) | ||
25 | + | ||
26 | AC_CHECK_HEADERS(resolv.h, dummy=yes, | ||
27 | AC_MSG_ERROR(resolver header files are required)) | ||
28 | AC_CHECK_LIB(resolv, ns_initparse, dummy=yes, [ | ||
29 | diff --git a/src/log.c b/src/log.c | ||
30 | index a693bd0..5b40c1f 100644 | ||
31 | --- a/src/log.c | ||
32 | +++ b/src/log.c | ||
33 | @@ -30,7 +30,6 @@ | ||
34 | #include <stdlib.h> | ||
35 | #include <string.h> | ||
36 | #include <syslog.h> | ||
37 | -#include <execinfo.h> | ||
38 | #include <dlfcn.h> | ||
39 | |||
40 | #include "connman.h" | ||
41 | @@ -215,9 +214,9 @@ static void print_backtrace(unsigned int offset) | ||
42 | static void signal_handler(int signo) | ||
43 | { | ||
44 | connman_error("Aborting (signal %d) [%s]", signo, program_exec); | ||
45 | - | ||
46 | +#ifdef HAVE_EXECINFO_H | ||
47 | print_backtrace(2); | ||
48 | - | ||
49 | +#endif /* HAVE_EXECINFO_H */ | ||
50 | exit(EXIT_FAILURE); | ||
51 | } | ||
52 | |||
53 | -- | ||
54 | 2.5.1 | ||
55 | |||
diff --git a/meta/recipes-connectivity/connman/connman/0001-iptables-Add-missing-function-item-of-xtables-to-mat.patch b/meta/recipes-connectivity/connman/connman/0001-iptables-Add-missing-function-item-of-xtables-to-mat.patch deleted file mode 100644 index 1b5a3e4407..0000000000 --- a/meta/recipes-connectivity/connman/connman/0001-iptables-Add-missing-function-item-of-xtables-to-mat.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From acea08a0e4234a4c1a87bedc087c73ff36de0c7b Mon Sep 17 00:00:00 2001 | ||
2 | From: Wu Zheng <wu.zheng@intel.com> | ||
3 | Date: Thu, 28 Jan 2016 18:04:17 +0800 | ||
4 | Subject: [PATCH] iptables: Add missing function item of xtables to match | ||
5 | iptables 1.6 | ||
6 | |||
7 | The struct of xtables_globals has been modified in iptables 1.6. | ||
8 | If connman runs with iptables 1.6, it can crash. | ||
9 | |||
10 | Program received signal SIGSEGV, Segmentation fault. | ||
11 | 0x00000000 in ?? () | ||
12 | 0xb7dea89c in xtables_find_target () from /usr/lib/libxtables.so.11 | ||
13 | 0xb7deac1c in ?? () from /usr/lib/libxtables.so.11 | ||
14 | 0xb7dea793 in xtables_find_target () from /usr/lib/libxtables.so.11 | ||
15 | |||
16 | The the missing function item of xtables is added to xtables_globals. | ||
17 | |||
18 | Upstream-Status: Backport | ||
19 | |||
20 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
21 | Signed-off-by: Wu Zheng <wu.zheng@intel.com> | ||
22 | --- | ||
23 | src/iptables.c | 3 +++ | ||
24 | 1 file changed, 3 insertions(+) | ||
25 | |||
26 | diff --git a/src/iptables.c b/src/iptables.c | ||
27 | index bc0c763..5ef757a 100644 | ||
28 | --- a/src/iptables.c | ||
29 | +++ b/src/iptables.c | ||
30 | @@ -1566,6 +1566,9 @@ struct xtables_globals iptables_globals = { | ||
31 | .option_offset = 0, | ||
32 | .opts = iptables_opts, | ||
33 | .orig_opts = iptables_opts, | ||
34 | +#if XTABLES_VERSION_CODE > 10 | ||
35 | + .compat_rev = xtables_compatible_revision, | ||
36 | +#endif | ||
37 | }; | ||
38 | |||
39 | static struct xtables_target *prepare_target(struct connman_iptables *table, | ||
40 | -- | ||
41 | 2.4.0 | ||
42 | |||