summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-07-22 17:08:05 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-29 13:08:59 +0100
commitd921c0a0032a63cc1848726d5e31ed81fd6281d0 (patch)
tree3adbb05bbf147e53ddc8a165dd17ee7b32bcd4dc /meta
parent4b5a21d86759be735721df7b86b6fb79e5ff2ffc (diff)
downloadpoky-d921c0a0032a63cc1848726d5e31ed81fd6281d0.tar.gz
connman: upgrade to v1.16
inet-fix-ip-cleanup-functions.patch no longer nedded; included in upstream. (From OE-Core rev: 9c48963a67c9dfd46f1d76ed42a9bd35e8cc2c8c) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch40
-rw-r--r--meta/recipes-connectivity/connman/connman_1.16.bb (renamed from meta/recipes-connectivity/connman/connman_1.15.bb)5
2 files changed, 2 insertions, 43 deletions
diff --git a/meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch b/meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch
deleted file mode 100644
index 3071549d95..0000000000
--- a/meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 100353e10f60a50ca1ba78daa6bc4dfebf5b3297 Mon Sep 17 00:00:00 2001
2From: Constantin Musca <constantinx.musca@intel.com>
3Date: Wed, 5 Dec 2012 15:07:21 +0200
4Subject: [PATCH] inet: fix ip cleanup functions
5
6Upstream-Status: Pending
7Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
8---
9 src/inet.c | 8 ++++++++
10 1 file changed, 8 insertions(+)
11
12diff --git a/src/inet.c b/src/inet.c
13index be69aca..e76a1f1 100644
14--- a/src/inet.c
15+++ b/src/inet.c
16@@ -626,6 +626,10 @@ int connman_inet_clear_ipv6_address(int index, const char *address,
17
18 DBG("index %d address %s prefix_len %d", index, address, prefix_len);
19
20+ if (address == NULL) {
21+ return -1;
22+ }
23+
24 err = __connman_inet_modify_address(RTM_DELADDR, 0, index, AF_INET6,
25 address, NULL, prefix_len, NULL);
26 if (err < 0) {
27@@ -649,6 +653,10 @@ int connman_inet_clear_address(int index, struct connman_ipaddress *ipaddress)
28
29 DBG("index %d address %s prefix_len %d", index, address, prefix_len);
30
31+ if (address == NULL) {
32+ return -1;
33+ }
34+
35 err = __connman_inet_modify_address(RTM_DELADDR, 0, index, AF_INET,
36 address, peer, prefix_len, broadcast);
37 if (err < 0) {
38--
391.7.11.7
40
diff --git a/meta/recipes-connectivity/connman/connman_1.15.bb b/meta/recipes-connectivity/connman/connman_1.16.bb
index 0ec29c9a42..7e54bc2df6 100644
--- a/meta/recipes-connectivity/connman/connman_1.15.bb
+++ b/meta/recipes-connectivity/connman/connman_1.16.bb
@@ -4,11 +4,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
4 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ 4 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
5 file://add_xuser_dbus_permission.patch \ 5 file://add_xuser_dbus_permission.patch \
6 file://connman \ 6 file://connman \
7 file://inet-fix-ip-cleanup-functions.patch \
8 " 7 "
9 8
10SRC_URI[md5sum] = "e785c0c4564bfffb5215272f1be6f17c" 9SRC_URI[md5sum] = "d2906816222219e10426442d07c3f4c1"
11SRC_URI[sha256sum] = "8229cc5e3e75197453ba2a644c03860a7cf9f4f27fcbf111bb589530d4efb58f" 10SRC_URI[sha256sum] = "7273e88e6a6338be1e51b0e4c685d556386897cba9317cd83370bfb3f009982a"
12 11
13PR = "${INC_PR}.0" 12PR = "${INC_PR}.0"
14 13