From fc0d38c450793750e376e51db430f6add4412326 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mon, 3 Jul 2023 17:47:29 +0100
Subject: [PATCH] Updates for eln/c9s building

---
 .gitignore                       |  1 +
 fdo-fix-tss-esapi-features.patch | 22 ++++++++++++++++++++++
 fido-device-onboard.spec         | 23 +++++++++++++++++------
 sources                          |  1 +
 4 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 fdo-fix-tss-esapi-features.patch

diff --git a/.gitignore b/.gitignore
index 27e00a3..95c57d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /fido-device-onboard-rs-*.tar.gz
+/fido-device-onboard-rs-0.4.10-vendor-patched.tar.xz
diff --git a/fdo-fix-tss-esapi-features.patch b/fdo-fix-tss-esapi-features.patch
new file mode 100644
index 0000000..38ad741
--- /dev/null
+++ b/fdo-fix-tss-esapi-features.patch
@@ -0,0 +1,22 @@
+--- fido-device-onboard-rs-0.4.10/manufacturing-client/Cargo.toml.orig	2023-07-03 15:24:05.020575397 +0100
++++ fido-device-onboard-rs-0.4.10/manufacturing-client/Cargo.toml	2023-07-03 15:24:26.381717418 +0100
+@@ -16,7 +16,7 @@
+ sys-info = "0.9"
+ passwd = "0.0.1"
+ rand = "0.8.4"
+-tss-esapi = "7.2"
++tss-esapi = { version = "7.2", features = ["generate-bindings"] }
+ regex = "1.3.7"
+ 
+ fdo-data-formats = { path = "../data-formats", version = "0.4.10" }
+--- fido-device-onboard-rs-0.4.10/owner-tool/Cargo.toml.orig	2023-07-03 15:22:27.024923885 +0100
++++ fido-device-onboard-rs-0.4.10/owner-tool/Cargo.toml	2023-07-03 15:23:31.955355563 +0100
+@@ -14,7 +14,7 @@
+ serde = { version = "1", features = ["derive"] }
+ serde_yaml = "0.9"
+ tokio = { version = "1", features = ["full"] }
+-tss-esapi = "7.2"
++tss-esapi = { version = "7.2", features = ["generate-bindings"] }
+ 
+ fdo-util = { path = "../util", version = "0.4.10" }
+ fdo-data-formats = { path = "../data-formats", version = "0.4.10" }
diff --git a/fido-device-onboard.spec b/fido-device-onboard.spec
index 9094606..48e127b 100644
--- a/fido-device-onboard.spec
+++ b/fido-device-onboard.spec
@@ -4,17 +4,22 @@
 
 Name:           fido-device-onboard
 Version:        0.4.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A rust implementation of the FIDO Device Onboard Specification
 License:        BSD-3-Clause
 
-
 URL:            https://github.com/fedora-iot/fido-device-onboard-rs
 Source0:        %{url}/archive/v%{version}/%{name}-rs-%{version}.tar.gz
+# See make-vendored-tarfile.sh in upstream repo
+Source1:        %{name}-rs-%{version}-vendor-patched.tar.xz
 # From upstream
 Patch0:         0001-chore-update-libcryptsetup-rs-to-0.8.patch
+Patch1:         fdo-fix-tss-esapi-features.patch
 
-%if 0%{?rhel} && !0%{?eln}
+# Because nobody cares
+ExcludeArch: %{ix86}
+
+%if 0%{?rhel}
 BuildRequires:  rust-toolset
 %else
 BuildRequires:  rust-packaging
@@ -33,17 +38,20 @@ BuildRequires:  tpm2-tss-devel
 %prep
 %autosetup -p1 -n %{name}-rs-%{version}
 
+%if 0%{?rhel}
+%cargo_prep -V 1
+%else
 %cargo_prep
-
 %generate_buildrequires
 %cargo_generate_buildrequires -a
+%endif
 
 %build
 %cargo_build \
 -F openssl-kdf/deny_custom
 
-%cargo_license_summary
-%{cargo_license} > LICENSE.dependencies
+%{?cargo_license_summary}
+%{?cargo_license} > LICENSE.dependencies
 
 %install
 install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-client-linuxapp
@@ -219,6 +227,9 @@ Requires: fdo-owner-cli = %{version}-%{release}
 %systemd_postun_with_restart fdo-aio.service
 
 %changelog
+* Mon Jul 03 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.10-2
+- Updates for eln/c9s building
+
 * Fri Jun 23 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.10-1
 - Update to 0.4.10
 
diff --git a/sources b/sources
index 3d96b9a..e82893b 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+SHA512 (fido-device-onboard-rs-0.4.10-vendor-patched.tar.xz) = e8a272e186be04d5937ed32d33bd9d968150cbe84c7cfa9fe5dc53055d7fc61c2198d42e38ee31fb56aaec75c27098e14af15964c6524fa7e396cd05081e337a
 SHA512 (fido-device-onboard-rs-0.4.10.tar.gz) = 7b8b082b845f6af269adaff9608075da43d884edd2ed39ec7b613c368d95b0083a8edbf160479d5effb7c19ce5049a2da3e5806dfbe7addcbc34bd3658367731