summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2016-05-12 13:16:52 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-14 22:05:12 (GMT)
commitad03e92c79496e82818c4fd0a9c000b5d46b5762 (patch)
treeaf467403c08619f57c36cd8e2e327cb7636602d9 /meta/recipes-connectivity/connman
parent0ff3f495ca4fb22a49791bf484416ac2e486d854 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch55
-rw-r--r--meta/recipes-connectivity/connman/connman/0001-iptables-Add-missing-function-item-of-xtables-to-mat.patch42
-rw-r--r--meta/recipes-connectivity/connman/connman_1.31.bb15
-rw-r--r--meta/recipes-connectivity/connman/connman_1.32.bb15
4 files changed, 15 insertions, 112 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 5dc6fd6..0000000
--- a/meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From 00d4447395725abaa651e12ed40095081e04011e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 13 Sep 2015 13:22:01 -0700
4Subject: [PATCH 1/3] Detect backtrace() API availability before using it
5
6C libraries besides glibc do not have backtrace() implemented
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Pending
11
12 configure.ac | 2 ++
13 src/log.c | 5 ++---
14 2 files changed, 4 insertions(+), 3 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index 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, [
29diff --git a/src/log.c b/src/log.c
30index 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--
542.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 1b5a3e4..0000000
--- a/meta/recipes-connectivity/connman/connman/0001-iptables-Add-missing-function-item-of-xtables-to-mat.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From acea08a0e4234a4c1a87bedc087c73ff36de0c7b Mon Sep 17 00:00:00 2001
2From: Wu Zheng <wu.zheng@intel.com>
3Date: Thu, 28 Jan 2016 18:04:17 +0800
4Subject: [PATCH] iptables: Add missing function item of xtables to match
5 iptables 1.6
6
7The struct of xtables_globals has been modified in iptables 1.6.
8If connman runs with iptables 1.6, it can crash.
9
10Program received signal SIGSEGV, Segmentation fault.
110x00000000 in ?? ()
120xb7dea89c in xtables_find_target () from /usr/lib/libxtables.so.11
130xb7deac1c in ?? () from /usr/lib/libxtables.so.11
140xb7dea793 in xtables_find_target () from /usr/lib/libxtables.so.11
15
16The the missing function item of xtables is added to xtables_globals.
17
18Upstream-Status: Backport
19
20Signed-off-by: Maxin B. John <maxin.john@intel.com>
21Signed-off-by: Wu Zheng <wu.zheng@intel.com>
22---
23 src/iptables.c | 3 +++
24 1 file changed, 3 insertions(+)
25
26diff --git a/src/iptables.c b/src/iptables.c
27index 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--
412.4.0
42
diff --git a/meta/recipes-connectivity/connman/connman_1.31.bb b/meta/recipes-connectivity/connman/connman_1.31.bb
deleted file mode 100644
index e71d221..0000000
--- a/meta/recipes-connectivity/connman/connman_1.31.bb
+++ /dev/null
@@ -1,15 +0,0 @@
1require connman.inc
2
3SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
4 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
5 file://0001-Detect-backtrace-API-availability-before-using-it.patch \
6 file://0002-resolve-musl-does-not-implement-res_ninit.patch \
7 file://0003-Fix-header-inclusions-for-musl.patch \
8 file://0001-iptables-Add-missing-function-item-of-xtables-to-mat.patch \
9 file://connman \
10 "
11SRC_URI[md5sum] = "cb1c413fcc4f49430294bbd7a92f5f3c"
12SRC_URI[sha256sum] = "88fcf0b6df334796b90e2fd2e434d6f5b36cd6f13b886a119b8c90276b72b8e2"
13
14RRECOMMENDS_${PN} = "connman-conf"
15
diff --git a/meta/recipes-connectivity/connman/connman_1.32.bb b/meta/recipes-connectivity/connman/connman_1.32.bb
new file mode 100644
index 0000000..532b17c
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman_1.32.bb
@@ -0,0 +1,15 @@
1require connman.inc
2
3SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
4 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
5 file://connman \
6 "
7SRC_URI_append_libc-musl = "file://0002-resolve-musl-does-not-implement-res_ninit.patch \
8 file://0003-Fix-header-inclusions-for-musl.patch \
9 "
10
11SRC_URI[md5sum] = "d0c3071c1d8dec9cd17b760f862de2ad"
12SRC_URI[sha256sum] = "3185864c73206a6033d12e9f583689dcd03f714a40a58333709d3f74a4e0934c"
13
14RRECOMMENDS_${PN} = "connman-conf"
15