From 7ea0c05a4df62215e858c1a0de5da92f35183f88 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 13 Feb 2023 09:47:43 +0000 Subject: [PATCH] Update to FDO 0.4.7 Resolves: rhbz#2075576 Signed-off-by: Peter Robinson --- .gitignore | 15 ++------- debug-profile.patch | 10 ------ fido-device-onboard.spec | 70 ++++++++++++++++++++++++++-------------- make-vendored-tarfile.sh | 14 ++++++++ sources | 15 ++------- 5 files changed, 64 insertions(+), 60 deletions(-) delete mode 100644 debug-profile.patch create mode 100644 make-vendored-tarfile.sh diff --git a/.gitignore b/.gitignore index 82850cb..ce5f38a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,2 @@ -/fido-device-onboard-rs-0.2.0-vendor.tar.gz -/fido-device-onboard-rs-0.2.0.tar.gz -/fido-device-onboard-rs-0.2.0-vendor-patched.tar.gz -/fido-device-onboard-rs-0.3.0.tar.gz -/fido-device-onboard-rs-0.3.0-vendor-patched.tar.gz -/fido-device-onboard-rs-0.4.0-vendor-patched.tar.gz -/fido-device-onboard-rs-0.4.0.tar.gz -/fido-device-onboard-rs-b52cd2912bc646779e290300fc27fa59f3264535.tar.gz -/fido-device-onboard-rs-b52cd2912bc646779e290300fc27fa59f3264535-vendor.tar.gz -/fido-device-onboard-rs-61145c33f1e58be9bf07ee59812c077bd0647b55.tar.gz -/fido-device-onboard-rs-61145c33f1e58be9bf07ee59812c077bd0647b55-vendor.tar.gz -/fido-device-onboard-rs-0.4.5.tar.gz -/fido-device-onboard-rs-0.4.5-vendor-patched.tar.gz +/fido-device-onboard-rs-*.tar.gz +/fido-device-onboard-rs-*-vendor-patched.tar.xz diff --git a/debug-profile.patch b/debug-profile.patch deleted file mode 100644 index 0ff628c..0000000 --- a/debug-profile.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --color -ru fido-device-onboard-rs-b52cd2912bc646779e290300fc27fa59f3264535-orig/Cargo.toml fido-device-onboard-rs-b52cd2912bc646779e290300fc27fa59f3264535/Cargo.toml ---- fido-device-onboard-rs-b52cd2912bc646779e290300fc27fa59f3264535-orig/Cargo.toml 2022-03-17 16:38:49.000000000 +0100 -+++ fido-device-onboard-rs-b52cd2912bc646779e290300fc27fa59f3264535/Cargo.toml 2022-03-28 12:03:59.101029855 +0200 -@@ -17,3 +17,6 @@ - - "integration-tests", - ] -+ -+[profile.release] -+debug = true diff --git a/fido-device-onboard.spec b/fido-device-onboard.spec index 0611859..7fbf204 100644 --- a/fido-device-onboard.spec +++ b/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} -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: debug-profile.patch - ExclusiveArch: %{rust_arches} -# RHBZ 1869980 +# Needs, at least, tss bindings regen ExcludeArch: s390x i686 %{power64} %if 0%{?rhel} && !0%{?eln} @@ -32,22 +50,22 @@ BuildRequires: rust-toolset %else BuildRequires: rust-packaging %endif -BuildRequires: systemd-rpm-macros -BuildRequires: openssl-devel >= 3.0.1-12 -BuildRequires: golang -BuildRequires: tpm2-tss-devel -BuildRequires: cryptsetup-devel -BuildRequires: clang-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 -%patch0 -p1 %cargo_prep -%if 0%{?rhel} && !0%{?eln} -tar xvf %{SOURCE1} + +# Vendored crates +tar xf %{SOURCE2} mkdir -p .cargo cat >.cargo/config << EOF [source.crates-io] @@ -56,10 +74,10 @@ replace-with = "vendored-sources" [source.vendored-sources] directory = "vendor" EOF -%endif %build -%{__cargo} build --release --features openssl-kdf/deny_custom +%cargo_build \ +-F openssl-kdf/deny_custom %install install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-client-linuxapp @@ -76,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 @@ -128,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 @@ -222,6 +240,10 @@ Requires: fdo-owner-cli %systemd_postun_with_restart fdo-aio.service %changelog +* Wed Nov 30 2022 Peter Robinson - 0.4.7-1 +- Update to 0.4.7 +- Package updates and cleanup + * Tue Mar 29 2022 Antonio Murdaca - 0.4.5-1 - bump to 0.4.5 diff --git a/make-vendored-tarfile.sh b/make-vendored-tarfile.sh new file mode 100644 index 0000000..314a2cd --- /dev/null +++ b/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/ diff --git a/sources b/sources index 0d0f9f7..3787d2c 100644 --- a/sources +++ b/sources @@ -1,13 +1,2 @@ -SHA512 (fido-device-onboard-rs-0.2.0-vendor.tar.gz) = 7760bd0eb21754185c7bf1d782cbad36dc044faa811a6d626897d4a208c7f374ce28201a9f25ed4de36d05d492a8cf2f521f14aa72e3c51b0ffbc3430e8d06fc -SHA512 (fido-device-onboard-rs-0.2.0.tar.gz) = 9d6be123d2b0dc90172600a736a2fedbfc97e2014fd09217800a086dfe788f4e20b053af3a697187141d788c3de3093e49664626b37f8b6f6dc1cc1a33a0f027 -SHA512 (fido-device-onboard-rs-0.2.0-vendor-patched.tar.gz) = 2ff9d97a067fd62dd3cdcb9535fe2a6715ad13ed54df787510b028cd135bc99d64a06cc4f0395b27a2476860509e1dfe7711592986f89f62acb42c2f61d7ea67 -SHA512 (fido-device-onboard-rs-0.3.0-vendor-patched.tar.gz) = 09e23118a29fff21593d6e4f024b050e3df3049a39d796a3c2299a20282f60c54d43c7ac48010b0f08bbb08955be45bf0b50c92e5543cbb3b77ecaa0fcaacdc7 -SHA512 (fido-device-onboard-rs-0.3.0.tar.gz) = 73174dee1571b13db45314b41a12c0879583238e326b94713163b2158354cd68ac253566453c108a86cd5082b3217a20d179f8de3ab02267abd6fa895c8a5626 -SHA512 (fido-device-onboard-rs-0.4.0-vendor-patched.tar.gz) = 50db064451da4b3f6d3ab842e2e9aa4a8c14ede8d733aeddfaa5f683b548c6e3e7b6b09e431cc5b8e928b3a5b994f6dd5a47a2fd38a3dcb70bce5c2ec0b64ef2 -SHA512 (fido-device-onboard-rs-0.4.0.tar.gz) = aa9e295fd3b27f7b81b1b40a9560fedf1ca53e23ac6ab952f29a385b663007db0b9fd003e5d2cacb36893b530e5ab8e02a2518df8643c84e960838302d048db9 -SHA512 (fido-device-onboard-rs-b52cd2912bc646779e290300fc27fa59f3264535.tar.gz) = 3a66a987cc067d0bfad37d51d66d6333225ae49a476b0dd7139beb61c5a942da9182bf408c45f6cec708d287abd9e1bb9f319902257efcd8f3efde60299c929c -SHA512 (fido-device-onboard-rs-b52cd2912bc646779e290300fc27fa59f3264535-vendor.tar.gz) = 6720652df8fc417a88dccea393f42a2b17ee5ef749a436d6814f43055fed0b9bdaa2a76c3c82f9a9293393a9fdc1c6fef0dc27ce12c61af222015844eb991193 -SHA512 (fido-device-onboard-rs-61145c33f1e58be9bf07ee59812c077bd0647b55.tar.gz) = 0d032c14e68b60e9e4205c0bef12b61a75853428328cbc5ee1fa9501d3bf367872d1615fef2366a82aece5bdbb6ba339888013dae797707e466c0be06bac8e0e -SHA512 (fido-device-onboard-rs-61145c33f1e58be9bf07ee59812c077bd0647b55-vendor.tar.gz) = ef4d9e16d158c7dcecd2aacb8b6da0ea09c59663dd4bb63b7a4213dc546f96517df202e7a93e7afaed925881d4ea2348bd08e074e3caea2235ba55675f58c507 -SHA512 (fido-device-onboard-rs-0.4.5-vendor-patched.tar.gz) = e7daf460dedfbfd9a453f77e23c4c9160b1681f3ef82946fe2dd8595244829fc20bb5bb67c19b05cc982e37096dc7cf427040e3dc3b7fed9f3a3c877d3870664 -SHA512 (fido-device-onboard-rs-0.4.5.tar.gz) = c1328d69d628212f3927daac1aaa220c4a16c89856f405e97f5d26d01a625cf0398e50894b88d8e5f0c271aaafcf7e2a9fd35198efdf093372fe1425150303f6 +SHA512 (fido-device-onboard-rs-0.4.7.tar.gz) = 4a3e5d1f36a5a52369e0d331370aa16d8ebe0659ab9a5b53d4b4620bc53c2e9b3b4f3b93f46027b2207cee8393c26507af028fbbab0876d79cca7dbd515c5925 +SHA512 (fido-device-onboard-rs-0.4.7-vendor-patched.tar.xz) = b2ca4e5ed1abde32ba67e2e2748db8012a013dbbc03a0520d8e8acee2ea4acc1160d559d7b90eace56c1f7cd4f967071ae460c4d3b09d117b61282f1448c2236