.gitignore

@@ -1 +1 @@
-SOURCES/open-iscsi-095f59c.tar.gz
+SOURCES/open-iscsi-d791ce0.tar.gz

.iscsi-initiator-utils.metadata

@@ -1 +1 @@
-d6947b76f161a0adcc6d984ed43a82c99e319578 SOURCES/open-iscsi-095f59c.tar.gz
+8724d0141bb4777e5728c3c16b2f89f123e0f8b0 SOURCES/open-iscsi-d791ce0.tar.gz

SOURCES/0001-service-file-tweaks.patch

@@ -1,26 +1,24 @@
-From 28e3ef5c630b8433eaad176a53c98af05a994f36 Mon Sep 17 00:00:00 2001
+From 2d84ee02e9ac69928261b38b5876bebb2349bd65 Mon Sep 17 00:00:00 2001
 From: rpm-build <rpm-build>
 Date: Tue, 4 Jun 2019 13:23:32 -0700
-Subject: [PATCH 01/23] unit file tweaks
+Subject: [PATCH] service file tweaks
 
 ---
- etc/systemd/iscsi-mark-root-nodes  | 34 ++++++++++++++++++++++++++++++
- etc/systemd/iscsi-onboot.service   | 15 +++++++++++++
- etc/systemd/iscsi-shutdown.service | 15 +++++++++++++
- etc/systemd/iscsi.service          | 16 +++++++-------
- etc/systemd/iscsid.service         |  6 ++----
- etc/systemd/iscsiuio.service       |  4 +---
- 6 files changed, 75 insertions(+), 15 deletions(-)
+ etc/systemd/iscsi-mark-root-nodes  | 30 ++++++++++++++++++++++++++++++
+ etc/systemd/iscsi-shutdown.service | 14 ++++++++++++++
+ etc/systemd/iscsi.service          | 23 +++++++++++++----------
+ etc/systemd/iscsid.service         |  6 ++++--
+ etc/systemd/iscsiuio.service       |  2 +-
+ 5 files changed, 62 insertions(+), 13 deletions(-)
  create mode 100755 etc/systemd/iscsi-mark-root-nodes
- create mode 100644 etc/systemd/iscsi-onboot.service
  create mode 100644 etc/systemd/iscsi-shutdown.service
 
 diff --git a/etc/systemd/iscsi-mark-root-nodes b/etc/systemd/iscsi-mark-root-nodes
 new file mode 100755
-index 0000000..9d48805
+index 0000000..c693707
 --- /dev/null
 +++ b/etc/systemd/iscsi-mark-root-nodes
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,30 @@
 +#!/bin/bash
 +
 +ISCSIADM=/usr/sbin/iscsiadm
@@ -32,11 +30,7 @@ index 0000000..9d48805
 +  portal=${p%,*}
 +  transport=${t%:}
 +
-+  # use session number to find the iface name in use
-+  num=${num#[}; num=${num%]}
-+  iface=$(iscsiadm -m session -r $num | grep iface.iscsi_ifacename | cut -d= -f2)
-+
-+  $ISCSIADM -m node -p $portal -T $target -I $iface -o update -n node.startup -v onboot
++  $ISCSIADM -m node -p $portal -T $target -o update -n node.startup -v onboot
 +
 +  start_iscsid=1
 +
@@ -55,33 +49,12 @@ index 0000000..9d48805
 +  systemctl --no-block start iscsiuio.service
 +fi
 +
-diff --git a/etc/systemd/iscsi-onboot.service b/etc/systemd/iscsi-onboot.service
-new file mode 100644
-index 0000000..42ced68
---- /dev/null
-+++ b/etc/systemd/iscsi-onboot.service
-@@ -0,0 +1,15 @@
-+[Unit]
-+Description=Special handling of early boot iSCSI sessions
-+Documentation=man:iscsiadm(8) man:iscsid(8)
-+DefaultDependencies=no
-+RefuseManualStart=true
-+Before=iscsi.service
-+After=systemd-remount-fs.service
-+ConditionDirectoryNotEmpty=/sys/class/iscsi_session
-+
-+[Service]
-+Type=oneshot
-+ExecStart=-/usr/libexec/iscsi-mark-root-nodes
-+
-+[Install]
-+WantedBy=sysinit.target
 diff --git a/etc/systemd/iscsi-shutdown.service b/etc/systemd/iscsi-shutdown.service
 new file mode 100644
-index 0000000..caee933
+index 0000000..69c1c77
 --- /dev/null
 +++ b/etc/systemd/iscsi-shutdown.service
-@@ -0,0 +1,15 @@
+@@ -0,0 +1,14 @@
 +[Unit]
 +Description=Logout off all iSCSI sessions on shutdown
 +Documentation=man:iscsid(8) man:iscsiadm(8)
@@ -95,75 +68,71 @@ index 0000000..caee933
 +[Service]
 +Type=oneshot
 +RemainAfterExit=true
-+ExecStart=-/usr/bin/true
 +ExecStop=-/usr/sbin/iscsiadm -m node --logoutall=all
 diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
-index 5e394b9..26e557d 100644
+index e475888..eadfcec 100644
 --- a/etc/systemd/iscsi.service
 +++ b/etc/systemd/iscsi.service
-@@ -1,17 +1,17 @@
+@@ -1,18 +1,21 @@
  [Unit]
  Description=Login and scanning of iSCSI devices
- Documentation=man:iscsiadm(8) man:iscsid(8)
+-Documentation=man:iscsiadm(8) man:iscsid(8)
 -Before=remote-fs.target
--After=network-online.target iscsid.service
--Requires=iscsid.socket iscsi-init.service
--Wants=network-online.target
+-After=network.target network-online.target iscsid.service
+-Requires=iscsid.service
+-ConditionPathExists=/etc/iscsi/initiatorname.iscsi
++Documentation=man:iscsid(8) man:iscsiadm(8)
 +DefaultDependencies=no
++Conflicts=shutdown.target
++After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service
 +Before=remote-fs-pre.target
-+After=network.target network-online.target iscsid.service iscsiuio.service systemd-remount-fs.service
-+Wants=network-online.target remote-fs-pre.target iscsi-shutdown.service
-+ConditionDirectoryNotEmpty=/var/lib/iscsi/nodes
++Wants=remote-fs-pre.target iscsi-shutdown.service
++ConditionDirectoryNotEmpty=|/var/lib/iscsi/nodes
++ConditionDirectoryNotEmpty=|/sys/class/iscsi_session
  
  [Service]
  Type=oneshot
--ExecStart=/sbin/iscsiadm -m node --loginall=automatic -W
+-ExecStart=/sbin/iscsiadm -m node --loginall=automatic
 -ExecStop=/sbin/iscsiadm -m node --logoutall=automatic
 -ExecStop=/sbin/iscsiadm -m node --logoutall=manual
--SuccessExitStatus=21 15
+-SuccessExitStatus=21
+ RemainAfterExit=true
++ExecStart=-/usr/libexec/iscsi-mark-root-nodes
 +ExecStart=-/usr/sbin/iscsiadm -m node --loginall=automatic
 +ExecReload=-/usr/sbin/iscsiadm -m node --loginall=automatic
 +SuccessExitStatus=21
- RemainAfterExit=true
  
  [Install]
+-WantedBy=remote-fs.target
++WantedBy=sysinit.target
 diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
-index 3fd7dd3..3958dae 100644
+index 4fef168..8d50cf0 100644
 --- a/etc/systemd/iscsid.service
 +++ b/etc/systemd/iscsid.service
-@@ -2,15 +2,13 @@
+@@ -1,14 +1,16 @@
+ [Unit]
  Description=Open-iSCSI
- Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
+-Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
++Documentation=man:iscsid(8) man:iscsiadm(8)
  DefaultDependencies=no
--After=network-online.target iscsiuio.service iscsi-init.service
-+After=network.target network-online.target iscsiuio.service
++Conflicts=shutdown.target
+ After=network.target iscsiuio.service
  Before=remote-fs-pre.target
--Wants=remote-fs-pre.target
--Requires=iscsi-init.service
  
  [Service]
  Type=notify
  NotifyAccess=main
 -ExecStart=/sbin/iscsid -f
 +ExecStart=/usr/sbin/iscsid -f
++ExecStop=/usr/sbin/iscsiadm -k 0 2
  KillMode=mixed
  Restart=on-failure
  
 diff --git a/etc/systemd/iscsiuio.service b/etc/systemd/iscsiuio.service
-index 923e019..fc0be93 100644
+index e4d9fd0..8620cde 100644
 --- a/etc/systemd/iscsiuio.service
 +++ b/etc/systemd/iscsiuio.service
-@@ -2,17 +2,15 @@
- Description=iSCSI UserSpace I/O driver
- Documentation=man:iscsiuio(8)
- DefaultDependencies=no
--Conflicts=shutdown.target
- Requires=iscsid.service
- BindTo=iscsid.service
- After=network.target
- Before=remote-fs-pre.target iscsid.service
--Wants=remote-fs-pre.target
- 
+@@ -11,7 +11,7 @@ Before=remote-fs-pre.target iscsid.service
  [Service]
  Type=notify
  NotifyAccess=main
@@ -173,5 +142,5 @@ index 923e019..fc0be93 100644
  Restart=on-failure
  
 -- 
-2.31.1
+2.21.0
 

SOURCES/0002-idmb_rec_write-check-for-tpgt-first.patch

@@ -1,4 +1,4 @@
-From 45878c9461298c9da68a626d990dc4ef99e01baa Mon Sep 17 00:00:00 2001
+From 97071360caa6868c21a161047ed471790c405efb Mon Sep 17 00:00:00 2001
 From: Chris Leech <cleech@redhat.com>
 Date: Tue, 13 Aug 2013 10:59:44 -0700
 Subject: [PATCH] idmb_rec_write, check for tpgt first
@@ -11,10 +11,10 @@ for splitting it up.
  1 file changed, 5 insertions(+), 13 deletions(-)
 
 diff --git a/usr/idbm.c b/usr/idbm.c
-index 42c2699..e6ede85 100644
+index be4d4e3..a7da540 100644
 --- a/usr/idbm.c
 +++ b/usr/idbm.c
-@@ -2178,6 +2178,10 @@ static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
+@@ -2078,6 +2078,10 @@ static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
  			goto free_portal;
  	}
  
@@ -25,7 +25,7 @@ index 42c2699..e6ede85 100644
  	rc = stat(portal, &statb);
  	if (rc) {
  		rc = 0;
-@@ -2186,22 +2190,10 @@ static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
+@@ -2086,22 +2090,10 @@ static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
  		 * set the tgpt. In new versions you must pass all the info in
  		 * from the start
  		 */
@@ -50,5 +50,5 @@ index 42c2699..e6ede85 100644
  		 * Old style portal as a file, but with tpgt. Let's update it.
  		 */
 -- 
-2.26.2
+2.21.0
 

SOURCES/0003-idbm_rec_write-seperate-old-and-new-style-writes.patch

@@ -1,7 +1,7 @@
-From 9823d8ead9e2d91765e4af39d906e25acd4e2a04 Mon Sep 17 00:00:00 2001
+From 4c6e7c0fcc6da66cf81c0714bf907762194eedf2 Mon Sep 17 00:00:00 2001
 From: Chris Leech <cleech@redhat.com>
 Date: Tue, 13 Aug 2013 11:34:31 -0700
-Subject: [PATCH 3/3] idbm_rec_write, seperate old and new style writes
+Subject: [PATCH] idbm_rec_write, seperate old and new style writes
 
 Duplicates a small bit of code, but easier to understand and extened.
 ---
@@ -9,10 +9,10 @@ Duplicates a small bit of code, but easier to understand and extened.
  1 file changed, 86 insertions(+), 43 deletions(-)
 
 diff --git a/usr/idbm.c b/usr/idbm.c
-index efdda75..307a01a 100644
+index a7da540..2f5e309 100644
 --- a/usr/idbm.c
 +++ b/usr/idbm.c
-@@ -2152,12 +2152,7 @@ mkdir_portal:
+@@ -2030,12 +2030,7 @@ mkdir_portal:
  	return f;
  }
  
@@ -26,13 +26,13 @@ index efdda75..307a01a 100644
  {
  	struct stat statb;
  	FILE *f;
-@@ -2170,39 +2165,8 @@ static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
+@@ -2048,39 +2043,8 @@ static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
  		return ISCSI_ERR_NOMEM;
  	}
  
 -	snprintf(portal, PATH_MAX, "%s", NODE_CONFIG_DIR);
 -	if (access(portal, F_OK) != 0) {
--		if (mkdir(portal, 0770) != 0) {
+-		if (mkdir(portal, 0660) != 0) {
 -			log_error("Could not make %s: %s", portal,
 -				  strerror(errno));
 -			rc = ISCSI_ERR_IDBM;
@@ -42,7 +42,7 @@ index efdda75..307a01a 100644
 -
 -	snprintf(portal, PATH_MAX, "%s/%s", NODE_CONFIG_DIR, rec->name);
 -	if (access(portal, F_OK) != 0) {
--		if (mkdir(portal, 0770) != 0) {
+-		if (mkdir(portal, 0660) != 0) {
 -			log_error("Could not make %s: %s", portal,
 -				  strerror(errno));
 -			rc = ISCSI_ERR_IDBM;
@@ -66,7 +66,7 @@ index efdda75..307a01a 100644
  
  	rc = stat(portal, &statb);
  	if (rc) {
-@@ -2223,11 +2187,11 @@ static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
+@@ -2101,11 +2065,11 @@ static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
  			log_error("Could not convert %s: %s", portal,
  				  strerror(errno));
  			rc = ISCSI_ERR_IDBM;
@@ -80,7 +80,7 @@ index efdda75..307a01a 100644
  	}
  
  mkdir_portal:
-@@ -2238,24 +2202,103 @@ mkdir_portal:
+@@ -2116,24 +2080,103 @@ mkdir_portal:
  			log_error("Could not make dir %s: %s",
  				  portal, strerror(errno));
  			rc = ISCSI_ERR_IDBM;
@@ -155,7 +155,7 @@ index efdda75..307a01a 100644
 +
 +	snprintf(portal, PATH_MAX, "%s", NODE_CONFIG_DIR);
 +	if (access(portal, F_OK) != 0) {
-+		if (mkdir(portal, 0770) != 0) {
++		if (mkdir(portal, 0660) != 0) {
 +			log_error("Could not make %s: %s", portal,
 +				  strerror(errno));
 +			rc = ISCSI_ERR_IDBM;
@@ -165,7 +165,7 @@ index efdda75..307a01a 100644
 +
 +	snprintf(portal, PATH_MAX, "%s/%s", NODE_CONFIG_DIR, rec->name);
 +	if (access(portal, F_OK) != 0) {
-+		if (mkdir(portal, 0770) != 0) {
++		if (mkdir(portal, 0660) != 0) {
 +			log_error("Could not make %s: %s", portal,
 +				  strerror(errno));
 +			rc = ISCSI_ERR_IDBM;
@@ -189,5 +189,5 @@ index efdda75..307a01a 100644
  		idbm_unlock();
  free_portal:
 -- 
-2.31.1
+2.21.0
 

SOURCES/0004-idbw_rec_write-pick-tpgt-from-existing-record.patch

@@ -1,4 +1,4 @@
-From 2b1c0c5f1f2dbc516a9b51950a82eac091dbce2c Mon Sep 17 00:00:00 2001
+From 6051b9ef3cdf206630969940aba980f4088e2e14 Mon Sep 17 00:00:00 2001
 From: Chris Leech <cleech@redhat.com>
 Date: Tue, 13 Aug 2013 12:39:07 -0700
 Subject: [PATCH] idbw_rec_write, pick tpgt from existing record
@@ -12,7 +12,7 @@ updated new style record instead.
  1 file changed, 40 insertions(+)
 
 diff --git a/usr/idbm.c b/usr/idbm.c
-index bc51388..f1e5c88 100644
+index 2f5e309..a2332cc 100644
 --- a/usr/idbm.c
 +++ b/usr/idbm.c
 @@ -28,6 +28,7 @@
@@ -23,21 +23,21 @@ index bc51388..f1e5c88 100644
  #include <sys/stat.h>
  #include <sys/file.h>
  #include <inttypes.h>
-@@ -203,6 +204,8 @@ static struct int_list_tbl {
- 	{ "SHA3-256", AUTH_CHAP_ALG_SHA3_256 },
- };
+@@ -164,6 +165,8 @@ static struct idbm *db;
+ 	_n++; \
+ } while(0)
  
 +static int idbm_remove_disc_to_node_link(node_rec_t *rec, char *portal);
 +
  static void
  idbm_recinfo_discovery(discovery_rec_t *r, recinfo_t *ri)
  {
-@@ -2207,12 +2210,49 @@ static int idbm_rec_write_old(node_rec_t *rec)
+@@ -2107,12 +2110,49 @@ static int idbm_rec_write_old(node_rec_t *rec)
  	FILE *f;
  	char *portal;
  	int rc = 0;
 +	glob_t globbuf;
-+	size_t i;
++	int i;
 +	int tpgt = PORTAL_GROUP_TAG_UNKNOWN;
  
  	portal = malloc(PATH_MAX);
@@ -83,5 +83,5 @@ index bc51388..f1e5c88 100644
  		 rec->name, rec->conn[0].address, rec->conn[0].port);
  
 -- 
-2.26.2
+2.21.0
 

SOURCES/0005-update-initscripts-and-docs.patch

@@ -1,16 +1,16 @@
-From 97b1242450df25648d203acf7cc297cd46d10e8c Mon Sep 17 00:00:00 2001
+From 6602f08bfcc2b2e75d1a58671cb160c96cf2d99b Mon Sep 17 00:00:00 2001
 From: Chris Leech <cleech@redhat.com>
 Date: Mon, 19 Nov 2012 16:37:13 -0800
 Subject: [PATCH] update initscripts and docs
 
 ---
- README          | 12 +++++-------
- etc/iscsid.conf | 23 +++++++++++------------
+ README          | 10 ++++------
+ etc/iscsid.conf | 21 ++++++++++-----------
  usr/idbm.c      |  4 ++++
- 3 files changed, 20 insertions(+), 19 deletions(-)
+ 3 files changed, 18 insertions(+), 17 deletions(-)
 
 diff --git a/README b/README
-index 508c9d7..b62a14e 100644
+index 2499d9a..c05814a 100644
 --- a/README
 +++ b/README
 @@ -77,11 +77,6 @@ the cache sync command will fail.
@@ -25,21 +25,16 @@ index 508c9d7..b62a14e 100644
  The userspace components iscsid, iscsiadm and iscsistart require the
  open-isns library, which can be found here:
  	https://github.com/gonzoleeman/open-isns/releases
-@@ -1163,11 +1158,11 @@ Red Hat or Fedora:
+@@ -1151,7 +1146,7 @@ Red Hat or Fedora:
  -----------------
  To start open-iscsi in Red Hat/Fedora you can do:
  
--	systemctl start open-iscsi
-+	systemctl start iscsi
+-	service open-iscsi start
++	service iscsi start
  
  To get open-iscsi to automatically start at run time you may have to
  run:
--	systemctl enable open-iscsi
-+	systemctl enable iscsi
- 
- And, to automatically mount a file system during startup
- you must have the partition entry in /etc/fstab marked with the "_netdev"
-@@ -1370,6 +1365,9 @@ iscsid will only perform rediscovery when it gets a SCN from the server.
+@@ -1353,6 +1348,9 @@ iscsid will only perform rediscovery when it gets a SCN from the server.
  #   linux-isns (SLES's iSNS server) where it sometimes does not send SCN
  #   events in the proper format, so they may not get handled.
  
@@ -50,20 +45,18 @@ index 508c9d7..b62a14e 100644
  --------
  
 diff --git a/etc/iscsid.conf b/etc/iscsid.conf
-index f21ed3d..420145b 100644
+index 70985af..2f3a28c 100644
 --- a/etc/iscsid.conf
 +++ b/etc/iscsid.conf
-@@ -19,8 +19,8 @@
+@@ -19,7 +19,7 @@
  # the time then leave this attribute commented out.
  #
  # Default for Fedora and RHEL. (uncomment to activate).
--# iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.socket
--#
+-# iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.soccket
 +iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.socket
-+# 
+ # 
  # Default if you are not using systemd (uncomment to activate)
  # iscsid.startup = /usr/bin/service start iscsid
- 
 @@ -41,8 +41,8 @@
  # To request that the iscsi initd scripts startup a session set to "automatic".
  # node.startup = automatic
@@ -75,7 +68,7 @@ index f21ed3d..420145b 100644
  
  # For "automatic" startup nodes, setting this to "Yes" will try logins on each
  # available iface until one succeeds, and then stop.  The default "No" will try
-@@ -271,28 +271,27 @@ node.conn[0].iscsi.MaxXmitDataSegmentLength = 0
+@@ -264,28 +264,27 @@ node.conn[0].iscsi.MaxXmitDataSegmentLength = 0
  discovery.sendtargets.iscsi.MaxRecvDataSegmentLength = 32768
  
  # To allow the targets to control the setting of the digest checking,
@@ -112,10 +105,10 @@ index f21ed3d..420145b 100644
  # For multipath configurations, you may want more than one session to be
  # created on each iface record.  If node.session.nr_sessions is greater
 diff --git a/usr/idbm.c b/usr/idbm.c
-index f1e5c88..0f0f17a 100644
+index a2332cc..aed08f2 100644
 --- a/usr/idbm.c
 +++ b/usr/idbm.c
-@@ -566,9 +566,13 @@ idbm_recinfo_node(node_rec_t *r, recinfo_t *ri)
+@@ -521,9 +521,13 @@ idbm_recinfo_node(node_rec_t *r, recinfo_t *ri)
  				 IDBM_SHOW, "None", "CRC32C", "CRC32C,None",
  				 "None,CRC32C", num, 1);
  		sprintf(key, CONN_DATA_DIGEST, i);
@@ -130,5 +123,5 @@ index f1e5c88..0f0f17a 100644
  		__recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW,
  				"No", "Yes", num, 1);
 -- 
-2.26.2
+2.21.0
 

SOURCES/0006-use-var-for-config.patch

@@ -1,7 +1,7 @@
-From e6ab14371300e45c4f03efa64917f7601675f01d Mon Sep 17 00:00:00 2001
+From 9cae86dd15bf78ee9d221f722f723062eb6ad3d8 Mon Sep 17 00:00:00 2001
 From: Chris Leech <cleech@redhat.com>
 Date: Mon, 19 Nov 2012 16:38:45 -0800
-Subject: [PATCH 1/1] use var for config
+Subject: [PATCH] use var for config
 
 ---
  README         | 33 ++++++++++++++++-----------------
@@ -13,7 +13,7 @@ Subject: [PATCH 1/1] use var for config
  6 files changed, 33 insertions(+), 32 deletions(-)
 
 diff --git a/README b/README
-index b62a14e..1875e3d 100644
+index c05814a..326c3b0 100644
 --- a/README
 +++ b/README
 @@ -172,8 +172,7 @@ Usage: iscsid [OPTION]
@@ -26,7 +26,7 @@ index b62a14e..1875e3d 100644
  
  Configuration is contained in directories for:
  
-@@ -573,7 +572,7 @@ a scsi_host per HBA port).
+@@ -561,7 +560,7 @@ a scsi_host per HBA port).
  To manage both types of initiator stacks, iscsiadm uses the interface (iface)
  structure. For each HBA port or for software iscsi for each network
  device (ethX) or NIC, that you wish to bind sessions to you must create
@@ -35,7 +35,7 @@ index b62a14e..1875e3d 100644
  
  Prep
  ----
-@@ -606,7 +605,7 @@ Running
+@@ -594,7 +593,7 @@ Running
  The command
  	iscsiadm -m iface
  
@@ -44,7 +44,7 @@ index b62a14e..1875e3d 100644
  
  	iface0 qla4xxx,00:c0:dd:08:63:e8,20.15.0.7,default,iqn.2005-06.com.redhat:madmax
  	iface1 qla4xxx,00:c0:dd:08:63:ea,20.15.0.9,default,iqn.2005-06.com.redhat:madmax
-@@ -616,10 +615,10 @@ The format is:
+@@ -604,10 +603,10 @@ The format is:
  
  For software iscsi, you can create the iface configs by hand, but it is
  recommended that you use iscsiadm's iface mode. There is an iface.example in
@@ -57,7 +57,7 @@ index b62a14e..1875e3d 100644
  must have a unique name which is less than or equal to 64 characters.
  
  Example
-@@ -627,12 +626,12 @@ Example
+@@ -615,12 +614,12 @@ Example
  
  If you have NIC1 with MAC address 00:0F:1F:92:6B:BF and NIC2 with
  MAC address 00:C0:DD:08:63:E7, and you wanted to do software iscsi over
@@ -72,7 +72,7 @@ index b62a14e..1875e3d 100644
  
  	iface.transport_name = tcp
  	iface.hwaddress = 00:C0:DD:08:63:E7
-@@ -674,7 +673,7 @@ port. The iface name will be of the form:
+@@ -662,7 +661,7 @@ port. The iface name will be of the form:
  Running the following command:
  	iscsiadm -m iface
  
@@ -81,7 +81,7 @@ index b62a14e..1875e3d 100644
  
  	default tcp,<empty>,<empty>,<empty>,<empty>
  	iser iser,<empty>,<empty>,<empty>,<empty>
-@@ -754,7 +753,7 @@ need a separate network connection to the target for discovery purposes.
+@@ -742,7 +741,7 @@ need a separate network connection to the target for discovery purposes.
  *This will be fixed in the next version of open-iscsi*
  
  For compatibility reasons, when you run iscsiadm to do discovery, it
@@ -90,7 +90,7 @@ index b62a14e..1875e3d 100644
  tcp for the iface.transport, and it will bind the portals that are discovered
  so that they will be logged in through those ifaces. This behavior can also
  be overridden by passing in the interfaces you want to use. For the case
-@@ -769,7 +768,7 @@ If you had defined interfaces but wanted the old behavior, where we do not
+@@ -757,7 +756,7 @@ If you had defined interfaces but wanted the old behavior, where we do not
  bind a session to an iface, then you can use the special iface "default":
  	iscsiadm -m discoverydb -t st -p ip:port -I default --discover -P 1
  
@@ -99,7 +99,7 @@ index b62a14e..1875e3d 100644
  not pass anything into iscsiadm, running iscsiadm will do the default
  behavior, allowing the network subsystem to decide which device to use.
  
-@@ -805,7 +804,7 @@ Discovery mode
+@@ -793,7 +792,7 @@ Discovery mode
  		ID [192.168.1.1:3260]:
  	iscsiadm -m discoverydb -t st -p 192.168.1.1:3260 --discover
  
@@ -108,7 +108,7 @@ index b62a14e..1875e3d 100644
  	ID [portal = 192.168.1.1:3260 and type = sendtargets. If found it
  	will perform discovery using the settings stored in the record.
  	If a record does not exist, it will be created using the iscsid.conf
-@@ -814,7 +813,7 @@ Discovery mode
+@@ -802,7 +801,7 @@ Discovery mode
  	The argument to -p may also be a hostname instead of an address:
  		iscsiadm -m discoverydb -t st -p somehost --discover
  
@@ -117,7 +117,7 @@ index b62a14e..1875e3d 100644
  	interfaces using software iscsi. If any are found then nodes found
  	during discovery will be setup so that they can logged in through
  	those interfaces. To specify a specific iface, pass the
-@@ -865,7 +864,7 @@ Discovery mode
+@@ -853,7 +852,7 @@ Discovery mode
  
  - SendTargets iSCSI Discovery with a specific interface.
  		If you wish to only use a subset of the interfaces in
@@ -126,7 +126,7 @@ index b62a14e..1875e3d 100644
  	iscsiadm -m discoverydb -t sendtargets -p 192.168.1.1:3260 \
  		--interface=iface0 --interface=iface1 --discover
  
-@@ -1232,8 +1231,8 @@ where targetname is the name of the target and ip_address:port is the address
+@@ -1223,8 +1222,8 @@ where targetname is the name of the target and ip_address:port is the address
  and port of the portal. tpgt is the Target Portal Group Tag of
  the portal, and is not used in iscsiadm commands except for static
  record creation. ifacename is the name of the iscsi interface
@@ -137,7 +137,7 @@ index b62a14e..1875e3d 100644
  Default here is iscsi_tcp/tcp to be used over whichever NIC the
  network layer decides is best.
  
-@@ -1353,7 +1352,7 @@ If set, iscsid will perform discovery to the address every
+@@ -1336,7 +1335,7 @@ If set, iscsid will perform discovery to the address every
  discovery.isns.discoveryd_poll_inval or
  discovery.sendtargets.discoveryd_poll_inval seconds,
  and it will log into any portals found from the discovery source using
@@ -147,7 +147,7 @@ index b62a14e..1875e3d 100644
  Note that for iSNS the poll_interval does not have to be set. If not set,
  iscsid will only perform rediscovery when it gets a SCN from the server.
 diff --git a/doc/iscsiadm.8 b/doc/iscsiadm.8
-index 3729a72..9f84a81 100644
+index bf23dd2..9cfce16 100644
 --- a/doc/iscsiadm.8
 +++ b/doc/iscsiadm.8
 @@ -228,7 +228,7 @@ This option is only valid for ping submode.
@@ -159,7 +159,7 @@ index 3729a72..9f84a81 100644
  iSCSI (qla4xxx) the iface config must have the hardware address
  (iface.hwaddress = port's MAC address)
  and the driver/transport_name (iface.transport_name). The iface's name is
-@@ -318,7 +318,7 @@ If no other options are specified: for \fIdiscovery\fR, \fIdiscoverydb\fR and
+@@ -301,7 +301,7 @@ If no other options are specified: for \fIdiscovery\fR, \fIdiscoverydb\fR and
  \fInode\fR, all of their respective records are displayed; for \fIsession\fR,
  all active sessions and connections are displayed; for \fIfw\fR, all boot
  firmware values are displayed; for \fIhost\fR, all iSCSI hosts are displayed;
@@ -168,7 +168,7 @@ index 3729a72..9f84a81 100644
  .TP
  \fB\-n\fR, \fB\-\-name=\fIname\fR
  In node mode, specify a field \fIname\fR in a record. In flashnode submode
-@@ -681,10 +681,10 @@ The configuration file read by \fBiscsid\fR and \fBiscsiadm\fR on startup.
+@@ -640,10 +640,10 @@ The configuration file read by \fBiscsid\fR and \fBiscsiadm\fR on startup.
  The file containing the iSCSI InitiatorName and InitiatorAlias read by
  \fBiscsid\fR and \fBiscsiadm\fR on startup.
  .TP
@@ -182,10 +182,10 @@ index 3729a72..9f84a81 100644
  .SH "SEE ALSO"
  .BR iscsid (8)
 diff --git a/doc/iscsid.8 b/doc/iscsid.8
-index db996b4..eaa9c3b 100644
+index 6f9218f..0da0551 100644
 --- a/doc/iscsid.8
 +++ b/doc/iscsid.8
-@@ -70,7 +70,7 @@ and
+@@ -65,7 +65,7 @@ and
  .B iscsiadm
  on startup.
  .TP
@@ -195,24 +195,24 @@ index db996b4..eaa9c3b 100644
  
  .SH "SEE ALSO"
 diff --git a/usr/idbm.c b/usr/idbm.c
-index 7c63c04..779d052 100644
+index aed08f2..15802c3 100644
 --- a/usr/idbm.c
 +++ b/usr/idbm.c
-@@ -3104,9 +3104,9 @@ free_info:
+@@ -2968,9 +2968,9 @@ free_info:
  int idbm_init(idbm_get_config_file_fn *fn)
  {
  	/* make sure root db dir is there */
 -	if (access(ISCSI_CONFIG_ROOT, F_OK) != 0) {
--		if (mkdir(ISCSI_CONFIG_ROOT, 0770) != 0) {
+-		if (mkdir(ISCSI_CONFIG_ROOT, 0660) != 0) {
 -			log_error("Could not make %s %d", ISCSI_CONFIG_ROOT,
 +	if (access(ISCSIVAR, F_OK) != 0) {
-+		if (mkdir(ISCSIVAR, 0770) != 0) {
++		if (mkdir(ISCSIVAR, 0660) != 0) {
 +			log_error("Could not make %s %d", ISCSIVAR,
  				   errno);
  			return errno;
  		}
 diff --git a/usr/idbm.h b/usr/idbm.h
-index 7496f1d..db3048b 100644
+index 18c5025..6bdfd60 100644
 --- a/usr/idbm.h
 +++ b/usr/idbm.h
 @@ -30,12 +30,13 @@
@@ -251,5 +251,5 @@ index 6c06f7f..c8b9de9 100644
  struct iface_rec;
  struct list_head;
 -- 
-2.31.1
+2.21.0
 

SOURCES/0007-use-red-hat-for-name.patch

@@ -1,4 +1,4 @@
-From 8312003a6a9e41d8d20eb8225ec8c4b2860351ec Mon Sep 17 00:00:00 2001
+From 1ddee25396962a6bd966b98311881ed6d4cba87c Mon Sep 17 00:00:00 2001
 From: Chris Leech <cleech@redhat.com>
 Date: Mon, 19 Nov 2012 16:40:04 -0800
 Subject: [PATCH] use red hat for name
@@ -22,10 +22,10 @@ index 6a413f6..dd77ed9 100644
  .SH AUTHORS
  Open-iSCSI project <http://www.open-iscsi.com/>
 diff --git a/utils/iscsi-iname.c b/utils/iscsi-iname.c
-index 0f587e1..0e15650 100644
+index da850dc..29aa4ad 100644
 --- a/utils/iscsi-iname.c
 +++ b/utils/iscsi-iname.c
-@@ -89,7 +89,7 @@ main(int argc, char *argv[])
+@@ -80,7 +80,7 @@ main(int argc, char *argv[])
  			exit(0);
  		}
  	} else {
@@ -35,5 +35,5 @@ index 0f587e1..0e15650 100644
  
  	/* try to feed some entropy from the pool to MD5 in order to get
 -- 
-2.26.2
+2.21.0
 

SOURCES/0008-libiscsi.patch

@@ -1,4 +1,4 @@
-From 8b4da8007ef59bbc833fed882ddae57bbcd51f1c Mon Sep 17 00:00:00 2001
+From af721a438031fa9f79db5de3b018c4b532ac2e0c Mon Sep 17 00:00:00 2001
 From: rpm-build <rpm-build>
 Date: Mon, 26 Jan 2015 12:57:11 -0800
 Subject: [PATCH] libiscsi
@@ -3914,12 +3914,12 @@ index 0000000..a21f888
 +	return rc;
 +}
 diff --git a/usr/Makefile b/usr/Makefile
-index 21bb154..885243a 100644
+index 3bb0cb4..8ae6e07 100644
 --- a/usr/Makefile
 +++ b/usr/Makefile
 @@ -37,7 +37,7 @@ PKG_CONFIG = /usr/bin/pkg-config
  CFLAGS ?= -O2 -g
- WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common
+ WARNFLAGS ?= -Wall -Wstrict-prototypes
  CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
 -	  -I$(TOPDIR)/libopeniscsiusr
 +	  -I$(TOPDIR)/libopeniscsiusr -DISNS_ENABLE
@@ -3927,7 +3927,7 @@ index 21bb154..885243a 100644
  ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr
  LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
 diff --git a/usr/discovery.c b/usr/discovery.c
-index 7dec696..2cf1838 100644
+index 199c160..d17a250 100644
 --- a/usr/discovery.c
 +++ b/usr/discovery.c
 @@ -36,6 +36,7 @@
@@ -3965,13 +3965,13 @@ index 7dec696..2cf1838 100644
  }
 +#endif
  
- int discovery_fw(void *data,
- 		 __attribute__((unused))struct iface_rec *iface,
+ int discovery_fw(void *data, struct iface_rec *iface,
+ 		 struct list_head *rec_list)
 diff --git a/usr/idbm.c b/usr/idbm.c
-index 27cad0a..2498a03 100644
+index 15802c3..3184c77 100644
 --- a/usr/idbm.c
 +++ b/usr/idbm.c
-@@ -1825,9 +1825,9 @@ int idbm_print_all_discovery(int info_level)
+@@ -1725,9 +1725,9 @@ int idbm_print_all_discovery(int info_level)
   * fn should return -1 if it skipped the rec, an ISCSI_ERR error code if
   * the operation failed or 0 if fn was run successfully.
   */
@@ -3985,10 +3985,10 @@ index 27cad0a..2498a03 100644
  	DIR *iface_dirfd;
  	struct dirent *iface_dent;
 diff --git a/usr/idbm.h b/usr/idbm.h
-index ce098b7..d1a7f63 100644
+index 6bdfd60..c6982e4 100644
 --- a/usr/idbm.h
 +++ b/usr/idbm.h
-@@ -105,6 +105,9 @@ struct rec_op_data {
+@@ -103,6 +103,9 @@ struct rec_op_data {
  	node_rec_t *match_rec;
  	idbm_iface_op_fn *fn;
  };
@@ -3999,16 +3999,16 @@ index ce098b7..d1a7f63 100644
  				char *targetname, bool ruw_lock);
  extern int idbm_for_each_node(int *found, void *data,
 diff --git a/usr/iscsi_ipc.h b/usr/iscsi_ipc.h
-index 47857dd..596543b 100644
+index 47857dd..fb8e965 100644
 --- a/usr/iscsi_ipc.h
 +++ b/usr/iscsi_ipc.h
 @@ -162,4 +162,6 @@ struct iscsi_ipc {
  			 char *host_stats);
  };
  
-+extern struct iscsi_ipc *ipc;
++struct iscsi_ipc *ipc;
 +
  #endif /* ISCSI_IPC_H */
 -- 
-2.26.2
+2.21.0
 

SOURCES/0009-Add-macros-to-release-GIL-lock.patch

@@ -1,4 +1,4 @@
-From 676f48d6e70f8406b36a004669d923825db51e2f Mon Sep 17 00:00:00 2001
+From 3df19ccba0af40da8cdb15c41e1bcd08ce25fbd9 Mon Sep 17 00:00:00 2001
 From: Jiri Konecny <jkonecny@redhat.com>
 Date: Mon, 11 May 2015 13:16:26 +0200
 Subject: [PATCH] Add macros to release GIL lock
@@ -52,5 +52,5 @@ index 8800853..40b5955 100644
  				libiscsi_get_error_string(context));
  		return NULL;
 -- 
-2.26.2
+2.21.0
 

SOURCES/0010-libiscsi-introduce-sessions-API.patch

@@ -1,4 +1,4 @@
-From 2c28c620727e522f022689312d76f107eb8ef18f Mon Sep 17 00:00:00 2001
+From bca0b3a085b7a169aa40d81ed7997c73fde8b4d3 Mon Sep 17 00:00:00 2001
 From: Peter Hatina <phatina@redhat.com>
 Date: Mon, 5 Oct 2015 16:50:36 -0700
 Subject: [PATCH] libiscsi introduce sessions API
@@ -242,7 +242,7 @@ index 756590e..a9891f4 100644
   *
   * Set the given nodes iSCSI parameter named by \e parameter to value \e value.
 diff --git a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c
-index 435c576..e549afe 100644
+index 418f51b..6febba2 100644
 --- a/usr/iscsi_sysfs.c
 +++ b/usr/iscsi_sysfs.c
 @@ -3,6 +3,7 @@
@@ -286,5 +286,5 @@ index 1d0377f..909db34 100644
  					      int *nr_found,
  					      iscsi_sysfs_iface_op_fn *fn);
 -- 
-2.26.2
+2.21.0
 

SOURCES/0011-libiscsi-fix-discovery-request-timeout-regression.patch

@@ -1,4 +1,4 @@
-From c53c576c09c5a3a1654b7a1f08fcc222a102499d Mon Sep 17 00:00:00 2001
+From 2e660a78632545e98f7c9e2ffb8518512c0db5ff Mon Sep 17 00:00:00 2001
 From: rpm-build <rpm-build>
 Date: Tue, 28 Feb 2017 09:00:41 -0800
 Subject: [PATCH] libiscsi: fix discovery request timeout regression
@@ -28,5 +28,5 @@ index 755c18c..bb17dfc 100644
  	rc = idbm_bind_ifaces_to_nodes(discovery_fw, &drec, &ifaces, &rec_list);
  	if (rc) {
 -- 
-2.26.2
+2.21.0
 

SOURCES/0012-libiscsi-format-security-build-errors.patch

@@ -1,4 +1,4 @@
-From cf4db608004f7c1f137ed556e3ba6b6f4d65da96 Mon Sep 17 00:00:00 2001
+From 3040b7530eda1ab5625d76783dc7b8cf595a0ef0 Mon Sep 17 00:00:00 2001
 From: rpm-build <rpm-build>
 Date: Tue, 28 Feb 2017 10:06:42 -0800
 Subject: [PATCH] libiscsi format-security build errors
@@ -31,5 +31,5 @@ index bb17dfc..7003388 100644
  	}
  
 -- 
-2.26.2
+2.21.0
 

SOURCES/0013-libiscsi-fix-build-to-use-libopeniscsiusr.patch

@@ -1,4 +1,4 @@
-From a86a677762cf5fd45a43029a4fd3dd83d1a87a98 Mon Sep 17 00:00:00 2001
+From 123fc55dd8ad98c9afd39bf0824b3d31d5e93214 Mon Sep 17 00:00:00 2001
 From: rpm-build <rpm-build>
 Date: Thu, 24 May 2018 15:17:05 -0700
 Subject: [PATCH] libiscsi fix build to use libopeniscsiusr
@@ -32,5 +32,5 @@ index 53f9746..f2cf248 100644
  
  # Flags for the tests
 -- 
-2.26.2
+2.21.0
 

SOURCES/0014-libiscsi-fix-build-against-latest-upstream-again.patch

@@ -1,4 +1,4 @@
-From 55af753f593243bcd1ab4c7e82620bdee432915b Mon Sep 17 00:00:00 2001
+From 039700890e11dff3323241349d3858f258c09cc0 Mon Sep 17 00:00:00 2001
 From: Chris Leech <cleech@redhat.com>
 Date: Thu, 7 Nov 2019 09:16:17 -0800
 Subject: [PATCH] libiscsi: fix build against latest upstream, again
@@ -62,5 +62,5 @@ index 7003388..c598aee 100644
  		strcpy(context->error_str, "No such node");
  		rc = ENODEV;
 -- 
-2.26.2
+2.21.0
 

SOURCES/0015-remove-the-offload-boot-supported-ifdef.patch

@@ -1,4 +1,4 @@
-From d410fe4b6eb2347f2160b8aaab24a639de99c23c Mon Sep 17 00:00:00 2001
+From d0689253c9e2eb78fc5296adb109aba4d35a13fd Mon Sep 17 00:00:00 2001
 From: Chris Leech <cleech@redhat.com>
 Date: Mon, 19 Nov 2012 17:09:24 -0800
 Subject: [PATCH] remove the offload boot supported ifdef
@@ -8,10 +8,10 @@ Subject: [PATCH] remove the offload boot supported ifdef
  1 file changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/usr/iface.c b/usr/iface.c
-index 11f3d2a..65c1615 100644
+index 645b0b8..9cd07fd 100644
 --- a/usr/iface.c
 +++ b/usr/iface.c
-@@ -998,6 +998,7 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
+@@ -993,6 +993,7 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
  {
  	struct iscsi_transport *t = NULL;
  	uint32_t hostno;
@@ -19,7 +19,7 @@ index 11f3d2a..65c1615 100644
  
  	if (strlen(context->initiatorname))
  		strlcpy(iface->iname, context->initiatorname,
-@@ -1011,10 +1012,7 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
+@@ -1006,10 +1007,7 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
  			return 0;
  		}
  	} else if (strlen(context->iface)) {
@@ -30,7 +30,7 @@ index 11f3d2a..65c1615 100644
  
  		memset(transport_name, 0, ISCSI_TRANSPORT_NAME_MAXLEN);
  		/* make sure offload driver is loaded */
-@@ -1040,9 +1038,6 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
+@@ -1035,9 +1033,6 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
  		}
  
  		strlcpy(iface->netdev, context->iface, sizeof(iface->netdev));
@@ -41,5 +41,5 @@ index 11f3d2a..65c1615 100644
  		return 0;
  
 -- 
-2.26.2
+2.21.0
 

SOURCES/0016-Revert-iscsiadm-return-error-when-login-fails.patch

@@ -1,4 +1,4 @@
-From 49dc2a687175f9671a159df38971a15287dae18c Mon Sep 17 00:00:00 2001
+From ccb9d70a0dad7c42f926f1680ae708a5ae3d3696 Mon Sep 17 00:00:00 2001
 From: Chris Leech <cleech@redhat.com>
 Date: Mon, 24 Feb 2014 09:33:33 -0800
 Subject: [PATCH] Revert "iscsiadm: return error when login fails"
@@ -30,5 +30,5 @@ index 0500f15..1e1f2bc 100644
  	}
  
 -- 
-2.26.2
+2.21.0
 

SOURCES/0017-dont-install-scripts.patch

@@ -1,4 +1,4 @@
-From e35261316aaa598c4146a5396745cb76571e94fe Mon Sep 17 00:00:00 2001
+From f524e332835b2b59d3f3ff8a67814ef2d58a2857 Mon Sep 17 00:00:00 2001
 From: rpm-build <rpm-build>
 Date: Fri, 25 May 2018 09:39:07 -0700
 Subject: [PATCH] dont install scripts
@@ -21,5 +21,5 @@ index 4ab091f..7e6b734 100644
  	$(INSTALL) -m 755 $^ $(DESTDIR)$(sbindir)
  
 -- 
-2.26.2
+2.21.0
 

SOURCES/0018-use-var-lib-iscsi-in-libopeniscsiusr.patch

@@ -1,4 +1,4 @@
-From e186e959ddc2a47e7cfe1f5a8ea4d3fa8248a478 Mon Sep 17 00:00:00 2001
+From e2b8215b80cc037ecbcb9eef50e432c31d5e56eb Mon Sep 17 00:00:00 2001
 From: rpm-build <rpm-build>
 Date: Wed, 30 May 2018 16:08:30 -0700
 Subject: [PATCH] use /var/lib/iscsi in libopeniscsiusr
@@ -12,7 +12,7 @@ Subject: [PATCH] use /var/lib/iscsi in libopeniscsiusr
  5 files changed, 9 insertions(+), 8 deletions(-)
 
 diff --git a/libopeniscsiusr/idbm.h b/libopeniscsiusr/idbm.h
-index cc90388..5a4d2fa 100644
+index 3fd0864..c84d332 100644
 --- a/libopeniscsiusr/idbm.h
 +++ b/libopeniscsiusr/idbm.h
 @@ -31,7 +31,8 @@
@@ -105,5 +105,5 @@ index 39e07b3..9eba7fa 100644
  /* Might be public in the future */
  __DLL_LOCAL void iscsi_node_free(struct iscsi_node *node);
 -- 
-2.26.2
+2.21.0
 

SOURCES/0019-Coverity-scan-fixes.patch

@@ -1,21 +1,21 @@
-From c455d7ff3a2fa37cdd5b43616db975aef336a007 Mon Sep 17 00:00:00 2001
+From 44bb05de04c0f8819c1fdae8f567dd802a8444e8 Mon Sep 17 00:00:00 2001
 From: Chris Leech <cleech@redhat.com>
 Date: Wed, 5 Jun 2019 09:08:39 -0700
-Subject: [PATCH 1/1] Coverity scan fixes
+Subject: [PATCH] Coverity scan fixes
 
 ---
  iscsiuio/src/unix/libs/qedi.c |  2 +-
- iscsiuio/src/unix/main.c      |  3 +++
+ iscsiuio/src/unix/main.c      | 12 ++++++++++--
  libopeniscsiusr/idbm.c        | 11 +++++------
  usr/idbm.c                    | 10 ++++------
  usr/iscsid.c                  |  2 +-
- 5 files changed, 14 insertions(+), 14 deletions(-)
+ 5 files changed, 21 insertions(+), 16 deletions(-)
 
 diff --git a/iscsiuio/src/unix/libs/qedi.c b/iscsiuio/src/unix/libs/qedi.c
-index 1af8d1b..9a814c6 100644
+index 3414cb5..a359700 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)
+@@ -1023,7 +1023,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",
  		  nic->log_name, hw_prod, bd_prod, rx_bd->rx_pkt_index, len);
@@ -25,10 +25,22 @@ index 1af8d1b..9a814c6 100644
  
  	if (bd_cons != bd_prod) {
 diff --git a/iscsiuio/src/unix/main.c b/iscsiuio/src/unix/main.c
-index 0c9ad49..f83f305 100644
+index 5e3f66c..4c50890 100644
 --- a/iscsiuio/src/unix/main.c
 +++ b/iscsiuio/src/unix/main.c
-@@ -391,6 +391,9 @@ int main(int argc, char *argv[])
+@@ -341,7 +341,10 @@ int main(int argc, char *argv[])
+ 
+ 			/* parent: wait for child msg then exit */
+ 			close(pipefds[1]);
+-			read(pipefds[0], msgbuf, sizeof(msgbuf));
++			if (read(pipefds[0], msgbuf, sizeof(msgbuf)) < 0) {
++				fprintf(stderr, "ERR: Waiting for child process failed\n");
++				exit(1);
++			}
+ 			exit(0);
+ 		}
+ 
+@@ -387,6 +390,9 @@ int main(int argc, char *argv[])
  	sigaddset(&set, SIGTERM);
  	sigaddset(&set, SIGUSR1);
  	rc = pthread_sigmask(SIG_SETMASK, &set, NULL);
@@ -38,21 +50,32 @@ index 0c9ad49..f83f305 100644
  
  	/*  Spin off the signal handling thread */
  	pthread_attr_init(&attr);
+@@ -416,7 +422,9 @@ int main(int argc, char *argv[])
+ 	if (!foreground) {
+ 		/* signal parent they can go away now */
+ 		close(pipefds[0]);
+-		write(pipefds[1], "ok\n", 3);
++		if (write(pipefds[1], "ok\n", 3) < 0) {
++			LOG_ERR("Failed to signal parent process of completed initialization");
++		}
+ 		close(pipefds[1]);
+ 	}
+ 
 diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c
-index 0910c63..6213e62 100644
+index d020e6c..342aab5 100644
 --- a/libopeniscsiusr/idbm.c
 +++ b/libopeniscsiusr/idbm.c
-@@ -321,12 +321,11 @@ int _idbm_lock(struct iscsi_context *ctx)
+@@ -287,12 +287,11 @@ int _idbm_lock(struct iscsi_context *ctx)
  		return 0;
  	}
  
 -	if (access(LOCK_DIR, F_OK) != 0) {
--		if (mkdir(LOCK_DIR, 0770) != 0) {
+-		if (mkdir(LOCK_DIR, 0660) != 0) {
 -			_error(ctx, "Could not open %s: %d %s", LOCK_DIR, errno,
 -				_strerror(errno, strerr_buff));
 -			return LIBISCSI_ERR_IDBM;
 -		}
-+	if (((mkdir(LOCK_DIR, 0770) != 0) && (errno != EEXIST)) ||
++	if (((mkdir(LOCK_DIR, 0660) != 0) && (errno != EEXIST)) ||
 +	    (access(LOCK_DIR, F_OK) != 0)) {
 +		_error(ctx, "Could not open %s: %d %s", LOCK_DIR, errno,
 +			_strerror(errno, strerr_buff));
@@ -61,20 +84,20 @@ index 0910c63..6213e62 100644
  
  	fd = open(LOCK_FILE, O_RDWR | O_CREAT, 0666);
 diff --git a/usr/idbm.c b/usr/idbm.c
-index b33ae42..1ac0b73 100644
+index 3184c77..0c6870c 100644
 --- a/usr/idbm.c
 +++ b/usr/idbm.c
-@@ -1461,12 +1461,10 @@ int idbm_lock(void)
+@@ -1339,12 +1339,10 @@ int idbm_lock(void)
  		return 0;
  	}
  
 -	if (access(LOCK_DIR, F_OK) != 0) {
--		if (mkdir(LOCK_DIR, 0770) != 0) {
+-		if (mkdir(LOCK_DIR, 0660) != 0) {
 -			log_error("Could not open %s: %s", LOCK_DIR,
 -				  strerror(errno));
 -			return ISCSI_ERR_IDBM;
 -		}
-+	if (((mkdir(LOCK_DIR, 0770) != 0) && (errno != EEXIST)) ||
++	if (((mkdir(LOCK_DIR, 0660) != 0) && (errno != EEXIST)) ||
 +	    (access(LOCK_DIR, F_OK) != 0)) {
 +		log_error("Could not open %s: %s", LOCK_DIR, strerror(errno));
 +		return ISCSI_ERR_IDBM;
@@ -82,10 +105,10 @@ index b33ae42..1ac0b73 100644
  
  	fd = open(LOCK_FILE, O_RDWR | O_CREAT, 0666);
 diff --git a/usr/iscsid.c b/usr/iscsid.c
-index dc54fec..fde8894 100644
+index 8f1c597..96a6452 100644
 --- a/usr/iscsid.c
 +++ b/usr/iscsid.c
-@@ -510,8 +510,8 @@ int main(int argc, char *argv[])
+@@ -489,8 +489,8 @@ int main(int argc, char *argv[])
  				log_close(log_pid);
  				exit(ISCSI_ERR);
  			}
@@ -96,5 +119,5 @@ index dc54fec..fde8894 100644
  		if ((control_fd = ipc->ctldev_open()) < 0) {
  			log_close(log_pid);
 -- 
-2.31.1
+2.21.0
 

SOURCES/0020-fix-upstream-build-breakage-of-iscsiuio-LDFLAGS.patch

@@ -1,25 +1,29 @@
-From 8bcaf32662ff762c2cab3d4b1f96c38965304e30 Mon Sep 17 00:00:00 2001
+From 4142125fa296d21a307fb2370b2d4d7e8487f22c Mon Sep 17 00:00:00 2001
 From: rpm-build <rpm-build>
 Date: Wed, 16 Oct 2019 23:17:20 -0700
-Subject: [PATCH 1/1] fix upstream build breakage of iscsiuio LDFLAGS
+Subject: [PATCH] fix upstream build breakage of iscsiuio LDFLAGS
 
 ---
- iscsiuio/configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ iscsiuio/configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac
-index 9b85448..1b9fb27 100644
+index b41df0e..a856cc5 100644
 --- a/iscsiuio/configure.ac
 +++ b/iscsiuio/configure.ac
-@@ -72,7 +72,7 @@ AC_ARG_WITH([systemd],
+@@ -67,10 +67,10 @@ AM_CONDITIONAL([DEBUG], [test x$debug = xtrue])
+ AC_ARG_WITH([systemd],
+ 	    AS_HELP_STRING([--without-systemd], [Build without systemd]),
+     [case "${withval}" in
+-     yes) LDFLAGS="`pkg-config --libs libsystemd`" ;;
++     yes) LDFLAGS="${LDFLAGS} `pkg-config --libs libsystemd`" ;;
+      no)  CFLAGS="${CFLAGS} -DNO_SYSTEMD" ;;
       *)   AC_MSG_ERROR([bad value $withval for --with-systemd]) ;;
-      esac],[with_libsystemd=auto])
- AS_IF([test "$with_libsystemd" != no],[
--    PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[LDFLAGS=$LIBSYSTEMD_LIBS],[
-+    PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[LDFLAGS="${LDFLAGS} $LIBSYSTEMD_LIBS"],[
-         if test "$with_libsystemd" = yes; then
-             AC_MSG_ERROR([could not find libsystemd using pkg-config])
- 	else
+-     esac],[LDFLAGS="`pkg-config --libs libsystemd`"])
++     esac],[LDFLAGS="${LDFLAGS} `pkg-config --libs libsystemd`"])
+ 
+ AC_CONFIG_COMMANDS([default],[[
+     if [ -n "$SOURCE_DATE_EPOCH" ] ; then
 -- 
-2.31.1
+2.21.0
 

SOURCES/0021-improve-systemd-service-files-for-boot-session-handl.patch

@@ -0,0 +1,130 @@
+From 77150edd697669467ff9f8775b93bd9d7a34cadf Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Mon, 28 Oct 2019 10:20:56 -0700
+Subject: [PATCH] improve systemd service files for boot session handling
+
+---
+ etc/systemd/iscsi-mark-root-nodes  |  6 +++++-
+ etc/systemd/iscsi-onboot.service   | 15 +++++++++++++++
+ etc/systemd/iscsi-shutdown.service |  1 +
+ etc/systemd/iscsi.service          | 11 ++++-------
+ etc/systemd/iscsid.service         |  4 +---
+ etc/systemd/iscsiuio.service       |  1 -
+ 6 files changed, 26 insertions(+), 12 deletions(-)
+ create mode 100644 etc/systemd/iscsi-onboot.service
+
+diff --git a/etc/systemd/iscsi-mark-root-nodes b/etc/systemd/iscsi-mark-root-nodes
+index c693707..9d48805 100755
+--- a/etc/systemd/iscsi-mark-root-nodes
++++ b/etc/systemd/iscsi-mark-root-nodes
+@@ -9,7 +9,11 @@ while read t num p target flash; do
+   portal=${p%,*}
+   transport=${t%:}
+ 
+-  $ISCSIADM -m node -p $portal -T $target -o update -n node.startup -v onboot
++  # use session number to find the iface name in use
++  num=${num#[}; num=${num%]}
++  iface=$(iscsiadm -m session -r $num | grep iface.iscsi_ifacename | cut -d= -f2)
++
++  $ISCSIADM -m node -p $portal -T $target -I $iface -o update -n node.startup -v onboot
+ 
+   start_iscsid=1
+ 
+diff --git a/etc/systemd/iscsi-onboot.service b/etc/systemd/iscsi-onboot.service
+new file mode 100644
+index 0000000..42ced68
+--- /dev/null
++++ b/etc/systemd/iscsi-onboot.service
+@@ -0,0 +1,15 @@
++[Unit]
++Description=Special handling of early boot iSCSI sessions
++Documentation=man:iscsiadm(8) man:iscsid(8)
++DefaultDependencies=no
++RefuseManualStart=true
++Before=iscsi.service
++After=systemd-remount-fs.service
++ConditionDirectoryNotEmpty=/sys/class/iscsi_session
++
++[Service]
++Type=oneshot
++ExecStart=-/usr/libexec/iscsi-mark-root-nodes
++
++[Install]
++WantedBy=sysinit.target
+diff --git a/etc/systemd/iscsi-shutdown.service b/etc/systemd/iscsi-shutdown.service
+index 69c1c77..caee933 100644
+--- a/etc/systemd/iscsi-shutdown.service
++++ b/etc/systemd/iscsi-shutdown.service
+@@ -11,4 +11,5 @@ RefuseManualStop=yes
+ [Service]
+ Type=oneshot
+ RemainAfterExit=true
++ExecStart=-/usr/bin/true
+ ExecStop=-/usr/sbin/iscsiadm -m node --logoutall=all
+diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
+index eadfcec..175cb2c 100644
+--- a/etc/systemd/iscsi.service
++++ b/etc/systemd/iscsi.service
+@@ -1,21 +1,18 @@
+ [Unit]
+ Description=Login and scanning of iSCSI devices
+-Documentation=man:iscsid(8) man:iscsiadm(8)
++Documentation=man:iscsiadm(8) man:iscsid(8)
+ DefaultDependencies=no
+-Conflicts=shutdown.target
+-After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service
+ Before=remote-fs-pre.target
++After=network.target network-online.target iscsid.service iscsiuio.service systemd-remount-fs.service
+ Wants=remote-fs-pre.target iscsi-shutdown.service
+-ConditionDirectoryNotEmpty=|/var/lib/iscsi/nodes
+-ConditionDirectoryNotEmpty=|/sys/class/iscsi_session
++ConditionDirectoryNotEmpty=/var/lib/iscsi/nodes
+ 
+ [Service]
+ Type=oneshot
+ RemainAfterExit=true
+-ExecStart=-/usr/libexec/iscsi-mark-root-nodes
+ ExecStart=-/usr/sbin/iscsiadm -m node --loginall=automatic
+ ExecReload=-/usr/sbin/iscsiadm -m node --loginall=automatic
+ SuccessExitStatus=21
+ 
+ [Install]
+-WantedBy=sysinit.target
++WantedBy=remote-fs.target
+diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
+index 8d50cf0..28402fb 100644
+--- a/etc/systemd/iscsid.service
++++ b/etc/systemd/iscsid.service
+@@ -1,8 +1,7 @@
+ [Unit]
+ Description=Open-iSCSI
+-Documentation=man:iscsid(8) man:iscsiadm(8)
++Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
+ DefaultDependencies=no
+-Conflicts=shutdown.target
+ After=network.target iscsiuio.service
+ Before=remote-fs-pre.target
+ 
+@@ -10,7 +9,6 @@ Before=remote-fs-pre.target
+ Type=notify
+ NotifyAccess=main
+ ExecStart=/usr/sbin/iscsid -f
+-ExecStop=/usr/sbin/iscsiadm -k 0 2
+ KillMode=mixed
+ Restart=on-failure
+ 
+diff --git a/etc/systemd/iscsiuio.service b/etc/systemd/iscsiuio.service
+index 8620cde..fc0be93 100644
+--- a/etc/systemd/iscsiuio.service
++++ b/etc/systemd/iscsiuio.service
+@@ -2,7 +2,6 @@
+ Description=iSCSI UserSpace I/O driver
+ Documentation=man:iscsiuio(8)
+ DefaultDependencies=no
+-Conflicts=shutdown.target
+ Requires=iscsid.service
+ BindTo=iscsid.service
+ After=network.target
+-- 
+2.21.0
+

SOURCES/0022-iscsi_if.h-replace-zero-length-array-with-flexible-a.patch

@@ -1,44 +0,0 @@
-From 84a8601fe7b9b5337af95835aaa5aae1bfd88d95 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Tue, 11 Aug 2020 21:00:29 +0200
-Subject: [PATCH] iscsi_if.h replace zero-length array with flexible-array
- member
-
----
- include/iscsi_if.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/iscsi_if.h b/include/iscsi_if.h
-index 5a1c614..e8cee0d 100644
---- a/include/iscsi_if.h
-+++ b/include/iscsi_if.h
-@@ -337,7 +337,7 @@ enum iscsi_param_type {
- struct iscsi_param_info {
- 	uint32_t len;		/* Actual length of the param value */
- 	uint16_t param;		/* iscsi param */
--	uint8_t value[0];	/* length sized value follows */
-+	uint8_t value[];	/* length sized value follows */
- } __attribute__((__packed__));
- 
- struct iscsi_iface_param_info {
-@@ -346,7 +346,7 @@ struct iscsi_iface_param_info {
- 	uint16_t param;		/* iscsi param value */
- 	uint8_t iface_type;	/* IPv4 or IPv6 */
- 	uint8_t param_type;	/* iscsi_param_type */
--	uint8_t value[0];	/* length sized value follows */
-+	uint8_t value[];	/* length sized value follows */
- } __attribute__((__packed__));
- 
- /*
-@@ -723,7 +723,7 @@ enum iscsi_flashnode_param {
- struct iscsi_flashnode_param_info {
- 	uint32_t len;		/* Actual length of the param */
- 	uint16_t param;		/* iscsi param value */
--	uint8_t value[0];	/* length sized value follows */
-+	uint8_t value[];	/* length sized value follows */
- } __attribute__((__packed__));
- 
- enum iscsi_discovery_parent_type {
--- 
-2.26.2
-

SOURCES/0022-use-Red-Hat-version-string-to-match-RPM-package-vers.patch

@@ -1,25 +1,25 @@
-From a7c0b325c7ce5c4bd72ddcf7022f42bd8cfc9e90 Mon Sep 17 00:00:00 2001
+From c589d94293f3bee77c34ca61371ddfbeef71f2af Mon Sep 17 00:00:00 2001
 From: Chris Leech <cleech@redhat.com>
 Date: Mon, 21 Jan 2013 15:43:36 -0800
-Subject: [PATCH 1/1] use Red Hat version string to match RPM package version
+Subject: [PATCH] use Red Hat version string to match RPM package version
 
 ---
  usr/version.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/usr/version.h b/usr/version.h
-index 3c68989..31b6f05 100644
+index 615f533..a1f6cc2 100644
 --- a/usr/version.h
 +++ b/usr/version.h
 @@ -6,7 +6,7 @@
   * This may not be the same value as the kernel versions because
   * some other maintainer could merge a patch without going through us
   */
--#define ISCSI_VERSION_STR	"2.1.4"
-+#define ISCSI_VERSION_STR	"6.2.1.4-1"
+-#define ISCSI_VERSION_STR	"2.0-878"
++#define ISCSI_VERSION_STR	"6.2.0.878-0"
  #define ISCSI_VERSION_FILE	"/sys/module/scsi_transport_iscsi/version"
  
  #endif
 -- 
-2.31.1
+2.21.0
 

SOURCES/0023-stop-using-Werror-for-now.patch

@@ -1,56 +0,0 @@
-From af428f588f8023784c6f4b0a25d13b70fb7216ab Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Tue, 3 Mar 2020 10:35:40 -0800
-Subject: [PATCH] stop using Werror for now
-
-need to work through these warning that only appear on s390x
-Werror seems bad for release, makes packaging a nightmare when new
-compilers come around
----
- Makefile        | 2 +-
- usr/Makefile    | 2 +-
- usr/initiator.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 7e6b734..0069e75 100644
---- a/Makefile
-+++ b/Makefile
-@@ -7,7 +7,7 @@
- DESTDIR ?=
- 
- prefix = /usr
--exec_prefix = /
-+exec_prefix = /usr
- sbindir = $(exec_prefix)/sbin
- bindir = $(exec_prefix)/bin
- mandir = $(prefix)/share/man
-diff --git a/usr/Makefile b/usr/Makefile
-index 885243a..1a743d1 100644
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -35,7 +35,7 @@ endif
- PKG_CONFIG = /usr/bin/pkg-config
- 
- CFLAGS ?= -O2 -g
--WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common
-+WARNFLAGS ?= -Wall -Wextra -Wstrict-prototypes -fno-common
- CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
- 	  -I$(TOPDIR)/libopeniscsiusr -DISNS_ENABLE
- CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
-diff --git a/usr/initiator.c b/usr/initiator.c
-index 684647c..a5a9d08 100644
---- a/usr/initiator.c
-+++ b/usr/initiator.c
-@@ -580,7 +580,7 @@ __session_conn_reopen(iscsi_conn_t *conn, queue_task_t *qtask, int do_stop,
- 		      int redirected)
- {
- 	iscsi_session_t *session = conn->session;
--	uint32_t delay;
-+	uint32_t delay = 0;
- 
- 	log_debug(1, "re-opening session %d (reopen_cnt %d)", session->id,
- 			session->reopen_cnt);
--- 
-2.26.2
-

SOURCES/0024-iscsistart-fix-null-pointer-deref-before-exit.patch

@@ -1,42 +0,0 @@
-From b9bf7cea4769efa73e6de9b13a8d1833d2ac3d92 Mon Sep 17 00:00:00 2001
-From: Chris Leech <cleech@redhat.com>
-Date: Wed, 16 Jun 2021 09:55:06 -0700
-Subject: [PATCH 1/1] iscsistart: fix null pointer deref before exit
-
-Fixes regression caused by "open-iscsi: Clean user_param list when
-process exit"  Which is a shame, as not freeing a memory at process exit
-doesn't really hurt anything.
-
-Same change as "Fix iscsiadm segfault when exiting" applied to iscsiadm.
-
-Fixes: b532ad67d495d42026165a26515c645995d23f18
-Signed-off-by: Chris Leech <cleech@redhat.com>
----
- usr/iscsistart.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/usr/iscsistart.c b/usr/iscsistart.c
-index 206cd4c..7eb573e 100644
---- a/usr/iscsistart.c
-+++ b/usr/iscsistart.c
-@@ -361,7 +361,7 @@ int main(int argc, char *argv[])
- 	struct boot_context *context, boot_context;
- 	struct sigaction sa_old;
- 	struct sigaction sa_new;
--	struct user_param *param;
-+	struct user_param *param, *tmp_param;
- 	int control_fd, mgmt_ipc_fd, err;
- 	pid_t pid;
- 
-@@ -556,7 +556,7 @@ int main(int argc, char *argv[])
- 	mgmt_ipc_close(mgmt_ipc_fd);
- 	free_initiator();
- 	sysfs_cleanup();
--	list_for_each_entry(param, &user_params, list) {
-+	list_for_each_entry_safe(param, tmp_param, &user_params, list) {
- 		list_del(&param->list);
- 		idbm_free_user_param(param);
- 	}
--- 
-2.31.1
-

SPECS/iscsi-initiator-utils.spec

@@ -1,6 +1,6 @@
-%global open_iscsi_version	2.1
-%global open_iscsi_build	4
-%global commit0			095f59ca464220eae285de6b5f2ee31185a6a84c
+%global open_iscsi_version	2.0
+%global open_iscsi_build	878
+%global commit0			d791ce020673381cf3b559866d1f61e0411126a6
 %global shortcommit0		%(c=%{commit0}; echo ${c:0:7})
 
 %if 0%{?rhel} > 7
@@ -13,7 +13,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.%{open_iscsi_version}.%{open_iscsi_build}
-Release: 8.git%{shortcommit0}%{?dist}
+Release: 0.git%{shortcommit0}%{?dist}
 Group: System Environment/Daemons
 License: GPLv2+
 URL: http://www.open-iscsi.org
@@ -21,7 +21,7 @@ Source0: https://github.com/open-iscsi/open-iscsi/archive/%{commit0}.tar.gz#/ope
 Source4: 04-iscsi
 Source5: iscsi-tmpfiles.conf
 
-Patch0001: 0001-unit-file-tweaks.patch
+Patch0001: 0001-service-file-tweaks.patch
 Patch0002: 0002-idmb_rec_write-check-for-tpgt-first.patch
 Patch0003: 0003-idbm_rec_write-seperate-old-and-new-style-writes.patch
 Patch0004: 0004-idbw_rec_write-pick-tpgt-from-existing-record.patch
@@ -41,23 +41,19 @@ Patch0017: 0017-dont-install-scripts.patch
 Patch0018: 0018-use-var-lib-iscsi-in-libopeniscsiusr.patch
 Patch0019: 0019-Coverity-scan-fixes.patch
 Patch0020: 0020-fix-upstream-build-breakage-of-iscsiuio-LDFLAGS.patch
-Patch0021: 0021-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
-Patch0022: 0022-iscsi_if.h-replace-zero-length-array-with-flexible-a.patch
-Patch0023: 0023-stop-using-Werror-for-now.patch
-Patch0024: 0024-iscsistart-fix-null-pointer-deref-before-exit.patch
+Patch0021: 0021-improve-systemd-service-files-for-boot-session-handl.patch
+Patch0022: 0022-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
 
 BuildRequires: flex bison doxygen kmod-devel systemd-units
 BuildRequires: autoconf automake libtool libmount-devel openssl-devel
 BuildRequires: isns-utils-devel
 BuildRequires: systemd-devel
+# For dir ownership
 Requires: %{name}-iscsiuio >= %{version}-%{release}
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
 
-# Old NetworkManager expects the dispatcher scripts in a different place
-Conflicts: NetworkManager < 1.20
-
 %global _hardened_build 1
 %global __provides_exclude_from ^(%{python2_sitearch}/.*\\.so|%{python3_sitearch}/.*\\.so)$
 
@@ -70,21 +66,21 @@ Protocol networks.
 # I don't think we're ready to expose these just yet
 # For now just add the needed library to the base package
 
-#%%package -n libopeniscsiusr
+#%package -n libopeniscsiusr
 #Summary: library providing access to Open-iSCSI initiator functionality
 #Group: Development/Libraries
 #License: BSD
 
-#%%description -n libopeniscsiusr
+#%description -n libopeniscsiusr
 #The libopeniscsiusr library provides a C API for access to the Open-iSCSI
 #initiator. It is used by the Open-iSCSI command line tools.
 
-#%%package -n libopeniscsiusr-devel
+#%package -n libopeniscsiusr-devel
 #Summary: Development files for libopeniscsiusr
 #Group: Development/Libraries
-#Requires: libopeniscsiusr = %%{version}-%%{release}
+#Requires: libopeniscsiusr = %{version}-%{release}
 
-#%%description -n libopeniscsiusr-devel
+#%description -n libopeniscsiusr-devel
 #The libopeniscsiusr-devel package contains libraries and header files for
 #developing applications that use libopeniscsiusr.
 
@@ -112,21 +108,20 @@ developing applications that use %{name}.
 %{?python_provide:%python_provide python2-%{name}}
 Summary: Python %{python2_version} bindings to %{name}
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+
 BuildRequires: python2-devel
 BuildRequires: python2-setuptools
 
 %description -n python2-%{name}
 The %{name}-python2 package contains Python %{python2_version} bindings to the
 libiscsi interface for interacting with %{name}
-%endif
-# ended with python2
+%endif # with python2
 
 %package -n python3-%{name}
 %{?python_provide:%python_provide python3-%{name}}
 Summary: Python %{python3_version} bindings to %{name}
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 
@@ -153,8 +148,7 @@ cd ..
 pushd libiscsi
 %if %{with python2}
 %py2_build
-%endif
-# ended with python2
+%endif # with python2
 %py3_build
 touch -r libiscsi.doxy html/*
 popd
@@ -163,7 +157,7 @@ popd
 %install
 %{__make} DESTDIR=%{?buildroot} install_programs install_doc install_etc install_libopeniscsiusr
 # upstream makefile doesn't get everything the way we like it
-#rm $RPM_BUILD_ROOT%%{_sbindir}/iscsi_discovery
+#rm $RPM_BUILD_ROOT%{_sbindir}/iscsi_discovery
 rm $RPM_BUILD_ROOT%{_mandir}/man8/iscsi_discovery.8
 rm $RPM_BUILD_ROOT%{_mandir}/man8/iscsi_fw_login.8
 %{__install} -pm 755 usr/iscsistart $RPM_BUILD_ROOT%{_sbindir}
@@ -181,14 +175,12 @@ rm $RPM_BUILD_ROOT%{_mandir}/man8/iscsi_fw_login.8
 %{__install} -d $RPM_BUILD_ROOT%{_sharedstatedir}/iscsi/ifaces
 
 # for %%ghost
-%{__install} -d $RPM_BUILD_ROOT%{_rundir}/lock/iscsi
-touch $RPM_BUILD_ROOT%{_rundir}/lock/iscsi/lock
+%{__install} -d $RPM_BUILD_ROOT/var/lock/iscsi
+touch $RPM_BUILD_ROOT/var/lock/iscsi/lock
 
 
 %{__install} -d $RPM_BUILD_ROOT%{_unitdir}
 %{__install} -pm 644 etc/systemd/iscsi.service $RPM_BUILD_ROOT%{_unitdir}
-# %%{__install} -pm 644 etc/systemd/iscsi-init.service $RPM_BUILD_ROOT%%{_unitdir}
-%{__install} -pm 644 etc/systemd/iscsi-onboot.service $RPM_BUILD_ROOT%{_unitdir}
 %{__install} -pm 644 etc/systemd/iscsi-shutdown.service $RPM_BUILD_ROOT%{_unitdir}
 %{__install} -pm 644 etc/systemd/iscsid.service $RPM_BUILD_ROOT%{_unitdir}
 %{__install} -pm 644 etc/systemd/iscsid.socket $RPM_BUILD_ROOT%{_unitdir}
@@ -198,8 +190,8 @@ touch $RPM_BUILD_ROOT%{_rundir}/lock/iscsi/lock
 %{__install} -d $RPM_BUILD_ROOT%{_libexecdir}
 %{__install} -pm 755 etc/systemd/iscsi-mark-root-nodes $RPM_BUILD_ROOT%{_libexecdir}
 
-%{__install} -d $RPM_BUILD_ROOT%{_prefix}/lib/NetworkManager/dispatcher.d
-%{__install} -pm 755 %{SOURCE4} $RPM_BUILD_ROOT%{_prefix}/lib/NetworkManager/dispatcher.d
+%{__install} -d $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d
+%{__install} -pm 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d
 
 %{__install} -d $RPM_BUILD_ROOT%{_tmpfilesdir}
 %{__install} -pm 644 %{SOURCE5} $RPM_BUILD_ROOT%{_tmpfilesdir}/iscsi.conf
@@ -212,14 +204,12 @@ touch $RPM_BUILD_ROOT%{_rundir}/lock/iscsi/lock
 
 %if %{with python2}
 %{__install} -d $RPM_BUILD_ROOT%{python2_sitearch}
-%endif
-# ended with python2
+%endif # with python2
 %{__install} -d $RPM_BUILD_ROOT%{python3_sitearch}
 pushd libiscsi
 %if %{with python2}
 %py2_install
-%endif
-# ended with python2
+%endif # with python2
 %py3_install
 popd
 
@@ -227,7 +217,7 @@ popd
 %post
 /sbin/ldconfig
 
-%systemd_post iscsi.service iscsi-onboot.service iscsi-shutdown.service iscsid.service iscsid.socket
+%systemd_post iscsi.service iscsi-shutdown.service iscsid.service iscsid.socket
 
 if [ $1 -eq 1 ]; then
 	if [ ! -f %{_sysconfdir}/iscsi/initiatorname.iscsi ]; then
@@ -235,7 +225,6 @@ if [ $1 -eq 1 ]; then
 	fi
 	# enable socket activation and persistant session startup by default
 	/bin/systemctl enable iscsi.service >/dev/null 2>&1 || :
-	/bin/systemctl enable iscsi-onboot.service >/dev/null 2>&1 || :
 	/bin/systemctl enable iscsid.socket >/dev/null 2>&1 || :
 fi
 
@@ -247,14 +236,14 @@ if [ $1 -eq 1 ]; then
 fi
 
 %preun
-%systemd_preun iscsi.service iscsi-onboot.service iscsi-shutdown.service iscsid.service iscsiuio.service iscsid.socket iscsiuio.socket
+%systemd_preun iscsi.service iscsi-shutdown.service iscsid.service iscsiuio.service iscsid.socket iscsiuio.socket
 
 %preun iscsiuio
 %systemd_preun iscsiuio.service iscsiuio.socket
 
 %postun
 /sbin/ldconfig
-%systemd_postun iscsi.service iscsi-onboot.service iscsi-shutdown.service iscsid.service iscsiuio.service iscsid.socket iscsiuio.socket
+%systemd_postun iscsi.service iscsi-shutdown.service iscsid.service iscsiuio.service iscsid.socket iscsiuio.socket
 
 %postun iscsiuio
 %systemd_postun iscsiuio.service iscsiuio.socket
@@ -284,11 +273,6 @@ if [ $1 -gt 0 ]; then
     systemctl start iscsi-shutdown.service >/dev/null 2>&1 || :
 fi
 
-%triggerpostun -- iscsi-initiator-utils < 6.2.0.878-4
-# added in 6.2.0.878-0, needs to be enabled during an upgrade
-if [ $1 -gt 0 ]; then
-	/bin/systemctl enable iscsi-onboot.service >/dev/null 2>&1 || :
-fi
 
 %files
 %doc README
@@ -299,16 +283,14 @@ fi
 %dir %{_sharedstatedir}/iscsi/slp
 %dir %{_sharedstatedir}/iscsi/ifaces
 %dir %{_sharedstatedir}/iscsi/send_targets
-%ghost %attr(0700, -, -) %{_rundir}/lock/iscsi
-%ghost %attr(0600, -, -) %{_rundir}/lock/iscsi/lock
+%ghost %{_var}/lock/iscsi
+%ghost %{_var}/lock/iscsi/lock
 %{_unitdir}/iscsi.service
-%{_unitdir}/iscsi-onboot.service
-# %%{_unitdir}/iscsi-init.service
 %{_unitdir}/iscsi-shutdown.service
 %{_unitdir}/iscsid.service
 %{_unitdir}/iscsid.socket
 %{_libexecdir}/iscsi-mark-root-nodes
-%{_prefix}/lib/NetworkManager
+%{_sysconfdir}/NetworkManager/dispatcher.d/04-iscsi
 %{_tmpfilesdir}/iscsi.conf
 %dir %{_sysconfdir}/iscsi
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf
@@ -327,20 +309,19 @@ fi
 %exclude %{_includedir}/libopeniscsiusr.h
 %exclude %{_includedir}/libopeniscsiusr_common.h
 %exclude %{_includedir}/libopeniscsiusr_iface.h
-%exclude %{_includedir}/libopeniscsiusr_node.h
 %exclude %{_includedir}/libopeniscsiusr_session.h
 %exclude %{_libdir}/pkgconfig/libopeniscsiusr.pc
 
-# %%files -n libopeniscsiusr
-# %%{_libdir}/libopeniscsiusr.so.*
+# %files -n libopeniscsiusr
+# %{_libdir}/libopeniscsiusr.so.*
 #
-# %%files -n libopeniscsiusr-devel
-# %%{_libdir}/libopeniscsiusr.so
-# %%{_includedir}/libopeniscsiusr.h
-# %%{_includedir}/libopeniscsiusr_common.h
-# %%{_includedir}/libopeniscsiusr_iface.h
-# %%{_includedir}/libopeniscsiusr_session.h
-# %%{_libdir}/pkgconfig/libopeniscsiusr.pc
+# %files -n libopeniscsiusr-devel
+# %{_libdir}/libopeniscsiusr.so
+# %{_includedir}/libopeniscsiusr.h
+# %{_includedir}/libopeniscsiusr_common.h
+# %{_includedir}/libopeniscsiusr_iface.h
+# %{_includedir}/libopeniscsiusr_session.h
+# %{_libdir}/pkgconfig/libopeniscsiusr.pc
 
 %files iscsiuio
 %{_sbindir}/iscsiuio
@@ -357,54 +338,12 @@ fi
 %if %{with python2}
 %files -n python2-%{name}
 %{python2_sitearch}/*
-%endif
-# ended with python2
+%endif # with python2
 
 %files -n python3-%{name}
 %{python3_sitearch}/*
 
 %changelog
-* Thu Jun 15 2023 Chris Leech <cleech@redhat.com> - 6.2.1.4-8.git095f59c
-- fix gating test
-
-* Thu Jun 15 2023 Chris Leech <cleech@redhat.com> - 6.2.1.4-7.git095f59c
-- move tests to tmt framework
-
-* Tue Jun 13 2023 Chris Leech <cleech@redhat.com> - 6.2.1.4-6.git095f59c
-- restore missing gating tests
-
-* Wed Jun 07 2023 Chris Leech <cleech@redhat.com> - 6.2.1.4-5.git095f59c
-- 2131090 fix idbm patch to not overwrite upstream changes in file mode
-
-* Mon Aug 09 2021 Chris Leech <cleech@redhat.com> - 6.2.1.4-4.git095f59c
-- 1755907 set proper attr in rpm db for lockfiles, fixes rpm verificiation warning
-
-* Wed Jun 16 2021 Chris Leech <cleech@redhat.com> - 6.2.1.4-3.git095f59c
-- coverity found a use-after-free regression in iscsistart
-
-* Mon Jun 14 2021 Chris Leech <cleech@redhat.com> - 6.2.1.4-2.git095f59c
-- 1924768 fix unit files for el8, not using iscsi-init
-
-* Fri Mar 12 2021 Chris Leech <cleech@redhat.com> - 6.2.1.2-1.gita8fcb37
-- 1924768 iscsiadm -m sessions fails when racing against session login/logout
-
-* Thu Aug 20 2020 Chris Leech - 6.2.0.878-5.gitd791ce0
-- 1849931, 1869438 go back to MD5 CHAP only by default
-  new CHAP modes can cause issue with some targets,
-  so SHA1/SHA256/SHA3-256 modes must be configured to enable now
-
-* Tue Mar 24 2020 Chris Leech <cleech@redhat.com> - 6.2.0.878-3.gitd791ce0
-- 1801577 new service file not enabled on upgrade, spec change to use triggers for that
-
-* Mon Feb 17 2020 Chris Leech <cleech@redhat.com> - 6.2.0.878-3.gitd791ce0
-- 1801577 missing spec file changes from 6.2.0.878-0 causing iSCSI boot regression
-
-* Mon Jan 20 2020 Chris Leech <cleech@redhat.com> - 6.2.0.878-2.gitd791ce0
-- 1786015 fix IPv6 discovery regression in iscsiuio
-
-* Wed Jan 08 2020 Chris Leech <cleech@redhat.com> - 6.2.0.878-1.gitd791ce0
-- 1788233 added node.session.auth.chap_algs configuration setting
-
 * Thu Nov 07 2019 Chris Leech <cleech@redhat.com> - 6.2.0.878-0.gitd791ce0
 - 1761940 iSCSI CHAP authentication not function with FIPS enabled
 - Service file improvements forward ported from RHEL 7.8