.fido-device-onboard.metadata

@@ -1,2 +1,2 @@
-f89779ff4421530aa4f51ebe1eaa81858ec4b1f5 SOURCES/fido-device-onboard-rs-0.4.5-vendor-patched.tar.gz
+46520f8fc83e17f4f308e56e464413df14b0a30e SOURCES/fido-device-onboard-rs-0.4.7-vendor-patched.tar.xz
-2bccb11a53358c1464e00d9a2b41251d793651d0 SOURCES/fido-device-onboard-rs-0.4.5.tar.gz
+7a56d23875101202a44ad2a35d928be29263cf4d SOURCES/fido-device-onboard-rs-0.4.7.tar.gz

.gitignore

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

SOURCES/kdf-debug-profile.patch

@@ -1,70 +0,0 @@
-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"}

SOURCES/make-vendored-tarfile.sh

@@ -0,0 +1,14 @@
+#/bin/bash
+set -x
+ver=$1
+cargo vendor
+# Various vendor cleanups
+pushd vendor
+# cleanup windows files
+rm -rf winapi/src/*
+touch winapi/src/lib.rs
+rm -rf winapi-x86_64-pc-windows-gnu/lib/*
+rm -rf winapi-i686-pc-windows-gnu/lib/*
+rm -rf vcpkg/test-data
+popd #vendor
+tar cjf fido-device-onboard-rs-$ver-vendor-patched.tar.xz vendor/

SPECS/fido-device-onboard.spec

@@ -1,30 +1,48 @@
+%global debug_package %{nil}
 %define dracutlibdir %{_prefix}/lib/dracut
 %bcond_without check
-%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
+Version:        0.4.7
 
 %forgemeta
 
 Name:           fido-device-onboard
-Release:        1%{?dist}
+Release:        3%{?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
+# Apache-2.0
+# Apache-2.0 OR BSL-1.0
+# Apache-2.0 OR ISC OR MIT
+# Apache-2.0 OR MIT
+# (Apache-2.0 OR MIT) AND BSD-3-Clause
+# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
+# BSD-2-Clause
+# BSD-3-Clause
+# CC0-1.0
+# CC0-1.0 OR Apache-2.0
+# ISC
+# MIT
+# MIT OR Apache-2.0
+# MIT OR Apache-2.0 OR Zlib
+# MPL-2.0
+# Unlicense OR MIT
+# Zlib OR Apache-2.0 OR MIT
+
+License:        Apache-2.0 and BSD and MIT
 URL:            %{forgeurl}
-Source:         %{forgesource}
+
+Source0:        %{forgesource}
+# this is a basic script to generate the vendor tarfile.
+Source1:        make-vendored-tarfile.sh
 %if "%{?commit}" != ""
-Source1:        %{name}-rs-%{commit}-vendor-patched.tar.gz
+Source2:        %{name}-rs-%{commit}-vendor-patched.tar.xz
 %else
-Source1:        %{name}-rs-%{version}-vendor-patched.tar.gz
+Source2:        %{name}-rs-%{version}-vendor-patched.tar.xz
 %endif
 
-Patch0:         kdf-debug-profile.patch
-
 ExclusiveArch:  %{rust_arches}
-# RHBZ 1869980
+# Needs, at least, tss bindings regen
 ExcludeArch:    s390x i686 %{power64}
 
 %if 0%{?rhel} && !0%{?eln}
@@ -32,27 +50,34 @@ BuildRequires:  rust-toolset
 %else
 BuildRequires:  rust-packaging
 %endif
-BuildRequires: systemd-rpm-macros
-BuildRequires: openssl-devel
-BuildRequires: golang
-BuildRequires: tpm2-tss-devel
-BuildRequires: cryptsetup-devel
 BuildRequires:  clang-devel
+BuildRequires:  cryptsetup-devel
+BuildRequires:  golang
+BuildRequires:  openssl-devel >= 3.0.1-12
+BuildRequires:  systemd-rpm-macros
+BuildRequires:  tpm2-tss-devel
 
 %description
 %{summary}.
 
 %prep
 %forgesetup
-%if 0%{?rhel} && !0%{?eln}
-%cargo_prep -V 1
-%else
 %cargo_prep
-%endif
+
-%patch0 -p1
+# Vendored crates
+tar xf %{SOURCE2}
+mkdir -p .cargo
+cat >.cargo/config << EOF
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"
+EOF
 
 %build
-%{__cargo} build --release --features "openssl-kdf/deny_custom,fdo-data-formats/use_noninteroperable_kdf"
+%cargo_build \
+-F openssl-kdf/deny_custom
 
 %install
 install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-client-linuxapp
@@ -69,7 +94,7 @@ 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
+# 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
@@ -77,6 +102,7 @@ install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/52fdo dracut/52fdo/m
 
 %package -n fdo-init
 Summary: dracut module for device initialization
+Requires: openssl-libs >= 3.0.1-12
 %description -n fdo-init
 %{summary}
 
@@ -87,6 +113,7 @@ Summary: dracut module for device initialization
 
 %package -n fdo-owner-onboarding-server
 Summary: FDO Owner Onboarding Server implementation
+Requires: openssl-libs >= 3.0.1-12
 %description -n fdo-owner-onboarding-server
 %{summary}
 
@@ -119,7 +146,7 @@ Summary: FDO Rendezvous Server implementation
 %files -n fdo-rendezvous-server
 %license LICENSE
 %{_libexecdir}/fdo/fdo-rendezvous-server
-%{_docdir}/fdo/rendezvous-server.yml
+%{_docdir}/fdo/rendezvous-*.yml
 %{_unitdir}/fdo-rendezvous-server.service
 
 %post -n fdo-rendezvous-server
@@ -133,6 +160,7 @@ Summary: FDO Rendezvous Server implementation
 
 %package -n fdo-manufacturing-server
 Summary: FDO Manufacturing Server implementation
+Requires: openssl-libs >= 3.0.1-12
 %description -n fdo-manufacturing-server
 %{summary}
 
@@ -153,6 +181,7 @@ Summary: FDO Manufacturing Server implementation
 
 %package -n fdo-client
 Summary: FDO Client implementation
+Requires: openssl-libs >= 3.0.1-12
 Requires: clevis
 Requires: clevis-luks
 Requires: cryptsetup
@@ -211,62 +240,30 @@ Requires: fdo-owner-cli
 %systemd_postun_with_restart fdo-aio.service
 
 %changelog
+* 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
 
-* Fri Feb 25 2022 Antonio Murdaca <runcom@linux.com> - 0.4.0-8
+* Mon Feb 28 2022 Antonio Murdaca <runcom@linux.com> - 0.4.0-2
-- attempt #1 to fix checksums
+- fix runtime requirements to use openssl-libs and not -devel
-
-* 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 v0.3.0
+- bump to 0.3.0
 
-* Mon Jan 10 2022 Antonio Murdaca <runcom@linux.com> - 0.2.0-5
+* Tue Jan 11 2022 Antonio Murdaca <runcom@linux.com> - 0.2.0-2
-- rebuilt dropping vendored exe(s) files (dll and .a)
+- use patched vendor w/o win files and rename license
 
-* Sat Dec 11 2021 Antonio Murdaca <runcom@linux.com> - 0.2.0-4
+* Mon Dec 13 2021 Antonio Murdaca <runcom@linux.com> - 0.2.0-1
-- Restore soname, add golang to BuildRequires
+- import fido-device-onboard
-
-* 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