diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-06-18 14:16:17 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-06-18 14:16:17 -0700 |
commit | f245613bfb313125190e092f2f50d913c4b6d4ce (patch) | |
tree | 59a25bf35938661a275bd47913589c3afef823c0 /meta-networking/recipes-daemons | |
parent | 8195786545df7ef5c29aeae1d5b1ad45aa33792a (diff) | |
download | meta-openembedded-f245613bfb313125190e092f2f50d913c4b6d4ce.tar.gz |
iscsi-initiator-utils: Update to latest
Remove patches for gcc8 issues which are now fixed upstream
but differently
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-daemons')
3 files changed, 1 insertions, 66 deletions
diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Include-limit.h-for-PATH_MAX.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Include-limit.h-for-PATH_MAX.patch deleted file mode 100644 index 074ea7565..000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Include-limit.h-for-PATH_MAX.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | From 782730a74dd453a3c9bd2b47b79b1797586871fa Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 1 Jun 2018 18:11:34 -0700 | ||
4 | Subject: [PATCH] Include limit.h for PATH_MAX | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | libopeniscsiusr/node.c | 1 + | ||
9 | 1 file changed, 1 insertion(+) | ||
10 | |||
11 | diff --git a/libopeniscsiusr/node.c b/libopeniscsiusr/node.c | ||
12 | index e82bb0d..3438a8f 100644 | ||
13 | --- a/libopeniscsiusr/node.c | ||
14 | +++ b/libopeniscsiusr/node.c | ||
15 | @@ -29,6 +29,7 @@ | ||
16 | #include <unistd.h> | ||
17 | #include <errno.h> | ||
18 | #include <string.h> | ||
19 | +#include <limits.h> | ||
20 | |||
21 | #include "libopeniscsiusr/libopeniscsiusr.h" | ||
22 | #include "misc.h" | ||
diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-iface-Set-strncpy-bounds-to-not-over.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-iface-Set-strncpy-bounds-to-not-over.patch deleted file mode 100644 index b7c87f416..000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-iface-Set-strncpy-bounds-to-not-over.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From 56a56567d4f334b119e60c4ef0ad87edf7b77609 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 1 Jun 2018 18:46:19 -0700 | ||
4 | Subject: [PATCH] libopeniscsiusr/iface: Set strncpy bounds to not overflow | ||
5 | |||
6 | Fixes warnings found by gcc8 | ||
7 | |||
8 | iface.c:492:47: error: '%s' directive output may be truncated writing up to 4095 bytes into a region of size 4073 [-Werror=format-truncation=] | ||
9 | |||
10 | iface.c:140:3: note: in expansion of macro '_strncpy' | ||
11 | _strncpy((*iface)->transport_name, proc_name + strlen("iscsi_"), | ||
12 | ^~~~~~~~ | ||
13 | |||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | libopeniscsiusr/iface.c | 5 +++-- | ||
17 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/libopeniscsiusr/iface.c b/libopeniscsiusr/iface.c | ||
20 | index 955395d..d33363e 100644 | ||
21 | --- a/libopeniscsiusr/iface.c | ||
22 | +++ b/libopeniscsiusr/iface.c | ||
23 | @@ -138,7 +138,7 @@ int _iscsi_iface_get_from_sysfs(struct iscsi_context *ctx, uint32_t host_id, | ||
24 | |||
25 | if (strncmp(proc_name, "iscsi_", strlen("iscsi_")) == 0) | ||
26 | _strncpy((*iface)->transport_name, proc_name + strlen("iscsi_"), | ||
27 | - sizeof((*iface)->transport_name) / sizeof(char)); | ||
28 | + sizeof((*iface)->transport_name) / sizeof(char) - 1); | ||
29 | else | ||
30 | _strncpy((*iface)->transport_name, proc_name, | ||
31 | sizeof((*iface)->transport_name) / sizeof(char)); | ||
32 | @@ -489,7 +489,8 @@ static int _fill_hw_iface_from_sys(struct iscsi_context *ctx, | ||
33 | |||
34 | sysfs_iface_dir_path = malloc(PATH_MAX); | ||
35 | _alloc_null_check(ctx, sysfs_iface_dir_path, rc, out); | ||
36 | - snprintf(sysfs_iface_dir_path, PATH_MAX, "%s/%s", | ||
37 | + sysfs_iface_dir_path[PATH_MAX+strlen(_ISCSI_SYS_IFACE_DIR)] = '\0'; | ||
38 | + snprintf(sysfs_iface_dir_path, PATH_MAX+strlen(_ISCSI_SYS_IFACE_DIR)+1, "%s/%s", | ||
39 | _ISCSI_SYS_IFACE_DIR, iface_kern_id); | ||
40 | |||
41 | _good(_sysfs_prop_get_str(ctx, sysfs_iface_dir_path, | ||
diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb index f61900d82..e6a87a38a 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb | |||
@@ -11,7 +11,7 @@ DEPENDS = "openssl flex-native bison-native open-isns util-linux" | |||
11 | 11 | ||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" |
13 | 13 | ||
14 | SRCREV ?= "0cfebb10d29382ac1058c950a60a946c28b01e53" | 14 | SRCREV ?= "bd79e4ed1004a6035d2538a308c5930890421a22" |
15 | 15 | ||
16 | SRC_URI = "git://github.com/open-iscsi/open-iscsi \ | 16 | SRC_URI = "git://github.com/open-iscsi/open-iscsi \ |
17 | file://initd.debian \ | 17 | file://initd.debian \ |
@@ -20,8 +20,6 @@ SRC_URI = "git://github.com/open-iscsi/open-iscsi \ | |||
20 | file://iscsi-initiator.service \ | 20 | file://iscsi-initiator.service \ |
21 | file://iscsi-initiator-targets.service \ | 21 | file://iscsi-initiator-targets.service \ |
22 | file://set_initiatorname \ | 22 | file://set_initiatorname \ |
23 | file://0001-Include-limit.h-for-PATH_MAX.patch \ | ||
24 | file://0002-libopeniscsiusr-iface-Set-strncpy-bounds-to-not-over.patch \ | ||
25 | " | 23 | " |
26 | S = "${WORKDIR}/git" | 24 | S = "${WORKDIR}/git" |
27 | B = "${WORKDIR}/build" | 25 | B = "${WORKDIR}/build" |