From 1ab7c615e40c56b29f4602c819bdb25d44ad6454 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 22 Dec 2020 14:36:07 +0100 Subject: [PATCH] Drop tpm1.2 support by default --- opencryptoki.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/opencryptoki.spec b/opencryptoki.spec index 7e61b85..41b4360 100644 --- a/opencryptoki.spec +++ b/opencryptoki.spec @@ -1,7 +1,7 @@ Name: opencryptoki Summary: Implementation of the PKCS#11 (Cryptoki) specification v2.11 Version: 3.15.1 -Release: 2%{?dist} +Release: 3%{?dist} License: CPL URL: https://github.com/opencryptoki/opencryptoki Source0: https://github.com/opencryptoki/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -24,7 +24,9 @@ Patch201: opencryptoki-3.15.1-fix_compiling_with_c++.patch Requires(pre): coreutils BuildRequires: gcc BuildRequires: openssl-devel +%if 0%{?tmptok} BuildRequires: trousers-devel +%endif BuildRequires: openldap-devel BuildRequires: autoconf automake libtool BuildRequires: bison flex @@ -186,6 +188,11 @@ configured with Enterprise PKCS#11 (EP11) firmware. ./bootstrap.sh %configure --with-systemd=%{_unitdir} --enable-testcases \ +%if 0%{?tpmtok} + --enable-tpmtok \ +%else + --disable-tpmtok \ +%endif %ifarch s390 s390x --enable-icatok --enable-ccatok --enable-ep11tok --enable-pkcsep11_migrate %else @@ -270,11 +277,13 @@ fi %dir %attr(770,root,pkcs11) %{_sharedstatedir}/%{name}/swtok/ %dir %attr(770,root,pkcs11) %{_sharedstatedir}/%{name}/swtok/TOK_OBJ/ +%if 0%{?tmptok} %files tpmtok %doc doc/README.tpm_stdll %{_libdir}/opencryptoki/stdll/libpkcs11_tpm.* %{_libdir}/opencryptoki/stdll/PKCS11_TPM.so %dir %attr(770,root,pkcs11) %{_sharedstatedir}/%{name}/tpm/ +%endif %files icsftok %doc doc/README.icsf_stdll @@ -316,6 +325,9 @@ fi %changelog +* Tue Dec 22 2020 Than Ngo - 3.15.1-3 +- Drop tpm1.2 support by default + * Tue Dec 22 2020 Than Ngo - 3.15.1-2 - Fix compiling with c++ - Added error message handling for p11sak remove-key command