.fido-device-onboard.metadata

@@ -1,2 +1,2 @@
-ea99d33a93fe21bf988b40ca38282d20d63c3484 SOURCES/fido-device-onboard-rs-0.5.0-vendor-patched.tar.xz
+197a762ee82c78701e76c363d5f2dfc225d80a44 SOURCES/fido-device-onboard-rs-0.5.1-vendor-patched.tar.xz
-33e6d8ea9eab83617089957c926db773eb62efab SOURCES/fido-device-onboard-rs-0.5.0.tar.gz
+2bd391405b20379e4237439ca78c67823e1e017d SOURCES/fido-device-onboard-rs-0.5.1.tar.gz

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/fido-device-onboard-rs-0.5.0-vendor-patched.tar.xz
+SOURCES/fido-device-onboard-rs-0.5.1-vendor-patched.tar.xz
-SOURCES/fido-device-onboard-rs-0.5.0.tar.gz
+SOURCES/fido-device-onboard-rs-0.5.1.tar.gz

SOURCES/0001-Revert-chore-use-git-fork-for-aws-nitro-enclaves-cos.patch

@@ -1,16 +1,16 @@
-From d9554495b54d1f150a85f4e329412ff62728d9c7 Mon Sep 17 00:00:00 2001
+From f1b53d4bdac4ab889eb084111f395d418945ed07 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
+From: Antonio Murdaca <amurdaca@redhat.com>
-Date: Thu, 15 Feb 2024 12:06:44 +0000
+Date: Mon, 25 Nov 2024 12:30:52 +0100
 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(-)
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-Sdiff --git a/data-formats/Cargo.toml b/data-formats/Cargo.toml
+diff --git a/data-formats/Cargo.toml b/data-formats/Cargo.toml
-index 714fc55..6d00eb4 100644
+index 83979e1..c8ae80f 100644
 --- a/data-formats/Cargo.toml
 +++ b/data-formats/Cargo.toml
 @@ -17,7 +17,7 @@ serde_cbor = "0.11"
@@ -23,18 +23,18 @@ index 714fc55..6d00eb4 100644
  num-traits = "0.2"
  num-derive = "0.3"
 diff --git a/http-wrapper/Cargo.toml b/http-wrapper/Cargo.toml
-index 5d4999c..7b98097 100644
+index 0decb0c..70fcf41 100644
 --- a/http-wrapper/Cargo.toml
 +++ b/http-wrapper/Cargo.toml
-@@ -20,7 +20,7 @@ openssl = "0.10.60"
+@@ -20,7 +20,7 @@ openssl = "0.10.66"
  
- fdo-data-formats = { path = "../data-formats", version = "0.5.0" }
+ fdo-data-formats = { path = "../data-formats", version = "0.5.1" }
- fdo-store = { path = "../store", version = "0.5.0" }
+ fdo-store = { path = "../store", version = "0.5.1" }
 -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
+2.47.0
 

SPECS/fido-device-onboard.spec

@@ -3,8 +3,8 @@
 %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.5.0
+Version:        0.5.1
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        A rust implementation of the FIDO Device Onboard Specification
 License:        BSD-3-Clause
 
@@ -36,13 +36,19 @@ BuildRequires:  libpq-devel
 %{summary}.
 
 %prep
-%setup -q -n %{name}-rs-%{version}
-# general patches should go here
-%patch -P1 -p1
 
 %if 0%{?rhel}
-%cargo_prep -V 1
+%autosetup -p1 -a1 -n %{name}-rs-%{version}
+rm -f Cargo.lock
+%if 0%{?rhel} >= 10
+%cargo_prep -v vendor
 %else
+%cargo_prep -V 1
+%endif
+%endif
+
+%if 0%{?fedora}
+%autosetup -p1 -n %{name}-rs-%{version}
 %cargo_prep
 %generate_buildrequires
 %cargo_generate_buildrequires -a
@@ -54,6 +60,9 @@ BuildRequires:  libpq-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
@@ -74,8 +83,9 @@ install -D -m 0644 -t %{buildroot}%{_docdir}/fdo/migrations/migrations_owner_onb
 install -D -m 0644 -t %{buildroot}%{_docdir}/fdo/migrations/migrations_rendezvous_server_postgres  migrations/migrations_rendezvous_server_postgres/2023-10-03-152801_create_db/*
 install -D -m 0644 -t %{buildroot}%{_docdir}/fdo/migrations/migrations_rendezvous_server_sqlite  migrations/migrations_rendezvous_server_sqlite/2023-10-03-152801_create_db/*
 # duplicates as needed by AIO command so link them
-ln -s %{_bindir}/fdo-owner-tool  %{buildroot}%{_libexecdir}/fdo/fdo-owner-tool
+mkdir -p %{buildroot}%{_bindir}
-ln -s %{_bindir}/fdo-admin-tool %{buildroot}%{_libexecdir}/fdo/fdo-admin-tool
+ln -sr %{buildroot}%{_bindir}/fdo-owner-tool  %{buildroot}%{_libexecdir}/fdo/fdo-owner-tool
+ln -sr %{buildroot}%{_bindir}/fdo-admin-tool %{buildroot}%{_libexecdir}/fdo/fdo-admin-tool
 # Create directories needed by the various services so we own them
 mkdir -p %{buildroot}%{_sysconfdir}/fdo
 mkdir -p %{buildroot}%{_sysconfdir}/fdo/keys
@@ -108,6 +118,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
 
@@ -120,6 +133,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
@@ -160,6 +176,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
@@ -192,13 +211,16 @@ 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
-%dir %{_sysconfdir}/fdo/keys
 %dir %{_sysconfdir}/fdo/stores
 %dir %{_sysconfdir}/fdo/stores/manufacturer_keys
 %dir %{_sysconfdir}/fdo/stores/manufacturing_sessions
+%dir %{_sysconfdir}/fdo/stores/owner_vouchers
 %{_libexecdir}/fdo/fdo-manufacturing-server
 %dir %{_localstatedir}/lib/fdo
 %dir %{_docdir}/fdo
@@ -228,6 +250,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
@@ -248,6 +273,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
@@ -265,6 +293,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
@@ -282,27 +313,20 @@ Requires: fdo-init = %{version}-%{release}
 %systemd_postun_with_restart fdo-aio.service
 
 %changelog
-* Wed Feb 28 2024 Irene Diez <idiez@redhat.com> - 0.5.0-2
+* Thu Nov 21 2024 Antonio Murdaca <amurdaca@redhat.com> - 0.5.1-1
-- Update license
+- Update to 0.5.1
-
-* Thu Feb 22 2024 Irene Diez <idiez@redhat.com> - 0.5.0-1
-- New version 0.5.0, adds database support
-- Remove unused patches
-
-* Wed Aug 23 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.12-4
-- Ensure client service fix is applied
 
-* Tue Aug 22 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.12-3
+* Tue Feb 20 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 0.5.0-1
-- Own var/lib/fdo, SELinux fixes
+- Update to 0.5.0
 
-* Thu Aug 17 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.12-2
+* Thu Jan 25 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.13-1
-- Add client/init deps to fdo-admin-cli
+- Update to 0.4.13
 
-* Thu Jul 27 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.12-1
+* Wed Jul 26 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.12-1
 - Update to 0.4.12
 
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.10-3
+* Mon Jul 03 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.11-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+- Update to 0.4.11
 
 * Mon Jul 03 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.10-2
 - Updates for eln/c9s building