From 7ce37550062b8f98d6452f212374ea2dda51dc19 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Tue, 1 Feb 2022 17:10:14 +0100 Subject: [PATCH] bump to 0.3.0 Resolves: rhbz#1989923 Signed-off-by: Antonio Murdaca --- .gitignore | 2 ++ fido-device-onboard.spec | 10 +++++++--- kdf.patch | 37 +++++++++++++++++++++++++++++++++++++ patch | 30 ------------------------------ sources | 2 ++ 5 files changed, 48 insertions(+), 33 deletions(-) create mode 100644 kdf.patch delete mode 100644 patch diff --git a/.gitignore b/.gitignore index d4fe1ef..0d09620 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /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 diff --git a/fido-device-onboard.spec b/fido-device-onboard.spec index f68ddca..195d665 100644 --- a/fido-device-onboard.spec +++ b/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.2.0 +Version: 0.3.0 %forgemeta Name: fido-device-onboard -Release: 2%{?dist} +Release: 1%{?dist} Summary: An implementation of the FIDO Device Onboard Specification written in rust License: BSD @@ -20,7 +20,8 @@ Source1: %{name}-rs-%{commit}-vendor-patched.tar.gz %else Source1: %{name}-rs-%{version}-vendor-patched.tar.gz %endif -Patch0: patch + +Patch0: kdf.patch ExclusiveArch: %{rust_arches} # RHBZ 1869980 @@ -173,6 +174,9 @@ Summary: FDO Owner tools implementation %{_docdir}/fdo/owner-addresses.yml %changelog +* Tue Feb 01 2022 Antonio Murdaca - 0.3.0-1 +- bump to 0.3.0 + * Tue Jan 11 2022 Antonio Murdaca - 0.2.0-2 - use patched vendor w/o win files and rename license diff --git a/kdf.patch b/kdf.patch new file mode 100644 index 0000000..4068e05 --- /dev/null +++ b/kdf.patch @@ -0,0 +1,37 @@ +diff --color -urN fido-device-onboard-rs-0.3.0-orig/Cargo.toml fido-device-onboard-rs-0.3.0/Cargo.toml +--- fido-device-onboard-rs-0.3.0-orig/Cargo.toml 2022-02-01 14:59:46.000000000 +0100 ++++ fido-device-onboard-rs-0.3.0/Cargo.toml 2022-02-01 18:17:45.773515653 +0100 +@@ -15,3 +15,7 @@ + + "integration-tests", + ] ++ ++[profile.release] ++debug = true ++ +diff --color -urN fido-device-onboard-rs-0.3.0-orig/examples/systemd/fdo-client-linuxapp.service fido-device-onboard-rs-0.3.0/examples/systemd/fdo-client-linuxapp.service +--- fido-device-onboard-rs-0.3.0-orig/examples/systemd/fdo-client-linuxapp.service 2022-02-01 14:59:46.000000000 +0100 ++++ fido-device-onboard-rs-0.3.0/examples/systemd/fdo-client-linuxapp.service 2022-02-01 17:06:50.581272078 +0100 +@@ -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 -urN fido-device-onboard-rs-0.3.0-orig/examples/systemd/fdo-owner-onboarding-server.service fido-device-onboard-rs-0.3.0/examples/systemd/fdo-owner-onboarding-server.service +--- fido-device-onboard-rs-0.3.0-orig/examples/systemd/fdo-owner-onboarding-server.service 2022-02-01 14:59:46.000000000 +0100 ++++ fido-device-onboard-rs-0.3.0/examples/systemd/fdo-owner-onboarding-server.service 2022-02-01 17:06:42.983274923 +0100 +@@ -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 --git a/patch b/patch deleted file mode 100644 index c2dd4c1..0000000 --- a/patch +++ /dev/null @@ -1,30 +0,0 @@ ---- fido-device-onboard-rs/Cargo.toml 2021-12-13 15:53:23.071283719 +0100 -+++ fido-device-onboard-rs/Cargo.toml 2021-12-13 15:50:55.968837268 +0100 -@@ -15,3 +15,6 @@ - - "integration-tests", - ] -+ -+[profile.release] -+debug = true -\ No newline at end of file ---- fido-device-onboard-rs/examples/systemd/fdo-client-linuxapp.service 2021-12-13 15:53:23.071283719 +0100 -+++ fido-device-onboard-rs/examples/systemd/fdo-client-linuxapp.service 2021-12-13 15:51:01.323889924 +0100 -@@ -7,6 +7,7 @@ - Type=oneshot - Environment=DEVICE_CREDENTIAL=/boot/device-credentials - Environment=LOG_LEVEL=info -+Environment=ALLOW_NONINTEROPABLE_KDF=1 - ExecStart=/usr/libexec/fdo/fdo-client-linuxapp - ExecStartPost=/usr/bin/mv /boot/device-credentials /etc/device-credentials - ---- fido-device-onboard-rs/examples/systemd/fdo-owner-onboarding-server.service 2021-12-13 15:53:23.072283729 +0100 -+++ fido-device-onboard-rs/examples/systemd/fdo-owner-onboarding-server.service 2021-12-13 15:51:04.354919728 +0100 -@@ -4,6 +4,7 @@ - - [Service] - Environment=LOG_LEVEL=info -+Environment=ALLOW_NONINEROPABLE_KDF=1 - ExecStart=/usr/libexec/fdo/fdo-owner-onboarding-server - # restart and failure condition - diff --git a/sources b/sources index dc0bdae..9ac9f84 100644 --- a/sources +++ b/sources @@ -1,3 +1,5 @@ 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