5 changed files with 200 additions and 79 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,3 @@
-SOURCES/sid-0.0.4.tar.gz
+/sid-0.0.4.tar.gz
+/sid-0.0.5.tar.gz
+/sid-0.0.6.tar.gz
--- a/.sid.metadata
+++ b/.sid.metadata
@ -1 +0,0 @@
-706c6b93b14fe4563fc6cedc3f141f5b957643ca SOURCES/sid-0.0.4.tar.gz
--- a/SOURCES/sid-0-0-5-modules-ucmd-dm_mpath-sync-with-mpath_valid-changes.patch
+++ b/SOURCES/sid-0-0-5-modules-ucmd-dm_mpath-sync-with-mpath_valid-changes.patch
@ -1,26 +0,0 @@
-commit 8bb6f6fd35342ab070d1a8a8ac4f2dbd18b7c063
-Author: Peter Rajnoha <prajnoha@redhat.com>
-Date:   Mon Jan 25 10:42:45 2021 +0100
-
-    modules: ucmd: dm_mpath: sync with mpath_valid changes
-    
-    Use symbolic MPATH_LOG_PRIO_NOLOG (instead of '-1') and MPATH_LOG_STDERR
-    (instead of MPATH_LOG_STDOUT which was removed) for mpathvalid_init
-    call.
---
- src/modules/ucmd/block/dm_mpath/dm_mpath.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/ucmd/block/dm_mpath/dm_mpath.c b/src/modules/ucmd/block/dm_mpath/dm_mpath.c
-index 2c474b6..a31fee0 100644
--- a/src/modules/ucmd/block/dm_mpath/dm_mpath.c
-+++ b/src/modules/ucmd/block/dm_mpath/dm_mpath.c
-@@ -39,7 +39,7 @@ static int _dm_mpath_init(struct module *module, struct sid_ucmd_mod_ctx *ucmd_m
- {
- 	log_debug(MID, "init");
- 	/* TODO - set up dm/udev logging */
-	if (mpathvalid_init(-1, MPATH_LOG_STDIO)) {
-+	if (mpathvalid_init(MPATH_LOG_PRIO_NOLOG, MPATH_LOG_STDERR)) {
- 		log_error(MID, "failed to initialize mpathvalid");
- 		return -1;
- 	}
--- a/SPECS/sid.spec
+++ b/SPECS/sid.spec
@ -3,7 +3,11 @@
 %{?commit:%global commitdate 20200828}
 %{?commit:%global scmsnap %{commitdate}git%{shortcommit}}

-%global enable_dm_mpath_support 1
+%global enable_mod_dummies 1
+%global enable_mod_block_blkid 1
+%global enable_mod_block_dm_mpath 1
+%global enable_mod_type_dm 1
+%global enable_mod_type_dm__lvm 1

 ##############################################################################
 # SID
@ -13,11 +17,11 @@ Name: sid
 %if 0%{?rhel}
 Epoch: %{rhel}
 %endif
-Version: 0.0.4
-Release: 6%{?scmsnap:.%{scmsnap}}%{?dist}
+Version: 0.0.6
+Release: 2%{?scmsnap:.%{scmsnap}}%{?dist}
 Summary: Storage Instantiation Daemon (SID)

-License: GPLv2+
+License: GPL-2.0-or-later
 URL: http://sid-project.github.io
 %if %{defined commit}
 Source0: https://github.com/sid-project/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
@ -25,26 +29,25 @@ Source0: https://github.com/sid-project/%{name}/archive/%{commit}/%{name}-%{shor
 Source0: https://github.com/sid-project/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
 %endif

-Patch0: sid-0-0-5-modules-ucmd-dm_mpath-sync-with-mpath_valid-changes.patch
-
-BuildRequires: make
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: gperf
 BuildRequires: libtool
+BuildRequires: multilib-rpm-config
 BuildRequires: gcc
 BuildRequires: systemd-rpm-macros
 BuildRequires: systemd-devel >= 221
 BuildRequires: libudev-devel >= 174
 BuildRequires: libuuid-devel
+%if %{enable_mod_block_blkid}
 BuildRequires: libblkid-devel
-%if %{enable_dm_mpath_support}
+%endif
+%if %{enable_mod_block_dm_mpath}
 BuildRequires: device-mapper-multipath-devel >= 0.8.4-7
 %endif

 Requires: systemd
 Requires: systemd-udev
-Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release}
-Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release}
 Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release}
 Requires: %{name}-tools = %{?epoch}:%{version}-%{release}

@ -63,13 +66,40 @@ of devices and their layers in the stack.
 %autosetup -p1 -n sid-%{version}
 %endif

-%if ! %{enable_dm_mpath_support}
-%global configure_dm_mpath --disable-mod-dm_mpath
+%if %{enable_mod_block_blkid}
+%global configure_mod_block_blkid --enable-mod-block-blkid
+%else
+%global configure_mod_block_dm_mpath --disable-mod-block-blkid
+%endif
+
+%if %{enable_mod_block_dm_mpath}
+%global configure_mod_block_dm_mpath --enable-mod-block-dm_mpath
+%else
+%global configure_mod_block_dm_mpath --disable-mod-block-dm_mpath
+%endif
+
+%if %{enable_mod_type_dm}
+%global configure_mod_type_dm --enable-mod-type-dm
+%else
+%global configure_mod_type_dm --disable-mod-type-dm
+%endif
+
+%if %{enable_mod_type_dm__lvm}
+%global configure_mod_type_dm__lvm --enable-mod-type-dm-lvm
+%else
+%global configure_mod_type_dm__lvm --disable-mod-type-dm-lvm
+%endif
+
+%if %{enable_mod_dummies}
+%global configure_mod_dummies --enable-mod-block-dummy --enable-mod-type-dummy
+%else
+%global configure_mod_dummies --disable-mod-block-dummy --disable-mod-type-dummy
 %endif

 %build
-./autogen.sh
-%configure %{?configure_dm_mpath}
+autoreconf -ivf
+%configure %{?configure_mod_block_blkid} %{?configure_mod_block_dm_mpath} %{?configure_mod_type_dm} %{?configure_mod_type_dm__lvm} %{?configure_mod_dummies}
+
 %make_build

 %install
@ -77,9 +107,10 @@ make DESTDIR=%{buildroot} install
 rm -f %{buildroot}/%{_libdir}/sid/*.{a,la}
 rm -f %{buildroot}/%{_libdir}/sid/modules/ucmd/block/*.{a,la}
 rm -f %{buildroot}/%{_libdir}/sid/modules/ucmd/type/*.{a,la}
+rm -f %{buildroot}/%{_libdir}/sid/modules/ucmd/type/dm/*.{a,la}

 %files
-%license COPYING
+%license COPYING BSD_LICENSE
 %{_sbindir}/sid
 %config(noreplace) %{_sysconfdir}/sysconfig/sid.sysconfig
 %{_udevrulesdir}/00-sid.rules
@ -103,12 +134,12 @@ rm -f %{buildroot}/%{_libdir}/sid/modules/ucmd/type/*.{a,la}

 %package base-libs
 Summary: Libraries for Storage Instantiation Daemon (SID) base
-License: GPLv2+
+License: GPL-2.0-or-later AND BSD-3-Clause
 %description base-libs
 This package contains shared libraries with low-level functionality needed for
 Storage Instantiation Daemon (SID), its modules and related tools. Currently,
-it contains basic support for bitmaps, buffering, IPC, hashing, lists, memory
-handling and other helper functions.
+it contains basic support for buffering, IPC, base64 encoding and other helper
+functions.

 %files base-libs
 %dir %{_libdir}/sid
@ -122,7 +153,7 @@ handling and other helper functions.

 %package base-libs-devel
 Summary: Development files for Storage Instantiation Daemon (SID) base
-License: GPLv2+
+License: GPL-2.0-or-later AND BSD-3-Clause
 Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release}
 %description base-libs-devel
 This package contains development files for Storage Instantiation Daemon (SID)
@ -132,26 +163,67 @@ base libraries.
 %dir %{_libdir}/sid
 %{_libdir}/sid/libsidbase.so
 %dir %{_includedir}/sid
-%{_includedir}/sid/config.h
 %dir %{_includedir}/sid/base
-%{_includedir}/sid/base/bitmap.h
+%{_includedir}/sid/base/binary.h
 %{_includedir}/sid/base/buffer-common.h
+%{_includedir}/sid/base/buffer-type.h
 %{_includedir}/sid/base/buffer.h
-%{_includedir}/sid/base/common.h
 %{_includedir}/sid/base/comms.h
-%{_includedir}/sid/base/list.h
-%{_includedir}/sid/base/mem.h
 %{_includedir}/sid/base/util.h
 %doc README.md


+##############################################################################
+# SID-INTERNAL-LIBS
+##############################################################################
+
+%package internal-libs
+Summary: Development files for Storage Instantiation Daemon (SID) internal
+License: GPL-2.0-or-later AND BSD-3-Clause
+Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release}
+%description internal-libs
+This package contains shared libraries with low-level functionality needed for
+Storage Instantiation Daemon (SID) and its modules. Currently, it contains
+basic support for bitmaps, hashing, lists, memory handling and other helper
+functions.
+
+%files internal-libs
+%dir %{_libdir}/sid
+%{_libdir}/sid/libsidinternal.so.*
+%doc README.md
+
+
+##############################################################################
+# SID-INTERNAL-LIBS-DEVEL
+##############################################################################
+%package internal-libs-devel
+Summary: Development files for Storage Instantiation Daemon (SID) internal
+License: GPL-2.0-or-later AND BSD-3-Clause
+%description internal-libs-devel
+This package contains development files for Storage Instantiation Daemon (SID)
+internal libraries.
+
+%files internal-libs-devel
+%dir %{_includedir}/sid/internal
+%{_includedir}/sid/internal/bitmap.h
+%{_includedir}/sid/internal/bptree.h
+%{_includedir}/sid/internal/common.h
+%{_includedir}/sid/internal/comp-attrs.h
+%{_includedir}/sid/internal/formatter.h
+%{_includedir}/sid/internal/hash.h
+%{_includedir}/sid/internal/list.h
+%{_includedir}/sid/internal/mem.h
+%{_includedir}/sid/internal/util.h
+%{_libdir}/sid/libsidinternal.so
+
+
 ##############################################################################
 # SID-LOG-LIBS
 ##############################################################################

 %package log-libs
 Summary: Libraries for Storage Instantiation Daemon (SID) logging
-License: GPLv2+
+License: GPL-2.0-or-later
 %description log-libs
 This package contains shared libraries with logging support needed for Storage
 Instantiation daemon (SID), its modules and related tools.
@ -168,7 +240,7 @@ Instantiation daemon (SID), its modules and related tools.

 %package log-libs-devel
 Summary: Development files for Storage Instantiation Daemon (SID) logging
-License: GPLv2+
+License: GPL-2.0-or-later
 Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release}
 %description log-libs-devel
 This package contains development files for Storage Instantiation Daemon (SID)
@ -189,8 +261,9 @@ logging libraries.

 %package iface-libs
 Summary: Libraries for Storage Instantiation Daemon (SID) interfaces
-License: GPLv2+
-Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release}
+License: GPL-2.0-or-later
+Requires: %{name}-internal-libs%{?_isa} = %{?epoch}:%{version}-%{release}
+Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release}
 %description iface-libs
 This package contains shared libraries to support interfaces used in Storage
 Instantiation Daemon (SID), its modules and related tools.
@ -198,7 +271,7 @@ Instantiation Daemon (SID), its modules and related tools.
 %files iface-libs
 %dir %{_libdir}/sid
 %{_libdir}/sid/libsidiface_servicelink.so.*
-%{_libdir}/sid/libsidiface_usid.so.*
+%{_libdir}/sid/libsidiface.so.*
 %doc README.md


@ -208,7 +281,7 @@ Instantiation Daemon (SID), its modules and related tools.

 %package iface-libs-devel
 Summary: Development files for Storage Instantiation Daemon (SID) interfaces
-License: GPLv2+
+License: GPL-2.0-or-later
 Requires: %{name}-iface-libs%{?_isa} = %{?epoch}:%{version}-%{release}
 %description iface-libs-devel
 This package contains development files for Storage Instantiation Daemon (SID)
@ -217,11 +290,12 @@ interface libraries.
 %files iface-libs-devel
 %dir %{_libdir}/sid
 %{_libdir}/sid/libsidiface_servicelink.so
-%{_libdir}/sid/libsidiface_usid.so
+%{_libdir}/sid/libsidiface.so
 %dir %{_includedir}/sid
 %dir %{_includedir}/sid/iface
 %{_includedir}/sid/iface/service-link.h
-%{_includedir}/sid/iface/usid.h
+%{_includedir}/sid/iface/iface.h
+%{_includedir}/sid/iface/iface_internal.h
 %doc README.md


@ -231,9 +305,8 @@ interface libraries.

 %package resource-libs
 Summary: Libraries for Storage Instantiation Daemon (SID) resources
-License: GPLv2+
-Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release}
-Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release}
+License: GPL-2.0-or-later
+Requires: %{name}-internal-libs%{?_isa} = %{?epoch}:%{version}-%{release}
 Requires: %{name}-iface-libs%{?_isa} = %{?epoch}:%{version}-%{release}
 # Systemd supports event loop since v221
 Requires: systemd-libs >= 221
@ -256,7 +329,7 @@ control, bridging SID core and udev and creating an instance of SID as a whole.

 %package resource-libs-devel
 Summary: Development files for Storage Instantiation Daemon (SID) resources
-License: GPLv2+
+License: GPL-2.0-or-later
 Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release}
 %description resource-libs-devel
 This package contains development files for Storage Instantiation Daemon (SID)
@ -273,6 +346,7 @@ resource libraries.
 %{_includedir}/sid/resource/resource-type-regs.h
 %{_includedir}/sid/resource/resource.h
 %{_includedir}/sid/resource/ucmd-module.h
+%{_includedir}/sid/resource/ubridge.h
 %{_includedir}/sid/resource/worker-control.h
 %doc README.md

@ -283,8 +357,6 @@ resource libraries.

 %package tools
 Summary: Storage Instantiation Daemon (SID) supporting tools
-Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release}
-Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release}
 Requires: %{name}-iface-libs%{?_isa} = %{?epoch}:%{version}-%{release}
 Requires: systemd-udev
 %description tools
@ -292,6 +364,7 @@ This package contains tools to support Storage Instantiation Daemon (SID).


 %files tools
+%{_sbindir}/sidctl
 %{_udevrulesdir}/../usid
 %doc README.md

@ -299,9 +372,11 @@ This package contains tools to support Storage Instantiation Daemon (SID).
 ##############################################################################
 # SID-MOD-DUMMIES
 ##############################################################################
+
+%if %{enable_mod_dummies}
+
 %package mod-dummies
 Summary: Dummy block and type module for Storage Instantiation Daemon (SID)
-Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release}
 Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release}
 %description mod-dummies
 This package contains dummy block and type modules for Storage Instantiation
@ -318,14 +393,17 @@ execution.
 %{_libdir}/sid/modules/ucmd/type/dummy_type.so
 %doc README.md

+%endif
+

 ##############################################################################
 # SID-MOD-BLOCK-BLKID
 ##############################################################################

+%if %{enable_mod_block_blkid}
+
 %package mod-block-blkid
 Summary: Blkid block module for Storage Instantiation Daemon (SID)
-Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release}
 Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release}
 %description mod-block-blkid
 This package contains blkid block module for Storage Instantiation Daemon (SID).
@ -338,16 +416,17 @@ This package contains blkid block module for Storage Instantiation Daemon (SID).
 %{_libdir}/sid/modules/ucmd/block/blkid.so
 %doc README.md

+%endif
+

 ##############################################################################
 # SID-MOD-BLOCK-DM_MPATH
 ##############################################################################

-%if %{enable_dm_mpath_support}
+%if %{enable_mod_block_dm_mpath}

 %package mod-block-dm-mpath
 Summary: Device-mapper multipath block module for Storage Instantiation Daemon (SID)
-Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release}
 Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release}
 Requires: device-mapper-multipath-libs >= 0.8.4-7
 %description mod-block-dm-mpath
@ -365,19 +444,85 @@ Instantiation Daemon (SID).
 %endif


+##############################################################################
+# SID-MOD-TYPE-DM
+##############################################################################
+
+%if %{enable_mod_type_dm}
+
+%package mod-type-dm
+Summary: Device-mapper type module for Storage Instantiation Daemon (SID)
+Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release}
+%description mod-type-dm
+This package contains device-mapper type module for Storage Instantiation
+Daemon (SID).
+
+%files mod-type-dm
+%dir %{_libdir}/sid
+%dir %{_libdir}/sid/modules
+%dir %{_libdir}/sid/modules/ucmd
+%dir %{_libdir}/sid/modules/ucmd/type
+%dir %{_libdir}/sid/modules/ucmd/type/dm
+%{_libdir}/sid/modules/ucmd/type/dm.so
+%doc README.md
+
+%endif
+
+
+##############################################################################
+# SID-MOD-TYPE-DM-LVM
+##############################################################################
+
+%if %{enable_mod_type_dm__lvm}
+
+%package mod-type-dm-lvm
+Summary: LVM type module for Storage Instantiation Daemon (SID)
+Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release}
+Requires: %{name}-mod-type-dm%{?_isa} = %{?epoch}:%{version}-%{release}
+%description mod-type-dm-lvm
+This package contains LVM type module for Storage Instantiation
+Daemon (SID).
+
+%files mod-type-dm-lvm
+%{_libdir}/sid/modules/ucmd/type/dm/lvm.so
+%doc README.md
+
+%endif
+
+
 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 8:0.0.4-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 9:0.0.6-2
+- Bump release for June 2024 mass rebuild

-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 8:0.0.4-5
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Fri Feb 9 2024 Peter Rajnoha <prajnoha@redhat.com> - 0.0.6-1
+- Update to latest upstream release.

-* Fri Jan 29 2021 Peter Rajnoha <prajnoha@redhat.com> - 0.0.4-4
- Add epoch to rpm spec file for RHEL-based releases.
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.5-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

-* Fri Jan 29 2021 Peter Rajnoha <prajnoha@redhat.com> - 0.0.4-3
- Sync with mpath_valid changes.
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.5-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Jan 03 2023 Peter Rajnoha <prajnoha@redhat.com> - 0.0.5-6
+- Use SPDX values for License fields in RPM spec file.
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri May 14 2021 Timm Bäder <tbaeder@redhat.com> - 0.0.5-2
+- Use make_install macro
+
+* Tue Apr 06 2021 Peter Rajnoha <prajnoha@redhat.com> - 0.0.5-1
+- Update to latest upstream release.

 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA512 (sid-0.0.6.tar.gz) = f10e4caf19439731f12933aac8c819cc7f32dd44259af2bf8189b8ee63eddc4a94a6ca6ec8c211d80ad9aec11e1f0192c89a7b264bb8b57b8cd22de90466d628
				`@ -1 +0,0 @@`
				`706c6b93b14fe4563fc6cedc3f141f5b957643ca SOURCES/sid-0.0.4.tar.gz`
				`@ -0,0 +1 @@`
				`SHA512 (sid-0.0.6.tar.gz) = f10e4caf19439731f12933aac8c819cc7f32dd44259af2bf8189b8ee63eddc4a94a6ca6ec8c211d80ad9aec11e1f0192c89a7b264bb8b57b8cd22de90466d628`