From 48c8f47887169c92062cd154ed161540f598f6a6 Mon Sep 17 00:00:00 2001
From: Bryan Gurney <bgurney@redhat.com>
Date: Wed, 17 May 2023 17:05:16 -0400
Subject: [PATCH] Update to 3.5.5

Signed-off-by: Bryan Gurney <bgurney@redhat.com>
---
 .gitignore      |  3 +++
 sources         |  6 +++---
 stratisd.spec   | 26 +++++++++++++-------------
 tests/tests.yml |  2 +-
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index fd62092..74eb380 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,3 +87,6 @@
 /stratisd-3.5.4.tar.gz
 /stratisd-3.5.4-vendor.tar.gz
 /stratisd-3.5.4.crate
+/stratisd-3.5.5.tar.gz
+/stratisd-3.5.5-vendor.tar.gz
+/stratisd-3.5.5.crate
diff --git a/sources b/sources
index 40c7f6b..3bb0391 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (stratisd-3.5.4.tar.gz) = 0fff8e4c9e23396e1778cb618d16bd3fd6cc36cc70a21b8b09c4a04ff3c6f1fe4635b9bc877aba3d751f7f0e9a725d80a04bc048cc3e27043b279fa488b361cb
-SHA512 (stratisd-3.5.4-vendor.tar.gz) = 2c8433713bcdcec73703506e5f254b43cf238f676a3bb31d2d44c9acb85dc3f22f590a24dc03f6e8ecfd6edfc09aadf316371de463a6f083adf14b88d82523b0
-SHA512 (stratisd-3.5.4.crate) = 7825b6cfc575a3aaf05cfdbcce077c3b40228b6c37f6c580f54115049b6e17fbb4f72fbc7dee6f04d0651144803f2bbed5746edc6a1cf0b37a99513fadce9fc5
+SHA512 (stratisd-3.5.5.tar.gz) = 9ed5381b5301c1b2795ab55d76914af5befd7795911851acf1fc97a67b414d241d50acb0e00119944274f4ca1a8fff79b1797ddc3b35ea678b6fa181fd6ce48e
+SHA512 (stratisd-3.5.5-vendor.tar.gz) = b79f706cb638f10381b68963a34cce005f299186edf372d08c7044c21a7e1b0da95cb8fcaf34cf802ed0dc54b7e71d0f4310bc43ce1fb0e43fc3c306fb59d931
+SHA512 (stratisd-3.5.5.crate) = c003c7fd35a93c0aa57e064b03cc59ac668c575b748cb8b7a8ef0139e6f0b9f6ada544aead0240481c0c9a8b6ba2f259c8851d03e4c9498de22f05633ea3dfca
diff --git a/stratisd.spec b/stratisd.spec
index da52353..df03eb2 100644
--- a/stratisd.spec
+++ b/stratisd.spec
@@ -4,20 +4,11 @@
 %global dracutdir %(pkg-config --variable=dracutdir dracut)
 
 Name:           stratisd
-Version:        3.5.4
-Release:        3%{?dist}
+Version:        3.5.5
+Release:        1%{?dist}
 Summary:        Daemon that manages block devices to create filesystems
 
-# ASL 2.0
-# ASL 2.0 or Boost
-# ASL 2.0 or MIT
-# BSD
-# ISC
-# MIT
-# MIT or ASL 2.0
-# MPLv2.0
-# Unlicense or MIT
-License:        MPLv2.0 and ASL 2.0 and BSD and MIT
+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
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:        %{url}/releases/download/v%{version}/%{name}-%{version}-vendor.tar.gz
@@ -102,7 +93,7 @@ tar --strip-components=1 --extract --verbose --file %{SOURCE2}
 %else
 %cargo_prep
 %generate_buildrequires
-%cargo_generate_buildrequires -f engine,dbus_enabled,min,systemd_compat,extras
+%cargo_generate_buildrequires -f engine,dbus_enabled,min,systemd_compat,extras,udev_scripts
 %endif
 
 %build
@@ -113,6 +104,8 @@ tar --strip-components=1 --extract --verbose --file %{SOURCE2}
 %{__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
 %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} 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
@@ -148,6 +141,10 @@ a2x -f manpage docs/stratis-dumpmetadata.txt
 
 %files
 %license LICENSE
+%if 0%{?rhel}
+%else
+%license LICENSE.dependencies
+%endif
 %doc README.md
 %{_libexecdir}/stratisd
 %dir %{_datadir}/dbus-1
@@ -183,6 +180,9 @@ a2x -f manpage docs/stratis-dumpmetadata.txt
 %{_mandir}/man8/stratis-dumpmetadata.8*
 
 %changelog
+* 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
 
diff --git a/tests/tests.yml b/tests/tests.yml
index d0b74f5..c5807aa 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -15,4 +15,4 @@
     repositories:
       - repo: "https://github.com/stratis-storage/testing.git"
         dest: "testing"
-        version: "v3.5.1"
+        version: "v3.5.2"