diff --git a/0001-missing-break-causing-segfault-with-case-sensitive-c.patch b/0001-missing-break-causing-segfault-with-case-sensitive-c.patch new file mode 100644 index 0000000000000000000000000000000000000000..2b1767c23800ff81fdeb7923e9b6fe6c4222d43d --- /dev/null +++ b/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/0153-use-anolis-for-name.patch b/0153-use-red-hat-for-name.patch similarity index 63% rename from 0153-use-anolis-for-name.patch rename to 0153-use-red-hat-for-name.patch index c7420f1bac33f486f72d412c336e997551bad852..27da7b163959d4f3fa53b138b24347b214b41739 100644 --- a/0153-use-anolis-for-name.patch +++ b/0153-use-red-hat-for-name.patch @@ -1,7 +1,7 @@ -From 1ddee25396962a6bd966b98311881ed6d4cba87c Fri Jan 29 00:00:00 2021 -From: Liwei Ge -Date: Fri, 29 Jan 2021 16:40:04 -0800 -Subject: [PATCH] use anolis for name +From 7f12a1ca8fe699958903278d010cf22d0a98767b Mon Sep 17 00:00:00 2001 +From: Chris Leech +Date: Mon, 19 Nov 2012 16:40:04 -0800 +Subject: use red hat for name --- doc/iscsi-iname.8 | 2 +- @@ -9,7 +9,7 @@ Subject: [PATCH] use anolis for name 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/iscsi-iname.8 b/doc/iscsi-iname.8 -index 6a413f6..dd77ed9 100644 +index a55d666d1af3..dd77ed9f3165 100644 --- a/doc/iscsi-iname.8 +++ b/doc/iscsi-iname.8 @@ -14,7 +14,7 @@ generates a unique iSCSI node name on every invocation. @@ -17,23 +17,23 @@ index 6a413f6..dd77ed9 100644 .TP .BI [-p=]\fIprefix\fP -Use the prefix passed in instead of the default "iqn.2005-03.org.open-iscsi" -+Use the prefix passed in instead of the default "iqn.2020-08.org.openanolis" ++Use the prefix passed in instead of the default "iqn.1994-05.com.redhat" .SH AUTHORS Open-iSCSI project diff --git a/utils/iscsi-iname.c b/utils/iscsi-iname.c -index da850dc..29aa4ad 100644 +index 6347edc46293..cb2f6c8b8651 100644 --- a/utils/iscsi-iname.c +++ b/utils/iscsi-iname.c -@@ -80,7 +80,7 @@ main(int argc, char *argv[]) +@@ -73,7 +73,7 @@ main(int argc, char *argv[]) exit(0); } } else { - prefix = "iqn.2005-03.org.open-iscsi"; -+ prefix = "iqn.2020-08.org.openanolis"; ++ prefix = "iqn.1994-05.com.redhat"; } /* try to feed some entropy from the pool to MD5 in order to get -- -2.21.0 +2.9.5 diff --git a/0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch b/0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch index a43f7f66565f3a017cfaa2f587994c645fea44d3..2aee113102127e50482466bca3e968842204fe66 100644 --- a/0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch +++ b/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/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index 27429a0129077617934fee8e6dace990b70b93ae..41d771c90d0a3a92a4344f2a91dddd4bb7182672 100644 --- a/iscsi-initiator-utils.spec +++ b/iscsi-initiator-utils.spec @@ -1,11 +1,10 @@ -%define anolis_release .0.1 %define open_iscsi_version 2.0 %define open_iscsi_build 874 Summary: iSCSI daemon and utility programs Name: iscsi-initiator-utils Version: 6.%{open_iscsi_version}.%{open_iscsi_build} -Release: 21%{anolis_release}%{?dist} +Release: 22%{?dist} Group: System Environment/Daemons License: GPLv2+ URL: http://www.open-iscsi.org @@ -78,7 +77,7 @@ Patch227: 0001-iscsid-Update-boot-gateway-information-during-sync_s.patch # distro specific modifications Patch351: 0151-update-initscripts-and-docs.patch Patch352: 0152-use-var-for-config.patch -Patch353: 0153-use-anolis-for-name.patch +Patch353: 0153-use-red-hat-for-name.patch Patch354: 0154-add-libiscsi.patch Patch356: 0156-remove-the-offload-boot-supported-ifdef.patch Patch359: 0159-iscsiuio-systemd-unit-files.patch @@ -110,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 @@ -333,9 +333,8 @@ fi %{_includedir}/libiscsi.h %changelog -* Fri Jan 07 2022 Liwei Ge - 6.2.0.874-21.0.1 -- Use anolis for iqn name -- Cherry-pick [db8e2ae] +* 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