From c7f203313a87e07d80d9a40c23d84b956ed90cab Mon Sep 17 00:00:00 2001
From: Chung Chung <cchung@redhat.com>
Date: Wed, 14 May 2025 12:50:32 -0400
Subject: [PATCH] Update to 3.8.1

Resolves: RHEL-71909

Signed-off-by: Chung Chung <cchung@redhat.com>
---
 .gitignore     |  2 ++
 plans/unit.fmf |  2 +-
 sources        |  4 ++--
 stratisd.spec  | 29 +++++++++--------------------
 4 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index c7bbd5c..0b18b8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -120,3 +120,5 @@
 /stratisd-3.7.2-vendor.tar.gz
 /stratisd-3.7.3.tar.gz
 /stratisd-3.7.3-vendor.tar.gz
+/stratisd-3.8.1.tar.gz
+/stratisd-3.8.1-vendor.tar.gz
diff --git a/plans/unit.fmf b/plans/unit.fmf
index a5a2b68..3c0c57f 100644
--- a/plans/unit.fmf
+++ b/plans/unit.fmf
@@ -13,7 +13,7 @@ prepare:
 discover:
   how: shell
   url: https://github.com/stratis-storage/testing.git
-  ref: v3.7.1
+  ref: v3.8.0
   tests:
     - name: unit
       test: python3 stratisd_cert.py -v
diff --git a/sources b/sources
index fcec61b..6323dc9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (stratisd-3.7.3.tar.gz) = 546a5de8b7f8a8ad638d2b8e6653a0d518e225b8babd4530292808f00739ecc576cc098c1f7fc906181c8e3e298836b9d75c42feea18c9222a89c7a74c3cc8fd
-SHA512 (stratisd-3.7.3-vendor.tar.gz) = e731cb3ec4ea2b9fd5db21b216d09c84f7dcec5a94fe827d5b8523c5b444d1ce6ebb4319cb0a9eeb255e766bd01f8ec0a98d7601ebd643fdfc780c801e35dec2
+SHA512 (stratisd-3.8.1.tar.gz) = 263402f8f75db0788f863a5d58b52f32617b704adfff88a90e80afb8ce1371f3430d8d7be9f0ab65d01652d8b1f0808e003e26b135f87304abc68112275ea5c7
+SHA512 (stratisd-3.8.1-vendor.tar.gz) = ea8526126b34f519c4b630e78d8ed25f40b69f8ad667a2831b8b87ef24eb555cc4c1e4074b9eae0c1699671a4fe15fc399e69917c0e00161c0ce1b131a596c1d
diff --git a/stratisd.spec b/stratisd.spec
index 173f6c5..55b002f 100644
--- a/stratisd.spec
+++ b/stratisd.spec
@@ -4,8 +4,8 @@
 %global dracutdir %(pkg-config --variable=dracutdir dracut)
 
 Name:           stratisd
-Version:        3.7.3
-Release:        2%{?dist}
+Version:        3.8.1
+Release:        1%{?dist}
 Summary:        Daemon that manages block devices to create filesystems
 
 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)
@@ -85,10 +85,8 @@ Requires:     stratisd
 %prep
 %autosetup -n stratisd-stratisd-v%{version} %{?rhel:-a1}
 
-%if 0%{?rhel} >= 10
+%if 0%{?rhel}
 %cargo_prep -v vendor
-%elif 0%{?rhel} && 0%{?rhel} < 10
-%cargo_prep -V 1
 %else
 %cargo_prep
 %generate_buildrequires
@@ -96,25 +94,15 @@ Requires:     stratisd
 %endif
 
 %build
-%if 0%{?rhel} && 0%{?rhel} < 10
-%{__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} 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} build %{?_smp_mflags} --release --bin=stratisd-tools --no-default-features --features engine,extras,min
-%else
 %{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=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-base32-decode --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static
-%{__cargo} build %{?__cargo_common_opts} --release --bin=stratisd-tools --no-default-features --features engine,extras,min
-%endif
+%{__cargo} build %{?__cargo_common_opts} --release --bin=stratisd-tools --no-default-features --features engine,extras
 a2x -f manpage docs/stratisd.txt
 a2x -f manpage docs/stratis-dumpmetadata.txt
-%if 0%{?rhel} >= 10
 %{cargo_vendor_manifest}
-%endif
 
 %install
 %make_install DRACUTDIR=%{dracutdir} PROFILEDIR=release
@@ -139,12 +127,8 @@ a2x -f manpage docs/stratis-dumpmetadata.txt
 
 %files
 %license LICENSE
-%if !(0%{?rhel} && 0%{?rhel} < 10)
 %license LICENSE.dependencies
-%endif
-%if 0%{?rhel} >= 10
 %license cargo-vendor.txt
-%endif
 %doc README.md
 %{_libexecdir}/stratisd
 %dir %{_datadir}/dbus-1
@@ -158,6 +142,7 @@ a2x -f manpage docs/stratis-dumpmetadata.txt
 %{_bindir}/stratis-predict-usage
 %{_unitdir}/stratisd-min-postinitrd.service
 %{_unitdir}/stratis-fstab-setup@.service
+%{_unitdir}/stratis-fstab-setup-with-network@.service
 %{_bindir}/stratis-min
 %{_libexecdir}/stratisd-min
 %{_bindir}/stratis-decode-dm
@@ -182,6 +167,10 @@ a2x -f manpage docs/stratis-dumpmetadata.txt
 %{_mandir}/man8/stratis-dumpmetadata.8*
 
 %changelog
+* Tue May 13 2025 Chung Chung <cchung@redhat.com> - 3.8.1-1
+- Update to 3.8.1
+  Resolves: RHEL-71909
+
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.7.3-2
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018