From f51bd484acf2ff5736397e846f07c29c20ba539a2d51698233d278e068465a52 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 16 May 2022 08:30:58 +0000
Subject: [PATCH 1/2] Accepting request 976484 from home:jejb1:gpg2

Enable tpm2 support which now exists in gpg2

This request enables tpm2 as a separate packaged add on (so the original gpg2 package and its dependencies is unchanged and the new gpg2-tpm package contains all the tpm2 dependencies).  To enable tpm2 support in
gpg2, you simply install gpg2-tpm and the keytotpm command will then just work

OBS-URL: https://build.opensuse.org/request/show/976484
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=273
---
 gpg2.spec | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gpg2.spec b/gpg2.spec
index 0ebba32..22b46be 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -87,6 +87,15 @@ revocation lists (CRLs) for X.509 certificates, downloading X.509 certificates,
 and providing access to OCSP providers.  Dirmngr is invoked internally by gpg,
 gpgsm, or via the gpg-connect-agent tool.
 
+%package tpm
+Summary:        TPM2 support for GnuPG
+Group:          Productivity/Networking/Security
+
+%description tpm
+Version 2.3 of GnuPG introduced support for converting GPG private
+keys to TPM2 wrapped form.  This package enables that support.  The
+keytotpm command will not function unless this package is installed.
+
 %lang_package
 
 %prep
@@ -105,6 +114,7 @@ date=$(date -u +%%Y-%%m-%%dT%%H:%%M+0000 -r %{SOURCE99})
     --with-pinentry-pgm=%{_bindir}/pinentry \
     --with-dirmngr-pgm=%{_bindir}/dirmngr \
     --with-scdaemon-pgm=%{_bindir}/scdaemon \
+    --with-tpm2daemon-pgm=%{_bindir}/tpm2daemon \
     --enable-ldap \
     --enable-gpgsm=yes \
     --enable-gpgtar \
@@ -136,6 +146,8 @@ rm -rf %{buildroot}/%{_datadir}/locale/en@{bold,}quot
 # install scdaemon to %%{_bindir} (bnc#863645)
 mv %{buildroot}%{_libdir}/scdaemon %{buildroot}%{_bindir}
 mv %{buildroot}%{_libdir}/dirmngr_ldap %{buildroot}%{_bindir}
+# install tpm2daemon
+mv %{buildroot}%{_libdir}/tpm2daemon %{buildroot}%{_bindir}
 # install udev rules for scdaemon
 install -Dm 0644 %{SOURCE4} %{buildroot}%{_udevrulesdir}/60-scdaemon.rules
 
@@ -162,6 +174,7 @@ install -Dm 0644 %{SOURCE4} %{buildroot}%{_udevrulesdir}/60-scdaemon.rules
 %exclude %{_docdir}/%{name}/examples/systemd-user/dirmngr.*
 %doc %{_docdir}/%{name}
 %exclude %{_bindir}/dirmngr*
+%exclude %{_bindir}/tpm2daemon*
 %{_bindir}/*
 %{_libdir}/[^d]*
 %{_sbindir}/addgnupghome
@@ -178,4 +191,7 @@ install -Dm 0644 %{SOURCE4} %{buildroot}%{_udevrulesdir}/60-scdaemon.rules
 %{_docdir}/%{name}/examples/systemd-user/dirmngr.*
 %{_bindir}/dirmngr*
 
+%files tpm
+%{_bindir}/tpm2daemon*
+
 %changelog

From 3e92c112c129c990ffb4bc047017a9e45270623c0dc127ad9a3061b6d0128c17 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 16 May 2022 09:13:17 +0000
Subject: [PATCH 2/2] - added tpm support, added a new subpackage gpg2-tpm

OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=274
---
 gpg2.changes | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gpg2.changes b/gpg2.changes
index a14e097..3b8c465 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon May 16 09:12:06 UTC 2022 - Marcus Meissner <meissner@suse.com>
+
+- added tpm support, added a new subpackage gpg2-tpm
+
 -------------------------------------------------------------------
 Mon Apr 25 19:09:32 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>