Disable TPM/TSS 1.2 support for F36+ / RHEL9+
TPM/TSS 1.2 has long since been superseded by TPM/TSS 2.0, and trousers is more or less dead and replaced by the tpm-tss toolkit for TPM/TSS 2.0. Resolves: rhbz#2033299
This commit is contained in:
@@ -5,9 +5,16 @@
|
|||||||
%bcond_without perl
|
%bcond_without perl
|
||||||
%bcond_with check
|
%bcond_with check
|
||||||
|
|
||||||
|
%if (0%{?fedora} && 0%{?fedora} < 36) || (0%{?rhel} && 0%{?rhel} < 9)
|
||||||
|
# trousers was retired for F36+ and no longer available in RHEL with 9+
|
||||||
|
%bcond_without tss_trousers
|
||||||
|
%else
|
||||||
|
%bcond_with tss_trousers
|
||||||
|
%endif
|
||||||
|
|
||||||
Name: strongswan
|
Name: strongswan
|
||||||
Version: 5.9.4
|
Version: 5.9.4
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
Summary: An OpenSource IPsec-based VPN and TNC solution
|
Summary: An OpenSource IPsec-based VPN and TNC solution
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.strongswan.org/
|
URL: http://www.strongswan.org/
|
||||||
@@ -29,7 +36,6 @@ BuildRequires: openldap-devel
|
|||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
BuildRequires: sqlite-devel
|
BuildRequires: sqlite-devel
|
||||||
BuildRequires: gettext-devel
|
BuildRequires: gettext-devel
|
||||||
BuildRequires: trousers-devel
|
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
BuildRequires: pam-devel
|
BuildRequires: pam-devel
|
||||||
BuildRequires: json-c-devel
|
BuildRequires: json-c-devel
|
||||||
@@ -51,6 +57,10 @@ BuildRequires: perl-devel perl-macros
|
|||||||
BuildRequires: perl(ExtUtils::MakeMaker)
|
BuildRequires: perl(ExtUtils::MakeMaker)
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{with tss_trousers}
|
||||||
|
BuildRequires: trousers-devel
|
||||||
|
%endif
|
||||||
|
|
||||||
BuildRequires: NetworkManager-libnm-devel
|
BuildRequires: NetworkManager-libnm-devel
|
||||||
Requires(post): systemd
|
Requires(post): systemd
|
||||||
Requires(preun): systemd
|
Requires(preun): systemd
|
||||||
@@ -147,7 +157,7 @@ for Strongswan runtime configuration from perl applications.
|
|||||||
--with-piddir=%{_rundir}/strongswan \
|
--with-piddir=%{_rundir}/strongswan \
|
||||||
--with-nm-ca-dir=%{_sysconfdir}/strongswan/ipsec.d/cacerts/ \
|
--with-nm-ca-dir=%{_sysconfdir}/strongswan/ipsec.d/cacerts/ \
|
||||||
--enable-bypass-lan \
|
--enable-bypass-lan \
|
||||||
--enable-tss-trousers \
|
--enable-tss-tss2 \
|
||||||
--enable-nm \
|
--enable-nm \
|
||||||
--enable-systemd \
|
--enable-systemd \
|
||||||
--enable-openssl \
|
--enable-openssl \
|
||||||
@@ -211,7 +221,6 @@ for Strongswan runtime configuration from perl applications.
|
|||||||
--enable-curl \
|
--enable-curl \
|
||||||
--enable-cmd \
|
--enable-cmd \
|
||||||
--enable-acert \
|
--enable-acert \
|
||||||
--enable-aikgen \
|
|
||||||
--enable-vici \
|
--enable-vici \
|
||||||
--enable-swanctl \
|
--enable-swanctl \
|
||||||
--enable-duplicheck \
|
--enable-duplicheck \
|
||||||
@@ -226,6 +235,10 @@ for Strongswan runtime configuration from perl applications.
|
|||||||
%endif
|
%endif
|
||||||
%if %{with check}
|
%if %{with check}
|
||||||
--enable-test-vectors \
|
--enable-test-vectors \
|
||||||
|
%endif
|
||||||
|
%if %{with tss_trousers}
|
||||||
|
--enable-tss-trousers \
|
||||||
|
--enable-aikgen \
|
||||||
%endif
|
%endif
|
||||||
--enable-kernel-libipsec \
|
--enable-kernel-libipsec \
|
||||||
--with-capabilities=libcap \
|
--with-capabilities=libcap \
|
||||||
@@ -395,6 +408,10 @@ install -D -m 0644 %{SOURCE1} %{buildroot}/%{_tmpfilesdir}/strongswan-starter.co
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 16 2021 Neal Gompa <ngompa@datto.com> - 5.9.4-4
|
||||||
|
- Disable TPM/TSS 1.2 support for F36+ / RHEL9+
|
||||||
|
- Resolves: rhbz#2033299 Drop TPM/TSS 1.2 support (trousers)
|
||||||
|
|
||||||
* Thu Nov 11 2021 Petr Menšík <pemensik@redhat.com> - 5.9.4-3
|
* Thu Nov 11 2021 Petr Menšík <pemensik@redhat.com> - 5.9.4-3
|
||||||
- Resolves rhbz#1419441 Add python and perl vici bindings
|
- Resolves rhbz#1419441 Add python and perl vici bindings
|
||||||
- Adds optional tests run
|
- Adds optional tests run
|
||||||
|
|||||||
Reference in New Issue
Block a user