Compare commits

...

No commits in common. 'c9' and 'c10-beta' have entirely different histories.
c9 ... c10-beta

2
.gitignore vendored

@ -1 +1 @@
SOURCES/libstoragemgmt-1.9.7.tar.gz
SOURCES/libstoragemgmt-1.10.1.tar.gz

@ -1 +1 @@
d1d300522b73f1db12763100d0bc0abcd01af5e4 SOURCES/libstoragemgmt-1.9.7.tar.gz
ea33ade14f3cf24233cb8b45855183b08583dc8f SOURCES/libstoragemgmt-1.10.1.tar.gz

@ -1,63 +0,0 @@
From bbb13a7970c4d82d2e7bace5e96056ef469eb7b3 Mon Sep 17 00:00:00 2001
From: Tony Asleson <tasleson@redhat.com>
Date: Fri, 14 Apr 2023 10:43:27 -0500
Subject: [PATCH] Correction for fips error
When running on a fips enabled system we encounter the following
error:
PLUGIN_BUG(2): [digital envelope routines] unsupported Data: Traceback (most recent call last):
...
File "/usr/lib64/python3.9/site-packages/lsm/_common.py", line 348, in md5
h = hashlib.md5()
ValueError: [digital envelope routines] unsupported
Utilize the usedforsecurity=False parameter to md5 to indicate that our
use is not for security related purposes.
Signed-off-by: Tony Asleson <tasleson@redhat.com>
---
plugin/nfs_plugin/nfs.py | 8 +++++++-
python_binding/lsm/_common.py | 7 ++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/plugin/nfs_plugin/nfs.py b/plugin/nfs_plugin/nfs.py
index 8a87652..11ce3c2 100644
--- a/plugin/nfs_plugin/nfs.py
+++ b/plugin/nfs_plugin/nfs.py
@@ -55,7 +55,13 @@ def _export_id(path, auth_type, anon_uid, anon_gid, options):
if auth_type is None:
auth_type = 'sec'
- hsh = hashlib.md5()
+ try:
+ # The use of md5 is not used for security, indicate
+ # this to hashlib so that we can run when fips is enabled
+ hsh = hashlib.md5(usedforsecurity=False)
+ except Exception:
+ hsh = hashlib.md5()
+
hsh.update(path.encode('utf-8'))
hsh.update(auth_type.encode('utf-8'))
if anon_uid is not None and anon_uid != NfsExport.ANON_UID_GID_NA:
diff --git a/python_binding/lsm/_common.py b/python_binding/lsm/_common.py
index 1220381..163f726 100644
--- a/python_binding/lsm/_common.py
+++ b/python_binding/lsm/_common.py
@@ -345,7 +345,12 @@ def uri_parameters(uri):
# @param t Item to generate signature on.
# @returns md5 hex digest.
def md5(t):
- h = hashlib.md5()
+ try:
+ # The use of md5 is not used for security, indicate
+ # this to hashlib so that we can run when fips is enabled
+ h = hashlib.md5(usedforsecurity=False)
+ except Exception:
+ h = hashlib.md5()
h.update(t.encode("utf-8"))
return h.hexdigest()
--
2.39.2

@ -1,23 +1,25 @@
%bcond_with test
Name: libstoragemgmt
Version: 1.9.7
Release: 2%{?dist}
Version: 1.10.1
Release: 3%{?dist}
Summary: Storage array management library
License: LGPLv2+
License: LGPL-2.1-or-later
URL: https://github.com/libstorage/libstoragemgmt
Source0: https://github.com/libstorage/libstoragemgmt/releases/download/%{version}/%{name}-%{version}.tar.gz
Patch1: 0001-Correction-for-fips-error.patch
Requires: python3-%{name}%{_isa}
Requires: ledmon-libs
# Packages that have been removed
Obsoletes: %{name}-netapp-plugin <= 1.6.2-10
Provides: %{name}-netapp-plugin <= 1.6.2-10
Obsoletes: %{name}-nstor-plugin <= 1.9.0-1
Provides: %{name}-nstor-plugin <= 1.9.0-1
Obsoletes: %{name}-smis-plugin <= 1.10.1-1
Provides: %{name}-smis-plugin <= 1.10.1-1
BuildRequires: gcc gcc-c++
BuildRequires: autoconf automake libtool libxml2-devel check-devel perl-interpreter
BuildRequires: autoconf automake libtool check-devel perl-interpreter
BuildRequires: glib2-devel
BuildRequires: systemd
BuildRequires: bash-completion
@ -27,6 +29,7 @@ BuildRequires: procps
BuildRequires: sqlite-devel
BuildRequires: python3-six
BuildRequires: python3-devel
BuildRequires: ledmon-devel
%{?systemd_requires}
BuildRequires: systemd systemd-devel
@ -69,23 +72,6 @@ Obsoletes: python3-%{name}-clibs <= 1.9.0-1
This contains python 3 client libraries as well as python framework
support and open source plug-ins written in python 3.
%package smis-plugin
Summary: Files for SMI-S generic array support for %{name}
BuildRequires: python3-pywbem
BuildRequires: make
Requires: python3-pywbem
BuildArch: noarch
Provides: %{name}-ibm-v7k-plugin <= 2:1.9.2-4
Obsoletes: %{name}-ibm-v7k-plugin <= 2:0.1.0-3
Requires: python3-%{name} = %{version}
Requires(post): python3-%{name} = %{version}
Requires(postun): python3-%{name} = %{version}
%description smis-plugin
The %{name}-smis-plugin package contains plug-in for generic SMI-S array
support.
%package targetd-plugin
Summary: Files for targetd array support for %{name}
Requires: python3-%{name} = %{version}
@ -167,7 +153,7 @@ plugin selection for locally managed storage.
%build
./autogen.sh
%configure --with-python3 --disable-static
%configure --with-python3 --disable-static --without-smispy
%make_build
%install
@ -195,8 +181,9 @@ fi
%endif
%pre
echo 'u libstoragemgmt - "daemon account for libstoragemgmt"' | \
systemd-sysusers --replace=/usr/lib/sysusers.d/libstoragemgmt.conf -
systemd-sysusers --replace=/usr/lib/sysusers.d/libstoragemgmt.conf -
%post
/sbin/ldconfig
@ -211,19 +198,6 @@ echo 'u libstoragemgmt - "daemon account for libstoragemgmt"' | \
/sbin/ldconfig
%systemd_postun %{name}.service
# Need to restart lsmd if plugin is new installed or removed.
%post smis-plugin
if [ $1 -eq 1 ]; then
# New install.
/usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
fi
%postun smis-plugin
if [ $1 -eq 0 ]; then
# Remove
/usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
fi
# Need to restart lsmd if plugin is new installed or removed.
%post targetd-plugin
if [ $1 -eq 1 ]; then
@ -358,24 +332,6 @@ fi
%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/sim.conf
%{_mandir}/man1/sim_lsmplugin.1*
%files smis-plugin
%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.*
%{_bindir}/smispy_lsmplugin
%{_mandir}/man1/smispy_lsmplugin.1*
%files targetd-plugin
%dir %{python3_sitelib}/targetd_plugin
%dir %{python3_sitelib}/targetd_plugin/__pycache__
@ -444,35 +400,90 @@ fi
%{_mandir}/man1/local_lsmplugin.1*
%changelog
* Tue Apr 18 2023 Tony Asleson <tasleson@redhat.com> - 1.9.7-2
- FIPS correction ref: https://issues.redhat.com/browse/RHEL-376
* Thu Aug 8 2024 Tony Asleson <tasleson@redhat.com> - 1.10.1-3
- Remove smis plugin sub package
* Wed Jul 17 2024 Tony Asleson <tasleson@redhat.com> - 1.10.1-2
- Add gating.yaml
* Mon Jul 15 2024 Tony Asleson <tasleson@redhat.com> - 1.10.1-1
- Upgrade to 1.10.1
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.9.8-7
- Bump release for June 2024 mass rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jul 21 2023 Tony Asleson <tasleson@redhat.com> - 1.9.8-4
- migrated to SPDX license
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 1.9.8-2
- Rebuilt for Python 3.12
* Mon Apr 17 2023 Tony Asleson <tasleson@redhat.com> - 1.9.8-1
- Upgrade to 1.9.8
* Wed Feb 22 2023 Tony Asleson <tasleson@redhat.com> - 1.9.7-1
* Mon Feb 20 2023 Tony Asleson <tasleson@redhat.com> - 1.9.7-1
- Upgrade to 1.9.7
* Thu Oct 27 2022 Tony Asleson <tasleson@redhat.com> - 1.9.5-1
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Nov 11 2022 Tony Asleson <tasleson@redhat.com> - 1.9.6-2
- Rebuild
* Thu Nov 10 2022 Tony Asleson <tasleson@redhat.com> - 1.9.6-1
- Upgrade to 1.9.6
* Mon Oct 17 2022 Tony Asleson <tasleson@redhat.com> - 1.9.5-1
- Upgrade to 1.9.5
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jul 18 2022 Tony Asleson <tasleson@redhat.com> - 1.9.4-4
- Use systemd-sysusers
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.9.4-3
- Rebuilt for Python 3.11
* Thu Apr 7 2022 Tony Asleson <tasleson@redhat.com> - 1.9.4-2
- Fix failure to build on i386
* Thu Apr 7 2022 Tony Asleson <tasleson@redhat.com> - 1.9.4-1
- Upgrade to 1.9.4
* Wed Jan 26 2022 Tony Asleson <tasleson@redhat.com> - 1.9.3-3
- Remove -Werror for build due to bug, see: https://gcc.gnu.org/PR104213
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Nov 17 2021 Tony Asleson <tasleson@redhat.com> - 1.9.3-1
- Upgrade to 1.9.3
- Add requirements for local plugin
* Thu Aug 12 2021 Tony Asleson <tasleson@redhat.com> - 1.9.2-4
- Re-spin to pick up gating file change
* Mon Aug 9 2021 Tony Asleson <tasleson@redhat.com> - 1.9.2-4
- Add missing requirement for python six library
* Wed Aug 11 2021 Tony Asleson <tasleson@redhat.com> - 1.9.2-3
- Fix for https://bugzilla.redhat.com/show_bug.cgi?id=1974108
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.9.2-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.9.2-2
- Rebuilt for Python 3.10
* Mon May 17 2021 Tony Asleson <tasleson@redhat.com> - 1.9.2-1
- Upgrade to 1.9.2
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.9.0-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Apr 20 2021 Tony Asleson <tasleson@redhat.com> - 1.9.1-1
- Upgrade to 1.9.1
* Thu Mar 25 2021 Tony Asleson <tasleson@redhat.com> - 1.9.0-1
- Upgrade to 1.9.0

Loading…
Cancel
Save