From 0f14c610dd251fddd4891a79dad9281c80e05596 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 7 Oct 2024 20:45:37 +0300 Subject: [PATCH] import libstoragemgmt-1.10.1-1.el9 --- .gitignore | 2 +- .libstoragemgmt.metadata | 2 +- SOURCES/0001-Correction-for-fips-error.patch | 63 -------------------- SPECS/libstoragemgmt.spec | 20 +++++-- 4 files changed, 16 insertions(+), 71 deletions(-) delete mode 100644 SOURCES/0001-Correction-for-fips-error.patch diff --git a/.gitignore b/.gitignore index 23ebaef..f837a3c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libstoragemgmt-1.9.7.tar.gz +SOURCES/libstoragemgmt-1.10.1.tar.gz diff --git a/.libstoragemgmt.metadata b/.libstoragemgmt.metadata index 644b270..1b9b6b9 100644 --- a/.libstoragemgmt.metadata +++ b/.libstoragemgmt.metadata @@ -1 +1 @@ -d1d300522b73f1db12763100d0bc0abcd01af5e4 SOURCES/libstoragemgmt-1.9.7.tar.gz +ea33ade14f3cf24233cb8b45855183b08583dc8f SOURCES/libstoragemgmt-1.10.1.tar.gz diff --git a/SOURCES/0001-Correction-for-fips-error.patch b/SOURCES/0001-Correction-for-fips-error.patch deleted file mode 100644 index 41470dd..0000000 --- a/SOURCES/0001-Correction-for-fips-error.patch +++ /dev/null @@ -1,63 +0,0 @@ -From bbb13a7970c4d82d2e7bace5e96056ef469eb7b3 Mon Sep 17 00:00:00 2001 -From: Tony Asleson -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 ---- - 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 - diff --git a/SPECS/libstoragemgmt.spec b/SPECS/libstoragemgmt.spec index 45b274f..ae46742 100644 --- a/SPECS/libstoragemgmt.spec +++ b/SPECS/libstoragemgmt.spec @@ -1,14 +1,14 @@ %bcond_with test Name: libstoragemgmt -Version: 1.9.7 -Release: 2%{?dist} +Version: 1.10.1 +Release: 1%{?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 @@ -17,7 +17,7 @@ Obsoletes: %{name}-nstor-plugin <= 1.9.0-1 Provides: %{name}-nstor-plugin <= 1.9.0-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 +27,7 @@ BuildRequires: procps BuildRequires: sqlite-devel BuildRequires: python3-six BuildRequires: python3-devel +BuildRequires: ledmon-devel %{?systemd_requires} BuildRequires: systemd systemd-devel @@ -195,8 +196,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 @@ -444,6 +446,12 @@ fi %{_mandir}/man1/local_lsmplugin.1* %changelog +* Mon Jul 15 2024 Tony Asleson - 1.10.1-1 +- Upgrade to 1.10.1 + +* Mon May 20 2024 Tony Asleson - 1.10.0-1 +- Upgrade to 1.10.0 + * Tue Apr 18 2023 Tony Asleson - 1.9.7-2 - FIPS correction ref: https://issues.redhat.com/browse/RHEL-376