Upstream fix for rhbz#2168089

Resolves: rhbz#2168089

Signed-off-by: Peter Robinson <pbrobinson@redhat.com>
This commit is contained in:
Peter Robinson 2023-02-15 15:26:20 +00:00
parent 7ea0c05a4d
commit af63204497
2 changed files with 33 additions and 1 deletions

View File

@ -8,7 +8,7 @@ Version: 0.4.7
%forgemeta %forgemeta
Name: fido-device-onboard Name: fido-device-onboard
Release: 1%{?dist} Release: 2%{?dist}
Summary: A rust implementation of the FIDO Device Onboard Specification Summary: A rust implementation of the FIDO Device Onboard Specification
# Apache-2.0 # Apache-2.0
@ -40,6 +40,7 @@ Source2: %{name}-rs-%{commit}-vendor-patched.tar.xz
%else %else
Source2: %{name}-rs-%{version}-vendor-patched.tar.xz Source2: %{name}-rs-%{version}-vendor-patched.tar.xz
%endif %endif
Patch0: rhbz2168089.patch
ExclusiveArch: %{rust_arches} ExclusiveArch: %{rust_arches}
# Needs, at least, tss bindings regen # Needs, at least, tss bindings regen
@ -62,6 +63,7 @@ BuildRequires: tpm2-tss-devel
%prep %prep
%forgesetup %forgesetup
%patch0 -p1
%cargo_prep %cargo_prep
# Vendored crates # Vendored crates
@ -240,6 +242,9 @@ Requires: fdo-owner-cli
%systemd_postun_with_restart fdo-aio.service %systemd_postun_with_restart fdo-aio.service
%changelog %changelog
* 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 * Wed Nov 30 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.7-1
- Update to 0.4.7 - Update to 0.4.7
- Package updates and cleanup - Package updates and cleanup

27
rhbz2168089.patch Normal file
View File

@ -0,0 +1,27 @@
From a58510d8ea798701745bf7513364dbfc485f08fb Mon Sep 17 00:00:00 2001
From: Irene Diez <idiez@redhat.com>
Date: Wed, 15 Feb 2023 16:12:59 +0100
Subject: [PATCH] fix: owner-onboarding service should also start
serviceinfoapi service
When using systemd units the fdo-owner-onboarding-server.service should
also start fdo-serviceinfo-api-server.
Signed-off-by: Irene Diez <idiez@redhat.com>
---
examples/systemd/fdo-owner-onboarding-server.service | 1 +
1 file changed, 1 insertion(+)
diff --git a/examples/systemd/fdo-owner-onboarding-server.service b/examples/systemd/fdo-owner-onboarding-server.service
index 97d3ee49..dc875ce2 100644
--- a/examples/systemd/fdo-owner-onboarding-server.service
+++ b/examples/systemd/fdo-owner-onboarding-server.service
@@ -5,6 +5,7 @@ After=network-online.target
[Service]
Environment=LOG_LEVEL=info
ExecStart=/usr/libexec/fdo/fdo-owner-onboarding-server
+ExecStartPost=/usr/libexec/fdo/fdo-serviceinfo-api-server
# restart and failure condition
[Install]