[rpms/iscsi-initiator-utils] rawhide: rebase to Open-iSCSI 2.1.12

[Chris Leech <cleech@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/iscsi-initiator-utils
            Branch : rawhide
            Commit : c04893d36932074141bc1e2cfa12a13ec0142d8d
            Author : Chris Leech <cleech@redhat.com>
            Date   : 2026-07-29T15:51:22-07:00
            Stats  : +21/-176 in 9 file(s)
            URL    : https://src.fedoraproject.org/rpms/iscsi-initiator-utils/c/c04893d36932074141bc1e2cfa12a13ec0142d8d?branch=rawhide

            Log:
            rebase to Open-iSCSI 2.1.12

- CVE-2026-44943: Privilege Escalation via Path Traversal (rhbz#2508458)
- CVE-2026-44944: Authentication bypass in iscsiuio control socket (rhbz#2508457)

Signed-off-by: Chris Leech <cleech@redhat.com>

---
diff --git a/.gitignore b/.gitignore
index 3c3c8d8..5fbbcdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /open-iscsi-a65a472.tar.gz
 /open-iscsi-d0f04ae.tar.gz
 /open-iscsi-4b3e853.tar.gz
+/open-iscsi-7e00642.tar.gz

diff --git a/0001-Fix-incorrect-parsing-of-node.discovery_type-static-.patch b/0001-Fix-incorrect-parsing-of-node.discovery_type-static-.patch
deleted file mode 100644
index 473f65f..0000000
--- a/0001-Fix-incorrect-parsing-of-node.discovery_type-static-.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 290d16d6c6b6f4c78af119eb874484b2f995dc23 Mon Sep 17 00:00:00 2001
-From: Mike Andrews <gubblebozer@gmail.com>
-Date: Sun, 28 Dec 2025 19:19:39 -0500
-Subject: [PATCH 1/1] Fix incorrect parsing of node.discovery_type "static" and
- "fw" (#518)
-
-Remove the unused DISCOVERY_TYPE_SLP enumeration value so that the strings
-"static" and "fw" map to the correct enum values.
-
-Previous versions supported an "slp" discovery_type.  In d1d456cf28cd89, the
-"slp" string was removed from the list of TYPE_INT_O string arguments when
-processing DISC_TYPE and NODE_DISC_TYPE records in idbm_recinfo_discovery and
-_idbm_node_rec_link.  But, it was left in the discovery_type enum.  The
-resulting parsing logic would then map the string values "static" and "fw" to
-the wrong enum values, and thus logic with unique action on
-DISCOVERY_TYPE_STATIC and DISCOVERY_TYPE_FW did the wrong thing.  Specifically,
-
-- "static" mapped to DISCOVERY_TYPE_SLP, and
-- "fw" mapped to DISCOVERY_TYPE_STATIC.
-
-One manifestation of this bug is that you can no longer use iscsiadm to
-manipulate or delete nodes with discovery_type = "static", as it falls through
-to the default case in setup_disc_to_node_link.
-
-Fixes #463.
----
- libopeniscsiusr/idbm.h | 2 --
- usr/config.h           | 2 --
- 2 files changed, 4 deletions(-)
-
-diff --git a/libopeniscsiusr/idbm.h b/libopeniscsiusr/idbm.h
-index 0b201f4..512851d 100644
---- a/libopeniscsiusr/idbm.h
-+++ b/libopeniscsiusr/idbm.h
-@@ -78,8 +78,6 @@ enum discovery_type {
- 	DISCOVERY_TYPE_SENDTARGETS,
- 	DISCOVERY_TYPE_ISNS,
- 	DISCOVERY_TYPE_OFFLOAD_SENDTARGETS,
--	/* SLP is Not Used --  kept as place holder */
--	DISCOVERY_TYPE_SLP_NOT_IMPLEMENTED,
- 	DISCOVERY_TYPE_STATIC,
- 	DISCOVERY_TYPE_FW,
- };
-diff --git a/usr/config.h b/usr/config.h
-index a38a25d..94a8ad0 100644
---- a/usr/config.h
-+++ b/usr/config.h
-@@ -161,8 +161,6 @@ typedef enum discovery_type {
- 	DISCOVERY_TYPE_SENDTARGETS,
- 	DISCOVERY_TYPE_ISNS,
- 	DISCOVERY_TYPE_OFFLOAD_SENDTARGETS,
--	/* SLP is Not Used --  kept as place holder */
--	DISCOVERY_TYPE_SLP_NOT_IMPLEMENTED,
- 	DISCOVERY_TYPE_STATIC,
- 	DISCOVERY_TYPE_FW,
- } discovery_type_e;
--- 
-2.54.0
-

diff --git a/0003-Use-DBROOT-in-iscsi-starter.-Include-iscsi-starter-i.patch b/0003-Use-DBROOT-in-iscsi-starter.-Include-iscsi-starter-i.patch
index 0378357..8af706b 100644
--- a/0003-Use-DBROOT-in-iscsi-starter.-Include-iscsi-starter-i.patch
+++ b/0003-Use-DBROOT-in-iscsi-starter.-Include-iscsi-starter-i.patch
@@ -1,4 +1,4 @@
-From 0f90d4440047a3c62bdf09d876787000d0fa5b7e Mon Sep 17 00:00:00 2001
+From 2cd1a3dd3f3137fcb3fee334e72bcffc0ed44d25 Mon Sep 17 00:00:00 2001
 From: Gordon Messmer <gordon.messmer@gmail.com>
 Date: Sat, 4 Feb 2023 14:13:12 -0800
 Subject: [PATCH 3/6] Use DBROOT in iscsi-starter. Include iscsi-starter in
@@ -11,17 +11,17 @@ Subject: [PATCH 3/6] Use DBROOT in iscsi-starter. Include iscsi-starter in
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/etc/Makefile b/etc/Makefile
-index 3f92054..6ec846f 100644
+index 4e705a2..2456f25 100644
 --- a/etc/Makefile
 +++ b/etc/Makefile
-@@ -46,7 +46,7 @@ INAME_DEST_FILE		= $(DESTDIR)$(HOMEDIR)/initiatorname.iscsi
+@@ -44,7 +44,7 @@ INAME_DEST_FILE		= $(DESTDIR)$(HOMEDIR)/initiatorname.iscsi
  all: $(SYSTEMD_SOURCES) $(SYSTEMD_GENERATED_SERVICE_FILES)
  
  $(SYSTEMD_GENERATED_SERVICE_FILES): systemd/%.service: systemd/%.service.template
 -	$(SED) -e 's:@SBINDIR@:$(SBINDIR):' $? > $@
 +	$(SED) -e 's:@SBINDIR@:$(SBINDIR):; s:@DBROOT@:$(DBROOT):' $? > $@
  
- install: install_systemd install_iface install_etc
+ install_etc: $(DESTDIR)$(HOMEDIR) $(ETC_DEST_FILES)
  
 diff --git a/etc/systemd/iscsi-starter.service.template b/etc/systemd/iscsi-starter.service.template
 index 5e97941..d3ea7cd 100644
@@ -52,5 +52,5 @@ index 90082c7..1470a53 100644
  foreach u: iscsi_etc_systemd_service_units
    iscsi_etc_systemd_service_units_arr += {u + '.service': files(u + '.service.template')}
 -- 
-2.39.2
+2.55.0
 

diff --git a/0007-Disable-Data-Digests.patch b/0007-Disable-Data-Digests.patch
index 7950780..b3ee510 100644
--- a/0007-Disable-Data-Digests.patch
+++ b/0007-Disable-Data-Digests.patch
@@ -1,4 +1,4 @@
-From 4fd0476062b1c63e1e4aff45a59e3fa79e3bf0e6 Mon Sep 17 00:00:00 2001
+From cef6bf73f15bb6acdfff6eac93235d66ee54f2a6 Mon Sep 17 00:00:00 2001
 From: rpm-build <rpm-build>
 Date: Tue, 18 Apr 2023 16:04:00 -0700
 Subject: [PATCH 6/6] Disable Data Digests
@@ -9,10 +9,10 @@ Subject: [PATCH 6/6] Disable Data Digests
  2 files changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/etc/iscsid.conf b/etc/iscsid.conf
-index ec4d4df..e009c29 100644
+index d173437..7719522 100644
 --- a/etc/iscsid.conf
 +++ b/etc/iscsid.conf
-@@ -285,27 +285,23 @@ discovery.sendtargets.iscsi.MaxRecvDataSegmentLength = 32768
+@@ -308,27 +308,23 @@ discovery.sendtargets.iscsi.MaxRecvDataSegmentLength = 32768
  
  # To allow the targets to control the setting of the digest checking,
  # with the initiator requesting a preference of enabling the checking,
@@ -46,12 +46,12 @@ index ec4d4df..e009c29 100644
 +# The default is to never use HeaderDigests.
  #
  
- # For multipath configurations, you may want more than one session to be
+ # When using iSCSI over long range links with high round-trip time
 diff --git a/usr/idbm.c b/usr/idbm.c
-index ca4a4ec..32e99bc 100644
+index 22a1942..56490e7 100644
 --- a/usr/idbm.c
 +++ b/usr/idbm.c
-@@ -568,9 +568,13 @@ idbm_recinfo_node(node_rec_t *r, recinfo_t *ri)
+@@ -578,9 +578,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);
@@ -66,5 +66,5 @@ index ca4a4ec..32e99bc 100644
  		__recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW,
  				"No", "Yes", num, 1);
 -- 
-2.39.2
+2.55.0
 

diff --git a/0010-use-Red-Hat-version-string-to-match-RPM-package-vers.patch b/0010-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
index 4a54a86..98b5af8 100644
--- a/0010-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
+++ b/0010-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
@@ -16,8 +16,8 @@ index a0859b7..7ae461a 100644
  DESTDIR ?=
  
  # our VERSION String
--ISCSI_VERSION_STR ?= 2.1.11
-+ISCSI_VERSION_STR ?= 6.2.1.11
+-ISCSI_VERSION_STR ?= 2.1.12
++ISCSI_VERSION_STR ?= 6.2.1.12
  
  prefix = /usr
  exec_prefix =
@@ -29,8 +29,8 @@ index d49afbb..ab67096 100644
  
  project('open-iscsi', 'c',
    meson_version: '>= 0.54.0',
--  version: '2.1.11',
-+  version: '6.2.1.11',
+-  version: '2.1.12',
++  version: '6.2.1.12',
    license: 'LGPL-2.1-or-later',
    default_options: [
      'c_std=gnu99',

diff --git a/0011-iscsi-gen-initiatorname-use-IQN_PREFIX-as-default.patch b/0011-iscsi-gen-initiatorname-use-IQN_PREFIX-as-default.patch
deleted file mode 100644
index 2f5f7bd..0000000
--- a/0011-iscsi-gen-initiatorname-use-IQN_PREFIX-as-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 880337d6e3feef3bba39a80b06c7f9021131de51 Mon Sep 17 00:00:00 2001
-From: Jesse Taube <jtaubepe@redhat.com>
-Date: Mon, 22 Jun 2026 13:44:50 -0400
-Subject: [PATCH 1/2] iscsi-gen-initiatorname use @IQN_PREFIX@ as default
-
-change iscsi-gen-initiatorname.sh.template to use a configurable default
-IQN prefix instead of hardcoding one, using the @IQN_PREFIX@ variable.
-
-Signed-off-by: Jesse Taube <jtaubepe@redhat.com>
----
- utils/Makefile                            | 4 ++--
- utils/iscsi-gen-initiatorname.sh.template | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/utils/Makefile b/utils/Makefile
-index 2cc41d4..46b3223 100644
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -18,7 +18,7 @@ HOMEDIR ?= $(etcdir)/iscsi
- 
- RULESDIR ?= $(etcdir)/udev/rules.d
- 
--IQN_PREFIX ?= "iqn.2016-04.com.open-iscsi"
-+IQN_PREFIX ?= iqn.2016-04.com.open-iscsi
- 
- CFLAGS ?= -O2 -fno-inline -g
- CFLAGS += -Wall -Wextra -Wstrict-prototypes
-@@ -42,7 +42,7 @@ OBJS = iscsi-iname.o md5.o
- all: $(PROGRAMS) $(SCRIPTS_GENERATED) $(RULESFILES_GENERATED)
- 
- $(SCRIPTS_GENERATED): %.sh: %.sh.template
--	$(SED) -e 's:@SBINDIR@:$(SBINDIR):' -e 's:@HOMEDIR@:$(HOMEDIR):' $? > $@
-+	$(SED) -e 's:@SBINDIR@:$(SBINDIR):' -e 's:@HOMEDIR@:$(HOMEDIR):' -e 's:@IQN_PREFIX@:$(IQN_PREFIX):' $? > $@
- 	$(CHMOD) 755 $@
- 
- $(RULESFILES_GENERATED): %.rules: %.rules.template
-diff --git a/utils/iscsi-gen-initiatorname.sh.template b/utils/iscsi-gen-initiatorname.sh.template
-index 5c2bfdf..e533f0f 100644
---- a/utils/iscsi-gen-initiatorname.sh.template
-+++ b/utils/iscsi-gen-initiatorname.sh.template
-@@ -16,7 +16,7 @@ INAME_DIR="@HOMEDIR@"
- INAME_FILE="$INAME_DIR/initiatorname.iscsi"
- 
- # our default IQN prefix
--DEFAULT_IQN_PREFIX="iqn.1996-04.de.suse:01"
-+DEFAULT_IQN_PREFIX="@IQN_PREFIX@"
- 
- #
- # set up comments for initiatorname files using variables
--- 
-2.54.0
-

diff --git a/0012-iscsi-init.service-Use-iscsi-gen-initiatorname.patch b/0012-iscsi-init.service-Use-iscsi-gen-initiatorname.patch
deleted file mode 100644
index 11c5f97..0000000
--- a/0012-iscsi-init.service-Use-iscsi-gen-initiatorname.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From b5b9609a273afaf91532afcfde89a01bb1b69ac6 Mon Sep 17 00:00:00 2001
-From: Jesse Taube <jtaubepe@redhat.com>
-Date: Mon, 22 Jun 2026 14:01:27 -0400
-Subject: [PATCH 2/2] iscsi-init.service: Use iscsi-gen-initiatorname
-
-The iscsi-init.service should use iscsi-gen-initiatorname to generate
-the initiatorname.iscsi file if it doesn't exist. This is more portable
-then generating it with iscsi-iname.
-
-Signed-off-by: Jesse Taube <jtaubepe@redhat.com>
----
- doc/iscsi-gen-initiatorname.8.template  | 2 +-
- etc/systemd/iscsi-init.service.template | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/iscsi-gen-initiatorname.8.template b/doc/iscsi-gen-initiatorname.8.template
-index 97a6e21..d930a16 100644
---- a/doc/iscsi-gen-initiatorname.8.template
-+++ b/doc/iscsi-gen-initiatorname.8.template
-@@ -36,7 +36,7 @@ Force overwrite of existing initiator name, if present.
- .TP
- .BI [-p] \fIIQN-PREFIX\fP
- Use \fIIQN-PREFIX\fP as the prefix to the IQN generated,
--instead of the default of \fBiqn.1996-04.de.suse:01\fP.
-+instead of the default of \fB@IQN_PREFIX@\fP.
- .SH FILES
- .TP
- @HOMEDIR@/initiatorname.iscsi
-diff --git a/etc/systemd/iscsi-init.service.template b/etc/systemd/iscsi-init.service.template
-index 8f9a8aa..c26c871 100644
---- a/etc/systemd/iscsi-init.service.template
-+++ b/etc/systemd/iscsi-init.service.template
-@@ -16,4 +16,4 @@ WantedBy=systemd-remount-fs.service
- [Service]
- Type=oneshot
- RemainAfterExit=no
--ExecStart=/usr/bin/sh -c 'echo "InitiatorName=`@SBINDIR@/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi'
-+ExecStart=@SBINDIR@/iscsi-gen-initiatorname
--- 
-2.54.0
-

diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index 0159302..ec17eeb 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -1,8 +1,8 @@
 %global open_iscsi_version	2.1
-%global open_iscsi_build	11
-%global commit0			4b3e853ab468a95d8a035efa8fc4298a6c6318a3
+%global open_iscsi_build	12
+%global commit0			7e00642c40123e0b3f949e74c3945872c17a407e
 %global shortcommit0		%(c=%{commit0}; echo ${c:0:7})
-%global commitdate0		20250215
+%global commitdate0		20260715
 # set this to 1 if commit0 is a snapshot after the tagged version
 %global with_snapshot		0
 
@@ -20,7 +20,6 @@ Source0: https://github.com/open-iscsi/open-iscsi/archive/%{commit0}.tar.gz#/ope
 Source4: 04-iscsi
 Source5: iscsi-tmpfiles.conf
 
-Patch00: 0001-Fix-incorrect-parsing-of-node.discovery_type-static-.patch
 Patch01: 0001-meson-don-t-hide-things-with-Wno-all.patch
 
 # https://github.com/open-iscsi/open-iscsi/pull/394/
@@ -35,8 +34,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-iscsi-gen-initiatorname-use-IQN_PREFIX-as-default.patch
-Patch12: 0012-iscsi-init.service-Use-iscsi-gen-initiatorname.patch
 
 # libiscsi, deprecated but still needed until UDisks2 is converted to libopeniscsiusr
 Patch101: 0101-libiscsi.patch
@@ -140,7 +137,6 @@ rm $RPM_BUILD_ROOT/%{_sbindir}/iscsi_fw_login
 rm $RPM_BUILD_ROOT/%{_sbindir}/iscsi_offload
 rm $RPM_BUILD_ROOT/usr/share/man/man8/iscsi_discovery.8
 rm $RPM_BUILD_ROOT/usr/share/man/man8/iscsi_fw_login.8
-rm $RPM_BUILD_ROOT/var/lib/iscsi/ifaces/iface.example
 
 %{__install} -d $RPM_BUILD_ROOT%{_libexecdir}
 %{__install} -pm 755 etc/systemd/iscsi-mark-root-nodes $RPM_BUILD_ROOT%{_libexecdir}

diff --git a/sources b/sources
index a603d49..15f4794 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (open-iscsi-4b3e853.tar.gz) = 2f8474876a33bf8fd70141aefb1fae5ce8695ce0cdcf7244816f8f79bdd79247cf88d86f9e9d0453ef98746db5508dc99983f0672b7095644d28cdfb9fbefa99
+SHA512 (open-iscsi-7e00642.tar.gz) = b69e46161a57f7d92fe67a16ff0ce6fcc4ea7fd12488208a20b36384ac87dfe5871301abf8af17567bd8f014257292e78c7f75ff7f9232de3ff85db080b25a1d