diff options
Diffstat (limited to 'testing/scripts')
| -rwxr-xr-x | testing/scripts/build-strongswan | 14 | ||||
| -rw-r--r-- | testing/scripts/recipes/010_tkm.mk | 2 | ||||
| -rw-r--r-- | testing/scripts/recipes/013_strongswan.mk | 5 |
3 files changed, 19 insertions, 2 deletions
diff --git a/testing/scripts/build-strongswan b/testing/scripts/build-strongswan index c52dddda8..8c6ecaafd 100755 --- a/testing/scripts/build-strongswan +++ b/testing/scripts/build-strongswan @@ -49,7 +49,21 @@ log_action "Mounting $SWANDIR as /root/strongswan" 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' + echo "Building and installing strongSwan" + +log_action "Determine strongSwan version" +desc=`git -C $SWANDIR describe --dirty` +if [ $? -eq 0 ]; then + SWANVERSION="$desc (`git -C $SWANDIR rev-parse --abbrev-ref HEAD`)" +else + SWANVERSION="`cat $SWANDIR/configure.ac | sed -n '/^AC_INIT/{ s/.*,\[\(.*\)\])$/\1/p }'`" +fi +echo "$SWANVERSION" > $SHAREDDIR/.strongswan-version +log_status 0 + log_action "Preparing source tree" execute_chroot 'autoreconf -i /root/strongswan' diff --git a/testing/scripts/recipes/010_tkm.mk b/testing/scripts/recipes/010_tkm.mk index 5abd2178b..8799d424d 100644 --- a/testing/scripts/recipes/010_tkm.mk +++ b/testing/scripts/recipes/010_tkm.mk @@ -2,7 +2,7 @@ PKG = tkm SRC = http://git.codelabs.ch/git/$(PKG).git -REV = v0.1.2 +REV = v0.1.3 export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat diff --git a/testing/scripts/recipes/013_strongswan.mk b/testing/scripts/recipes/013_strongswan.mk index 404c6c6bf..994acaa28 100644 --- a/testing/scripts/recipes/013_strongswan.mk +++ b/testing/scripts/recipes/013_strongswan.mk @@ -18,6 +18,7 @@ NUM_CPUS := $(shell getconf _NPROCESSORS_ONLN) CONFIG_OPTS = \ --sysconfdir=/etc \ + --with-strongswan-conf=/etc/strongswan.conf.testing \ --with-random-device=/dev/urandom \ --disable-load-warning \ --enable-curl \ @@ -98,7 +99,8 @@ CONFIG_OPTS = \ --enable-ntru \ --enable-lookip \ --enable-swanctl \ - --enable-bliss + --enable-bliss \ + --enable-sha3 export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat @@ -109,6 +111,7 @@ $(TAR): $(PKG): $(TAR) tar xfj $(TAR) + echo "$(SWANVERSION)" > /root/shared/.strongswan-version configure: $(BUILDDIR) cd $(BUILDDIR) && $(DIR)/configure $(CONFIG_OPTS) |