diff --git a/.gitignore b/.gitignore index dff3dfe..0637f20 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /open-iscsi-095f59c.tar.gz /open-iscsi-2a8f9d8.tar.gz /open-iscsi-c26218d.tar.gz +/open-iscsi-a65a472.tar.gz diff --git a/0009-Coverity-scan-fixes.patch b/0009-Coverity-scan-fixes.patch index 1b3904e..65b1e92 100644 --- a/0009-Coverity-scan-fixes.patch +++ b/0009-Coverity-scan-fixes.patch @@ -15,12 +15,12 @@ diff --git a/iscsiuio/src/unix/libs/qedi.c b/iscsiuio/src/unix/libs/qedi.c index 1af8d1b..9a814c6 100644 --- a/iscsiuio/src/unix/libs/qedi.c +++ b/iscsiuio/src/unix/libs/qedi.c -@@ -1030,7 +1030,7 @@ static int qedi_read(nic_t *nic, packet_t *pkt) +@@ -1034,7 +1034,7 @@ static int qedi_read(nic_t *nic, packet_t *pkt) - LOG_DEBUG(PFX "%s:hw_prod %d bd_prod %d, rx_pkt_idx %d, rxlen %d", + ILOG_DEBUG(PFX "%s:hw_prod %d bd_prod %d, rx_pkt_idx %d, rxlen %d", nic->log_name, hw_prod, bd_prod, rx_bd->rx_pkt_index, len); -- LOG_DEBUG(PFX "%s: sw_con %d bd_cons %d num BD %d", -+ LOG_DEBUG(PFX "%s: sw_con %d bd_cons %d num BD %lu", +- ILOG_DEBUG(PFX "%s: sw_con %d bd_cons %d num BD %d", ++ ILOG_DEBUG(PFX "%s: sw_con %d bd_cons %d num BD %lu", nic->log_name, sw_cons, bd_cons, QEDI_NUM_RX_BD); if (bd_cons != bd_prod) { @@ -33,7 +33,7 @@ index 0c9ad49..f83f305 100644 sigaddset(&set, SIGUSR1); rc = pthread_sigmask(SIG_SETMASK, &set, NULL); + if (rc != 0) { -+ LOG_ERR("Failed to set thread signal mask"); ++ ILOG_ERR("Failed to set thread signal mask"); + } /* Spin off the signal handling thread */ diff --git a/0011-remove-unicode-symbols-from-iscsid.conf.patch b/0011-remove-unicode-symbols-from-iscsid.conf.patch deleted file mode 100644 index b3d2de7..0000000 --- a/0011-remove-unicode-symbols-from-iscsid.conf.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b89d270f820ea6da0639ae25864bffcbddd3ed46 Mon Sep 17 00:00:00 2001 -From: Chris Leech -Date: Tue, 4 Jul 2023 12:20:03 -0700 -Subject: [PATCH 1/1] remove unicode symbols from iscsid.conf - ---- - etc/iscsid.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/iscsid.conf b/etc/iscsid.conf -index ca29e43..607ad0f 100644 ---- a/etc/iscsid.conf -+++ b/etc/iscsid.conf -@@ -69,7 +69,7 @@ node.leading_login = No - # To configure which CHAP algorithms to enable, set - # node.session.auth.chap_algs to a comma separated list. - # The algorithms should be listed in order of decreasing --# preference — in particular, with the most preferred algorithm first. -+# preference - in particular, with the most preferred algorithm first. - # Valid values are MD5, SHA1, SHA256, and SHA3-256. - # The default is MD5. - #node.session.auth.chap_algs = SHA3-256,SHA256,SHA1,MD5 --- -2.40.1 - diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index 20a8c30..5dac0bc 100644 --- a/iscsi-initiator-utils.spec +++ b/iscsi-initiator-utils.spec @@ -1,6 +1,6 @@ %global open_iscsi_version 2.1 %global open_iscsi_build 9 -%global commit0 c26218d9f8afdca44a492a4c3811648bd2880b26 +%global commit0 a65a472a35b436c7a2d47c5862aae530ac4ae9c8 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Disable python2 build by default @@ -10,8 +10,8 @@ Summary: iSCSI daemon and utility programs Name: iscsi-initiator-utils Version: 6.%{open_iscsi_version}.%{open_iscsi_build} -Release: 17.git%{shortcommit0}%{?dist} -License: GPLv2+ +Release: 18.git%{shortcommit0}%{?dist} +License: GPL-2.0-or-later URL: https://github.com/open-iscsi/open-iscsi Source0: https://github.com/open-iscsi/open-iscsi/archive/%{commit0}.tar.gz#/open-iscsi-%{shortcommit0}.tar.gz Source4: 04-iscsi @@ -31,7 +31,6 @@ Patch07: 0007-Disable-Data-Digests.patch Patch08: 0008-Revert-iscsiadm-return-error-when-login-fails.patch Patch09: 0009-Coverity-scan-fixes.patch Patch10: 0010-use-Red-Hat-version-string-to-match-RPM-package-vers.patch -Patch11: 0011-remove-unicode-symbols-from-iscsid.conf.patch # libiscsi, deprecated but still needed until UDisks2 is converted to libopeniscsiusr Patch101: 0101-libiscsi.patch @@ -64,7 +63,7 @@ Protocol networks. %package iscsiuio Summary: Userspace configuration daemon required for some iSCSI hardware -License: BSD +License: BSD-4-Clause Requires: %{name} = %{version}-%{release} %description iscsiuio @@ -273,6 +272,9 @@ systemctl --no-reload preset iscsi.service iscsi-starter.service &>/dev/null || %endif %changelog +* Wed Nov 15 2023 Chris Leech - 6.2.1.9-18.gita65a472 +- iscsiuio threading fixes (iscsiuio 0.7.8.8) + * Thu Jul 20 2023 Fedora Release Engineering - 6.2.1.9-17.gitc26218d - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 80d8486..83105fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (open-iscsi-c26218d.tar.gz) = 1da57f95aff4ac32653e726ffc2d011f7a287999ba7b40192ae6800f882c4ca6fa2e76a74616df8002c17f68ac64a7c7686fb8c6fbaa39b6db95dbf7d64215b7 +SHA512 (open-iscsi-a65a472.tar.gz) = f2befa5047a8a1f714910d402503828d6ae5d7be85d3b59db33cde32c4e36fe401430c6ae033a066d9bd57a3be0c0933185240cfc8660973e03c8a8c427d4ba6