diff -Nurp strongswan-old/testing/config/kernel/config-5.8 strongswan/testing/config/kernel/config-5.8
--- strongswan-old/testing/config/kernel/config-5.8	2021-01-11 17:28:10.000000000 +0300
+++ strongswan/testing/config/kernel/config-5.8	2021-01-18 03:23:02.279561027 +0300
@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.8.3 Kernel Configuration
+# Linux/x86 5.8.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0"
+CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=70500
-CONFIG_LD_VERSION=230000000
+CONFIG_GCC_VERSION=80300
+CONFIG_LD_VERSION=231010000
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
@@ -489,6 +489,7 @@ CONFIG_VIRTUALIZATION=y
 CONFIG_AS_AVX512=y
 CONFIG_AS_SHA1_NI=y
 CONFIG_AS_SHA256_NI=y
+CONFIG_AS_TPAUSE=y
 
 #
 # General architecture-dependent options
@@ -1862,7 +1863,6 @@ CONFIG_BACKLIGHT_GENERIC=y
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
@@ -2810,6 +2810,8 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
+# CONFIG_KASAN is not set
 CONFIG_KASAN_STACK=1
 # end of Memory Debugging
 
diff -Nurp strongswan-old/testing/config/kvm/moon.xml strongswan/testing/config/kvm/moon.xml
--- strongswan-old/testing/config/kvm/moon.xml	2021-01-11 17:28:10.000000000 +0300
+++ strongswan/testing/config/kvm/moon.xml	2021-01-18 02:45:25.072461534 +0300
@@ -14,6 +14,7 @@
     <model fallback='allow'>core2duo</model>
     <feature policy='optional' name='aes'/>
     <feature policy='optional' name='pclmuldq'/>
+    <feature policy="disable" name="monitor"/>
   </cpu>
   <features>
     <acpi/>
diff -Nurp strongswan-old/testing/config/kvm/sun.xml strongswan/testing/config/kvm/sun.xml
--- strongswan-old/testing/config/kvm/sun.xml	2021-01-11 17:28:10.000000000 +0300
+++ strongswan/testing/config/kvm/sun.xml	2021-01-18 02:45:41.992592410 +0300
@@ -14,6 +14,7 @@
     <model fallback='allow'>core2duo</model>
     <feature policy='optional' name='aes'/>
     <feature policy='optional' name='pclmuldq'/>
+    <feature policy="disable" name="monitor"/>
   </cpu>
   <features>
     <acpi/>
diff -Nurp strongswan-old/testing/scripts/build-baseimage strongswan/testing/scripts/build-baseimage
--- strongswan-old/testing/scripts/build-baseimage	2021-01-11 17:28:10.000000000 +0300
+++ strongswan/testing/scripts/build-baseimage	2021-01-18 02:43:03.251360833 +0300
@@ -34,6 +34,7 @@ stretch)
 buster)
 	INC=$INC,libahven7-dev,libxmlada-schema8-dev,libgmpada8-dev
 	INC=$INC,libalog4-dev,dbus-user-session
+	INC=$INC,libfl-dev,libbotan-2-dev,libip4tc-dev,gawk
 	;;
 *)
 	echo_warn "Package list for '$BASEIMGSUITE' might has to be updated"
diff -Nurp strongswan-old/testing/scripts/build-strongswan strongswan/testing/scripts/build-strongswan
--- strongswan-old/testing/scripts/build-strongswan	2021-01-11 17:28:10.000000000 +0300
+++ strongswan/testing/scripts/build-strongswan	2021-01-18 02:43:36.501619542 +0300
@@ -123,7 +123,7 @@ log_action "Mounting proc filesystem to
 execute "mount -t proc none $LOOPDIR/proc"
 do_on_exit umount $LOOPDIR/proc
 
-mkdir -p $LOOPDIR/root/shared
+mkdir -p $LOOPDIR/root/shared $SHAREDDIR
 log_action "Mounting $SHAREDDIR as /root/shared"
 execute "mount -o bind $SHAREDDIR $LOOPDIR/root/shared"
 do_on_exit umount $LOOPDIR/root/shared
diff -Nurp strongswan-old/testing/scripts/recipes/013_strongswan.mk strongswan/testing/scripts/recipes/013_strongswan.mk
--- strongswan-old/testing/scripts/recipes/013_strongswan.mk	2021-01-11 17:28:10.000000000 +0300
+++ strongswan/testing/scripts/recipes/013_strongswan.mk	2021-01-18 03:08:11.052834547 +0300
@@ -2,8 +2,8 @@
 
 PV  = $(SWANVERSION)
 PKG = strongswan-$(PV)
-TAR = $(PKG).tar.bz2
-SRC = http://download.strongswan.org/$(TAR)
+ZIP = $(PKG).zip
+SRC = https://github.com/strongswan/strongswan/archive/$(SWANVERSION).zip
 
 # can be passed to load sources from a directory instead of a tarball
 ifneq ($(origin SRCDIR), undefined)
@@ -113,15 +113,15 @@ export ADA_PROJECT_PATH=/usr/local/ada/l
 
 all: install
 
-$(TAR):
-	wget $(SRC)
+$(ZIP):
+	wget --ca-directory=/usr/share/ca-certificates/mozilla/ $(SRC) -O $(ZIP)
 
-$(PKG): $(TAR)
-	tar xfj $(TAR)
+$(PKG): $(ZIP)
+	unzip -o $(ZIP)
 	echo "$(SWANVERSION)" > /root/shared/.strongswan-version
 
 configure: $(BUILDDIR)
-	cd $(BUILDDIR) && $(DIR)/configure $(CONFIG_OPTS)
+	cd $(BUILDDIR) && $(DIR)/autogen.sh && $(DIR)/configure $(CONFIG_OPTS)
 
 build: configure
 	cd $(BUILDDIR) && make -j $(NUM_CPUS)
diff -Nurp strongswan-old/testing/scripts/recipes/015_strongTNC.mk strongswan/testing/scripts/recipes/015_strongTNC.mk
--- strongswan-old/testing/scripts/recipes/015_strongTNC.mk	2021-01-11 17:28:10.000000000 +0300
+++ strongswan/testing/scripts/recipes/015_strongTNC.mk	2021-01-18 02:32:32.196320744 +0300
@@ -18,6 +18,7 @@ $(DEPS): $(PKG)-master
 	pip download -d $(DEPS) -r $(PKG)-master/requirements.txt six
 
 install: $(DEPS)
+	pip install wheel
 	# six is required for djangorestframework-camel-case
 	pip install --no-index --find-links=file://`pwd`/$(DEPS) -r $(PKG)-master/requirements.txt six
 	cp -r $(PKG)-master /var/www/tnc && chgrp -R www-data /var/www/tnc && chmod g+sw /var/www/tnc
diff -Nurp strongswan-old/testing/testing.conf.local strongswan/testing/testing.conf.local
--- strongswan-old/testing/testing.conf.local	1970-01-01 03:00:00.000000000 +0300
+++ strongswan/testing/testing.conf.local	2021-01-18 20:54:39.777502551 +0300
@@ -0,0 +1,8 @@
+#: ${ENABLE_BUILD_BASEIMAGE=no}
+#: ${ENABLE_BUILD_ROOTIMAGE=no}
+#: ${ENABLE_BUILD_GUESTKERNEL=no}
+#: ${ENABLE_BUILD_CERTIFICATES=no}
+#: ${ENABLE_BUILD_GUESTIMAGES=no}
+
+: ${BASEIMGSUITE=buster}
+: ${SWANVERSION=master}