diff options
Diffstat (limited to 'meta/recipes-connectivity/connman/connman-0.75')
3 files changed, 0 insertions, 149 deletions
diff --git a/meta/recipes-connectivity/connman/connman-0.75/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman-0.75/add_xuser_dbus_permission.patch deleted file mode 100644 index 764c689fcc..0000000000 --- a/meta/recipes-connectivity/connman/connman-0.75/add_xuser_dbus_permission.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | Some platform (like atom-pc) enables rootless X, | ||
2 | thus we need to add the xuser in the list. | ||
3 | |||
4 | Upstream-Status: Inappropriate [configuration] | ||
5 | |||
6 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> | ||
7 | |||
8 | diff -ruN connman-0.65-orig/src/connman-dbus.conf connman-0.65/src/connman-dbus.conf | ||
9 | --- connman-0.65-orig/src/connman-dbus.conf 2011-03-04 09:34:49.000000000 +0800 | ||
10 | +++ connman-0.65/src/connman-dbus.conf 2011-03-04 09:35:21.000000000 +0800 | ||
11 | @@ -7,6 +7,12 @@ | ||
12 | <allow send_interface="net.connman.Agent"/> | ||
13 | <allow send_interface="net.connman.Counter"/> | ||
14 | </policy> | ||
15 | + <policy user="xuser"> | ||
16 | + <allow own="net.connman"/> | ||
17 | + <allow send_destination="net.connman"/> | ||
18 | + <allow send_interface="net.connman.Agent"/> | ||
19 | + <allow send_interface="net.connman.Counter"/> | ||
20 | + </policy> | ||
21 | <policy at_console="true"> | ||
22 | <allow send_destination="net.connman"/> | ||
23 | </policy> | ||
diff --git a/meta/recipes-connectivity/connman/connman-0.75/connman b/meta/recipes-connectivity/connman/connman-0.75/connman deleted file mode 100644 index f01bf371c2..0000000000 --- a/meta/recipes-connectivity/connman/connman-0.75/connman +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | DAEMON=/usr/sbin/connmand | ||
4 | PIDFILE=/var/run/connmand.pid | ||
5 | DESC="Connection Manager" | ||
6 | |||
7 | if [ -f /etc/default/connman ] ; then | ||
8 | . /etc/default/connman | ||
9 | fi | ||
10 | |||
11 | set -e | ||
12 | |||
13 | nfsroot=0 | ||
14 | |||
15 | exec 9<&0 < /proc/mounts | ||
16 | while read dev mtpt fstype rest; do | ||
17 | if test $mtpt = "/" ; then | ||
18 | case $fstype in | ||
19 | nfs | nfs4) | ||
20 | nfsroot=1 | ||
21 | break | ||
22 | ;; | ||
23 | *) | ||
24 | ;; | ||
25 | esac | ||
26 | fi | ||
27 | done | ||
28 | |||
29 | do_start() { | ||
30 | EXTRA_PARAM="" | ||
31 | if test $nfsroot -eq 1 ; then | ||
32 | EXTRA_PARAM="-P ethernet" | ||
33 | fi | ||
34 | $DAEMON $EXTRA_PARAM | ||
35 | } | ||
36 | |||
37 | do_stop() { | ||
38 | start-stop-daemon --stop --name connmand --quiet | ||
39 | } | ||
40 | |||
41 | case "$1" in | ||
42 | start) | ||
43 | echo "Starting $DESC" | ||
44 | do_start | ||
45 | ;; | ||
46 | stop) | ||
47 | echo "Stopping $DESC" | ||
48 | do_stop | ||
49 | ;; | ||
50 | restart|force-reload) | ||
51 | echo "Restarting $DESC" | ||
52 | do_stop | ||
53 | sleep 1 | ||
54 | do_start | ||
55 | ;; | ||
56 | *) | ||
57 | echo "Usage: $0 {start|stop|restart|force-reload}" >&2 | ||
58 | exit 1 | ||
59 | ;; | ||
60 | esac | ||
61 | |||
62 | exit 0 | ||
diff --git a/meta/recipes-connectivity/connman/connman-0.75/xtables_version.patch b/meta/recipes-connectivity/connman/connman-0.75/xtables_version.patch deleted file mode 100644 index 13e2c36aa8..0000000000 --- a/meta/recipes-connectivity/connman/connman-0.75/xtables_version.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | xtables_merge_options API change, fix its calling in connman. | ||
2 | |||
3 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> | ||
4 | |||
5 | Upstream-Status: Backport | ||
6 | |||
7 | diff -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) | ||
36 | diff -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) | ||