[svn-upgrade] new version strongswan (4.5.0)

5 files changed, 65 insertions, 7 deletions

diff --git a/testing/scripts/build-umlkernel b/testing/scripts/build-umlkernel
index 7a98fc6c1..b9f0d710d 100755
--- a/testing/scripts/build-umlkernel
+++ b/testing/scripts/build-umlkernel
@@ -119,10 +119,10 @@ cp $KERNELCONFIG .config
 cecho "!!"
 cecho "!! Making .config for kernel. You might be prompted for new parameters!"
 cecho "!!"
-make oldconfig ARCH=um >> $LOGFILE 2>&1
+make oldconfig ARCH=um SUBARCH=i386 2>&1 | tee -a $LOGFILE
 
 cecho-n " * Now compiling uml kernel.."
-make linux ARCH=um  >> $LOGFILE 2>&1
+make linux ARCH=um SUBARCH=i386 >> $LOGFILE 2>&1
 cgecho "done"
 
 cecho-n " * Copying uml kernel to '${BUILDDIR}/linux-uml-${KERNELVERSION}'.."
diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index 8a083e2ec..e22b65cf4 100755
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-umlrootfs
@@ -127,6 +127,7 @@ echo "ln -sf /usr/share/zoneinfo/${TZUML} /etc/localtime" >> $INSTALLSHELL
 echo "cd /root/${STRONGSWANVERSION}" >> $INSTALLSHELL
 echo -n "./configure --sysconfdir=/etc" >> $INSTALLSHELL
 echo -n " --with-random-device=/dev/urandom" >> $INSTALLSHELL
+echo -n " --disable-load-warning" >> $INSTALLSHELL
 
 if [ "$USE_LIBCURL" = "yes" ]
 then
@@ -171,6 +172,36 @@ then
     echo -n " --enable-eap-radius" >> $INSTALLSHELL
 fi
 
+if [ "$USE_EAP_TLS" = "yes" ]
+then
+    echo -n " --enable-eap-tls" >> $INSTALLSHELL
+fi
+
+if [ "$USE_EAP_TTLS" = "yes" ]
+then
+    echo -n " --enable-eap-ttls" >> $INSTALLSHELL
+fi
+
+if [ "$USE_EAP_TNC" = "yes" ]
+then
+    echo -n " --enable-eap-tnc" >> $INSTALLSHELL
+fi
+
+if [ "$USE_TNC_IMC" = "yes" ]
+then
+    echo -n " --enable-tnc-imc" >> $INSTALLSHELL
+fi
+
+if [ "$USE_TNC_IMV" = "yes" ]
+then
+    echo -n " --enable-tnc-imv" >> $INSTALLSHELL
+fi
+
+if [ "$USE_TNCCS_11" = "yes" ]
+then
+    echo -n " --enable-tnccs-11" >> $INSTALLSHELL
+fi
+
 if [ "$USE_SQL" = "yes" ]
 then
     echo -n " --enable-sql --enable-sqlite" >> $INSTALLSHELL
@@ -246,8 +277,23 @@ then
     echo -n " --enable-addrblock" >> $INSTALLSHELL
 fi
 
+if [ "$USE_CTR" = "yes" ]
+then
+    echo -n " --enable-ctr" >> $INSTALLSHELL
+fi
+
+if [ "$USE_CCM" = "yes" ]
+then
+    echo -n " --enable-ccm" >> $INSTALLSHELL
+fi
+
+if [ "$USE_GCM" = "yes" ]
+then
+    echo -n " --enable-gcm" >> $INSTALLSHELL
+fi
+
 echo "" >> $INSTALLSHELL
-echo "make" >> $INSTALLSHELL
+echo "make -j" >> $INSTALLSHELL
 echo "make install" >> $INSTALLSHELL
 echo "ldconfig" >> $INSTALLSHELL
 
diff --git a/testing/scripts/gstart-umls b/testing/scripts/gstart-umls
index 624db8d8b..c6fcd26dc 100755
--- a/testing/scripts/gstart-umls
+++ b/testing/scripts/gstart-umls
@@ -67,10 +67,10 @@ do
 	    \$SWITCH_${host} \
 	    mem=${MEM}M con=pty con0=fd:0,fd:1" &
         cgecho "done"
+        sleep 15
     fi
     let "x0+=dx"
     let "y0+=dy"
-    sleep 15
 done
 
 if [ -z "$BOOTING_HOSTS" ]
diff --git a/testing/scripts/load-testconfig b/testing/scripts/load-testconfig
index 8dd3069f6..0e167e8e2 100755
--- a/testing/scripts/load-testconfig
+++ b/testing/scripts/load-testconfig
@@ -45,7 +45,7 @@ then
     for host in `ls $TESTSDIR/$testname/hosts`
     do
 	eval HOSTLOGIN="root@`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`"
-	scp -r $TESTSDIR/$testname/hosts/$host/etc $HOSTLOGIN:/ > /dev/null 2>&1
+	scp $SSHCONF -r $TESTSDIR/$testname/hosts/$host/etc $HOSTLOGIN:/ > /dev/null 2>&1
     done
 fi
 
@@ -57,6 +57,18 @@ fi
 for host in $IPSECHOSTS
 do
     eval HOSTLOGIN="root@`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`"
-    ssh $HOSTLOGIN 'rm -f /var/log/auth.log /var/log/daemon.log; \
+    ssh $SSHCONF $HOSTLOGIN 'rm -f /var/log/auth.log /var/log/daemon.log; \
+		    kill -SIGHUP `cat /var/run/syslogd.pid`' > /dev/null 2>&1
+done
+
+
+##########################################################################
+# clear radius.log on FreeRadius servers
+#
+
+for host in $RADIUSHOSTS
+do
+    eval HOSTLOGIN="root@`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`"
+    ssh $SSHCONF $HOSTLOGIN 'rm -f /var/log/radius/radius.log; \
 		    kill -SIGHUP `cat /var/run/syslogd.pid`' > /dev/null 2>&1
 done
diff --git a/testing/scripts/restore-defaults b/testing/scripts/restore-defaults
index b26be9936..64cc0262e 100755
--- a/testing/scripts/restore-defaults
+++ b/testing/scripts/restore-defaults
@@ -46,6 +46,6 @@ then
     for host in `ls $TESTSDIR/${testname}/hosts`
     do
 	eval HOSTLOGIN="root@`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`"
-	scp -r $HOSTCONFIGDIR/${host}/etc $HOSTLOGIN:/ > /dev/null 2>&1
+	scp $SSHCONF -r $HOSTCONFIGDIR/${host}/etc $HOSTLOGIN:/ > /dev/null 2>&1
     done
 fi