From e60bf1e36266e8d539360ba708080cf4c067658a Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Wed, 7 Jun 2023 09:56:54 -0700 Subject: [PATCH] fix idbm patch to not overwrite upstream changes in file mode Resolves: #2131090 Signed-off-by: Chris Leech --- 0003-idbm_rec_write-seperate-old-and-new-style-writes.patch | 4 ++-- iscsi-initiator-utils.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/0003-idbm_rec_write-seperate-old-and-new-style-writes.patch b/0003-idbm_rec_write-seperate-old-and-new-style-writes.patch index 067300b..608f488 100644 --- a/0003-idbm_rec_write-seperate-old-and-new-style-writes.patch +++ b/0003-idbm_rec_write-seperate-old-and-new-style-writes.patch @@ -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, 0660) != 0) { ++ if (mkdir(portal, 0770) != 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, 0660) != 0) { ++ if (mkdir(portal, 0770) != 0) { + log_error("Could not make %s: %s", portal, + strerror(errno)); + rc = ISCSI_ERR_IDBM; diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index 9d6d401..07d2729 100644 --- a/iscsi-initiator-utils.spec +++ b/iscsi-initiator-utils.spec @@ -13,7 +13,7 @@ Summary: iSCSI daemon and utility programs Name: iscsi-initiator-utils Version: 6.%{open_iscsi_version}.%{open_iscsi_build} -Release: 4.git%{shortcommit0}%{?dist} +Release: 5.git%{shortcommit0}%{?dist} Group: System Environment/Daemons License: GPLv2+ URL: http://www.open-iscsi.org @@ -364,6 +364,9 @@ fi %{python3_sitearch}/* %changelog +* Wed Jun 07 2023 Chris Leech - 6.2.1.4-5.git095f59c +- 2131090 fix idbm patch to not overwrite upstream changes in file mode + * Mon Aug 09 2021 Chris Leech - 6.2.1.4-4.git095f59c - 1755907 set proper attr in rpm db for lockfiles, fixes rpm verificiation warning