@ -4,17 +4,15 @@
%global dracutdir %(pkg-config --variable=dracutdir dracut)
%global dracutdir %(pkg-config --variable=dracutdir dracut)
Name: stratisd
Name: stratisd
Version: 3.5.8
Version: 3.6.7
Release: 1 %{?dist}
Release: 3 %{?dist}
Summary: Daemon that manages block devices to create filesystems
Summary: Daemon that manages block devices to create filesystems
License: MPL-2.0
License: (MIT OR Apache-2.0) AND Unicode-DFS-2016 AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND MIT AND MPL-2.0 AND (Unlicense OR MIT)
URL: https://github.com/stratis-storage/stratisd
URL: https://github.com/stratis-storage/stratisd
Source0: %{url}/archive/stratisd-v%{version}/%{name}-%{version}.tar.gz
Source0: %{url}/archive/stratisd-v%{version}/%{name}-%{version}.tar.gz
Source1: %{url}/releases/download/stratisd-v%{version}/%{name}-%{version}-vendor.tar.gz
Source1: %{url}/releases/download/stratisd-v%{version}/%{name}-%{version}-vendor.tar.gz
Source2: %{crates_source}
Patch0: vendor-serde_derive.patch
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
%if 0%{?rhel}
%if 0%{?rhel}
@ -66,7 +64,7 @@ ExcludeArch: i686
Requires: stratisd
Requires: stratisd
Requires: dracut >= 051
Requires: dracut >= 051
Requires: plymouth
Requires: systemd
%description dracut
%description dracut
%{summary}.
%{summary}.
@ -85,38 +83,12 @@ Requires: stratisd
%{summary}.
%{summary}.
%prep
%prep
# Rename SOURCE0's top-level directory because it starts with
%autosetup -n stratisd-stratisd-v%{version} %{?rhel:-a1}
# stratisd-stratisd-v. GitHub calculates the directory name from the repo name
# + the tag. Extract the upstream crate on top of the extracted GitHub release,
# overwriting changed files. The primary purpose of this step is to ensure that
# the Cargo.toml that is used in building is the one that is generated by
# cargo-publish and cargo-package, not the file with path dependencies that
# GitHub packs up. Tar the overwritten files back up again into a tar file
# with the format and top-level directory that %setup expects cleaning up the
# previously extracted directory and its contents at the same time. Move the
# newly created tar file to the SOURCE0 location.
tar --transform="s/^stratisd\-stratisd-v/stratisd-/" --extract --file %{SOURCE0}
tar --extract --overwrite --file %{SOURCE2}
tar --create --gzip --file %{SOURCE0}.newfile ./stratisd-%{version} --remove-files
mv %{SOURCE0}.newfile %{SOURCE0}
%setup -q
%if 0%{?rhel}
# Untar the vendor tarfile.
tar --extract --file %{SOURCE1}
# Remove pre-compiled procedural macro, compile from source
rm ./vendor/serde_derive/serde_derive-x86_64-unknown-linux-gnu
%patch0 -p1
# Rezip the tarfile
tar --create --gzip --file %{SOURCE1}.newfile ./vendor --remove-files
mv %{SOURCE1}.newfile %{SOURCE1}
%if 0%{?rhel} >= 10
%cargo_prep -v vendor
%elif 0%{?rhel} && 0%{?rhel} < 10
%cargo_prep -V 1
%cargo_prep -V 1
%else
%else
%cargo_prep
%cargo_prep
%generate_buildrequires
%generate_buildrequires
@ -124,35 +96,34 @@ mv %{SOURCE1}.newfile %{SOURCE1}
%endif
%endif
%build
%build
%if 0%{?rhel}
%if 0%{?rhel} && 0%{?rhel} < 10
%{__cargo} build %{?_smp_mflags} --release --bin=stratisd
%{__cargo} build %{?_smp_mflags} --release --bin=stratisd
%{__cargo} build %{?_smp_mflags} --release --bin=stratis-min --bin=stratisd-min --bin=stratis-utils --no-default-features --features engine,min,systemd_compat
%{__cargo} build %{?_smp_mflags} --release --bin=stratis-min --bin=stratisd-min --bin=stratis-utils --no-default-features --features engine,min,systemd_compat
%{__cargo} rustc %{?_smp_mflags} --release --bin=stratis-str-cmp --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static
%{__cargo} rustc %{?_smp_mflags} --release --bin=stratis-str-cmp --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static
%{__cargo} rustc %{?_smp_mflags} --release --bin=stratis-base32-decode --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static
%{__cargo} rustc %{?_smp_mflags} --release --bin=stratis-base32-decode --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static
%{__cargo} build %{?_smp_mflags} --release --bin=stratis-dumpmetadata --no-default-features --features engine,extras,min
%{__cargo} build %{?_smp_mflags} --release --bin=stratisd-tools --no-default-features --features engine,extras,min
%else
%else
%cargo_license_summary -f engine,dbus_enabled,min,systemd_compat,extras,udev_scripts
%{cargo_license -f engine,dbus_enabled,min,systemd_compat,extras,udev_scripts} > LICENSE.dependencies
%{cargo_license -f engine,dbus_enabled,min,systemd_compat,extras,udev_scripts} > LICENSE.dependencies
%{__cargo} build %{?__cargo_common_opts} --release --bin=stratisd
%{__cargo} build %{?__cargo_common_opts} --release --bin=stratisd
%{__cargo} build %{?__cargo_common_opts} --release --bin=stratis-min --bin=stratisd-min --bin=stratis-utils --no-default-features --features engine,min,systemd_compat
%{__cargo} build %{?__cargo_common_opts} --release --bin=stratis-min --bin=stratisd-min --bin=stratis-utils --no-default-features --features engine,min,systemd_compat
%{__cargo} rustc %{?__cargo_common_opts} --release --bin=stratis-str-cmp --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static
%{__cargo} rustc %{?__cargo_common_opts} --release --bin=stratis-str-cmp --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static
%{__cargo} rustc %{?__cargo_common_opts} --release --bin=stratis-base32-decode --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static
%{__cargo} rustc %{?__cargo_common_opts} --release --bin=stratis-base32-decode --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static
%{__cargo} build %{?__cargo_common_opts} --release --bin=stratis-dumpmetadata --no-default-features --features engine,extras,min
%{__cargo} build %{?__cargo_common_opts} --release --bin=stratisd-tools --no-default-features --features engine,extras,min
%endif
%endif
a2x -f manpage docs/stratisd.txt
a2x -f manpage docs/stratisd.txt
a2x -f manpage docs/stratis-dumpmetadata.txt
a2x -f manpage docs/stratis-dumpmetadata.txt
%if 0%{?rhel} >= 10
%{cargo_vendor_manifest}
%endif
%install
%install
%make_install DRACUTDIR=%{dracutdir} PROFILEDIR=release
%make_install DRACUTDIR=%{dracutdir} PROFILEDIR=release
%if %{with check}
%if %{with check}
%check
%check
# Compile stratisd tests only where package does not use vendoring.
%if 0%{?rhel} && 0%{?rhel} < 10
# This is a temporary step, to address the problem of loopdev crate
%cargo_test --no-run
# 0.4.0 failing to build properly in some situations due to a failure of
%else
# bindgen 0.59.0.
# See https://github.com/stratis-storage/project/issues/607
%if !0%{?rhel}
%cargo_test -- --no-run
%cargo_test -- --no-run
%endif
%endif
%endif
%endif
@ -168,10 +139,12 @@ a2x -f manpage docs/stratis-dumpmetadata.txt
%files
%files
%license LICENSE
%license LICENSE
%if 0%{?rhel}
%if !(0%{?rhel} && 0%{?rhel} < 10)
%else
%license LICENSE.dependencies
%license LICENSE.dependencies
%endif
%endif
%if 0%{?rhel} >= 10
%license cargo-vendor.txt
%endif
%doc README.md
%doc README.md
%{_libexecdir}/stratisd
%{_libexecdir}/stratisd
%dir %{_datadir}/dbus-1
%dir %{_datadir}/dbus-1
@ -203,104 +176,248 @@ a2x -f manpage docs/stratis-dumpmetadata.txt
%files tools
%files tools
%license LICENSE
%license LICENSE
%{_bindir}/stratisd-tools
%{_bindir}/stratis-dumpmetadata
%{_bindir}/stratis-dumpmetadata
%{_mandir}/man8/stratis-dumpmetadata.8*
%{_mandir}/man8/stratis-dumpmetadata.8*
%changelog
%changelog
* Mon Jul 31 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.8-1
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.6.7-3
- Refine handling of partially-set-up pools
- Bump release for June 2024 mass rebuild
- Resolves: rhbz#2223409
* Thu Apr 25 2024 Bryan Gurney <bgurney@redhat.com> - 3.6.7-2
* Thu Jun 08 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.7-1
- Rebuild for new gating configuration
- Increase libcryptsetup-rs dependency lower bound to 0.8.0
- Resolves: RHEL-33817
- Resolves: rhbz#2213277
* Wed Apr 24 2024 Bryan Gurney <bgurney@redhat.com> - 3.6.7-1
* Tue May 16 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.5-1
- Update to 3.6.7
- Update to version 3.5.5
- Resolves: RHEL-33817
- Resolves: rhbz#2167463
- Take into account the sector size of crypt devices
* Thu Jan 25 2024 Bryan Gurney <bgurney@redhat.com> - 3.6.4-1
- Resolves: rhbz#2170318
- Update to 3.6.4
- Add stratisd-tools package with stratis-dumpmetadata program
- Resolves: rhbz#2173726
* Thu Nov 30 2023 Bryan Gurney <bgurney@redhat.com> - 3.6.3-1
- Support key description key in kernel keyring
- Update to 3.6.3
- Resolves: rhbz#2038492
* Thu Nov 16 2023 Bryan Gurney <bgurney@redhat.com> - 3.6.2-1
- Update to 3.6.2
* Tue Oct 31 2023 Bryan Gurney <bgurney@redhat.com> - 3.6.1-1
- Update to 3.6.1
* Wed Oct 25 2023 Bryan Gurney <bgurney@redhat.com> - 3.6.0-2
- Use testing tag v3.6.0
* Tue Oct 24 2023 Bryan Gurney <bgurney@redhat.com> - 3.6.0-1
- Update to 3.6.0
* Wed Aug 30 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.9-2
- Use testing tag v3.5.3
- Remove vendor-serde_derive.patch file
* Wed Aug 30 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.9-1
- Update to 3.5.9
- Remove patch macro for serde_derive patch
* Mon Jul 31 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.8-4
- Use patch macro for serde_derive patch
* Fri Jul 28 2023 mulhern <amulhern@redhat.com> - 3.5.8-3
- Patch vendored tarfile to remove executable
* Thu Jul 27 2023 mulhern <amulhern@redhat.com> - 3.5.8-2
- Add additional dependency for TMT tests
* Thu Jul 27 2023 mulhern <amulhern@redhat.com> - 3.5.8-1
- Update to 3.5.8
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jun 14 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.7-2
- Use tmt tests
* Wed Jun 07 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.7-1
- Update to 3.5.7
* Wed May 31 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.5-2
- Rebuild for new libcryptsetup-rs version
* Wed May 17 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.5-1
- Update to 3.5.5
* Wed Apr 26 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.4-3
- Fix up ExclusiveArch directives
* Mon Apr 24 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.4-2
- Update spec file
* Fri Apr 21 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.4-1
- Update to 3.5.4
* Mon Apr 17 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.3-1
- Update to 3.5.3
* Fri Mar 17 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.2-2
- Add BuildRequires for device-mapper-devel
* Fri Mar 17 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.2-1
- Update to 3.5.2
* Tue Feb 28 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.1-3
- Allow annocheck on rpminspect.yaml for non-static binaries
* Mon Feb 20 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.1-2
- Add debuginfo ignore to rpminspect.yaml
* Tue Feb 07 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.1-1
- Update to 3.5.1
* Fri Feb 03 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.0-4
- Remove debuginfo ignore from rpminspect.yaml
* Thu Feb 02 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.0-3
- Remove elf ignore from rpminspect.yaml
* Wed Feb 01 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.0-2
- Update rpminspect.yaml
* Tue Jan 24 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.0-1
- Update to 3.5.0
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Mon Jan 16 2023 Bryan Gurney <bgurney@redhat.com> - 3.4.4-2
- Remove Fedora ELN conditionals from spec file
- Use ExclusiveArch only if RHEL
* Tue Jan 03 2023 Bryan Gurney <bgurney@redhat.com> - 3.4.4-1
* Tue Jan 03 2023 Bryan Gurney <bgurney@redhat.com> - 3.4.4-1
- Use devicemapper-rs version 0.32.3
- Update to 3.4.4
- Resolves: rhbz#2155689
* Fri Dec 16 2022 Bryan Gurney <bgurney@redhat.com> - 3.4.3-1
* Thu Dec 15 2022 Bryan Gurney <bgurney@redhat.com> - 3.4.3-1
- Migrate pool for start pool by name functionality
- Update to 3.4.3
- Resolves: rhbz#2153593
* Tue Dec 06 2022 Bryan Gurney <bgurney@redhat.com> - 3.4.2-1
* Tue Dec 06 2022 Bryan Gurney <bgurney@redhat.com> - 3.4.2-1
- Increase amount of space allocated for thin pool metadata
- Update to 3.4.2
- Resolves: rhbz#2150109
* Tue Nov 29 2022 Bryan Gurney <bgurney@redhat.com> - 3.4.1-1
* Wed Nov 23 2022 Bryan Gurney <bgurney@redhat.com> - 3.4.0-1
- Update to 3.4.1
- Update to version 3.4.0
- Resolves: rhbz#2124976
* Tue Oct 18 2022 Bryan Gurney <bgurney@redhat.com> - 3.3.0-1
- Allow a pool to make use of added capacity of a block device
- Update to 3.3.0
- Resolves: rhbz#2039955
- Enforce per-pool consistency of block device sector sizes
* Sun Aug 28 2022 mulhern <amulhern@redhat.com> - 3.2.3-1
- Resolves: rhbz#2039957
- Update to 3.2.3
- Do not read data from device specified in udev remove event
- Resolves: rhbz#2124681
- Specify pool to start by its name
- Resolves: rhbz#2125012
* Wed Aug 24 2022 Bryan Gurney <bgurney@redhat.com> - 3.2.2-1
* Wed Aug 24 2022 Bryan Gurney <bgurney@redhat.com> - 3.2.2-1
- Fix assertion for migrating from greedy to lazy allocation
- Update to 3.2.2
- Resolves: rhbz#2119537
* Fri Jul 29 2022 mulhern <amulhern@redhat.com> - 3.2.1-1
* Mon Aug 01 2022 Bryan Gurney <bgurney@redhat.com> - 3.2.1-1
- Update to 3.2.1
- Set a per-command ioctl version in device-mapper header
- Resolves: rhbz#2112461
* Wed Jul 27 2022 mulhern <amulhern@redhat.com> - 3.1.2-2
- Run all gating tests that require no devices
* Fri Jul 08 2022 Bryan Gurney <bgurney@redhat.com> - 3.2.0-1
- Add the ability to stop and start pools
* Wed Jul 27 2022 mulhern <amulhern@redhat.com> - 3.1.2-1
- Resolves: rhbz#2039960
- Update to 3.1.2
* Wed Jun 08 2022 Bryan Gurney <bgurney@redhat.com> - 3.1.0-2
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-2
- Increment release number to include bugs fixed in 3.1.0
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
- Resolves: rhbz#2039946
- Pass optional size parameter for new filesystem
* Tue Jul 12 2022 Bryan Gurney <bgurney@redhat.com> - 3.1.1-1
- Resolves: rhbz#1990905
- Update to 3.1.1
- Unify rollback to refresh Clevis info on Clevis bind command
- Resolves: rhbz#2005110
* Fri Jul 01 2022 Bryan Gurney <bgurney@redhat.com> - 3.1.0-5
- Retarget thinpool to cache device when initializing cache
- Refine gating tests to minimal set
- Resolves: rhbz#2007018
- Improve thin provisioning implementation
* Wed Jun 22 2022 Bryan Gurney <bgurney@redhat.com> - 3.1.0-4
- Resolves: rhbz#2040352
- Add gating test
- Verify udev info with libblkid before overwriting
- Resolves: rhbz#2041624
* Mon Jun 06 2022 Bryan Gurney <bgurney@redhat.com> - 3.1.0-3
- Remove buildhost_subdomain section from rpminspect.yaml
* Tue May 31 2022 Bryan Gurney <bgurney@redhat.com> - 3.1.0-1
* Fri Jun 03 2022 Bryan Gurney <bgurney@redhat.com> - 3.1.0-2
- Synchronize spec with upstream unified spec file
- Remove .rust2rpm.conf file
* Wed May 25 2022 mulhern <amulhern@redhat.com> - 3.1.0-1
- Update to 3.1.0
- Update to 3.1.0
- Resolves: rhbz#2039946
- Revise stratisd.spec file to unified format
- Remove old rust2rpm config file
* Fri Aug 20 2021 Bryan Gurney <bgurney@redhat.com> - 2.4.2-3
* Mon Mar 28 2022 mulhern <amulhern@redhat.com> - 3.0.4-11
- Add stratisd to requires for stratisd-dracut
- Fix ${rust_arches}; use long form tar options
- Resolves: rhbz#1996104
* Sat Mar 26 2022 mulhern <amulhern@redhat.com> - 3.0.4-10
- Fix cryptsetup-Requires; add blkid-Requires
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.2-2
* Fri Mar 25 2022 mulhern <amulhern@redhat.com> - 3.0.4-9
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
- Make specfile fully and minimally unified
Related: rhbz#1991688
* Fri Jun 11 2021 Bryan Gurney <bgurney@redhat.com> - 2.4.2-1
* Thu Mar 24 2022 mulhern <amulhern@redhat.com> - 3.0.4-8
- Tidy up BuildRequires
* Thu Mar 24 2022 mulhern <amulhern@redhat.com> - 3.0.4-7
- Remove __cargo_skip_build
* Thu Mar 24 2022 mulhern <amulhern@redhat.com> - 3.0.4-6
- Only build the tests, do not try to run them
* Thu Mar 24 2022 mulhern <amulhern@redhat.com> - 3.0.4-5
- Do not set unused global
* Tue Mar 15 2022 mulhern <amulhern@redhat.com> - 3.0.4-4
- Install two scripts
* Mon Mar 14 2022 mulhern <amulhern@redhat.com> - 3.0.4-3
- Fix the previous revision
* Mon Mar 14 2022 mulhern <amulhern@redhat.com> - 3.0.4-2
- Use upstream crate for Rust source
* Sat Feb 12 2022 mulhern <amulhern@redhat.com> - 3.0.4-1
- Update to 3.0.4
* Mon Feb 7 2022 mulhern <amulhern@redhat.com> - 3.0.3-1
- Update to 3.0.3
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Dec 21 2021 mulhern <amulhern@redhat.com> - 3.0.2-1
- Update to 3.0.2
* Sun Nov 28 2021 mulhern <amulhern@redhat.com> - 2.4.4-1
- Update to 2.4.4
* Tue Oct 19 2021 mulhern <amulhern@redhat.com> - 2.4.2-3
- Rebuilt to include dbus-tree 0.9.2
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jun 1 2021 mulhern <amulhern@redhat.com> - 2.4.2-1
- Update to 2.4.2
- Update to 2.4.2
- Resolves: rhbz#1914315
- Add boot from root support
* Tue May 18 2021 John Baublitz <jbaublitz@redhat.com> - 2.4.1-1
- Resolves: rhbz#1869768
- Update to new release and split dracut modules out into subpackage
* Thu May 13 2021 John Baublitz <jbaublitz@redhat.com> - 2.4.0-4
- Ensure that binaries are installed with proper features enabled
- Ensure that binaries are installed with proper features enabled
- Split dracut modules out to subpackage
- Add additional dependencies in dracut module
* Wed May 12 2021 John Baublitz <jbaublitz@redhat.com> - 2.4.0-3
- Fix installed file paths
* Tue Apr 27 2021 mulhern <amulhern@redhat.com> - 2.4.0-2
- Fixes to previous release
* Tue Apr 27 2021 mulhern <amulhern@redhat.com> - 2.4.0-1
- Update to 2.4.0
* Wed Mar 17 2021 mulhern <amulhern@redhat.com> - 2.3.0-10
- Use external URL for vendored sources
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.0-9
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.3.0-9
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
- Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-8
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
