Drop tpm1.2 support by default
This commit is contained in:
parent
a9de92bcda
commit
1ab7c615e4
@ -1,7 +1,7 @@
|
|||||||
Name: opencryptoki
|
Name: opencryptoki
|
||||||
Summary: Implementation of the PKCS#11 (Cryptoki) specification v2.11
|
Summary: Implementation of the PKCS#11 (Cryptoki) specification v2.11
|
||||||
Version: 3.15.1
|
Version: 3.15.1
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
License: CPL
|
License: CPL
|
||||||
URL: https://github.com/opencryptoki/opencryptoki
|
URL: https://github.com/opencryptoki/opencryptoki
|
||||||
Source0: https://github.com/opencryptoki/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
|
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
|
Requires(pre): coreutils
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
|
%if 0%{?tmptok}
|
||||||
BuildRequires: trousers-devel
|
BuildRequires: trousers-devel
|
||||||
|
%endif
|
||||||
BuildRequires: openldap-devel
|
BuildRequires: openldap-devel
|
||||||
BuildRequires: autoconf automake libtool
|
BuildRequires: autoconf automake libtool
|
||||||
BuildRequires: bison flex
|
BuildRequires: bison flex
|
||||||
@ -186,6 +188,11 @@ configured with Enterprise PKCS#11 (EP11) firmware.
|
|||||||
./bootstrap.sh
|
./bootstrap.sh
|
||||||
|
|
||||||
%configure --with-systemd=%{_unitdir} --enable-testcases \
|
%configure --with-systemd=%{_unitdir} --enable-testcases \
|
||||||
|
%if 0%{?tpmtok}
|
||||||
|
--enable-tpmtok \
|
||||||
|
%else
|
||||||
|
--disable-tpmtok \
|
||||||
|
%endif
|
||||||
%ifarch s390 s390x
|
%ifarch s390 s390x
|
||||||
--enable-icatok --enable-ccatok --enable-ep11tok --enable-pkcsep11_migrate
|
--enable-icatok --enable-ccatok --enable-ep11tok --enable-pkcsep11_migrate
|
||||||
%else
|
%else
|
||||||
@ -270,11 +277,13 @@ fi
|
|||||||
%dir %attr(770,root,pkcs11) %{_sharedstatedir}/%{name}/swtok/
|
%dir %attr(770,root,pkcs11) %{_sharedstatedir}/%{name}/swtok/
|
||||||
%dir %attr(770,root,pkcs11) %{_sharedstatedir}/%{name}/swtok/TOK_OBJ/
|
%dir %attr(770,root,pkcs11) %{_sharedstatedir}/%{name}/swtok/TOK_OBJ/
|
||||||
|
|
||||||
|
%if 0%{?tmptok}
|
||||||
%files tpmtok
|
%files tpmtok
|
||||||
%doc doc/README.tpm_stdll
|
%doc doc/README.tpm_stdll
|
||||||
%{_libdir}/opencryptoki/stdll/libpkcs11_tpm.*
|
%{_libdir}/opencryptoki/stdll/libpkcs11_tpm.*
|
||||||
%{_libdir}/opencryptoki/stdll/PKCS11_TPM.so
|
%{_libdir}/opencryptoki/stdll/PKCS11_TPM.so
|
||||||
%dir %attr(770,root,pkcs11) %{_sharedstatedir}/%{name}/tpm/
|
%dir %attr(770,root,pkcs11) %{_sharedstatedir}/%{name}/tpm/
|
||||||
|
%endif
|
||||||
|
|
||||||
%files icsftok
|
%files icsftok
|
||||||
%doc doc/README.icsf_stdll
|
%doc doc/README.icsf_stdll
|
||||||
@ -316,6 +325,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 22 2020 Than Ngo <than@redhat.com> - 3.15.1-3
|
||||||
|
- Drop tpm1.2 support by default
|
||||||
|
|
||||||
* Tue Dec 22 2020 Than Ngo <than@redhat.com> - 3.15.1-2
|
* Tue Dec 22 2020 Than Ngo <than@redhat.com> - 3.15.1-2
|
||||||
- Fix compiling with c++
|
- Fix compiling with c++
|
||||||
- Added error message handling for p11sak remove-key command
|
- Added error message handling for p11sak remove-key command
|
||||||
|
Loading…
Reference in New Issue
Block a user