From 382d899fb47abf163487246485fc0189e395eb89 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Fri, 1 Sep 2023 16:09:50 +0800 Subject: [PATCH 1/2] update to iscsi-initiator-utils-6.2.1.4-8.git095f59c.el8_8.src.rpm Signed-off-by: Zhao Hang --- ...ite-seperate-old-and-new-style-writes.patch | 4 ++-- ...me.patch => 0007-use-red-hat-for-name.patch | 12 ++++++------ dist | 1 + iscsi-initiator-utils.spec | 18 +++++++++++++----- 4 files changed, 22 insertions(+), 13 deletions(-) rename 0007-use-anolis-for-name.patch => 0007-use-red-hat-for-name.patch (73%) create mode 100644 dist 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/0007-use-anolis-for-name.patch b/0007-use-red-hat-for-name.patch similarity index 73% rename from 0007-use-anolis-for-name.patch rename to 0007-use-red-hat-for-name.patch index f9d00d1..53ac29c 100644 --- a/0007-use-anolis-for-name.patch +++ b/0007-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 8312003a6a9e41d8d20eb8225ec8c4b2860351ec Mon Sep 17 00:00:00 2001 +From: Chris Leech +Date: Mon, 19 Nov 2012 16:40:04 -0800 +Subject: [PATCH] use red hat for name --- doc/iscsi-iname.8 | 2 +- @@ -17,7 +17,7 @@ index 6a413f6..dd77ed9 100644 .TP .BI [-p=]\fIprefix\fP -Use the prefix passed in instead of the default "iqn.2016-04.com.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 @@ -30,7 +30,7 @@ index 0f587e1..0e15650 100644 } } else { - prefix = "iqn.2016-04.com.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 diff --git a/dist b/dist new file mode 100644 index 0000000..5aa45c5 --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an8_8 diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index 4fe8a2d..d34e36a 100644 --- a/iscsi-initiator-utils.spec +++ b/iscsi-initiator-utils.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 %global open_iscsi_version 2.1 %global open_iscsi_build 4 %global commit0 095f59ca464220eae285de6b5f2ee31185a6a84c @@ -14,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}%{anolis_release}%{?dist} +Release: 8.git%{shortcommit0}%{?dist} Group: System Environment/Daemons License: GPLv2+ URL: http://www.open-iscsi.org @@ -28,7 +27,7 @@ Patch0003: 0003-idbm_rec_write-seperate-old-and-new-style-writes.patch Patch0004: 0004-idbw_rec_write-pick-tpgt-from-existing-record.patch Patch0005: 0005-update-initscripts-and-docs.patch Patch0006: 0006-use-var-for-config.patch -Patch0007: 0007-use-anolis-for-name.patch +Patch0007: 0007-use-red-hat-for-name.patch Patch0008: 0008-libiscsi.patch Patch0009: 0009-Add-macros-to-release-GIL-lock.patch Patch0010: 0010-libiscsi-introduce-sessions-API.patch @@ -365,8 +364,17 @@ fi %{python3_sitearch}/* %changelog -* Thu Jan 13 2022 lihaipeng - 6.2.1.4-4.git095f59c.0.1 -- Use anolis for iqn name +* Thu Jun 15 2023 Chris Leech - 6.2.1.4-8.git095f59c +- fix gating test + +* Thu Jun 15 2023 Chris Leech - 6.2.1.4-7.git095f59c +- move tests to tmt framework + +* Tue Jun 13 2023 Chris Leech - 6.2.1.4-6.git095f59c +- restore missing gating tests + +* 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 -- Gitee From 66d7d8aad4a44c82666e45774bb1fd3f0524d5a0 Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Fri, 29 Jan 2021 09:45:11 +0800 Subject: [PATCH 2/2] rebrand: use anolis for iqn name --- ...-for-name.patch => 0007-use-anolis-for-name.patch | 12 ++++++------ iscsi-initiator-utils.spec | 8 ++++++-- 2 files changed, 12 insertions(+), 8 deletions(-) rename 0007-use-red-hat-for-name.patch => 0007-use-anolis-for-name.patch (73%) diff --git a/0007-use-red-hat-for-name.patch b/0007-use-anolis-for-name.patch similarity index 73% rename from 0007-use-red-hat-for-name.patch rename to 0007-use-anolis-for-name.patch index 53ac29c..f9d00d1 100644 --- a/0007-use-red-hat-for-name.patch +++ b/0007-use-anolis-for-name.patch @@ -1,7 +1,7 @@ -From 8312003a6a9e41d8d20eb8225ec8c4b2860351ec Mon Sep 17 00:00:00 2001 -From: Chris Leech -Date: Mon, 19 Nov 2012 16:40:04 -0800 -Subject: [PATCH] use red hat for name +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 --- doc/iscsi-iname.8 | 2 +- @@ -17,7 +17,7 @@ index 6a413f6..dd77ed9 100644 .TP .BI [-p=]\fIprefix\fP -Use the prefix passed in instead of the default "iqn.2016-04.com.open-iscsi" -+Use the prefix passed in instead of the default "iqn.1994-05.com.redhat" ++Use the prefix passed in instead of the default "iqn.2020-08.org.openanolis" .SH AUTHORS Open-iSCSI project @@ -30,7 +30,7 @@ index 0f587e1..0e15650 100644 } } else { - prefix = "iqn.2016-04.com.open-iscsi"; -+ prefix = "iqn.1994-05.com.redhat"; ++ prefix = "iqn.2020-08.org.openanolis"; } /* try to feed some entropy from the pool to MD5 in order to get diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index d34e36a..2386f3e 100644 --- a/iscsi-initiator-utils.spec +++ b/iscsi-initiator-utils.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %global open_iscsi_version 2.1 %global open_iscsi_build 4 %global commit0 095f59ca464220eae285de6b5f2ee31185a6a84c @@ -13,7 +14,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: 8.git%{shortcommit0}%{anolis_release}%{?dist} Group: System Environment/Daemons License: GPLv2+ URL: http://www.open-iscsi.org @@ -27,7 +28,7 @@ Patch0003: 0003-idbm_rec_write-seperate-old-and-new-style-writes.patch Patch0004: 0004-idbw_rec_write-pick-tpgt-from-existing-record.patch Patch0005: 0005-update-initscripts-and-docs.patch Patch0006: 0006-use-var-for-config.patch -Patch0007: 0007-use-red-hat-for-name.patch +Patch0007: 0007-use-anolis-for-name.patch Patch0008: 0008-libiscsi.patch Patch0009: 0009-Add-macros-to-release-GIL-lock.patch Patch0010: 0010-libiscsi-introduce-sessions-API.patch @@ -364,6 +365,9 @@ fi %{python3_sitearch}/* %changelog +* Fri Sep 01 2023 lihaipeng - 6.2.1.4-8.git095f59c.0.1 +- Use anolis for iqn name + * Thu Jun 15 2023 Chris Leech - 6.2.1.4-8.git095f59c - fix gating test -- Gitee