diff --git a/SOURCES/0001-enable-all-CHAP-digest-functions-by-default.patch b/SOURCES/0001-enable-all-CHAP-digest-functions-by-default.patch deleted file mode 100644 index 804cb2f..0000000 --- a/SOURCES/0001-enable-all-CHAP-digest-functions-by-default.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a89f547c29f5d3f61a10eb1847b992f9f7f9a65a Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Wed, 8 Jan 2020 14:00:35 -0800 -Subject: [PATCH 1/1] enable all CHAP digest functions by default - ---- - etc/iscsid.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/iscsid.conf b/etc/iscsid.conf -index 420145b..c1960e5 100644 ---- a/etc/iscsid.conf -+++ b/etc/iscsid.conf -@@ -62,7 +62,7 @@ node.leading_login = No - # The algorithms should be listen with most prefered first. - # Valid values are MD5, SHA1, SHA256, and SHA3-256. - # The default is MD5. --#node.session.auth.chap_algs = SHA3-256,SHA256,SHA1,MD5 -+node.session.auth.chap_algs = SHA3-256,SHA256,SHA1,MD5 - - # To set a CHAP username and password for initiator - # authentication by the target(s), uncomment the following lines: --- -2.21.1 - diff --git a/SOURCES/0022-use-Red-Hat-version-string-to-match-RPM-package-vers.patch b/SOURCES/0022-use-Red-Hat-version-string-to-match-RPM-package-vers.patch index 2717913..ad9b76f 100644 --- a/SOURCES/0022-use-Red-Hat-version-string-to-match-RPM-package-vers.patch +++ b/SOURCES/0022-use-Red-Hat-version-string-to-match-RPM-package-vers.patch @@ -16,7 +16,7 @@ index 615f533..a1f6cc2 100644 * some other maintainer could merge a patch without going through us */ -#define ISCSI_VERSION_STR "2.0-878" -+#define ISCSI_VERSION_STR "6.2.0.878-2" ++#define ISCSI_VERSION_STR "6.2.0.878-5" #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 003550e..f837753 100644 --- a/SPECS/iscsi-initiator-utils.spec +++ b/SPECS/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 @@ -45,7 +45,6 @@ Patch0021: 0021-improve-systemd-service-files-for-boot-session-handl.patch Patch0022: 0022-use-Red-Hat-version-string-to-match-RPM-package-vers.patch Patch0023: 0001-configuration-support-for-CHAP-algorithms.patch Patch0024: 0001-Fix-bug-with-libopeniscsiusr.pc.patch -Patch0025: 0001-enable-all-CHAP-digest-functions-by-default.patch Patch0026: 0001-Revert-Out-of-bounds-read-Overrunning-array-of-8-2-b.patch BuildRequires: flex bison doxygen kmod-devel systemd-units @@ -356,6 +355,11 @@ fi %{python3_sitearch}/* %changelog +* Thu Aug 20 2020 Chris Leech - 6.2.0.878-5.gitd791ce0 +- 1849931, 1869438 go back to MD5 CHAP only by default + new CHAP modes can cause issue with some targets, + so SHA1/SHA256/SHA3-256 modes must be configured to enable now + * Tue Mar 24 2020 Chris Leech - 6.2.0.878-3.gitd791ce0 - 1801577 new service file not enabled on upgrade, spec change to use triggers for that