From a6eb8a263e9e79128c546e4de759f72c59399a97 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Mon, 10 Feb 2020 15:42:52 +0100 Subject: [PATCH] Remove bogus variable to unbreak build on gcc10 --- tpm2-pkcs11-1.0.1-gcc10.patch | 13 +++++++++++++ tpm2-pkcs11.spec | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 tpm2-pkcs11-1.0.1-gcc10.patch diff --git a/tpm2-pkcs11-1.0.1-gcc10.patch b/tpm2-pkcs11-1.0.1-gcc10.patch new file mode 100644 index 0000000..2244bd2 --- /dev/null +++ b/tpm2-pkcs11-1.0.1-gcc10.patch @@ -0,0 +1,13 @@ +diff --git a/src/lib/token.h b/src/lib/token.h +index eeb193f..6a6ae6c 100644 +--- a/src/lib/token.h ++++ b/src/lib/token.h +@@ -14,7 +14,7 @@ typedef struct token_config token_config; + struct token_config { + bool is_initialized; /* token initialization state */ + char *tcti; /* token specific tcti config */ +-} config; ++}; + + typedef struct session_table session_table; + typedef struct session_ctx session_ctx; diff --git a/tpm2-pkcs11.spec b/tpm2-pkcs11.spec index 5e0ea80..fa72e23 100644 --- a/tpm2-pkcs11.spec +++ b/tpm2-pkcs11.spec @@ -11,6 +11,7 @@ Source0: https://github.com/tpm2-software/%{name}/releases/download/%{version}%{ Source1: https://github.com/tpm2-software/%{name}/releases/download/%{version}%{?candidate:-%{candidate}}/%{name}-%{version}%{?candidate:-%{candidate}}.tar.gz.asc # William Roberts (Bill Roberts) key from pgp.mit.edu Source2: gpgkey-8E1F50C1.gpg +Patch1: tpm2-pkcs11-1.0.1-gcc10.patch BuildRequires: gcc BuildRequires: make @@ -51,6 +52,7 @@ The tools required to setup and configure TPM2 for PKCS#11. %prep gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %setup -q -n %{name}-%{version}%{?candidate:-%{candidate}} +%patch1 -p1 -b .gcc10 %build