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

[Paride Legovini]

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

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

Fix verified on Focal by the bug submitter using the Focal PPA package.

Please review; no sponsorship needed.

[Christian Ehrhardt  (paelzer)]

* Changelog:
  - [+] changelog entry correct version and targeted codename
  - [+] changelog entries correct
  - [+] bug references correct
  - [+] update-maintainer has been run (before)

* New Delta:
  - [+] change is upstreamed

* Git/Maintenance
  - [+] extra testcases added or not needed for this
  - [+] commits are properly split (more important on -dev than on SRUs)

* Build/Test:
  - [+] build is ok
  - [+] verified PPA package installs/uninstalls
  - [+] sanity checks test fine

The one thing I'm unsure is that strongswan usually has .conf file for almost all of their plugins. It is likely that this is ok here as it isn't a pluging but a lib for a plugin.
I'm double checking the build log ...
I see ./usr/share/strongswan/templates/config/plugins/tpm.conf but there is no new unhandled tss*.conf AFAICS.

The SRU template looks great well outlined why we think this can be fixed via an SRU!.

+1

review: Approve

diff --git a/debian/changelog b/debian/changelog
index cc0057d..19036ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+strongswan (5.9.1-1ubuntu1.1) hirsute; 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 12:15:40 +0200
+
 strongswan (5.9.1-1ubuntu1) hirsute; urgency=medium
 
   * Merge with Debian unstable. Remaining changes:
diff --git a/debian/control b/debian/control
index fbd59a0..a64a176 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,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 25cbede..3d32107 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 \