rpms/gnutls
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Disable TPM support by default

Browse Source 
Resolves: #1927370

Signed-off-by: Daiki Ueno <dueno@redhat.com>
This commit is contained in:
Daiki Ueno 2021-05-27 16:37:55 +02:00
parent d9b7cbba12
commit c625967bd4
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnutls.spec
View File

@ -1,6 +1,6 @@
# This spec file has been automatically updated # This spec file has been automatically updated
Version: 3.7.1 Version: 3.7.1
Release: 3%{?dist} Release: 4%{?dist}
Patch1: gnutls-3.6.7-no-now-guile.patch Patch1: gnutls-3.6.7-no-now-guile.patch
Patch2: gnutls-3.2.7-rpath.patch Patch2: gnutls-3.2.7-rpath.patch
Patch3: gnutls-3.7.1-aggressive-realloc-fixes.patch Patch3: gnutls-3.7.1-aggressive-realloc-fixes.patch
@ -13,6 +13,7 @@ Patch3: gnutls-3.7.1-aggressive-realloc-fixes.patch
%bcond_without guile %bcond_without guile
%bcond_without fips %bcond_without fips
%endif %endif
%bcond_with tpm12
Summary: A TLS protocol implementation Summary: A TLS protocol implementation
Name: gnutls Name: gnutls
@ -25,7 +26,9 @@ BuildRequires: automake, autoconf, gperf, libtool, texinfo
BuildRequires: autogen-libopts-devel >= 5.18, autogen BuildRequires: autogen-libopts-devel >= 5.18, autogen
%endif %endif
BuildRequires: nettle-devel >= 3.5.1 BuildRequires: nettle-devel >= 3.5.1
%if %{with tpm12}
BuildRequires: trousers-devel >= 0.3.11.2 BuildRequires: trousers-devel >= 0.3.11.2
%endif
BuildRequires: libidn2-devel BuildRequires: libidn2-devel
BuildRequires: libunistring-devel BuildRequires: libunistring-devel
BuildRequires: net-tools, datefudge, softhsm, gcc, gcc-c++ BuildRequires: net-tools, datefudge, softhsm, gcc, gcc-c++
@ -40,7 +43,9 @@ Requires: crypto-policies
Requires: p11-kit-trust Requires: p11-kit-trust
Requires: libtasn1 >= 4.3 Requires: libtasn1 >= 4.3
Requires: nettle >= 3.4.1 Requires: nettle >= 3.4.1
%if %{with tpm12}
Recommends: trousers >= 0.3.11.2 Recommends: trousers >= 0.3.11.2
%endif
%if %{with dane} %if %{with dane}
BuildRequires: unbound-devel unbound-libs BuildRequires: unbound-devel unbound-libs
@ -186,7 +191,11 @@ export GUILD
--disable-non-suiteb-curves \ --disable-non-suiteb-curves \
--with-system-priority-file=%{_sysconfdir}/crypto-policies/back-ends/gnutls.config \ --with-system-priority-file=%{_sysconfdir}/crypto-policies/back-ends/gnutls.config \
--with-default-trust-store-pkcs11="pkcs11:" \ --with-default-trust-store-pkcs11="pkcs11:" \
%if %{with tpm12}
--without-tpm \
%else
--with-trousers-lib=%{_libdir}/libtspi.so.1 \ --with-trousers-lib=%{_libdir}/libtspi.so.1 \
%endif
--htmldir=%{_docdir}/manual \ --htmldir=%{_docdir}/manual \
%if %{with guile} %if %{with guile}
--enable-guile \ --enable-guile \
@ -262,7 +271,9 @@ make check %{?_smp_mflags} GNUTLS_SYSTEM_PRIORITY_FILE=/dev/null
%files utils %files utils
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/certtool %{_bindir}/certtool
%if %{with tpm12}
%{_bindir}/tpmtool %{_bindir}/tpmtool
%endif
%{_bindir}/ocsptool %{_bindir}/ocsptool
%{_bindir}/psktool %{_bindir}/psktool
%{_bindir}/p11tool %{_bindir}/p11tool
@ -291,6 +302,9 @@ make check %{?_smp_mflags} GNUTLS_SYSTEM_PRIORITY_FILE=/dev/null
%endif %endif
%changelog %changelog
* Thu May 27 2021 Daiki Ueno <dueno@redhat.com> - 3.7.1-4
- Disable TPM support by default (#1927370)
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.7.1-3 * Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.7.1-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937