Merge pull request #621 from nullr0ute/0.5.0-rel

chore: bump for 0.5.0 release
fdo-rs · Feb 20, 2024 · 6e0906a · 6e0906a
2 parents 072e027 + b45961a
commit 6e0906a
Show file tree

Hide file tree

Showing 20 changed files with 150 additions and 75 deletions.
diff --git a/0001-Revert-chore-use-git-fork-for-aws-nitro-enclaves-cos.patch b/0001-Revert-chore-use-git-fork-for-aws-nitro-enclaves-cos.patch
@@ -0,0 +1,40 @@
+From d9554495b54d1f150a85f4e329412ff62728d9c7 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Thu, 15 Feb 2024 12:06:44 +0000
+Subject: [PATCH] Revert "chore: use git fork for aws-nitro-enclaves-cose"
+
+This reverts commit 1ea09e88baee3c47cdc76902f0034d553207d515.
+---
+ data-formats/Cargo.toml | 2 +-
+ http-wrapper/Cargo.toml | 2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+Sdiff --git a/data-formats/Cargo.toml b/data-formats/Cargo.toml
+index 714fc55..6d00eb4 100644
+--- a/data-formats/Cargo.toml
++++ b/data-formats/Cargo.toml
+@@ -17,7 +17,7 @@ serde_cbor = "0.11"
+ serde_repr = "0.1.6"
+ serde_tuple = "0.5"
+ thiserror = "1"
+-aws-nitro-enclaves-cose = { git = "https://github.com/nullr0ute/aws-nitro-enclaves-cose/", rev = "e3938e60d9051690569d1e4fcbe1c0c99d2fafa8" }
++aws-nitro-enclaves-cose = "0.4.0"
+ uuid = "1.3"
+ num-traits = "0.2"
+ num-derive = "0.3"
+diff --git a/http-wrapper/Cargo.toml b/http-wrapper/Cargo.toml
+index 5d4999c..7b98097 100644
+--- a/http-wrapper/Cargo.toml
++++ b/http-wrapper/Cargo.toml
+@@ -20,7 +20,7 @@ openssl = "0.10.60"
+
+ fdo-data-formats = { path = "../data-formats", version = "0.4.13" }
+ fdo-store = { path = "../store", version = "0.4.13" }
+-aws-nitro-enclaves-cose = { git = "https://github.com/nullr0ute/aws-nitro-enclaves-cose/", rev = "e3938e60d9051690569d1e4fcbe1c0c99d2fafa8" }
++aws-nitro-enclaves-cose = "0.4.0"
+
+ # Server-side
+ uuid = { version = "1.3", features = ["v4"], optional = true }
+-- 
+2.43.1
+
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/admin-tool/Cargo.toml b/admin-tool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fdo-admin-tool"
-version = "0.4.13"
+version = "0.5.0"
 authors = ["Antonio Murdaca <runcom@linux.com>"]
 edition = "2018"
 
@@ -21,10 +21,10 @@ pretty_env_logger = "0.5"
 nix = "0.26"
 tokio = { version = "1", features = ["full"] }
 
-fdo-data-formats = { path = "../data-formats", version = "0.4.13" }
-fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["server", "client"] }
-fdo-store = { path = "../store", version = "0.4.13", features = ["directory"] }
-fdo-util = { path = "../util", version = "0.4.13" }
+fdo-data-formats = { path = "../data-formats", version = "0.5.0" }
+fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["server", "client"] }
+fdo-store = { path = "../store", version = "0.5.0", features = ["directory"] }
+fdo-util = { path = "../util", version = "0.5.0" }
 
 [dev-dependencies]
 rand = "0.8"
diff --git a/client-linuxapp/Cargo.toml b/client-linuxapp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fdo-client-linuxapp"
-version = "0.4.13"
+version = "0.5.0"
 authors = ["Patrick Uiterwijk <patrick@puiterwijk.org>"]
 edition = "2018"
 
@@ -21,6 +21,6 @@ secrecy = "0.8"
 devicemapper = "0.34"
 openssl = "0.10.60"
 
-fdo-data-formats = { path = "../data-formats", version = "0.4.13" }
-fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["client"] }
-fdo-util = { path = "../util", version = "0.4.13" }
+fdo-data-formats = { path = "../data-formats", version = "0.5.0" }
+fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["client"] }
+fdo-util = { path = "../util", version = "0.5.0" }
diff --git a/data-formats/Cargo.toml b/data-formats/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fdo-data-formats"
-version = "0.4.13"
+version = "0.5.0"
 authors = ["Patrick Uiterwijk <patrick@puiterwijk.org>"]
 edition = "2018"
 

diff --git a/db/Cargo.toml b/db/Cargo.toml
@@ -1,17 +1,17 @@
 [package]
 name = "fdo-db"
-version = "0.4.13"
+version = "0.5.0"
 edition = "2021"
 
 
 [dependencies]
 anyhow = "1.0"
 diesel = { version = "2.1.0", features = ["sqlite", "postgres", "r2d2"] }
 
-fdo-data-formats = { path = "../data-formats", version = "0.4.13" }
+fdo-data-formats = { path = "../data-formats", version = "0.5.0" }
 
 [dev-dependencies]
-fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["server"] }
+fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["server"] }
 openssl = "0.10.55"
 
 [features]

diff --git a/fido-device-onboard.spec b/fido-device-onboard.spec
@@ -3,7 +3,7 @@
 %global combined_license Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND BSD-3-Clause AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache 2.0) AND ISC AND MIT AND ((MIT OR Apache-2.0) AND Unicode-DFS-2016) AND (Apache-2.0 OR MIT OR Zlib) AND MPL-2.0 AND (Unlicense OR MIT)
 
 Name:           fido-device-onboard
-Version:        0.4.13
+Version:        0.5.0
 Release:        1%{?dist}
 Summary:        A rust implementation of the FIDO Device Onboard Specification
 License:        BSD-3-Clause
@@ -12,6 +12,7 @@ URL:            https://github.com/fdo-rs/fido-device-onboard-rs
 Source0:        %{url}/archive/v%{version}/%{name}-rs-%{version}.tar.gz
 # See make-vendored-tarfile.sh in upstream repo
 Source1:        %{name}-rs-%{version}-vendor-patched.tar.xz
+Patch1:         0001-Revert-chore-use-git-fork-for-aws-nitro-enclaves-cos.patch
 
 # Because nobody cares
 ExcludeArch: %{ix86}
@@ -24,6 +25,7 @@ BuildRequires:  rust-packaging
 BuildRequires:  clang-devel
 BuildRequires:  cryptsetup-devel
 BuildRequires:  device-mapper-devel
+BuildRequires:  libpq-devel
 BuildRequires:  golang
 BuildRequires:  openssl-devel >= 3.0.1-12
 BuildRequires:  systemd-rpm-macros
@@ -33,11 +35,17 @@ BuildRequires:  tpm2-tss-devel
 %{summary}.
 
 %prep
-%autosetup -p1 -n %{name}-rs-%{version}
+%setup -q -n %{name}-rs-%{version}
 
 %if 0%{?rhel}
+tar xf %{SOURCE1}
+%if 0%{?rhel} >= 10
+%cargo_prep -v vendor
+%else
 %cargo_prep -V 1
+%endif
 %else
+%patch -P1 -p1
 %cargo_prep
 %generate_buildrequires
 %cargo_generate_buildrequires -a
@@ -49,6 +57,9 @@ BuildRequires:  tpm2-tss-devel
 
 %{?cargo_license_summary}
 %{?cargo_license} > LICENSE.dependencies
+%if 0%{?rhel} >= 10
+%cargo_vendor_manifest
+%endif
 
 %install
 install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-client-linuxapp
@@ -103,6 +114,9 @@ Requires: dracut
 
 %files -n fdo-init
 %license LICENSE LICENSE.dependencies
+%if 0%{?rhel} >= 10
+%license cargo-vendor.txt
+%endif
 %{dracutlibdir}/modules.d/52fdo/
 %{_libexecdir}/fdo/fdo-manufacturing-client
 
@@ -115,6 +129,9 @@ Requires: openssl-libs >= 3.0.1-12
 
 %files -n fdo-owner-onboarding-server
 %license LICENSE LICENSE.dependencies
+%if 0%{?rhel} >= 10
+%license cargo-vendor.txt
+%endif
 %dir %{_sysconfdir}/fdo
 %dir %{_sysconfdir}/fdo/keys
 %dir %{_sysconfdir}/fdo/owner-onboarding-server.conf.d
@@ -155,6 +172,9 @@ License: %combined_license
 
 %files -n fdo-rendezvous-server
 %license LICENSE LICENSE.dependencies
+%if 0%{?rhel} >= 10
+%license cargo-vendor.txt
+%endif
 %dir %{_sysconfdir}/fdo
 %dir %{_sysconfdir}/fdo/keys
 %dir %{_sysconfdir}/fdo/rendezvous-server.conf.d
@@ -187,6 +207,9 @@ Requires: openssl-libs >= 3.0.1-12
 
 %files -n fdo-manufacturing-server
 %license LICENSE LICENSE.dependencies
+%if 0%{?rhel} >= 10
+%license cargo-vendor.txt
+%endif
 %dir %{_sysconfdir}/fdo
 %dir %{_sysconfdir}/fdo/keys
 %dir %{_sysconfdir}/fdo/manufacturing-server.conf.d
@@ -224,6 +247,9 @@ Requires: cryptsetup
 %{summary}
 
 %files -n fdo-client
+%if 0%{?rhel} >= 10
+%license cargo-vendor.txt
+%endif
 %license LICENSE LICENSE.dependencies
 %{_libexecdir}/fdo/fdo-client-linuxapp
 %{_unitdir}/fdo-client-linuxapp.service
@@ -244,6 +270,9 @@ License: %combined_license
 %{summary}
 
 %files -n fdo-owner-cli
+%if 0%{?rhel} >= 10
+%license cargo-vendor.txt
+%endif
 %license LICENSE LICENSE.dependencies
 %{_bindir}/fdo-owner-tool
 %{_libexecdir}/fdo/fdo-owner-tool
@@ -261,6 +290,9 @@ Requires: fdo-init = %{version}-%{release}
 %{summary}
 
 %files -n fdo-admin-cli
+%if 0%{?rhel} >= 10
+%license cargo-vendor.txt
+%endif
 %license LICENSE LICENSE.dependencies
 %dir %{_sysconfdir}/fdo
 %dir %{_sysconfdir}/fdo/keys
@@ -278,6 +310,9 @@ Requires: fdo-init = %{version}-%{release}
 %systemd_postun_with_restart fdo-aio.service
 
 %changelog
+* Tue Feb 20 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 0.5.0-1
+- Update to 0.5.0
+
 * Thu Jan 25 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.13-1
 - Update to 0.4.13
 

diff --git a/http-wrapper/Cargo.toml b/http-wrapper/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fdo-http-wrapper"
-version = "0.4.13"
+version = "0.5.0"
 authors = ["Patrick Uiterwijk <patrick@puiterwijk.org>"]
 edition = "2018"
 
@@ -18,8 +18,8 @@ hex = "0.4"
 
 openssl = "0.10.60"
 
-fdo-data-formats = { path = "../data-formats", version = "0.4.13" }
-fdo-store = { path = "../store", version = "0.4.13" }
+fdo-data-formats = { path = "../data-formats", version = "0.5.0" }
+fdo-store = { path = "../store", version = "0.5.0" }
 aws-nitro-enclaves-cose = { git = "https://github.com/nullr0ute/aws-nitro-enclaves-cose/", rev = "e3938e60d9051690569d1e4fcbe1c0c99d2fafa8" }
 
 # Server-side