From e26f74545442d811a18b36c2d579f646204d1426 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 8 Jan 2024 17:03:05 +0000 Subject: [PATCH] Rebuild for fixed dependencies --- fdo-bump-devicemapper-libcryptosetup.patch | 46 ++++++++++++++++++++++ fido-device-onboard.spec | 7 +++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 fdo-bump-devicemapper-libcryptosetup.patch diff --git a/fdo-bump-devicemapper-libcryptosetup.patch b/fdo-bump-devicemapper-libcryptosetup.patch new file mode 100644 index 0000000..d60c168 --- /dev/null +++ b/fdo-bump-devicemapper-libcryptosetup.patch @@ -0,0 +1,46 @@ +From 90bb88a24ddf9292150f7de6eeb2f93b0a793acf Mon Sep 17 00:00:00 2001 +From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> +Date: Fri, 27 Oct 2023 10:52:23 +0000 +Subject: [PATCH] chore: bump devicemapper from 0.33.5 to 0.34.0 + +Bumps [devicemapper](https://github.com/stratis-storage/devicemapper-rs) from 0.33.5 to 0.34.0. +- [Release notes](https://github.com/stratis-storage/devicemapper-rs/releases) +- [Changelog](https://github.com/stratis-storage/devicemapper-rs/blob/master/CHANGES.txt) +- [Commits](https://github.com/stratis-storage/devicemapper-rs/compare/v0.33.5...devicemapper-v0.34.0) + +--- +updated-dependencies: +- dependency-name: devicemapper + dependency-type: direct:production + update-type: version-update:semver-minor +... + +Signed-off-by: dependabot[bot] +--- + client-linuxapp/Cargo.toml | 2 +- + 2 files changed, 48 insertions(+), 26 deletions(-) + +diff --git a/client-linuxapp/Cargo.toml b/client-linuxapp/Cargo.toml +index ee362913..9df5fe96 100644 +--- a/client-linuxapp/Cargo.toml ++++ b/client-linuxapp/Cargo.toml +@@ -18,7 +18,7 @@ uuid = "1.3" + thiserror = "1" + libcryptsetup-rs = { version = "0.8.0", features = ["mutex"] } + secrecy = "0.8" +-devicemapper = "0.33" ++devicemapper = "0.34" + openssl = "0.10.55" + + fdo-data-formats = { path = "../data-formats", version = "0.4.12" } +--- fido-device-onboard-rs-0.4.12/client-linuxapp/Cargo.toml.orig 2023-12-03 22:30:29.457047282 +0000 ++++ fido-device-onboard-rs-0.4.12/client-linuxapp/Cargo.toml 2023-12-03 22:30:36.901090510 +0000 +@@ -17,7 +17,7 @@ + nix = "0.26" + uuid = "1.3" + thiserror = "1" +-libcryptsetup-rs = { version = "0.8.0", features = ["mutex"] } ++libcryptsetup-rs = { version = "0.9.0", features = ["mutex"] } + secrecy = "0.8" + devicemapper = "0.34" + openssl = "0.10.55" diff --git a/fido-device-onboard.spec b/fido-device-onboard.spec index e801be5..98a8b82 100644 --- a/fido-device-onboard.spec +++ b/fido-device-onboard.spec @@ -4,7 +4,7 @@ Name: fido-device-onboard Version: 0.4.12 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A rust implementation of the FIDO Device Onboard Specification License: BSD-3-Clause @@ -16,6 +16,7 @@ Patch0: 0001-hack-drop-shadow.patch Patch1: 0001-fix-drop-unused-sha-crypt-dep.patch Patch2: fix-devmapper-version.patch Patch3: 0001-fix-relabel-devcreds-before-onboarding.patch +Patch4: fdo-bump-devicemapper-libcryptosetup.patch # Because nobody cares ExcludeArch: %{ix86} @@ -41,6 +42,7 @@ BuildRequires: tpm2-tss-devel %patch0 -p1 %patch1 -p1 %patch3 -p1 +%patch4 -p1 %if 0%{?rhel} %patch2 -p1 @@ -270,6 +272,9 @@ Requires: fdo-init = %{version}-%{release} %systemd_postun_with_restart fdo-aio.service %changelog +* Mon Jan 08 2024 Peter Robinson - 0.4.12-6 +- Rebuild for fixed dependencies + * Fri Dec 01 2023 Fabio Valentini - 0.4.12-5 - Rebuild for openssl crate >= v0.10.60 (RUSTSEC-2023-0044, RUSTSEC-2023-0072)