Compare commits

...

No commits in common. "c8" and "a10s" have entirely different histories.
c8 ... a10s

11 changed files with 272 additions and 374 deletions

50
.gitignore vendored
View File

@ -1 +1,49 @@
SOURCES/libstoragemgmt-1.9.1.tar.gz /libstoragemgmt-0.0.9.tar.gz
/libstoragemgmt-0.0.11.tar.gz
/libstoragemgmt-0.0.12.tar.gz
/libstoragemgmt-0.0.13.tar.gz
/libstoragemgmt-0.0.15.tar.gz
/libstoragemgmt-0.0.16.tar.gz
/libstoragemgmt-0.0.17.tar.gz
/libstoragemgmt-0.0.18.tar.gz
/libstoragemgmt-0.0.19.tar.gz
/libstoragemgmt-0.0.20.tar.gz
/libstoragemgmt-0.0.21.tar.gz
/libstoragemgmt-0.0.22.tar.gz
/libstoragemgmt-0.0.23.tar.gz
/libstoragemgmt-0.0.24.tar.gz
/libstoragemgmt-0.1.0.tar.gz
/libstoragemgmt-1.0.0.tar.gz
/libstoragemgmt-1.1.0.tar.gz
/libstoragemgmt-1.2.1.tar.gz
/libstoragemgmt-1.2.3.tar.gz
/libstoragemgmt-1.3.1.tar.gz
/libstoragemgmt-1.3.2.tar.gz
/libstoragemgmt-1.3.5.tar.gz
/libstoragemgmt-1.4.0.tar.gz
/libstoragemgmt-1.5.0.tar.gz
/libstoragemgmt-1.6.0.tar.gz
/libstoragemgmt-1.6.1.tar.gz
/libstoragemgmt-1.6.2.tar.gz
/libstoragemgmt-1.7.0.tar.gz
/libstoragemgmt-1.7.1.tar.gz
/libstoragemgmt-1.7.2.tar.gz
/libstoragemgmt-1.7.3.tar.gz
/libstoragemgmt-1.8.0.tar.gz
/libstoragemgmt-1.8.2.tar.gz
/libstoragemgmt-1.8.3.tar.gz
/libstoragemgmt-1.8.4.tar.gz
/libstoragemgmt-1.8.5.tar.gz
/libstoragemgmt-1.8.6.tar.gz
/libstoragemgmt-1.8.7.tar.gz
/libstoragemgmt-1.8.8.tar.gz
/libstoragemgmt-1.9.0.tar.gz
/libstoragemgmt-1.9.1.tar.gz
/libstoragemgmt-1.9.2.tar.gz
/libstoragemgmt-1.9.3.tar.gz
/libstoragemgmt-1.9.4.tar.gz
/libstoragemgmt-1.9.5.tar.gz
/libstoragemgmt-1.9.6.tar.gz
/libstoragemgmt-1.9.7.tar.gz
/libstoragemgmt-1.9.8.tar.gz
/libstoragemgmt-1.10.1.tar.gz

View File

@ -1,9 +0,0 @@
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 -

View File

@ -1,13 +0,0 @@
diff --git a/plugin/megaraid_plugin/megaraid.py b/plugin/megaraid_plugin/megaraid.py
index 748bdba..0210235 100644
--- a/plugin/megaraid_plugin/megaraid.py
+++ b/plugin/megaraid_plugin/megaraid.py
@@ -791,7 +791,7 @@ def volume_raid_info(self, volume, flags=Client.FLAG_RSVD):
int(vd_prop_info['Span Depth']))
elif raid_type == Volume.RAID_TYPE_RAID10:
strip_count = (
- int(vd_prop_info['Number of Drives Per Span']) / 2 *
+ int_div(int(vd_prop_info['Number of Drives Per Span']), 2) *
int(vd_prop_info['Span Depth']))
else:
# MegaRAID does not support 15 or 16 yet.

View File

@ -1,120 +0,0 @@
diff --git a/configure.ac b/configure.ac
index 02ecc4c..0a2316a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,9 +106,6 @@ fi
dnl Availability of various common headers (non-fatal if missing).
AC_CHECK_HEADERS([dlfcn.h])
-#Check for openssl development libs, we are using in simc_lsmplugin
-AC_CHECK_LIB([crypto], [MD5_Final], [SSL_LIBS=-lcrypto], AC_MSG_ERROR([Missing openssl-devel libraries]))
-AC_SUBST([SSL_LIBS])
#Check for sqlite development libs for simc_lsmplugin
PKG_CHECK_MODULES([SQLITE3], [sqlite3])
diff --git a/packaging/libstoragemgmt.spec.in b/packaging/libstoragemgmt.spec.in
index 4c19606..6148cb5 100644
--- a/packaging/libstoragemgmt.spec.in
+++ b/packaging/libstoragemgmt.spec.in
@@ -27,7 +27,6 @@ Obsoletes: %{name}-nfs-plugin-clibs < %{version}-%{release}
BuildRequires: gcc gcc-c++
BuildRequires: autoconf automake libtool libxml2-devel check-devel perl-interpreter
-BuildRequires: openssl-devel
BuildRequires: glib2-devel
BuildRequires: systemd
BuildRequires: bash-completion
diff --git a/plugin/sim_plugin/simarray.py b/plugin/sim_plugin/simarray.py
index c39f5f0..c5471bb 100644
--- a/plugin/sim_plugin/simarray.py
+++ b/plugin/sim_plugin/simarray.py
@@ -130,7 +130,7 @@ def data_disk_count(raid_type, disk_count):
class BackStore(object):
VERSION = "4.1"
- VERSION_SIGNATURE = 'LSM_SIMULATOR_DATA_%s_%s' % (VERSION, md5(VERSION))
+ VERSION_SIGNATURE = 'LSM_SIMULATOR_DATA_%s' % (VERSION)
JOB_DEFAULT_DURATION = 1
JOB_DATA_TYPE_VOL = 1
JOB_DATA_TYPE_FS = 2
diff --git a/plugin/simc/db.c b/plugin/simc/db.c
index 8f8e1e9..fd5b797 100644
--- a/plugin/simc/db.c
+++ b/plugin/simc/db.c
@@ -354,13 +354,8 @@ out:
}
static const char *_sys_version(void) {
- char version_md5[_MD5_HASH_STR_LEN];
-
- _md5(_DB_VERSION, version_md5);
-
- snprintf(_SYS_VERSION, _BUFF_SIZE, "%s_%s_%s", _DB_VERSION_STR_PREFIX,
- _DB_VERSION, version_md5);
-
+ snprintf(_SYS_VERSION, _BUFF_SIZE, "%s_%s", _DB_VERSION_STR_PREFIX,
+ _DB_VERSION);
return _SYS_VERSION;
}
diff --git a/plugin/simc/simc_lsmplugin.c b/plugin/simc/simc_lsmplugin.c
index 5eea918..13e0166 100644
--- a/plugin/simc/simc_lsmplugin.c
+++ b/plugin/simc/simc_lsmplugin.c
@@ -20,7 +20,6 @@
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
-#include <openssl/md5.h>
#include <sqlite3.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/plugin/simc/utils.c b/plugin/simc/utils.c
index 99cbef7..616ea75 100644
--- a/plugin/simc/utils.c
+++ b/plugin/simc/utils.c
@@ -49,19 +49,6 @@ int _get_db_from_plugin_ptr(char *err_msg, lsm_plugin_ptr c, sqlite3 **db) {
return rc;
}
-void _md5(const char *data, char *out_hash) {
- int i = 0;
- unsigned char digest[MD5_DIGEST_LENGTH];
-
- assert(data != NULL);
- assert(out_hash != NULL);
-
- MD5((const unsigned char *)data, strlen(data), digest);
-
- for (; i < MD5_DIGEST_LENGTH; ++i)
- sprintf(out_hash + i * 2, "%02x", (unsigned int)digest[i]);
-}
-
/*
* Copy from c_binding/utils.c, will remove if that was exposed out.
*/
diff --git a/plugin/simc/utils.h b/plugin/simc/utils.h
index f018b0a..30c9bb8 100644
--- a/plugin/simc/utils.h
+++ b/plugin/simc/utils.h
@@ -19,7 +19,6 @@
#ifndef _SIMC_UTILS_H_
#define _SIMC_UTILS_H_
-#include <openssl/md5.h>
#include <sqlite3.h>
#include <stdbool.h>
#include <stdlib.h>
@@ -145,12 +144,6 @@ struct _simc_private_data {
}
int _get_db_from_plugin_ptr(char *err_msg, lsm_plugin_ptr c, sqlite3 **db);
-/*
- * data: Non-NULL pointer to a string.
- * out_hash: Pointer to char[_MD5_HASH_STR_LEN]
- */
-void _md5(const char *data, char *out_hash);
-
/*
* true if file exists or false.
*/

View File

@ -1,16 +0,0 @@
diff --git a/test/cmdtest.py.in b/test/cmdtest.py.in
index 0764318..e4f4f77 100755
--- a/test/cmdtest.py.in
+++ b/test/cmdtest.py.in
@@ -64,7 +64,10 @@ def random_iqn():
"""Logic taken from anaconda library"""
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'))

View File

@ -1,37 +0,0 @@
diff --git a/plugin/nfs_plugin/nfs.py b/plugin/nfs_plugin/nfs.py
index be1abdb..944d136 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 1508972..e09be49 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()

View File

@ -1,12 +0,0 @@
diff --git a/tools/lsmcli/cmdline.py b/tools/lsmcli/cmdline.py
index ae249b8..6698c53 100644
--- a/tools/lsmcli/cmdline.py
+++ b/tools/lsmcli/cmdline.py
@@ -1228,6 +1228,7 @@ def cli(self):
_add_common_options(parser, is_child=False)
subparsers = parser.add_subparsers(metavar="command")
+ subparsers.required = True
# Walk the command list and add all of them to the parser
for cmd in cmds:

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

View File

@ -1,29 +1,27 @@
%bcond_with test %bcond_with test
Name: libstoragemgmt Name: libstoragemgmt
Version: 1.9.1 Version: 1.10.1
Release: 7%{?dist} Release: 4%{?dist}.alma.1
Summary: Storage array management library Summary: Storage array management library
Group: System Environment/Libraries License: LGPL-2.1-or-later
License: LGPLv2+
URL: https://github.com/libstorage/libstoragemgmt URL: https://github.com/libstorage/libstoragemgmt
Source0: https://github.com/libstorage/libstoragemgmt/releases/download/%{version}/%{name}-%{version}.tar.gz Source0: https://github.com/libstorage/libstoragemgmt/releases/download/%{version}/%{name}-%{version}.tar.gz
Patch0: BZ_1710776_change_run_dir.patch Requires: python3-%{name}%{_isa}
Patch1: BZ_2018657_correct_raid10_info.patch Requires: ledmon-libs
Patch2: RHEL-397_part1_remove_openssl_usage.patch
Patch3: RHEL-397_part2_cmdtest_correct_hashlib.md5_usage.patch ExcludeArch: i686
Patch4: RHEL-397_part3_correction_fips_error_lib.patch
Patch5: RHEL-397_part4_require_subparsers.patch
Requires: python3-%{name}%{_isa} = %{version}-%{release}
# Packages that have been removed # Packages that have been removed
Obsoletes: %{name}-netapp-plugin <= 1.6.2-10 Obsoletes: %{name}-netapp-plugin <= 1.6.2-10
Provides: %{name}-netapp-plugin <= 1.6.2-10 Provides: %{name}-netapp-plugin <= 1.6.2-10
Obsoletes: %{name}-nstor-plugin <= 1.9.0-1 Obsoletes: %{name}-nstor-plugin <= 1.9.0-1
Provides: %{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: 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: glib2-devel
BuildRequires: systemd BuildRequires: systemd
BuildRequires: bash-completion BuildRequires: bash-completion
@ -33,11 +31,13 @@ BuildRequires: procps
BuildRequires: sqlite-devel BuildRequires: sqlite-devel
BuildRequires: python3-six BuildRequires: python3-six
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: ledmon-devel
%{?systemd_requires} %{?systemd_requires}
BuildRequires: systemd systemd-devel BuildRequires: systemd systemd-devel
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: valgrind
%description %description
The libStorageMgmt library will provide a vendor agnostic open source storage The libStorageMgmt library will provide a vendor agnostic open source storage
@ -48,7 +48,6 @@ executing plug-ins in a separate process (lsmd).
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel %description devel
@ -57,8 +56,9 @@ developing applications that use %{name}.
%package -n python3-%{name} %package -n python3-%{name}
Summary: Python 3 client libraries and plug-in support for %{name} Summary: Python 3 client libraries and plug-in support for %{name}
Group: System Environment/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: python3-six
# If obsoleted packages are installed, we need to meet it's requirement # If obsoleted packages are installed, we need to meet it's requirement
# of having the correct version of this package functionality installed too as # of having the correct version of this package functionality installed too as
# the update occurs first, before the obsolete removes the obsoleted package. # the update occurs first, before the obsolete removes the obsoleted package.
@ -74,26 +74,8 @@ Obsoletes: python3-%{name}-clibs <= 1.9.0-1
This contains python 3 client libraries as well as python framework This contains python 3 client libraries as well as python framework
support and open source plug-ins written in python 3. support and open source plug-ins written in python 3.
%package smis-plugin
Summary: Files for SMI-S generic array support for %{name}
Group: System Environment/Libraries
BuildRequires: python3-pywbem
Requires: python3-pywbem
BuildArch: noarch
Provides: %{name}-ibm-v7k-plugin <= 2:1.9.1-1
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 %package targetd-plugin
Summary: Files for targetd array support for %{name} Summary: Files for targetd array support for %{name}
Group: System Environment/Libraries
Requires: python3-%{name} = %{version} Requires: python3-%{name} = %{version}
Requires(post): python3-%{name} = %{version} Requires(post): python3-%{name} = %{version}
Requires(postun): python3-%{name} = %{version} Requires(postun): python3-%{name} = %{version}
@ -105,7 +87,6 @@ support.
%package udev %package udev
Summary: Udev files for %{name} Summary: Udev files for %{name}
Group: System Environment/Base
%description udev %description udev
The %{name}-udev package contains udev rules and helper utilities for The %{name}-udev package contains udev rules and helper utilities for
@ -113,7 +94,6 @@ uevents generated by the kernel.
%package megaraid-plugin %package megaraid-plugin
Summary: Files for LSI MegaRAID support for %{name} Summary: Files for LSI MegaRAID support for %{name}
Group: System Environment/Libraries
Requires: python3-%{name} = %{version} Requires: python3-%{name} = %{version}
Requires(post): python3-%{name} = %{version} Requires(post): python3-%{name} = %{version}
Requires(postun): python3-%{name} = %{version} Requires(postun): python3-%{name} = %{version}
@ -125,7 +105,6 @@ MegaRAID storage management via storcli.
%package hpsa-plugin %package hpsa-plugin
Summary: Files for HP SmartArray support for %{name} Summary: Files for HP SmartArray support for %{name}
Group: System Environment/Libraries
Requires: python3-%{name} = %{version} Requires: python3-%{name} = %{version}
Requires(post): python3-%{name} = %{version} Requires(post): python3-%{name} = %{version}
Requires(postun): python3-%{name} = %{version} Requires(postun): python3-%{name} = %{version}
@ -137,7 +116,6 @@ SmartArray storage management via hpssacli.
%package arcconf-plugin %package arcconf-plugin
Summary: Files for Microsemi Adaptec and Smart Family support for %{name} Summary: Files for Microsemi Adaptec and Smart Family support for %{name}
Group: System Environment/Libraries
Requires: python3-%{name} = %{version} Requires: python3-%{name} = %{version}
Requires(post): python3-%{name} = %{version} Requires(post): python3-%{name} = %{version}
Requires(postun): python3-%{name} = %{version} Requires(postun): python3-%{name} = %{version}
@ -149,13 +127,9 @@ Adaptec RAID and Smart Family Controller storage management.
%package nfs-plugin %package nfs-plugin
Summary: Files for NFS local filesystem support for %{name} Summary: Files for NFS local filesystem support for %{name}
Group: System Environment/Libraries
Requires: python3-%{name} = %{version} Requires: python3-%{name} = %{version}
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: nfs-utils Requires: nfs-utils
Obsoletes: %{name}-nfs-plugin-clibs <= 1.9.0-1
Provides: %{name}-nfs-plugin-clibs <= 1.9.0-1
Requires(post): python3-%{name} = %{version} Requires(post): python3-%{name} = %{version}
Requires(postun): python3-%{name} = %{version} Requires(postun): python3-%{name} = %{version}
@ -164,7 +138,6 @@ The nfs-plugin package contains plug-in for local NFS exports support.
%package local-plugin %package local-plugin
Summary: Files for local pseudo plugin of %{name} Summary: Files for local pseudo plugin of %{name}
Group: System Environment/Libraries
Requires: python3-%{name} = %{version} Requires: python3-%{name} = %{version}
Requires: %{name}-arcconf-plugin = %{version}-%{release} Requires: %{name}-arcconf-plugin = %{version}-%{release}
Requires: %{name}-hpsa-plugin = %{version}-%{release} Requires: %{name}-hpsa-plugin = %{version}-%{release}
@ -182,17 +155,13 @@ plugin selection for locally managed storage.
%build %build
./autogen.sh ./autogen.sh
%configure PYTHON=%{__python3} --with-python3 --disable-static \ %configure --with-python3 --disable-static --without-smispy
%if %{without test} %make_build
--without-test
%endif
V=1 make %{?_smp_mflags}
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
make install DESTDIR=%{buildroot} %make_install
find %{buildroot} -name '*.la' -exec rm -f {} ';' find %{buildroot} -name '*.la' -exec rm -f {} ';'
@ -203,19 +172,6 @@ install -m 644 tools/udev/90-scsi-ua.rules \
install -m 755 tools/udev/scan-scsi-target \ install -m 755 tools/udev/scan-scsi-target \
%{buildroot}/%{_udevrulesdir}/../scan-scsi-target %{buildroot}/%{_udevrulesdir}/../scan-scsi-target
# Fix shebangs using the proper %%{__python3} macro
pathfix.py -pni "%{__python3}" \
%{buildroot}/usr/bin/nfs_lsmplugin \
%{buildroot}/usr/bin/lsmcli \
%{buildroot}/usr/bin/arcconf_lsmplugin \
%{buildroot}/usr/bin/targetd_lsmplugin \
%{buildroot}/usr/bin/sim_lsmplugin \
%{buildroot}/usr/bin/megaraid_lsmplugin \
%{buildroot}/usr/bin/hpsa_lsmplugin \
%{buildroot}/usr/bin/local_lsmplugin \
%{buildroot}/usr/bin/smispy_lsmplugin
%if 0%{with test} %if 0%{with test}
%check %check
if ! make check if ! make check
@ -223,13 +179,13 @@ then
cat test-suite.log || true cat test-suite.log || true
exit 1 exit 1
fi fi
%endif %endif
%pre %pre
getent group libstoragemgmt >/dev/null || groupadd -r libstoragemgmt
getent passwd libstoragemgmt >/dev/null || \ echo 'u libstoragemgmt - "daemon account for libstoragemgmt"' | \
useradd -r -g libstoragemgmt -d /var/run/lsm -s /sbin/nologin \ systemd-sysusers --replace=/usr/lib/sysusers.d/libstoragemgmt.conf -
-c "daemon account for libstoragemgmt" libstoragemgmt
%post %post
/sbin/ldconfig /sbin/ldconfig
@ -244,19 +200,6 @@ getent passwd libstoragemgmt >/dev/null || \
/sbin/ldconfig /sbin/ldconfig
%systemd_postun %{name}.service %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. # Need to restart lsmd if plugin is new installed or removed.
%post targetd-plugin %post targetd-plugin
if [ $1 -eq 1 ]; then if [ $1 -eq 1 ]; then
@ -331,7 +274,6 @@ if [ $1 -eq 0 ]; then
fi fi
%files %files
%defattr(-,root,root,-)
%doc README COPYING.LIB NEWS %doc README COPYING.LIB NEWS
%{_mandir}/man1/lsmcli.1* %{_mandir}/man1/lsmcli.1*
%{_mandir}/man1/lsmd.1* %{_mandir}/man1/lsmd.1*
@ -354,7 +296,6 @@ fi
%attr(0644, root, root) %{_tmpfilesdir}/%{name}.conf %attr(0644, root, root) %{_tmpfilesdir}/%{name}.conf
%files devel %files devel
%defattr(-,root,root,-)
%{_includedir}/* %{_includedir}/*
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}.pc
@ -393,27 +334,7 @@ fi
%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/sim.conf %config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/sim.conf
%{_mandir}/man1/sim_lsmplugin.1* %{_mandir}/man1/sim_lsmplugin.1*
%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.*
%{_bindir}/smispy_lsmplugin
%{_mandir}/man1/smispy_lsmplugin.1*
%files targetd-plugin %files targetd-plugin
%defattr(-,root,root,-)
%dir %{python3_sitelib}/targetd_plugin %dir %{python3_sitelib}/targetd_plugin
%dir %{python3_sitelib}/targetd_plugin/__pycache__ %dir %{python3_sitelib}/targetd_plugin/__pycache__
%{python3_sitelib}/targetd_plugin/__pycache__/* %{python3_sitelib}/targetd_plugin/__pycache__/*
@ -423,12 +344,10 @@ fi
%{_mandir}/man1/targetd_lsmplugin.1* %{_mandir}/man1/targetd_lsmplugin.1*
%files udev %files udev
%defattr(-,root,root,-)
%{_udevrulesdir}/../scan-scsi-target %{_udevrulesdir}/../scan-scsi-target
%{_udevrulesdir}/90-scsi-ua.rules %{_udevrulesdir}/90-scsi-ua.rules
%files megaraid-plugin %files megaraid-plugin
%defattr(-,root,root,-)
%dir %{python3_sitelib}/megaraid_plugin %dir %{python3_sitelib}/megaraid_plugin
%dir %{python3_sitelib}/megaraid_plugin/__pycache__ %dir %{python3_sitelib}/megaraid_plugin/__pycache__
%{python3_sitelib}/megaraid_plugin/__pycache__/* %{python3_sitelib}/megaraid_plugin/__pycache__/*
@ -440,7 +359,6 @@ fi
%{_mandir}/man1/megaraid_lsmplugin.1* %{_mandir}/man1/megaraid_lsmplugin.1*
%files hpsa-plugin %files hpsa-plugin
%defattr(-,root,root,-)
%dir %{python3_sitelib}/hpsa_plugin %dir %{python3_sitelib}/hpsa_plugin
%dir %{python3_sitelib}/hpsa_plugin/__pycache__ %dir %{python3_sitelib}/hpsa_plugin/__pycache__
%{python3_sitelib}/hpsa_plugin/__pycache__/* %{python3_sitelib}/hpsa_plugin/__pycache__/*
@ -452,7 +370,6 @@ fi
%{_mandir}/man1/hpsa_lsmplugin.1* %{_mandir}/man1/hpsa_lsmplugin.1*
%files nfs-plugin %files nfs-plugin
%defattr(-,root,root,-)
%dir %{python3_sitearch}/nfs_plugin %dir %{python3_sitearch}/nfs_plugin
%dir %{python3_sitearch}/nfs_plugin/__pycache__ %dir %{python3_sitearch}/nfs_plugin/__pycache__
%{python3_sitearch}/nfs_plugin/__pycache__/* %{python3_sitearch}/nfs_plugin/__pycache__/*
@ -464,7 +381,6 @@ fi
%{_mandir}/man1/nfs_lsmplugin.1* %{_mandir}/man1/nfs_lsmplugin.1*
%files arcconf-plugin %files arcconf-plugin
%defattr(-,root,root,-)
%dir %{python3_sitelib}/arcconf_plugin %dir %{python3_sitelib}/arcconf_plugin
%dir %{python3_sitelib}/arcconf_plugin/__pycache__ %dir %{python3_sitelib}/arcconf_plugin/__pycache__
%{python3_sitelib}/arcconf_plugin/__pycache__/* %{python3_sitelib}/arcconf_plugin/__pycache__/*
@ -476,7 +392,6 @@ fi
%{_mandir}/man1/arcconf_lsmplugin.1* %{_mandir}/man1/arcconf_lsmplugin.1*
%files local-plugin %files local-plugin
%defattr(-,root,root,-)
%dir %{python3_sitelib}/local_plugin %dir %{python3_sitelib}/local_plugin
%dir %{python3_sitelib}/local_plugin/__pycache__ %dir %{python3_sitelib}/local_plugin/__pycache__
%{python3_sitelib}/local_plugin/__pycache__/* %{python3_sitelib}/local_plugin/__pycache__/*
@ -487,96 +402,210 @@ fi
%{_mandir}/man1/local_lsmplugin.1* %{_mandir}/man1/local_lsmplugin.1*
%changelog %changelog
* Thu Jun 29 2023 Tony Asleson <tasleson@redhat.com> - 1.9.1-7 * Tue Feb 10 2026 Eduard Abdullin <eabdullin@almalinux.org> - 1.10.1-4.alma.1
- Remove valgrind dependency as not being used and causing - Exclude i686 architecture from build
build to fail as it pulls in python3.11
* Tue Jun 27 2023 Tony Asleson <tasleson@redhat.com> - 1.9.1-6 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.10.1-4
- Fix subparsers - Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Tue Jun 27 2023 Tony Asleson <tasleson@redhat.com> - 1.9.1-5 * Thu Aug 8 2024 Tony Asleson <tasleson@redhat.com> - 1.10.1-3
- Add missing test yaml configuration file - Remove smis plugin sub package
* Wed Jun 21 2023 Tony Asleson <tasleson@redhat.com> - 1.9.1-4 * Wed Jul 17 2024 Tony Asleson <tasleson@redhat.com> - 1.10.1-2
- RHEL-397 fips related corrections - Add gating.yaml
* Fri Nov 12 2021 Tony Asleson <tasleson@redhat.com> - 1.9.1-3 * Mon Jul 15 2024 Tony Asleson <tasleson@redhat.com> - 1.10.1-1
- Correct rpmdiff warnings - Upgrade to 1.10.1
- RHBZ #2018657
* Tue Nov 9 2021 Tony Asleson <tasleson@redhat.com> - 1.9.1-2 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.9.8-7
- Correct megaraid raid info (RHBZ #2018657) - 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
* Mon Feb 20 2023 Tony Asleson <tasleson@redhat.com> - 1.9.7-1
- Upgrade to 1.9.7
* 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
* Mon Aug 9 2021 Tony Asleson <tasleson@redhat.com> - 1.9.2-4
- Add missing requirement for python six library
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* 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
* Tue Apr 20 2021 Tony Asleson <tasleson@redhat.com> - 1.9.1-1 * Tue Apr 20 2021 Tony Asleson <tasleson@redhat.com> - 1.9.1-1
- Upgrade to 1.9.1 - Upgrade to 1.9.1
* Wed Apr 14 2021 Tony Asleson <tasleson@redhat.com> - 1.9.0-2 * Thu Mar 25 2021 Tony Asleson <tasleson@redhat.com> - 1.9.0-1
- Re-order dependencies - Upgrade to 1.9.0
- Correct multi-lib issue with python simulator files location
* Tue Mar 30 2021 Tony Asleson <tasleson@redhat.com> - 1.9.0-1 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-3
- Upgrade to 1.9.0 (RHBZ #1939191) - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jan 25 2021 Tony Asleson <tasleson@redhat.com> - 1.8.8-2
- Disable test
* Tue Dec 15 2020 Tony Asleson <tasleson@redhat.com> - 1.8.8-1
- Upgrade to 1.8.8 which removes a couple of plugins and reorg.
the plugin install directories.
* Thu Dec 3 2020 Tony Asleson <tasleson@redhat.com> - 1.8.7-1 * Thu Dec 3 2020 Tony Asleson <tasleson@redhat.com> - 1.8.7-1
- Upgrade to 1.8.7 (RHBZ #1817117) - Upgrade to 1.8.7
* Thu Nov 5 2020 Tony Asleson <tasleson@redhat.com> - 1.8.6-1 * Mon Nov 2 2020 Tony Asleson <tasleson@redhat.com> - 1.8.6-1
- Upgrade to 1.8.6 (RHBZ #1817117) - Upgrade to 1.8.6
* Wed Jul 1 2020 Tony Asleson <tasleson@redhat.com> - 1.8.3-2 * Thu Oct 1 2020 Tony Asleson <tasleson@redhat.com> - 1.8.5-3
- Version bump for (RHBZ #1792447) - Remove pywbem version check as its not needed and breaks
now that epoch is used in it.
* Thu Feb 13 2020 Tony Asleson <tasleson@redhat.com> - 1.8.3-1 * Fri Sep 4 2020 Tony Asleson <tasleson@redhat.com> - 1.8.5-2
- Upgrade to 1.8.3 (RHBZ #1741288) - Fix test compile error for i386
* Thu Feb 13 2020 Tony Asleson <tasleson@redhat.com> - 1.8.1-4 * Tue Aug 11 2020 Tony Asleson <tasleson@redhat.com> - 1.8.5-1
- Fix dnf groupinstall base (RHBZ #1792370) - Upgrade to 1.8.5
- Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1864052
* Wed Oct 30 2019 Tony Asleson <tasleson@redhat.com> - 1.8.1-3 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.4-5
- Correct rpm -V (RHBZ #1726209) - Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Jun 13 2019 Tony Asleson <tasleson@redhat.com> - 1.8.1-2 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.4-4
- Correct gating.yaml (RHBZ #1720284) - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jun 11 2019 Tony Asleson <tasleson@redhat.com> - 1.8.1-1 * Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 1.8.4-3
- Obsolete the netapp plugin. - Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Fri May 24 2019 Tony Asleson <tasleson@redhat.com> - 1.8.1-0 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.8.4-2
- Upgrade to 1.8.1 - Rebuilt for Python 3.9
* Wed May 22 2019 Tony Asleson <tasleson@redhat.com> - 1.6.2-11 * Thu May 21 2020 Tony Asleson <tasleson@redhat.com> - 1.8.4-1
- Fix tmpfiles run directory (RHBZ #1710776) - Upgrade to 1.8.4
- Add nfs-utils dependency (RHBZ #1657407)
* Tue Oct 16 2018 Tony Asleson <tasleson@redhat.com> - 1.6.2-10 * Wed Feb 12 2020 Tony Asleson <tasleson@redhat.com> - 1.8.3-1
- Remove NetApp Ontap plugin. (RHBZ #1626415) - Upgrade to 1.8.3
* Tue Sep 25 2018 Gris Ge <fge@redhat.com> - 1.6.2-9 * Mon Feb 10 2020 Tony Asleson <tasleson@redhat.com> - 1.8.2-3
- Fix the manapge of lsmd.conf. (RHBZ #1612755) - Correct python clib packages to include ISA for correct dependencies
* Tue Sep 18 2018 Gris Ge <fge@redhat.com> - 1.6.2-8 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-2
- Fix the `rpm -V` failures. (RHBZ #1630114) - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Sep 18 2018 Gris Ge <fge@redhat.com> - 1.6.2-7 * Tue Dec 10 2019 Tony Asleson <tasleson@redhat.com> - 1.8.2-1
- Upgrade to 1.8.2
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.8.0-4
- Rebuilt for Python 3.8.0rc1 (#1748018)
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.8.0-3
- Rebuilt for Python 3.8
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Apr 17 2019 Tony Asleson <tasleson@redhat.com> - 1.8.0-1
- Upgrade to 1.8.0
* Mon Feb 18 2019 Tony Asleson <tasleson@redhat.com> - 1.7.3-1
- Upgrade to 1.7.3
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Dec 19 2018 Tony Asleson <tasleson@redhat.com> - 1.7.2-1
- Upgrade to 1.7.2
* Tue Nov 6 2018 Tony Asleson <tasleson@redhat.com> - 1.7.1-1
- Upgrade to 1.7.1
* Wed Oct 31 2018 Tony Asleson <tasleson@redhat.com> - 1.7.0-1
- Upgrade to 1.7.0
* Tue Sep 18 2018 Gris Ge <fge@redhat.com> - 1.6.2-10
- Add explicit package version requirement to libstoragemgmt-nfs-plugin-clibs. - Add explicit package version requirement to libstoragemgmt-nfs-plugin-clibs.
* Mon Sep 03 2018 Gris Ge <fge@redhat.com> - 1.6.2-6 * Mon Sep 17 2018 Gris Ge <fge@redhat.com> - 1.6.2-9
- Move lsm utils to /usr/libexec/lsm.d folder. (RHBZ #1623506) - Fix the `rpm -V` failures. (RHBZ #1629735, the same issue also in Fedora)
* Mon Sep 03 2018 Gris Ge <fge@redhat.com> - 1.6.2-5 * Tue Jul 24 2018 Adam Williamson <awilliam@redhat.com> - 1.6.2-8
- Removed the dependency of yajl. (RHBZ #1560205) - Rebuild for new libconfig
* Fri Aug 10 2018 Gris Ge <fge@redhat.com> 1.6.2-4 * Tue Jul 24 2018 Gris Ge <fge@redhat.com> - 1.6.2-7
- Removed the requirement of initscripts. - Add missing gcc gcc-c++ build requirements.
- Remove python2 sub-packages.
* Fri Aug 3 2018 Florian Weimer <fweimer@redhat.com> - 1.6.2-3 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-6
- Honor %%{valgrind_arches} - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
- De-configure the test suite unless building with testing
* Tue Jul 03 2018 Tomas Orsava <torsava@redhat.com> - 1.6.2-2 * Tue Jun 26 2018 Gris Ge <fge@redhat.com> - 1.6.2-5
- Switch hardcoded python3 path into the %%{__python3} macro - Fix lscmli on python 3.7.
- Fix shebangs accordingly
* Tue Jun 26 2018 Gris Ge <fge@redhat.com> - 1.6.2-4
- Rebuild again with --target=f29-python.
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.6.2-3
- Rebuilt for Python 3.7
* Mon Jun 18 2018 Gris Ge <fge@redhat.com> - 1.6.2-2
- Removed the requirement of initscripts. (RHBZ 1592363)
* Fri May 18 2018 Gris Ge <fge@redhat.com> - 1.6.2-1 * Fri May 18 2018 Gris Ge <fge@redhat.com> - 1.6.2-1
- Upgrade to 1.6.2. - Upgrade to 1.6.2.

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (libstoragemgmt-1.10.1.tar.gz) = 17d1ed40abde5218aea7e1e6a99c9e7105e76c9746f8647fa27424991f100b4ac16de502bef865549e4f4c7d582860bb6466eb0b3fdc646ed64a043ad6ae6742

21
tests/tests.yml Normal file
View File

@ -0,0 +1,21 @@
- hosts: localhost
roles:
- role: standard-test-basic
tags:
- classic
tests:
- simple:
dir: ./libstoragemgmt/test/
run: ./integration.sh
required_packages:
- libstoragemgmt
- libstoragemgmt-arcconf-plugin
- libstoragemgmt-hpsa-plugin
- libstoragemgmt-local-plugin
- libstoragemgmt-megaraid-plugin
- libstoragemgmt-nfs-plugin
- libstoragemgmt-targetd-plugin
- libstoragemgmt-udev
repositories:
- repo: "https://github.com/libstorage/libstoragemgmt.git"
dest: "libstoragemgmt"