From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 16 Aug 2017 08:38:44 +0000 (+0200)
Subject: testing: Make removal of SWID tags work with different releases
X-Git-Tag: 5.6.1dr1~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=936db031c7fd24d6c0b94f31b55df4a3b076a6e8;p=thirdparty%2Fstrongswan.git

testing: Make removal of SWID tags work with different releases

The regid.2004-03.org.strongswan directory might not exist in new images.
---

diff --git a/testing/scripts/build-strongswan b/testing/scripts/build-strongswan
index d4e9e922f1..150fce30c6 100755
--- a/testing/scripts/build-strongswan
+++ b/testing/scripts/build-strongswan
@@ -50,8 +50,7 @@ execute "bindfs -u $SRCUID -g $SRCGID $SWANDIR $LOOPDIR/root/strongswan"
 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'
+execute_chroot "find /usr/local/share -path '*strongswan*' -name *.swidtag -delete"
 
 echo "Building and installing strongSwan"