summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/connman/connman-0.75/xtables_version.patch64
-rw-r--r--meta/recipes-connectivity/connman/connman_0.75.bb3
2 files changed, 66 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/connman/connman-0.75/xtables_version.patch b/meta/recipes-connectivity/connman/connman-0.75/xtables_version.patch
new file mode 100644
index 0000000000..13e2c36aa8
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman-0.75/xtables_version.patch
@@ -0,0 +1,64 @@
1xtables_merge_options API change, fix its calling in connman.
2
3Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
4
5Upstream-Status: Backport
6
7diff -ruN connman-0.75-orig//src/iptables.c connman-0.75/src/iptables.c
8--- connman-0.75-orig//src/iptables.c 2011-02-22 12:16:25.000000000 +0800
9+++ connman-0.75/src/iptables.c 2011-10-26 09:21:33.941164000 +0800
10@@ -1089,7 +1089,11 @@
11 if (xt_t->init != NULL)
12 xt_t->init(xt_t->t);
13 iptables_globals.opts =
14- xtables_merge_options(iptables_globals.opts,
15+ xtables_merge_options(
16+#if XTABLES_VERSION_CODE > 5
17+ iptables_globals.orig_opts,
18+#endif
19+ iptables_globals.opts,
20 xt_t->extra_opts,
21 &xt_t->option_offset);
22 if (iptables_globals.opts == NULL)
23@@ -1113,7 +1117,11 @@
24 xt_m->init(xt_m->m);
25 if (xt_m != xt_m->next) {
26 iptables_globals.opts =
27- xtables_merge_options(iptables_globals.opts,
28+ xtables_merge_options(
29+#if XTABLES_VERSION_CODE > 5
30+ iptables_globals.orig_opts,
31+#endif
32+ iptables_globals.opts,
33 xt_m->extra_opts,
34 &xt_m->option_offset);
35 if (iptables_globals.opts == NULL)
36diff -ruN connman-0.75-orig//tools/iptables-test.c connman-0.75/tools/iptables-test.c
37--- connman-0.75-orig//tools/iptables-test.c 2011-02-22 12:16:25.000000000 +0800
38+++ connman-0.75/tools/iptables-test.c 2011-10-26 09:23:25.701164000 +0800
39@@ -1076,7 +1076,11 @@
40 if (xt_t->init != NULL)
41 xt_t->init(xt_t->t);
42 connman_iptables_globals.opts =
43- xtables_merge_options(connman_iptables_globals.opts,
44+ xtables_merge_options(
45+#if XTABLES_VERSION_CODE > 5
46+ connman_iptables_globals.orig_opts,
47+#endif
48+ connman_iptables_globals.opts,
49 xt_t->extra_opts,
50 &xt_t->option_offset);
51 if (connman_iptables_globals.opts == NULL)
52@@ -1102,7 +1106,11 @@
53 xt_m->init(xt_m->m);
54 if (xt_m != xt_m->next) {
55 connman_iptables_globals.opts =
56- xtables_merge_options(connman_iptables_globals.opts,
57+ xtables_merge_options(
58+#if XTABLES_VERSION_CODE > 5
59+ connman_iptables_globals.orig_opts,
60+#endif
61+ connman_iptables_globals.opts,
62 xt_m->extra_opts,
63 &xt_m->option_offset);
64 if (connman_iptables_globals.opts == NULL)
diff --git a/meta/recipes-connectivity/connman/connman_0.75.bb b/meta/recipes-connectivity/connman/connman_0.75.bb
index 4c25fccda5..8a02753f04 100644
--- a/meta/recipes-connectivity/connman/connman_0.75.bb
+++ b/meta/recipes-connectivity/connman/connman_0.75.bb
@@ -1,5 +1,5 @@
1require connman.inc 1require connman.inc
2PR = "r1" 2PR = "r2"
3 3
4EXTRA_OECONF += "\ 4EXTRA_OECONF += "\
5 ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \ 5 ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
@@ -21,6 +21,7 @@ EXTRA_OECONF += "\
21SRC_URI = "\ 21SRC_URI = "\
22 ${KERNELORG_MIRROR}/linux/network/connman/connman-${PV}.tar.gz \ 22 ${KERNELORG_MIRROR}/linux/network/connman/connman-${PV}.tar.gz \
23 file://add_xuser_dbus_permission.patch \ 23 file://add_xuser_dbus_permission.patch \
24 file://xtables_version.patch \
24 file://connman \ 25 file://connman \
25" 26"
26 27