Compare commits
No commits in common. "f92fc5d23a1a1658f7a193de5f6d9251b876cc6d" and "18f381e424e00e6bf6691195eef278d9a352ebae" have entirely different histories.
f92fc5d23a
...
18f381e424
@ -1,41 +0,0 @@
|
||||
From b49d3f24c6916e7954869bc159eac4861c67f9b0 Mon Sep 17 00:00:00 2001
|
||||
From: tasleson tasleson@redhat.com
|
||||
Date: Tue, 2 Apr 2024 16:21:03 +0800
|
||||
Subject: [PATCH] Correct HBA-Mode and Correct hashlib.md5 usage
|
||||
|
||||
---
|
||||
plugin/megaraid_plugin/megaraid.py | 2 +-
|
||||
test/cmdtest.py.in | 4 ++++
|
||||
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/plugin/megaraid_plugin/megaraid.py b/plugin/megaraid_plugin/megaraid.py
|
||||
index eee7233..9004262 100644
|
||||
--- a/plugin/megaraid_plugin/megaraid.py
|
||||
+++ b/plugin/megaraid_plugin/megaraid.py
|
||||
@@ -547,7 +547,7 @@ class MegaRAID(IPlugin):
|
||||
if ctrl_show_all_output["Status"]["Current Personality"] == "HBA-Mode ":
|
||||
mode = System.MODE_HBA
|
||||
else:
|
||||
- mode = System.MODE_HBA
|
||||
+ mode = System.MODE_HARDWARE_RAID
|
||||
else:
|
||||
mode = System.MODE_UNKNOWN
|
||||
|
||||
diff --git a/test/cmdtest.py.in b/test/cmdtest.py.in
|
||||
index 273f07d..46d3379 100755
|
||||
--- a/test/cmdtest.py.in
|
||||
+++ b/test/cmdtest.py.in
|
||||
@@ -65,6 +65,10 @@ def random_iqn():
|
||||
|
||||
s = "iqn.1994-05.com.domain:01."
|
||||
m = hashlib.md5()
|
||||
+ try:
|
||||
+ m = hashlib.md5(usedforsecurity=False)
|
||||
+ except Exception:
|
||||
+ m = hashlib.md5()
|
||||
u = os.uname()
|
||||
for i in u:
|
||||
m.update(i.encode('utf-8'))
|
||||
--
|
||||
2.27.0
|
||||
|
||||
9
0001-change-run-dir.patch
Normal file
9
0001-change-run-dir.patch
Normal file
@ -0,0 +1,9 @@
|
||||
diff --git a/packaging/daemon/libstoragemgmt.conf b/packaging/daemon/libstoragemgmt.conf
|
||||
index 1c118a9..cdb43c2 100644
|
||||
--- a/packaging/daemon/libstoragemgmt.conf
|
||||
+++ b/packaging/daemon/libstoragemgmt.conf
|
||||
@@ -1,2 +1,2 @@
|
||||
-D /var/run/lsm 0775 root libstoragemgmt -
|
||||
-D /var/run/lsm/ipc 0775 root libstoragemgmt -
|
||||
+D /run/lsm 0775 root libstoragemgmt -
|
||||
+D /run/lsm/ipc 0775 root libstoragemgmt -
|
||||
36
0002-Specify-signed-char.patch
Normal file
36
0002-Specify-signed-char.patch
Normal file
@ -0,0 +1,36 @@
|
||||
From 50cd68b994d988c116731a1ff36f3537c6103890 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Asleson <tasleson@redhat.com>
|
||||
Date: Wed, 12 Feb 2020 10:04:58 -0600
|
||||
Subject: [PATCH 1/1] Specify signed char
|
||||
|
||||
x86 architecture default to signed characters. Other architectures
|
||||
default to unsigned characters. When building on non-x86 arch we
|
||||
get the following error
|
||||
|
||||
./json.hpp:22700:42: required from here
|
||||
./json.hpp:8494:24: error: comparison is always true due to limited
|
||||
range of data type [-Werror=type-limits]
|
||||
8494 | if ('\x00' <= c and c <= '\x1F')
|
||||
| ~~~~~~~^~~~
|
||||
|
||||
Signed-off-by: Tony Asleson <tasleson@redhat.com>
|
||||
---
|
||||
c_binding/json.hpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/c_binding/json.hpp b/c_binding/json.hpp
|
||||
index 6b6655a..a4ed769 100644
|
||||
--- a/c_binding/json.hpp
|
||||
+++ b/c_binding/json.hpp
|
||||
@@ -3097,7 +3097,7 @@ scan_number_done:
|
||||
std::size_t chars_read = 0;
|
||||
|
||||
/// raw input token string (for error messages)
|
||||
- std::vector<char> token_string {};
|
||||
+ std::vector<signed char> token_string {};
|
||||
|
||||
/// buffer for variable-length tokens (numbers, strings)
|
||||
string_t token_buffer {};
|
||||
--
|
||||
2.32.0
|
||||
|
||||
2959
fix-too-many-argument-for-format.patch
Normal file
2959
fix-too-many-argument-for-format.patch
Normal file
File diff suppressed because it is too large
Load Diff
BIN
libstoragemgmt-1.8.0.tar.gz
Normal file
BIN
libstoragemgmt-1.8.0.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
@ -1,20 +1,20 @@
|
||||
%global py2_build_dir %{_builddir}/%{name}-%{version}-%{release}-python2
|
||||
%define with_python2 0
|
||||
Name: libstoragemgmt
|
||||
Version: 1.9.8
|
||||
Release: 2
|
||||
Version: 1.8.0
|
||||
Release: 6
|
||||
Summary: Storage array management library
|
||||
License: LGPLv2+
|
||||
URL: https://github.com/libstorage/libstoragemgmt
|
||||
Source0: https://github.com/libstorage/libstoragemgmt/releases/download/%{version}/%{name}-%{version}.tar.gz
|
||||
Patch1: 0001-Correct-HBA-Mode-and-Correct-hashlib.md5-usage.patch
|
||||
|
||||
Patch1: 0001-change-run-dir.patch
|
||||
Patch2: 0002-Specify-signed-char.patch
|
||||
Patch3: fix-too-many-argument-for-format.patch
|
||||
|
||||
BuildRequires: gcc gcc-c++ autoconf automake libtool libxml2-devel check-devel perl-interpreter
|
||||
BuildRequires: glib2-devel systemd bash-completion libconfig-devel systemd-devel
|
||||
BuildRequires: procps sqlite-devel python3-six python3-devel systemd systemd-devel chrpath
|
||||
%ifarch %{valgrind_arches}
|
||||
BuildRequires: valgrind
|
||||
%endif
|
||||
BuildRequires: openssl-devel glib2-devel systemd bash-completion libconfig-devel systemd-devel
|
||||
BuildRequires: procps sqlite-devel python3-six python3-devel systemd systemd-devel chrpath valgrind
|
||||
%{?systemd_requires}
|
||||
|
||||
%if 0%{?with_python2}
|
||||
@ -67,6 +67,7 @@ Python2 for libstoragemgmt-clibs.
|
||||
%package -n python3-libstoragemgmt
|
||||
Summary: python3 for libstoragemgmt
|
||||
Requires: %{name} = %{version}-%{release} python3-libstoragemgmt-clibs
|
||||
BuildArch: noarch
|
||||
|
||||
%{?python_provide:%python_provide python3-%{name}}
|
||||
|
||||
@ -130,6 +131,7 @@ Udev files for %{name}.
|
||||
|
||||
%package nfs-plugin
|
||||
Summary: Files for NFS local filesystem support for %{name}
|
||||
BuildArch: noarch
|
||||
Requires: python3-%{name} = %{version} nfs-utils
|
||||
Requires(post): python3-%{name} = %{version}
|
||||
Requires(postun): python3-%{name} = %{version}
|
||||
@ -137,8 +139,9 @@ Requires(postun): python3-%{name} = %{version}
|
||||
%description nfs-plugin
|
||||
Files for NFS local filesystem support for %{name}
|
||||
|
||||
|
||||
%package nfs-plugin-clibs
|
||||
Summary: clibs package for nfs-plugin
|
||||
Summary: clibs package for nfs-plugin
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description nfs-plugin-clibs
|
||||
@ -156,12 +159,7 @@ rm -fr %{py2_build_dir}
|
||||
cp -a . %{py2_build_dir}
|
||||
%endif
|
||||
|
||||
%ifarch %{valgrind_arches}
|
||||
WITHOUT_VALGRIND=
|
||||
%else
|
||||
WITHOUT_VALGRIND=--without-mem-leak-test
|
||||
%endif
|
||||
%configure --with-python3 $WITHOUT_VALGRIND
|
||||
%configure --with-python3
|
||||
%make_build
|
||||
|
||||
%if 0%{?with_python2}
|
||||
@ -304,38 +302,24 @@ fi
|
||||
%{_libexecdir}/lsm.d/*.py*
|
||||
%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/sim.conf
|
||||
%{_bindir}/sim_lsmplugin
|
||||
%dir %{python3_sitearch}/lsm
|
||||
%{python3_sitearch}/lsm/*.py
|
||||
%{python3_sitearch}/lsm/__pycache__/
|
||||
%{python3_sitearch}/lsm/lsmcli/*
|
||||
%dir %{python3_sitearch}/sim_plugin
|
||||
%{python3_sitearch}/sim_plugin/__pycache__/
|
||||
%{python3_sitearch}/sim_plugin/__init__.*
|
||||
%{python3_sitearch}/sim_plugin/simulator.*
|
||||
%{python3_sitearch}/sim_plugin/simarray.*
|
||||
%dir %{python3_sitelib}/lsm
|
||||
%{python3_sitelib}/lsm/*.py
|
||||
%{python3_sitelib}/lsm/__pycache__/
|
||||
%{python3_sitelib}/lsm/external/*
|
||||
%{python3_sitelib}/lsm/lsmcli/*
|
||||
%{python3_sitelib}/lsm/plugin/sim/*
|
||||
%{python3_sitelib}/lsm/plugin/__init__.py
|
||||
%{python3_sitelib}/lsm/plugin/__pycache__/
|
||||
|
||||
%files -n python3-%{name}-clibs
|
||||
%defattr(-,root,root)
|
||||
%{python3_sitearch}/lsm/_clib.*
|
||||
%{python3_sitelib}/lsm/_clib.*
|
||||
|
||||
%files smis-plugin
|
||||
%defattr(-,root,root)
|
||||
%dir %{python3_sitelib}/smispy_plugin
|
||||
%dir %{python3_sitelib}/smispy_plugin/__pycache__
|
||||
%{python3_sitelib}/smispy_plugin/__pycache__/*
|
||||
%{python3_sitelib}/smispy_plugin/__init__.*
|
||||
%{python3_sitelib}/smispy_plugin/smis.*
|
||||
%{python3_sitelib}/smispy_plugin/dmtf.*
|
||||
%{python3_sitelib}/smispy_plugin/utils.*
|
||||
%{python3_sitelib}/smispy_plugin/smis_common.*
|
||||
%{python3_sitelib}/smispy_plugin/smis_cap.*
|
||||
%{python3_sitelib}/smispy_plugin/smis_sys.*
|
||||
%{python3_sitelib}/smispy_plugin/smis_pool.*
|
||||
%{python3_sitelib}/smispy_plugin/smis_disk.*
|
||||
%{python3_sitelib}/smispy_plugin/smis_vol.*
|
||||
%{python3_sitelib}/smispy_plugin/smis_ag.*
|
||||
%dir %{python3_sitelib}/lsm/plugin/smispy
|
||||
%{_bindir}/smispy_lsmplugin
|
||||
%{_mandir}/man1/smispy_lsmplugin.1*
|
||||
%{python3_sitelib}/lsm/plugin/smispy/*
|
||||
|
||||
%files netapp-plugin
|
||||
%defattr(-,root,root)
|
||||
@ -343,41 +327,27 @@ fi
|
||||
%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/hpsa.conf
|
||||
%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/arcconf.conf
|
||||
%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/local.conf
|
||||
%{_bindir}/ontap_lsmplugin
|
||||
%{_bindir}/targetd_lsmplugin
|
||||
%{_bindir}/nstor_lsmplugin
|
||||
%{_bindir}/megaraid_lsmplugin
|
||||
%{_bindir}/hpsa_lsmplugin
|
||||
%{_bindir}/arcconf_lsmplugin
|
||||
%{_bindir}/local_lsmplugin
|
||||
%{python3_sitelib}/hpsa_plugin/__pycache__/*
|
||||
%{python3_sitelib}/hpsa_plugin/__init__.*
|
||||
%{python3_sitelib}/hpsa_plugin/hpsa.*
|
||||
%{python3_sitelib}/hpsa_plugin/utils.*
|
||||
%{_mandir}/man1/hpsa_lsmplugin.1*
|
||||
%dir %{python3_sitelib}/arcconf_plugin
|
||||
%dir %{python3_sitelib}/arcconf_plugin/__pycache__
|
||||
%{python3_sitelib}/arcconf_plugin/__pycache__/*
|
||||
%{python3_sitelib}/arcconf_plugin/__init__.*
|
||||
%{python3_sitelib}/arcconf_plugin/arcconf.*
|
||||
%{python3_sitelib}/arcconf_plugin/utils.*
|
||||
%dir %{python3_sitelib}/local_plugin
|
||||
%dir %{python3_sitelib}/local_plugin/__pycache__
|
||||
%{python3_sitelib}/local_plugin/__pycache__/*
|
||||
%{python3_sitelib}/local_plugin/__init__.*
|
||||
%{python3_sitelib}/local_plugin/local.*
|
||||
%{_mandir}/man1/local_lsmplugin.1*
|
||||
%dir %{python3_sitelib}/megaraid_plugin
|
||||
%dir %{python3_sitelib}/megaraid_plugin/__pycache__
|
||||
%{python3_sitelib}/megaraid_plugin/__pycache__/*
|
||||
%{python3_sitelib}/megaraid_plugin/__init__.*
|
||||
%{python3_sitelib}/megaraid_plugin/megaraid.*
|
||||
%{python3_sitelib}/megaraid_plugin/utils.*
|
||||
%{_mandir}/man1/megaraid_lsmplugin.1*
|
||||
%dir %{python3_sitelib}/targetd_plugin
|
||||
%dir %{python3_sitelib}/targetd_plugin/__pycache__
|
||||
%{python3_sitelib}/targetd_plugin/__pycache__/*
|
||||
%{python3_sitelib}/targetd_plugin/__init__.*
|
||||
%{python3_sitelib}/targetd_plugin/targetd.*
|
||||
%{_mandir}/man1/targetd_lsmplugin.1*
|
||||
%dir %{python3_sitelib}/lsm/plugin/ontap
|
||||
%{python3_sitelib}/lsm/plugin/ontap/*
|
||||
%dir %{python3_sitelib}/lsm/plugin/targetd
|
||||
%{python3_sitelib}/lsm/plugin/targetd/*
|
||||
%dir %{python3_sitelib}/lsm/plugin/nstor
|
||||
%{python3_sitelib}/lsm/plugin/nstor/*
|
||||
%dir %{python3_sitelib}/lsm/plugin/megaraid
|
||||
%{python3_sitelib}/lsm/plugin/megaraid/*
|
||||
%dir %{python3_sitelib}/lsm/plugin/hpsa
|
||||
%{python3_sitelib}/lsm/plugin/hpsa/*
|
||||
%dir %{python3_sitelib}/lsm/plugin/arcconf
|
||||
%{python3_sitelib}/lsm/plugin/arcconf/*
|
||||
%dir %{python3_sitelib}/lsm/plugin/local
|
||||
%{python3_sitelib}/lsm/plugin/local/*
|
||||
|
||||
%files udev
|
||||
%defattr(-,root,root)
|
||||
@ -388,15 +358,13 @@ fi
|
||||
%defattr(-,root,root)
|
||||
%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/nfs.conf
|
||||
%{_bindir}/nfs_lsmplugin
|
||||
%dir %{python3_sitearch}/nfs_plugin
|
||||
%dir %{python3_sitearch}/nfs_plugin/__pycache__
|
||||
%{python3_sitearch}/nfs_plugin/__pycache__/*
|
||||
%{python3_sitearch}/nfs_plugin/__init__.*
|
||||
%{python3_sitearch}/nfs_plugin/nfs.*
|
||||
%{_mandir}/man1/nfs_lsmplugin.1*
|
||||
%dir %{python3_sitelib}/lsm/plugin/nfs
|
||||
%{python3_sitelib}/lsm/plugin/nfs/__pycache__/*
|
||||
%{python3_sitelib}/lsm/plugin/nfs/__init__.*
|
||||
%{python3_sitelib}/lsm/plugin/nfs/nfs.*
|
||||
|
||||
%files nfs-plugin-clibs
|
||||
%{python3_sitearch}/nfs_plugin/nfs_clib.*
|
||||
%files nfs-plugin-clibs
|
||||
%{python3_sitelib}/lsm/plugin/nfs/nfs_clib.*
|
||||
|
||||
%files help
|
||||
%defattr(-,root,root)
|
||||
@ -404,21 +372,6 @@ fi
|
||||
%{_mandir}/man*/*
|
||||
|
||||
%changelog
|
||||
* Tue Apr 2 2024 wulei <baiguo@kylinos.cn> - 1.9.8-2
|
||||
- Correct HBA Mode and Correct hashlib.md5 usage
|
||||
|
||||
* Wed Oct 11 2023 wulei <wu_lei@hoperun.com> - 1.9.8-1
|
||||
- Update to 1.9.8
|
||||
|
||||
* Wed Sep 20 2023 laokz <zhangkai@iscas.ac.cn> - 1.9.6-2
|
||||
- make with_mem_leak_test option following %{valgrind_arches}
|
||||
|
||||
* Tue Feb 7 2023 xu_ping <xuping33@h-partners.com> - 1.9.6-1
|
||||
- Upgrade 1.9.6
|
||||
|
||||
* Sat Jan 7 2023 mengwenhua <mengwenhua@xfusion.com> - 1.8.0-7
|
||||
- Sim fs resize
|
||||
|
||||
* Fri Jan 28 2022 wulei <wulei80@huawei.com> - 1.8.0-6
|
||||
- fix too many argument for format
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user