import fido-device-onboard-0.4.5-1.el8

.fido-device-onboard.metadata

@@ -1,2 +1,2 @@
-49d6a159dc3e0b2369ffb6ac11bcf41a2c773ac9 SOURCES/fido-device-onboard-rs-0.4.0-vendor-patched.tar.gz
+f89779ff4421530aa4f51ebe1eaa81858ec4b1f5 SOURCES/fido-device-onboard-rs-0.4.5-vendor-patched.tar.gz
-a8e4a64065bf7ae103a6bb903c6884a01f07bffb SOURCES/fido-device-onboard-rs-0.4.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.4.0-vendor-patched.tar.gz
+SOURCES/fido-device-onboard-rs-0.4.5-vendor-patched.tar.gz
-SOURCES/fido-device-onboard-rs-0.4.0.tar.gz
+SOURCES/fido-device-onboard-rs-0.4.5.tar.gz

SOURCES/kdf-debug-profile.patch

@@ -1,17 +1,31 @@
-diff --color -ru fido-device-onboard-rs-0.4.0-orig/Cargo.toml fido-device-onboard-rs-0.4.0/Cargo.toml
+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.0-orig/Cargo.toml	2022-02-24 20:44:38.000000000 +0100
+--- fido-device-onboard-rs-0.4.5-orig/Cargo.toml	2022-03-29 17:38:59.000000000 +0200
-+++ fido-device-onboard-rs-0.4.0/Cargo.toml	2022-02-25 15:02:08.945332612 +0100
++++ fido-device-onboard-rs-0.4.5/Cargo.toml	2022-03-30 10:45:59.381526470 +0200
-@@ -17,3 +17,7 @@
+@@ -17,3 +17,6 @@
-     "serviceinfo-api-dev-server",
+ 
      "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
-diff --color -ru fido-device-onboard-rs-0.4.0-orig/examples/systemd/fdo-client-linuxapp.service fido-device-onboard-rs-0.4.0/examples/systemd/fdo-client-linuxapp.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.0-orig/examples/systemd/fdo-client-linuxapp.service	2022-02-24 20:44:38.000000000 +0100
++++ fido-device-onboard-rs-0.4.5/examples/systemd/fdo-aio.service	2022-03-30 10:47:12.654629934 +0200
-+++ fido-device-onboard-rs-0.4.0/examples/systemd/fdo-client-linuxapp.service	2022-02-25 15:05:29.705471465 +0100
+@@ -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
@@ -20,9 +34,9 @@ diff --color -ru fido-device-onboard-rs-0.4.0-orig/examples/systemd/fdo-client-l
  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.0-orig/examples/systemd/fdo-owner-onboarding-server.service fido-device-onboard-rs-0.4.0/examples/systemd/fdo-owner-onboarding-server.service
+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.0-orig/examples/systemd/fdo-owner-onboarding-server.service	2022-02-24 20:44:38.000000000 +0100
+--- 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.0/examples/systemd/fdo-owner-onboarding-server.service	2022-02-25 15:03:10.817375407 +0100
++++ 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]
@@ -35,10 +49,9 @@ diff --color -ru fido-device-onboard-rs-0.4.0-orig/examples/systemd/fdo-owner-on
 -WantedBy=multi-user.target
 \ No newline at end of file
 +WantedBy=multi-user.target
-Only in fido-device-onboard-rs-0.4.0: kdf-debug-profile.patch
+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
-diff --color -ru fido-device-onboard-rs-0.4.0-orig/vendor/tss-esapi-sys/build.rs fido-device-onboard-rs-0.4.0/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.0-orig/vendor/tss-esapi-sys/build.rs	2022-02-25 14:59:52.024237824 +0100
++++ fido-device-onboard-rs-0.4.5/vendor/tss-esapi-sys/build.rs	2022-03-30 10:46:34.037575407 +0200
-+++ fido-device-onboard-rs-0.4.0/vendor/tss-esapi-sys/build.rs	2022-02-25 15:01:34.660308864 +0100
 @@ -4,7 +4,7 @@
  #[cfg(feature = "generate-bindings")]
  use std::path::PathBuf;
@@ -48,9 +61,9 @@ diff --color -ru fido-device-onboard-rs-0.4.0-orig/vendor/tss-esapi-sys/build.rs
  
  fn main() {
      if std::env::var("DOCS_RS").is_ok() {
-diff --color -ru fido-device-onboard-rs-0.4.0-orig/vendor/tss-esapi-sys/.cargo-checksum.json fido-device-onboard-rs-0.4.0/vendor/tss-esapi-sys/.cargo-checksum.json
+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.0-orig/vendor/tss-esapi-sys/.cargo-checksum.json	2022-02-25 14:59:52.025237825 +0100
+--- 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.0/vendor/tss-esapi-sys/.cargo-checksum.json	2022-02-25 15:04:18.844422454 +0100
++++ 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

SPECS/fido-device-onboard.spec

@@ -4,12 +4,12 @@
 %global __cargo_is_lib() false
 %global forgeurl https://github.com/fedora-iot/fido-device-onboard-rs
 
-Version:        0.4.0
+Version:        0.4.5
 
 %forgemeta
 
 Name:           fido-device-onboard
-Release:        8%{?dist}
+Release:        1%{?dist}
 Summary:        An implementation of the FIDO Device Onboard Specification written in rust
 
 License:        BSD
@@ -36,6 +36,8 @@ BuildRequires: systemd-rpm-macros
 BuildRequires: openssl-devel
 BuildRequires: golang
 BuildRequires: tpm2-tss-devel
+BuildRequires: cryptsetup-devel
+BuildRequires: clang-devel
 
 %description
 %{summary}.
@@ -58,10 +60,15 @@ install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-manufact
 install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-manufacturing-server
 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/*
+mkdir -p %{buildroot}%{_sysconfdir}/fdo
 # 52fdo
 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
@@ -86,17 +93,23 @@ Summary: FDO Owner Onboarding Server implementation
 %files -n fdo-owner-onboarding-server
 %license LICENSE
 %{_libexecdir}/fdo/fdo-owner-onboarding-server
+%{_libexecdir}/fdo/fdo-serviceinfo-api-server
+%{_docdir}/fdo/serviceinfo-api-server.yml
+%{_unitdir}/fdo-serviceinfo-api-server.service
 %{_docdir}/fdo/owner-onboarding-server.yml
 %{_unitdir}/fdo-owner-onboarding-server.service
 
 %post -n fdo-owner-onboarding-server
 %systemd_post fdo-owner-onboarding-server.service
+%systemd_post fdo-serviceinfo-api-server.service
 
 %preun -n fdo-owner-onboarding-server
 %systemd_preun fdo-owner-onboarding-server.service
+%systemd_post fdo-serviceinfo-api-server.service
 
 %postun -n fdo-owner-onboarding-server
 %systemd_postun_with_restart fdo-owner-onboarding-server.service
+%systemd_postun_with_restart fdo-serviceinfo-api-server.service
 
 %package -n fdo-rendezvous-server
 Summary: FDO Rendezvous Server implementation
@@ -140,6 +153,9 @@ Summary: FDO Manufacturing Server implementation
 
 %package -n fdo-client
 Summary: FDO Client implementation
+Requires: clevis
+Requires: clevis-luks
+Requires: cryptsetup
 %description -n fdo-client
 %{summary}
 
@@ -155,7 +171,7 @@ Summary: FDO Client implementation
 %systemd_preun fdo-client-linuxapp.service
 
 %postun -n fdo-client
-%systemd_postun_with_restart fdo-client.linuxapp.service
+%systemd_postun_with_restart fdo-client-linuxapp.service
 
 %package -n fdo-owner-cli
 Summary: FDO Owner tools implementation
@@ -165,17 +181,39 @@ Summary: FDO Owner tools implementation
 %files -n fdo-owner-cli
 %license LICENSE
 %{_bindir}/fdo-owner-tool
+%{_libexecdir}/fdo/fdo-owner-tool
 
 %package -n fdo-admin-cli
 Summary: FDO admin tools implementation
+Requires: fdo-manufacturing-server
+Requires: fdo-init
+Requires: fdo-client
+Requires: fdo-rendezvous-server
+Requires: fdo-owner-onboarding-server
+Requires: fdo-owner-cli
 %description -n fdo-admin-cli
 %{summary}
 
 %files -n fdo-admin-cli
 %license LICENSE
 %{_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
+
+%preun -n fdo-admin-cli
+%systemd_preun fdo-aio.service
+
+%postun -n fdo-admin-cli
+%systemd_postun_with_restart fdo-aio.service
 
 %changelog
+* Tue Mar 29 2022 Antonio Murdaca <runcom@linux.com> - 0.4.5-1
+- bump to 0.4.5
+
 * Fri Feb 25 2022 Antonio Murdaca <runcom@linux.com> - 0.4.0-8
 - attempt #1 to fix checksums