summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-01-15 22:08:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-16 11:57:33 +0000
commitb1ae9679089f958d01020e7a77b40be504740c2c (patch)
tree83551c2698c8ce9822cd10f1f338a3b8c0382ad9 /meta
parent7048fbdc05c1f2d9acaf1052550dec792c1f18da (diff)
downloadpoky-b1ae9679089f958d01020e7a77b40be504740c2c.tar.gz
connman: upgrade to 1.10
0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch - adapted to the new version 0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch - patch removed (it is included in the new version) inet-fix-ip-cleanup-functions.patch: added - fix for ip cleanup functions (From OE-Core rev: e0cca947fc87c8f7a6d2a8fd719c87d56dd52941) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> 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/0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch61
-rw-r--r--meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch38
-rw-r--r--meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch40
-rw-r--r--meta/recipes-connectivity/connman/connman_1.10.bb (renamed from meta/recipes-connectivity/connman/connman_1.4.bb)8
4 files changed, 67 insertions, 80 deletions
diff --git a/meta/recipes-connectivity/connman/connman/0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch b/meta/recipes-connectivity/connman/connman/0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch
deleted file mode 100644
index 3bced52054..0000000000
--- a/meta/recipes-connectivity/connman/connman/0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch
+++ /dev/null
@@ -1,61 +0,0 @@
1From f2094e6b2e4542adf458d8fa58d7bccd5edb762e Mon Sep 17 00:00:00 2001
2From: Andrei Gherzan <andrei@gherzan.ro>
3Date: Tue, 17 Jul 2012 17:27:39 +0300
4Subject: [PATCH V3 1/2] timezone.c: If there is no d_type support use
5 fstatat()
6
7This is useful for filesystems where d_type is always DT_UNKNOWN.
8In this case use fstatat() function.
9
10Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
11Upstream-Status: Submitted
12
13---
14 src/timezone.c | 24 ++++++++++++++++++++++++
15 1 file changed, 24 insertions(+)
16
17diff --git a/src/timezone.c b/src/timezone.c
18index 173d658..f951f6b 100644
19--- a/src/timezone.c
20+++ b/src/timezone.c
21@@ -157,6 +157,8 @@ static char *find_origin(void *src_map, struct stat *src_st,
22 DIR *dir;
23 struct dirent *d;
24 char *str, pathname[PATH_MAX];
25+ struct stat buf;
26+ int ret;
27
28 if (subpath == NULL)
29 strncpy(pathname, basepath, sizeof(pathname));
30@@ -205,6 +207,28 @@ static char *find_origin(void *src_map, struct stat *src_st,
31 return str;
32 }
33 break;
34+ case DT_UNKNOWN:
35+ /*
36+ * If there is no d_type support use fstatat()
37+ * to check if directory
38+ */
39+ ret = fstatat(dirfd(dir), d->d_name, &buf, 0);
40+ if (ret < 0)
41+ continue;
42+ if (!(buf.st_mode & S_IFDIR))
43+ continue;
44+ if (subpath == NULL)
45+ strncpy(pathname, d->d_name, sizeof(pathname));
46+ else
47+ snprintf(pathname, sizeof(pathname),
48+ "%s/%s", subpath, d->d_name);
49+
50+ str = find_origin(src_map, src_st, basepath, pathname);
51+ if (str != NULL) {
52+ closedir(dir);
53+ return str;
54+ }
55+ break;
56 }
57 }
58
59--
601.7.9.5
61
diff --git a/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch b/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch
index d3205c0e68..7315545c26 100644
--- a/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch
+++ b/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch
@@ -8,20 +8,33 @@ This is useful for filesystems where d_type is always DT_UNKNOWN.
8In this case use fstatat() function. 8In this case use fstatat() function.
9 9
10Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com> 10Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
11Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
11Upstream-Status: Submitted 12Upstream-Status: Submitted
12 13
13--- 14---
14 src/storage.c | 19 +++++++++++++++++++ 15 src/storage.c | 19 +++++++++++++++++++
15 1 file changed, 19 insertions(+) 16 1 file changed, 19 insertions(+)
16 17
17diff --git a/src/storage.c b/src/storage.c 18Index: git/src/storage.c
18index 47bd0cb..0491a52 100644 19===================================================================
19--- a/src/storage.c 20--- git.orig/src/storage.c
20+++ b/src/storage.c 21+++ git/src/storage.c
21@@ -206,6 +206,25 @@ gchar **connman_storage_get_services() 22@@ -193,7 +193,6 @@ gchar **connman_storage_get_services()
22 23
23 g_string_append_printf(result, "%s/", d->d_name); 24 switch (d->d_type) {
24 break; 25 case DT_DIR:
26- case DT_UNKNOWN:
27 /*
28 * If the settings file is not found, then
29 * assume this directory is not a services dir.
30@@ -203,6 +202,25 @@ gchar **connman_storage_get_services()
31 ret = stat(str, &buf);
32 g_free(str);
33 if (ret < 0)
34+ continue;
35+
36+ g_string_append_printf(result, "%s/", d->d_name);
37+ break;
25+ case DT_UNKNOWN: 38+ case DT_UNKNOWN:
26+ /* 39+ /*
27+ * If there is no d_type support use fstatat() 40+ * If there is no d_type support use fstatat()
@@ -37,13 +50,6 @@ index 47bd0cb..0491a52 100644
37+ ret = stat(str, &buf); 50+ ret = stat(str, &buf);
38+ g_free(str); 51+ g_free(str);
39+ if (ret < 0) 52+ if (ret < 0)
40+ continue; 53 continue;
41+
42+ g_string_append_printf(result, "%s/", d->d_name);
43+ break;
44 }
45 }
46 54
47-- 55 g_string_append_printf(result, "%s/", d->d_name);
481.7.9.5
49
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
new file mode 100644
index 0000000000..3071549d95
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch
@@ -0,0 +1,40 @@
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.4.bb b/meta/recipes-connectivity/connman/connman_1.10.bb
index bd8ba65cfc..10d5255979 100644
--- a/meta/recipes-connectivity/connman/connman_1.4.bb
+++ b/meta/recipes-connectivity/connman/connman_1.10.bb
@@ -1,12 +1,14 @@
1require connman.inc 1require connman.inc
2 2
3# 1.4 tag 3# 1.10 tag
4SRCREV = "f701bbca259f1f35e68d338f31f5373f75f3da5f" 4SRCREV = "3bda76eb442c9395db1dba17352c3e78376671cc"
5SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ 5SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \
6 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ 6 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
7 file://add_xuser_dbus_permission.patch \ 7 file://add_xuser_dbus_permission.patch \
8 file://connman \ 8 file://connman \
9 file://0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch \ 9 file://0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch \
10 file://0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch" 10 file://inet-fix-ip-cleanup-functions.patch"
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12PR = "${INC_PR}.0" 12PR = "${INC_PR}.0"
13
14RRECOMMENDS_${PN} = "connman-conf"