Sync changes to SLFO-1.2 branch

gnutls.changes

@@ -5,6 +5,11 @@ Tue Jul 15 08:12:29 UTC 2025 - Pedro Monreal <pmonreal@suse.com>
   cryptography (PQC) has been removed and is only provided through
   leancrypto.
 
+-------------------------------------------------------------------
+Tue Jul 15 07:40:21 UTC 2025 - Pedro Monreal <pmonreal@suse.com>
+
+- Build with TPM 2.0 support via tpm2-0-tss.
+
 -------------------------------------------------------------------
 Mon Jul 14 17:00:21 UTC 2025 - Lucas Mulling <lucas.mulling@suse.com>
 

gnutls.spec

@@ -40,6 +40,7 @@
 %bcond_with kcapi
 %endif
 %bcond_with tpm
+%bcond_without tpm2
 %bcond_without leancrypto
 Name:           gnutls
 Version:        3.8.10
@@ -116,6 +117,9 @@ BuildRequires:  net-tools-deprecated
 %if %{with tpm}
 BuildRequires:  trousers-devel
 %endif
+%if %{with tpm2}
+BuildRequires:  tpm2-0-tss-devel >= 3.0.3
+%endif
 %if %{with dane}
 Requires:       libgnutls-dane%{gnutls_dane_sover} = %{version}
 %if 0%{?suse_version} <= 1320
@@ -130,6 +134,9 @@ BuildRequires:  jitterentropy-devel >= 3.4.0
 Requires:       crypto-policies
 Requires:       libjitterentropy3 >= 3.4.0
 %endif
+%if %{with tpm}
+Recommends:     trousers
+%endif
 
 %description
 The GnuTLS library provides a secure layer over a reliable transport
@@ -244,6 +251,11 @@ autoreconf -fiv
 %if %{without tpm}
         --without-tpm \
 %endif
+%if %{with tpm2}
+        --with-tpm2 \
+%else
+        --without-tpm2 \
+%endif
 %if %{with dane}
         --with-unbound-root-key-file=%{_localstatedir}/lib/unbound/root.key \
 %else