From 11d6b62db969bdd808d0f56706cb18f113927a31 Mon Sep 17 00:00:00 2001
From: Yves-Alexis Perez <corsac@corsac.net>
Date: Fri, 1 Sep 2017 17:21:25 +0200
Subject: New upstream version 5.6.0

---
 testing/scripts/build-guestimages         | 2 +-
 testing/scripts/build-strongswan          | 1 +
 testing/scripts/recipes/013_strongswan.mk | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'testing/scripts')

diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages
index 43a71b921..7dd7188c2 100755
--- a/testing/scripts/build-guestimages
+++ b/testing/scripts/build-guestimages
@@ -48,11 +48,11 @@ do
 	execute "cp -rf $HOSTSDIR/${host}/etc $LOOPDIR" 0
 	execute "cp -rf $HOSTSDIR/default/* $LOOPDIR" 0
 	execute_chroot "ldconfig" 0
+	execute "mkdir $LOOPDIR/etc/pts" 0
 
 	if [ "$host" = "alice" ]
 	then
 		execute "mkdir $LOOPDIR/var/log/apache2/tnc" 0
-		execute "mkdir $LOOPDIR/etc/pts" 0
 		execute_chroot "chgrp www-data /etc/pts" 0
 		execute_chroot "chmod g+w /etc/pts" 0
 	fi
diff --git a/testing/scripts/build-strongswan b/testing/scripts/build-strongswan
index 8c6ecaafd..d4e9e922f 100755
--- a/testing/scripts/build-strongswan
+++ b/testing/scripts/build-strongswan
@@ -51,6 +51,7 @@ do_on_exit umount $LOOPDIR/root/strongswan
 
 log_action "Remove SWID tags of previous versions"
 execute_chroot 'find /usr/local/share/regid.2004-03.org.strongswan -name *.swidtag -delete'
+execute_chroot 'find /usr/local/share/strongswan -name *.swidtag -delete'
 
 echo "Building and installing strongSwan"
 
diff --git a/testing/scripts/recipes/013_strongswan.mk b/testing/scripts/recipes/013_strongswan.mk
index a5b2d8060..3c5f41834 100644
--- a/testing/scripts/recipes/013_strongswan.mk
+++ b/testing/scripts/recipes/013_strongswan.mk
@@ -56,6 +56,8 @@ CONFIG_OPTS = \
 	--enable-imv-attestation \
 	--enable-imc-swid \
 	--enable-imv-swid \
+	--enable-imc-swima \
+	--enable-imv-swima \
 	--enable-imc-hcd \
 	--enable-imv-hcd \
 	--enable-sql \
-- 
cgit v1.2.3