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

[Paride Legovini]

Fix for LP: #1940079, done by cherry-picking my own commit done against the Debian packaging.

Test PPA: https://launchpad.net/~paride/+archive/ubuntu/strongswan

Resulting libstrongswan-extra-plugins binary debdiff:

File lists identical (after any substitutions)

Control files: lines which differ (wdiff format)
------------------------------------------------
Depends: libstrongswan (= [-5.9.1-1ubuntu2),-] {+5.9.1-1ubuntu3),+} libc6 (>= [-2.25),-] {+2.34),+} libcurl4 (>= 7.16.2), libgcrypt20 (>= 1.8.0), libgpg-error0 (>= 1.14), libldap-2.5-0 (>= [-2.5.4)-] {+2.5.4), libtss2-sys1 (>= 3.0.1)+}
Installed-Size: [-794-] {+822+}
Version: [-5.9.1-1ubuntu2-] {+5.9.1-1ubuntu3+}

[Christian Ehrhardt  (paelzer)]

libtss2-sys1 is in main, the change LGTM and thanks for ensuring Debian is not diverting on this!
+1

Now it is up to the release team to FFE ack as well before we upload.

review: Approve

[Paride Legovini (paride)]

Manually marked as Merged as the imported didn't, likely because of empty directories being present in the source tree.

diff --git a/debian/changelog b/debian/changelog
index 5efee25..436a5e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+strongswan (5.9.1-1ubuntu3) impish; 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]>  Thu, 16 Sep 2021 11:40:38 +0200
+
 strongswan (5.9.1-1ubuntu2) impish; urgency=medium
 
   * No-change rebuild due to OpenLDAP soname bump.
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 \