deleted file mode 100644
@@ -1,43 +0,0 @@
-From 424d5967e94f6adf4c0669d390779af8da0bef20 Mon Sep 17 00:00:00 2001
-From: Lee Duncan <lduncan@suse.com>
-Date: Sat, 18 Sep 2021 16:10:50 -0700
-Subject: [PATCH] Fix compiler error introduced with recent IPv6 commit.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 76350316de38 ("Handle IPv6 interfaces correctly.") added
-a string copy that creates this gcc-11 error message:
-
-> gcc-11 -O2 -g -Wall -Werror -Wextra -fvisibility=hidden -fPIC -I/usr/include/kmod -c -o idbm.o idbm.c
-> idbm.c: In function ‘_idbm_node_rec_link’:
-> idbm.c:999:17: error: ‘strncpy’ specified bound 65 equals destination size [-Werror=stringop-truncation]
-> 999 | strncpy((*node).iface.name, iface_name, ISCSI_MAX_IFACE_LEN);
-> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-So copy one less character, maximum.
-
-Upstream-Status: Backport
-[https://github.com/open-iscsi/open-iscsi/commit/424d5967e94f6adf4c0669d390779af8da0bef20]
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- libopeniscsiusr/idbm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c
-index b2524ed..6f57e45 100644
---- a/libopeniscsiusr/idbm.c
-+++ b/libopeniscsiusr/idbm.c
-@@ -996,7 +996,7 @@ static void _idbm_node_rec_link(struct iscsi_node *node, struct idbm_rec *recs,
-
- /* use the interface name passed in, if any */
- if (iface_name)
-- strncpy((*node).iface.name, iface_name, ISCSI_MAX_IFACE_LEN);
-+ strncpy((*node).iface.name, iface_name, ISCSI_MAX_IFACE_LEN-1);
-
- /*
- * Note: because we do not add the iface.iscsi_ifacename to
-2.25.1
-
similarity index 96%
rename from meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.5.bb
rename to meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.6.bb
@@ -12,11 +12,10 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRCREV ?= "20d0aa96f2170339b1967f4be81e9c5042bbce03"
+SRCREV ?= "ee575fd19429ec6dc24b49f2ce3822b4a01f57de"
SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \
file://0001-Makefile-Do-not-set-Werror.patch \
- file://0001-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch \
file://initd.debian \
file://99_iscsi-initiator-utils \
file://iscsi-initiator \
0001-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch removed since it's included in 2.1.6. Changelog: ========= This release adds more bug fixes and cleanups. No major functionality changes. libopeniscsiusr: extend sysfs ignore_error to include EINVAL Fix compiler error introduced with recent IPv6 commit. Remove dependences from iscsi-init.service Use "sbindir" for path in systemd service files Updated README a bit Finish ability to have binary location configurable. Fix iscsi-init so that it runs when root writable remove redundant params in Makefile Fixing last parts of sbindir configuration Cosmetic cleanup on recent addition Update the iscsi-gen-initiatorname script: harden and generalize change iscsi-gen-initiatorname option -b => -p Add man page for the iscsi-gen-initiatorname script. Install new man page for iscsi-gen-initiatorname Fix issues discovered by gcc12 Fix more issues discovered by gcc12 iscsi sysfs: check state before onlining devs iscsistart: fix login timeout handling iscsid: use infinite timeout if passed in iscsid: add error code for req timeouts Improve 'iscsid.conf' iscsiadm: Call log_init() first to fix a segmentation fault iscsi_err: Add iscsid request timed out error messages Fix wrong install_systemd destination path actor: add name to struct actor and init it with function name actor: print thread name in log actor: enhanced: print error log when init a initilized thread initiator_common: make set operational parameter log easy to read iscsid: Check session id before start sync a thread Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- ...or-introduced-with-recent-IPv6-commi.patch | 43 ------------------- ....1.5.bb => iscsi-initiator-utils_2.1.6.bb} | 3 +- 2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch rename meta-networking/recipes-daemons/iscsi-initiator-utils/{iscsi-initiator-utils_2.1.5.bb => iscsi-initiator-utils_2.1.6.bb} (96%)