From b12556952f40cad69b1f41823d8e963e0b544996 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 23 2021 14:38:26 +0000 Subject: import iscsi-initiator-utils-6.2.0.874-22.el7_9 --- diff --git a/SOURCES/0001-missing-break-causing-segfault-with-case-sensitive-c.patch b/SOURCES/0001-missing-break-causing-segfault-with-case-sensitive-c.patch new file mode 100644 index 0000000..2b1767c --- /dev/null +++ b/SOURCES/0001-missing-break-causing-segfault-with-case-sensitive-c.patch @@ -0,0 +1,25 @@ +From 94204171c765a9e95139a0eb788f058ac2e4e0da Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Thu, 7 Oct 2021 10:57:54 -0700 +Subject: [PATCH 1/1] missing break causing segfault with case sensitive config + file issues + +--- + usr/idbm.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/usr/idbm.c b/usr/idbm.c +index 0862d29..2274a67 100644 +--- a/usr/idbm.c ++++ b/usr/idbm.c +@@ -1072,6 +1072,7 @@ setup_passwd_len: + goto updated; + } + } ++ break; + case TYPE_INT_LIST: + if (!info[i].data) + continue; +-- +2.33.0 + diff --git a/SOURCES/0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch b/SOURCES/0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch index a43f7f6..2aee113 100644 --- a/SOURCES/0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch +++ b/SOURCES/0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch @@ -16,7 +16,7 @@ index 20f07946be1f..baa8c00c7185 100644 * some other maintainer could merge a patch without going through us */ -#define ISCSI_VERSION_STR "2.0-874" -+#define ISCSI_VERSION_STR "6.2.0.874-19" ++#define ISCSI_VERSION_STR "6.2.0.874-22" #define ISCSI_VERSION_FILE "/sys/module/scsi_transport_iscsi/version" #endif diff --git a/SPECS/iscsi-initiator-utils.spec b/SPECS/iscsi-initiator-utils.spec index dbb26e9..41d771c 100644 --- a/SPECS/iscsi-initiator-utils.spec +++ b/SPECS/iscsi-initiator-utils.spec @@ -4,7 +4,7 @@ Summary: iSCSI daemon and utility programs Name: iscsi-initiator-utils Version: 6.%{open_iscsi_version}.%{open_iscsi_build} -Release: 21%{?dist} +Release: 22%{?dist} Group: System Environment/Daemons License: GPLv2+ URL: http://www.open-iscsi.org @@ -109,6 +109,7 @@ Patch501: 0501-configuration-support-for-CHAP-algorithms.patch Patch502: 0502-CHAP-FIPS-backport-fixups.patch Patch503: 0503-fix-libiscsi-after-adding-libcrypto-requirement.patch Patch504: 0504-iscsiadm-buffer-overflow-regression-when-discovering.patch +Patch505: 0001-missing-break-causing-segfault-with-case-sensitive-c.patch BuildRequires: flex bison python-devel doxygen kmod-devel systemd-devel libmount-devel autoconf automake libtool openssl-devel # For dir ownership @@ -332,6 +333,9 @@ fi %{_includedir}/libiscsi.h %changelog +* Thu Oct 07 2021 Chris Leech - 6.2.0.874-22 +- 1946578 fix segfault on case mismatch in config/record file + * Mon Aug 09 2021 Chris Leech - 6.2.0.874-21 - 1989972 set proper attr in rpm db for lockfiles, fixes rpm verificiation warning