Merge ~paride/ubuntu/+source/strongswan:lp1940079-tss2-focal into ubuntu/+source/strongswan:ubuntu/focal-devel

[Paride Legovini]

Focal SRU fix for LP #1940079. This is the same change that landed in the Debian packaging (git) and in Impish, applied to Focal.

Test Plan: see the SRU template.
Test PPA: https://launchpad.net/~paride/+archive/ubuntu/strongswan

Fix verified by the bug submitter using the PPA package.

Please review; no sponsorship needed.

[Christian Ehrhardt  (paelzer)]

This one was abandoned (wrong merge target)

[Christian Ehrhardt  (paelzer)]

Along the Hirsute version of this +1
Thanks!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 0443e1b..8bf8082 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+strongswan (5.8.2-1ubuntu3.2) focal; urgency=medium
+
+  * Compile the tpm plugin against the tpm2 software stack (tss2)
+    (Debian packaging cherry-pick, LP: #1940079)
+    - d/rules: add the --enable-tss-tss2 configure flag
+    - d/control: add Build-Depends: libtss2-dev
+
+ -- Paride Legovini <[e-mail]>  Fri, 17 Sep 2021 10:48:56 +0200
+
 strongswan (5.8.2-1ubuntu3.1) focal; urgency=medium
 
   * Re-enable eap-{dynamic,peap} libcharon plugins (LP: #1878887)
diff --git a/debian/control b/debian/control
index 3859289..88ec114 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Build-Depends: bison,
                libssl-dev (>= 0.9.8),
                libsystemd-dev [linux-any],
                libtool,
+               libtss2-dev,
                libxml2-dev,
                pkg-config,
                po-debconf,
diff --git a/debian/rules b/debian/rules
index f012b4d..59f75eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,7 @@ CONFIGUREARGS := --libdir=/usr/lib --libexecdir=/usr/lib \
 		--enable-pkcs11 \
 		--enable-test-vectors \
 		--enable-tpm \
+		--enable-tss-tss2 \
 		--enable-unity \
 		--enable-xauth-eap \
 		--enable-xauth-pam \