From e56d7854982e73a76afa1bdbe6080687a3ef753d Mon Sep 17 00:00:00 2001
From: Bryan Gurney <bgurney@redhat.com>
Date: Wed, 24 Apr 2024 11:06:34 -0400
Subject: [PATCH] Update to 3.6.7

Resolves: RHEL-33817

Signed-off-by: Bryan Gurney <bgurney@redhat.com>
---
 .gitignore    |  2 ++
 sources       |  5 ++---
 stratisd.spec | 48 ++++++++++++++++++++----------------------------
 3 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3fc9097..bf63e23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,3 +114,5 @@
 /stratisd-3.6.4.tar.gz
 /stratisd-3.6.4-vendor.tar.gz
 /stratisd-3.6.4.crate
+/stratisd-3.6.7.tar.gz
+/stratisd-3.6.7-vendor.tar.gz
diff --git a/sources b/sources
index 428a6ed..0aee0bf 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (stratisd-3.6.4.tar.gz) = 56256c1a59643909019d17389663a17bae6081ef2275069ddf3c26904a6b73e52fcacb15ff7b2563c4e2d832a77049b740b8db01674cfc5f2d851bd20d18e50e
-SHA512 (stratisd-3.6.4-vendor.tar.gz) = 670ea05665996ba20fd8a29d40c9d88a0e0caf3e0bda580492f245afaaba5fc5a2acf557dc8b46ad2a1fca8fe7e10dc9456416168a92b2633c204d07e9f1473f
-SHA512 (stratisd-3.6.4.crate) = e1ec278def811ff614a132b2812e9f8ee4817782a67502ad169a581d637fa6064b2644d098a15edcd5150cf118c3b344b928fff4840e2735b1f0e8d5b02aea3c
+SHA512 (stratisd-3.6.7.tar.gz) = 613f5b191c9cec3a857e05d544600c974d024afc6274c7a4c0d8f24e52a7c4609becbdf4b991764318a773ac2dbe9ab55cc71aef8dc29171621449465311f74e
+SHA512 (stratisd-3.6.7-vendor.tar.gz) = ab6fb63170722c10fdc1f289828cecca04900102fccffa006399ab417bf54af70e3007b743bc1fa0933b81d614c565935669444717375afe4b4bfb57cd222370
diff --git a/stratisd.spec b/stratisd.spec
index 8ef654f..87543fe 100644
--- a/stratisd.spec
+++ b/stratisd.spec
@@ -4,7 +4,7 @@
 %global dracutdir %(pkg-config --variable=dracutdir dracut)
 
 Name:           stratisd
-Version:        3.6.4
+Version:        3.6.7
 Release:        1%{?dist}
 Summary:        Daemon that manages block devices to create filesystems
 
@@ -12,7 +12,6 @@ License:        (MIT OR Apache-2.0) AND Unicode-DFS-2016 AND Apache-2.0 AND (Apa
 URL:            https://github.com/stratis-storage/stratisd
 Source0:        %{url}/archive/stratisd-v%{version}/%{name}-%{version}.tar.gz
 Source1:        %{url}/releases/download/stratisd-v%{version}/%{name}-%{version}-vendor.tar.gz
-Source2:        %{crates_source}
 
 
 ExclusiveArch:  %{rust_arches}
@@ -84,24 +83,11 @@ Requires:     stratisd
 %{summary}.
 
 %prep
-# Rename SOURCE0's top-level directory because it starts with
-# 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 --directory=./stratisd-%{version} --strip-components=1 --extract --overwrite --file %{SOURCE2}
-tar --create --gzip --file %{SOURCE0}.newfile ./stratisd-%{version} --remove-files
-mv %{SOURCE0}.newfile %{SOURCE0}
+%autosetup -n stratisd-stratisd-v%{version} %{?rhel:-a1}
 
-%setup -q
-
-%if 0%{?rhel}
+%if 0%{?rhel} >= 10
+%cargo_prep -v vendor
+%elif 0%{?rhel} && 0%{?rhel} < 10
 %cargo_prep -V 1
 %else
 %cargo_prep
@@ -110,7 +96,7 @@ mv %{SOURCE0}.newfile %{SOURCE0}
 %endif
 
 %build
-%if 0%{?rhel}
+%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
@@ -126,18 +112,18 @@ mv %{SOURCE0}.newfile %{SOURCE0}
 %endif
 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
 
 %if %{with check}
 %check
-# Compile stratisd tests only where package does not use vendoring.
-# This is a temporary step, to address the problem of loopdev crate
-# 0.4.0 failing to build properly in some situations due to a failure of
-# bindgen 0.59.0.
-# See https://github.com/stratis-storage/project/issues/607
-%if !0%{?rhel}
+%if 0%{?rhel} && 0%{?rhel} < 10
+%cargo_test --no-run
+%else
 %cargo_test -- --no-run
 %endif
 %endif
@@ -153,10 +139,12 @@ a2x -f manpage docs/stratis-dumpmetadata.txt
 
 %files
 %license LICENSE
-%if 0%{?rhel}
-%else
+%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
@@ -193,6 +181,10 @@ a2x -f manpage docs/stratis-dumpmetadata.txt
 %{_mandir}/man8/stratis-dumpmetadata.8*
 
 %changelog
+* Wed Apr 24 2024 Bryan Gurney <bgurney@redhat.com> - 3.6.7-1
+- Update to 3.6.7
+- Resolves: RHEL-33817
+
 * Thu Jan 25 2024 Bryan Gurney <bgurney@redhat.com> - 3.6.4-1
 - Update to 3.6.4