.fido-device-onboard.metadata

@@ -1,2 +1,2 @@
-ea99d33a93fe21bf988b40ca38282d20d63c3484 SOURCES/fido-device-onboard-rs-0.5.0-vendor-patched.tar.xz
+f89779ff4421530aa4f51ebe1eaa81858ec4b1f5 SOURCES/fido-device-onboard-rs-0.4.5-vendor-patched.tar.gz
-33e6d8ea9eab83617089957c926db773eb62efab SOURCES/fido-device-onboard-rs-0.5.0.tar.gz
+2bccb11a53358c1464e00d9a2b41251d793651d0 SOURCES/fido-device-onboard-rs-0.4.5.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.4.5-vendor-patched.tar.gz
-SOURCES/fido-device-onboard-rs-0.5.0.tar.gz
+SOURCES/fido-device-onboard-rs-0.4.5.tar.gz

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

@@ -1,40 +0,0 @@
-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.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" }
-+aws-nitro-enclaves-cose = "0.4.0"
- 
- # Server-side
- uuid = { version = "1.3", features = ["v4"], optional = true }
--- 
-2.43.1
-

SOURCES/kdf-debug-profile.patch

@@ -0,0 +1,70 @@
+diff --color -ru fido-device-onboard-rs-0.4.5-orig/Cargo.toml fido-device-onboard-rs-0.4.5/Cargo.toml
+--- fido-device-onboard-rs-0.4.5-orig/Cargo.toml	2022-03-29 17:38:59.000000000 +0200
++++ fido-device-onboard-rs-0.4.5/Cargo.toml	2022-03-30 10:45:59.381526470 +0200
+@@ -17,3 +17,6 @@
+ 
+     "integration-tests",
+ ]
++
++[profile.release]
++debug = true
+diff --color -ru fido-device-onboard-rs-0.4.5-orig/examples/systemd/fdo-aio.service fido-device-onboard-rs-0.4.5/examples/systemd/fdo-aio.service
+--- fido-device-onboard-rs-0.4.5-orig/examples/systemd/fdo-aio.service	2022-03-29 17:38:59.000000000 +0200
++++ fido-device-onboard-rs-0.4.5/examples/systemd/fdo-aio.service	2022-03-30 10:47:12.654629934 +0200
+@@ -4,8 +4,9 @@
+ 
+ [Service]
+ Environment=LOG_LEVEL=info
++Environment=ALLOW_NONINTEROPERABLE_KDF=1
+ ExecStart=/usr/bin/fdo-admin-tool aio --directory /etc/fdo/aio --binary-path /usr/libexec/fdo
+ # restart and failure condition
+ 
+ [Install]
+-WantedBy=multi-user.target
+\ No newline at end of file
++WantedBy=multi-user.target
+diff --color -ru fido-device-onboard-rs-0.4.5-orig/examples/systemd/fdo-client-linuxapp.service fido-device-onboard-rs-0.4.5/examples/systemd/fdo-client-linuxapp.service
+--- fido-device-onboard-rs-0.4.5-orig/examples/systemd/fdo-client-linuxapp.service	2022-03-29 17:38:59.000000000 +0200
++++ fido-device-onboard-rs-0.4.5/examples/systemd/fdo-client-linuxapp.service	2022-03-30 10:46:15.357549030 +0200
+@@ -5,6 +5,7 @@
+ [Service]
+ Type=oneshot
+ EnvironmentFile=-/boot/fdo-client-env
++Environment=ALLOW_NONINTEROPERABLE_KDF=1
+ Environment=LOG_LEVEL=info
+ ExecStart=/usr/libexec/fdo/fdo-client-linuxapp
+ ExecStartPost=-/usr/bin/mv /boot/device-credentials /etc/device-credentials
+diff --color -ru fido-device-onboard-rs-0.4.5-orig/examples/systemd/fdo-owner-onboarding-server.service fido-device-onboard-rs-0.4.5/examples/systemd/fdo-owner-onboarding-server.service
+--- fido-device-onboard-rs-0.4.5-orig/examples/systemd/fdo-owner-onboarding-server.service	2022-03-29 17:38:59.000000000 +0200
++++ fido-device-onboard-rs-0.4.5/examples/systemd/fdo-owner-onboarding-server.service	2022-03-30 10:46:21.433557612 +0200
+@@ -4,8 +4,9 @@
+ 
+ [Service]
+ Environment=LOG_LEVEL=info
++Environment=ALLOW_NONINTEROPERABLE_KDF=1
+ ExecStart=/usr/libexec/fdo/fdo-owner-onboarding-server
+ # restart and failure condition
+ 
+ [Install]
+-WantedBy=multi-user.target
+\ No newline at end of file
++WantedBy=multi-user.target
+diff --color -ru fido-device-onboard-rs-0.4.5-orig/vendor/tss-esapi-sys/build.rs fido-device-onboard-rs-0.4.5/vendor/tss-esapi-sys/build.rs
+--- fido-device-onboard-rs-0.4.5-orig/vendor/tss-esapi-sys/build.rs	2022-03-29 19:26:41.000000000 +0200
++++ fido-device-onboard-rs-0.4.5/vendor/tss-esapi-sys/build.rs	2022-03-30 10:46:34.037575407 +0200
+@@ -4,7 +4,7 @@
+ #[cfg(feature = "generate-bindings")]
+ use std::path::PathBuf;
+ 
+-const MINIMUM_VERSION: &str = "2.3.3";
++const MINIMUM_VERSION: &str = "2.3.2";
+ 
+ fn main() {
+     if std::env::var("DOCS_RS").is_ok() {
+diff --color -ru fido-device-onboard-rs-0.4.5-orig/vendor/tss-esapi-sys/.cargo-checksum.json fido-device-onboard-rs-0.4.5/vendor/tss-esapi-sys/.cargo-checksum.json
+--- fido-device-onboard-rs-0.4.5-orig/vendor/tss-esapi-sys/.cargo-checksum.json	2022-03-29 19:26:41.000000000 +0200
++++ fido-device-onboard-rs-0.4.5/vendor/tss-esapi-sys/.cargo-checksum.json	2022-03-30 10:46:55.432605617 +0200
+@@ -1 +1 @@
+-{"files":{"Cargo.toml":"cb816c6cd69d7eb4e712c63575fed05fb120ffaf14a6d462dae7e22d86341721","LICENSE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","README.md":"2cb476d1db06c323503dc6d15e0f5ed5d6f31b940ee19fb6a1267d26ca2ea109","build.rs":"6cc37b07c069d8e4a532922f4f816c51269a3947bc1d64b1ac5c13330da9422c","regenerate-bindings.sh":"adfc0001d4837ea2e82dadb0455b5dd1da24c728e2526ceef9e1774f2dac3174","src/bindings/aarch64-unknown-linux-gnu.rs":"fbeeefd5706344fb9b37e670f0a3ccb410d3686012f64f9b9b25038f3683f9a2","src/bindings/arm-unknown-linux-gnueabi.rs":"17dc8ad101cbec08ba9a9ef55c3c7d101164c35d19cfd694dca7e25a324101bf","src/bindings/x86_64-unknown-darwin.rs":"1a1f2cd427ebb4d4bf102204507f1fa9e2973ecb7ee7f3e27be61f7ae21a9e43","src/bindings/x86_64-unknown-linux-gnu.rs":"31473ca2a2f853acd091dad98605ee02dcdb521b70023fa8e34822b9bac4bdde","src/lib.rs":"d03e402ccd471f25acca136550af86caa33af7714290424b24b236f1ac9e450f"},"package":"0e2f37914ec4d494d145cfa18bb8429498b238d63c47a08b89d09c1ec2545ff0"}
+\ No newline at end of file
++{"files":{"Cargo.toml":"cb816c6cd69d7eb4e712c63575fed05fb120ffaf14a6d462dae7e22d86341721","LICENSE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","README.md":"2cb476d1db06c323503dc6d15e0f5ed5d6f31b940ee19fb6a1267d26ca2ea109","build.rs":"4c8649e92bafa9834c7db410c08bd5da8017708dec46a7ddbc526a8f86e91f11","regenerate-bindings.sh":"adfc0001d4837ea2e82dadb0455b5dd1da24c728e2526ceef9e1774f2dac3174","src/bindings/aarch64-unknown-linux-gnu.rs":"fbeeefd5706344fb9b37e670f0a3ccb410d3686012f64f9b9b25038f3683f9a2","src/bindings/arm-unknown-linux-gnueabi.rs":"17dc8ad101cbec08ba9a9ef55c3c7d101164c35d19cfd694dca7e25a324101bf","src/bindings/x86_64-unknown-darwin.rs":"1a1f2cd427ebb4d4bf102204507f1fa9e2973ecb7ee7f3e27be61f7ae21a9e43","src/bindings/x86_64-unknown-linux-gnu.rs":"31473ca2a2f853acd091dad98605ee02dcdb521b70023fa8e34822b9bac4bdde","src/lib.rs":"d03e402ccd471f25acca136550af86caa33af7714290424b24b236f1ac9e450f"},"package":"0e2f37914ec4d494d145cfa18bb8429498b238d63c47a08b89d09c1ec2545ff0"}

SPECS/fido-device-onboard.spec

@@ -1,59 +1,58 @@
-%global dracutlibdir %{_prefix}/lib/dracut
+%define dracutlibdir %{_prefix}/lib/dracut
 %bcond_without check
-%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)
+%global __cargo_skip_build 0
+%global __cargo_is_lib() false
+%global forgeurl https://github.com/fedora-iot/fido-device-onboard-rs
+
+Version:        0.4.5
+
+%forgemeta
 
 Name:           fido-device-onboard
-Version:        0.5.0
+Release:        1%{?dist}
-Release:        2%{?dist}
+Summary:        An implementation of the FIDO Device Onboard Specification written in rust
-Summary:        A rust implementation of the FIDO Device Onboard Specification
-License:        BSD-3-Clause
 
-URL:            https://github.com/fdo-rs/fido-device-onboard-rs
+License:        BSD
-Source0:        %{url}/archive/v%{version}/%{name}-rs-%{version}.tar.gz
+URL:            %{forgeurl}
-# See make-vendored-tarfile.sh in upstream repo
+Source:         %{forgesource}
-Source1:        %{name}-rs-%{version}-vendor-patched.tar.xz
+%if "%{?commit}" != ""
-Patch1:         0001-Revert-chore-use-git-fork-for-aws-nitro-enclaves-cos.patch
+Source1:        %{name}-rs-%{commit}-vendor-patched.tar.gz
+%else
+Source1:        %{name}-rs-%{version}-vendor-patched.tar.gz
+%endif
 
-# Because nobody cares
+Patch0:         kdf-debug-profile.patch
-ExcludeArch: %{ix86}
 
-%if 0%{?rhel}
+ExclusiveArch:  %{rust_arches}
+# RHBZ 1869980
+ExcludeArch:    s390x i686 %{power64}
+
+%if 0%{?rhel} && !0%{?eln}
 BuildRequires:  rust-toolset
 %else
 BuildRequires:  rust-packaging
 %endif
-BuildRequires:  clang-devel
-BuildRequires:  cryptsetup-devel
-BuildRequires:  device-mapper-devel
-BuildRequires:  golang
-BuildRequires:  openssl-devel >= 3.0.1-12
 BuildRequires: systemd-rpm-macros
+BuildRequires: openssl-devel
+BuildRequires: golang
 BuildRequires: tpm2-tss-devel
-BuildRequires:  sqlite-devel
+BuildRequires: cryptsetup-devel
-BuildRequires:  libpq-devel
+BuildRequires: clang-devel
 
 %description
 %{summary}.
 
 %prep
-%setup -q -n %{name}-rs-%{version}
+%forgesetup
-# general patches should go here
+%if 0%{?rhel} && !0%{?eln}
-%patch -P1 -p1
-
-%if 0%{?rhel}
 %cargo_prep -V 1
 %else
 %cargo_prep
-%generate_buildrequires
-%cargo_generate_buildrequires -a
 %endif
+%patch0 -p1
 
 %build
-%cargo_build \
+%{__cargo} build --release --features "openssl-kdf/deny_custom,fdo-data-formats/use_noninteroperable_kdf"
--F openssl-kdf/deny_custom
-
-%{?cargo_license_summary}
-%{?cargo_license} > LICENSE.dependencies
 
 %install
 install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-client-linuxapp
@@ -62,37 +61,15 @@ install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-manufact
 install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-owner-onboarding-server
 install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-rendezvous-server
 install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-serviceinfo-api-server
+# duplicates as needed by AIO command
+install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-owner-tool
+install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-admin-tool
 install -D -m 0755 -t %{buildroot}%{_bindir} target/release/fdo-owner-tool
 install -D -m 0755 -t %{buildroot}%{_bindir} target/release/fdo-admin-tool
 install -D -m 0644 -t %{buildroot}%{_unitdir} examples/systemd/*
 install -D -m 0644 -t %{buildroot}%{_docdir}/fdo examples/config/*
-# db sql files
-install -D -m 0644 -t %{buildroot}%{_docdir}/fdo/migrations/migrations_manufacturing_server_postgres  migrations/migrations_manufacturing_server_postgres/2023-10-03-152801_create_db/*
-install -D -m 0644 -t %{buildroot}%{_docdir}/fdo/migrations/migrations_manufacturing_server_sqlite  migrations/migrations_manufacturing_server_sqlite/2023-10-03-152801_create_db/*
-install -D -m 0644 -t %{buildroot}%{_docdir}/fdo/migrations/migrations_owner_onboarding_server_postgres  migrations/migrations_owner_onboarding_server_postgres/2023-10-03-152801_create_db/*
-install -D -m 0644 -t %{buildroot}%{_docdir}/fdo/migrations/migrations_owner_onboarding_server_sqlite  migrations/migrations_owner_onboarding_server_sqlite/2023-10-03-152801_create_db/*
-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
-ln -s %{_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
+# 52fdo
-mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores
-mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/manufacturer_keys
-mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/manufacturing_sessions
-mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/owner_onboarding_sessions
-mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/owner_vouchers
-mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/rendezvous_registered
-mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/rendezvous_sessions
-mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/serviceinfo_api_devices
-mkdir -p %{buildroot}%{_sysconfdir}/fdo/manufacturing-server.conf.d
-mkdir -p %{buildroot}%{_sysconfdir}/fdo/owner-onboarding-server.conf.d
-mkdir -p %{buildroot}%{_sysconfdir}/fdo/rendezvous-server.conf.d
-mkdir -p %{buildroot}%{_sysconfdir}/fdo/serviceinfo-api-server.conf.d
-mkdir -p %{buildroot}%{_localstatedir}/lib/fdo
-# Dracut manufacturing service
 install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/52fdo dracut/52fdo/module-setup.sh
 install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/52fdo dracut/52fdo/manufacturing-client-generator
 install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/52fdo dracut/52fdo/manufacturing-client-service
@@ -100,44 +77,26 @@ install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/52fdo dracut/52fdo/m
 
 %package -n fdo-init
 Summary: dracut module for device initialization
-License: %combined_license
-Requires: openssl-libs >= 3.0.1-12
-Requires: dracut
 %description -n fdo-init
 %{summary}
 
 %files -n fdo-init
-%license LICENSE LICENSE.dependencies
+%license LICENSE
-%{dracutlibdir}/modules.d/52fdo/
+%{dracutlibdir}/modules.d/52fdo/*
 %{_libexecdir}/fdo/fdo-manufacturing-client
 
 %package -n fdo-owner-onboarding-server
 Summary: FDO Owner Onboarding Server implementation
-License: %combined_license
-Requires: openssl-libs >= 3.0.1-12
 %description -n fdo-owner-onboarding-server
 %{summary}
 
 %files -n fdo-owner-onboarding-server
-%license LICENSE LICENSE.dependencies
+%license LICENSE
-%dir %{_sysconfdir}/fdo
-%dir %{_sysconfdir}/fdo/keys
-%dir %{_sysconfdir}/fdo/owner-onboarding-server.conf.d
-%dir %{_sysconfdir}/fdo/serviceinfo-api-server.conf.d
-%dir %{_sysconfdir}/fdo/stores
-%dir %{_sysconfdir}/fdo/stores/owner_onboarding_sessions
-%dir %{_sysconfdir}/fdo/stores/owner_vouchers
-%dir %{_sysconfdir}/fdo/stores/serviceinfo_api_devices
 %{_libexecdir}/fdo/fdo-owner-onboarding-server
 %{_libexecdir}/fdo/fdo-serviceinfo-api-server
-%dir %{_localstatedir}/lib/fdo
-%dir %{_docdir}/fdo
-%{_docdir}/fdo/device_specific_serviceinfo.yml
 %{_docdir}/fdo/serviceinfo-api-server.yml
-%{_docdir}/fdo/owner-onboarding-server.yml
-%{_docdir}/fdo/migrations/migrations_owner_onboarding_server_postgres/*
-%{_docdir}/fdo/migrations/migrations_owner_onboarding_server_sqlite/*
 %{_unitdir}/fdo-serviceinfo-api-server.service
+%{_docdir}/fdo/owner-onboarding-server.yml
 %{_unitdir}/fdo-owner-onboarding-server.service
 
 %post -n fdo-owner-onboarding-server
@@ -154,24 +113,13 @@ Requires: openssl-libs >= 3.0.1-12
 
 %package -n fdo-rendezvous-server
 Summary: FDO Rendezvous Server implementation
-License: %combined_license
 %description -n fdo-rendezvous-server
 %{summary}
 
 %files -n fdo-rendezvous-server
-%license LICENSE LICENSE.dependencies
+%license LICENSE
-%dir %{_sysconfdir}/fdo
-%dir %{_sysconfdir}/fdo/keys
-%dir %{_sysconfdir}/fdo/rendezvous-server.conf.d
-%dir %{_sysconfdir}/fdo/stores
-%dir %{_sysconfdir}/fdo/stores/rendezvous_registered
-%dir %{_sysconfdir}/fdo/stores/rendezvous_sessions
 %{_libexecdir}/fdo/fdo-rendezvous-server
-%dir %{_localstatedir}/lib/fdo
+%{_docdir}/fdo/rendezvous-server.yml
-%dir %{_docdir}/fdo
-%{_docdir}/fdo/rendezvous-*.yml
-%{_docdir}/fdo/migrations/migrations_rendezvous_server_postgres/*
-%{_docdir}/fdo/migrations/migrations_rendezvous_server_sqlite/*
 %{_unitdir}/fdo-rendezvous-server.service
 
 %post -n fdo-rendezvous-server
@@ -185,26 +133,13 @@ License: %combined_license
 
 %package -n fdo-manufacturing-server
 Summary: FDO Manufacturing Server implementation
-License: %combined_license
-Requires: openssl-libs >= 3.0.1-12
 %description -n fdo-manufacturing-server
 %{summary}
 
 %files -n fdo-manufacturing-server
-%license LICENSE LICENSE.dependencies
+%license LICENSE
-%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
 %{_libexecdir}/fdo/fdo-manufacturing-server
-%dir %{_localstatedir}/lib/fdo
-%dir %{_docdir}/fdo
 %{_docdir}/fdo/manufacturing-server.yml
-%{_docdir}/fdo/migrations/migrations_manufacturing_server_postgres/*
-%{_docdir}/fdo/migrations/migrations_manufacturing_server_sqlite/*
 %{_unitdir}/fdo-manufacturing-server.service
 
 %post -n fdo-manufacturing-server
@@ -218,17 +153,14 @@ Requires: openssl-libs >= 3.0.1-12
 
 %package -n fdo-client
 Summary: FDO Client implementation
-License: %combined_license
-Requires: openssl-libs >= 3.0.1-12
 Requires: clevis
 Requires: clevis-luks
-Requires: clevis-pin-tpm2
 Requires: cryptsetup
 %description -n fdo-client
 %{summary}
 
 %files -n fdo-client
-%license LICENSE LICENSE.dependencies
+%license LICENSE
 %{_libexecdir}/fdo/fdo-client-linuxapp
 %{_unitdir}/fdo-client-linuxapp.service
 
@@ -243,34 +175,31 @@ Requires: cryptsetup
 
 %package -n fdo-owner-cli
 Summary: FDO Owner tools implementation
-License: %combined_license
 %description -n fdo-owner-cli
 %{summary}
 
 %files -n fdo-owner-cli
-%license LICENSE LICENSE.dependencies
+%license LICENSE
 %{_bindir}/fdo-owner-tool
 %{_libexecdir}/fdo/fdo-owner-tool
 
 %package -n fdo-admin-cli
 Summary: FDO admin tools implementation
-License: %combined_license
+Requires: fdo-manufacturing-server
-Requires: fdo-manufacturing-server = %{version}-%{release}
+Requires: fdo-init
-Requires: fdo-rendezvous-server = %{version}-%{release}
+Requires: fdo-client
-Requires: fdo-owner-onboarding-server = %{version}-%{release}
+Requires: fdo-rendezvous-server
-Requires: fdo-owner-cli = %{version}-%{release}
+Requires: fdo-owner-onboarding-server
-Requires: fdo-client = %{version}-%{release}
+Requires: fdo-owner-cli
-Requires: fdo-init = %{version}-%{release}
 %description -n fdo-admin-cli
 %{summary}
 
 %files -n fdo-admin-cli
-%license LICENSE LICENSE.dependencies
+%license LICENSE
-%dir %{_sysconfdir}/fdo
-%dir %{_sysconfdir}/fdo/keys
 %{_bindir}/fdo-admin-tool
 %{_libexecdir}/fdo/fdo-admin-tool
 %{_unitdir}/fdo-aio.service
+%dir %{_sysconfdir}/fdo
 
 %post -n fdo-admin-cli
 %systemd_post fdo-aio.service
@@ -282,74 +211,62 @@ 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
-- Update license
-
-* 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
-- Own var/lib/fdo, SELinux fixes
-
-* Thu Aug 17 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.12-2
-- Add client/init deps to fdo-admin-cli
-
-* Thu Jul 27 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
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Jul 03 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.10-2
-- Updates for eln/c9s building
-
-* Fri Jun 23 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.10-1
-- Update to 0.4.10
-
-* Wed Jun 14 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.9-5
-- More spec updates
-
-* Wed Jun 14 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.9-4
-- Add patch for libcryptsetup-rs 0.8 API changes
-
-* Tue Jun 13 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.9-3
-- Updates for licenses
-
-* Tue May 30 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.9-2
-- Review feedback
-- Patch for libcryptsetup-rs 0.7
-
-* Thu May 11 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.9-1
-- Update to 0.4.9
-
-* Mon Feb 20 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.7-3
-- Fix services start
-
-* Wed Feb 15 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.7-2
-- Upstream fix for rhbz#2168089
-
-* Wed Nov 30 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.7-1
-- Update to 0.4.7
-- Package updates and cleanup
-
 * Tue Mar 29 2022 Antonio Murdaca <runcom@linux.com> - 0.4.5-1
 - bump to 0.4.5
 
-* Mon Feb 28 2022 Antonio Murdaca <runcom@linux.com> - 0.4.0-2
+* Fri Feb 25 2022 Antonio Murdaca <runcom@linux.com> - 0.4.0-8
-- fix runtime requirements to use openssl-libs and not -devel
+- attempt #1 to fix checksums
+
+* Fri Feb 25 2022 Antonio Murdaca <runcom@linux.com> - 0.4.0-7
+- patch the right vendor/tss-esapi-sys
+
+* Fri Feb 25 2022 Antonio Murdaca <runcom@linux.com> - 0.4.0-6
+- patch Cargo.toml to ignore Cargo.lock for hash checks of tss-esapi-sys
+
+* Fri Feb 25 2022 Antonio Murdaca <runcom@linux.com> - 0.4.0-5
+- patch tss-esapi-sys/build.rs to require 2.3.2
+
+* Thu Feb 24 2022 Antonio Murdaca <runcom@linux.com> - 0.4.0-4
+- rebuilt with tpm2-tss-devel build require
+
+* Thu Feb 24 2022 Antonio Murdaca <runcom@linux.com> - 0.4.0-3
+- rebuilt to use the correct patch for the 0.4.0 source
+
+* Thu Feb 24 2022 Antonio Murdaca <runcom@linux.com> - 0.4.0-2
+- rebuilt to use the correct 0.4.0 source archive
 
 * Thu Feb 24 2022 Antonio Murdaca <runcom@linux.com> - 0.4.0-1
 - upgrade to 0.4.0
 
+* Thu Feb 03 2022 Antonio Murdaca <runcom@linux.com> - 0.3.0-4
+- revert and add missing %patch call
+
+* Thu Feb 03 2022 Antonio Murdaca <runcom@linux.com> - 0.3.0-3
+- rebuilt to drop commit conditional or patch doesn't work
+
+* Thu Feb 03 2022 Antonio Murdaca <runcom@linux.com> - 0.3.0-2
+- rebuilt to drop faulty conditional
+
 * Tue Feb 01 2022 Antonio Murdaca <runcom@linux.com> - 0.3.0-1
-- bump to 0.3.0
+- bump to v0.3.0
 
-* Tue Jan 11 2022 Antonio Murdaca <runcom@linux.com> - 0.2.0-2
+* Mon Jan 10 2022 Antonio Murdaca <runcom@linux.com> - 0.2.0-5
-- use patched vendor w/o win files and rename license
+- rebuilt dropping vendored exe(s) files (dll and .a)
 
-* Mon Dec 13 2021 Antonio Murdaca <runcom@linux.com> - 0.2.0-1
+* Sat Dec 11 2021 Antonio Murdaca <runcom@linux.com> - 0.2.0-4
-- import fido-device-onboard
+- Restore soname, add golang to BuildRequires
+
+* Sat Dec 11 2021 Antonio Murdaca <runcom@linux.com> - 0.2.0-3
+- disable libfdo-data soname
+
+* Sat Dec 11 2021 Antonio Murdaca <runcom@linux.com> - 0.2.0-2
+- rebuilt
+
+* Fri Dec 10 2021 Antonio Murdaca <runcom@linux.com> - 0.2.0-1
+- bump to 0.2.0
+
+* Wed Nov 17 2021 Antonio Murdaca <runcom@linux.com> - 0.1.0-2
+- rebuilt
+
+* Tue Oct 5 2021 Antonio Murdaca <amurdaca@redhat.com> - 0.1.0-1
+- initial release