[svn-upgrade] Integrating new upstream version, strongswan (4.2.4)

9 files changed, 182 insertions, 17 deletions

diff --git a/testing/scripts/build-umlhostfs b/testing/scripts/build-umlhostfs
index c73ce00d0..7cbfe9c97 100755
--- a/testing/scripts/build-umlhostfs
+++ b/testing/scripts/build-umlhostfs
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: build-umlhostfs 3273 2007-10-08 20:18:34Z andreas $
+# RCSID $Id: build-umlhostfs 3935 2008-05-12 20:06:58Z andreas $
 
 DIR=`dirname $0`
 
@@ -65,11 +65,12 @@ do
     cecho-n "$host.."
     cp gentoo-fs gentoo-fs-$host
     mount -o loop gentoo-fs-$host $LOOPDIR
-    cp -rfp $BUILDDIR/hosts/${host}/etc $LOOPDIR
+    cp -rf $BUILDDIR/hosts/${host}/etc $LOOPDIR
     if [ "$host" = "winnetou" ]
     then
     	mkdir $LOOPDIR/var/log/apache2/ocsp
-	cp -rfp $UMLTESTDIR/testing/images $LOOPDIR/var/www/localhost/htdocs
+	cp -rf $UMLTESTDIR/testing/images $LOOPDIR/var/www/localhost/htdocs
+	chroot $LOOPDIR ln -s /etc/openssl/certs /var/www/localhost/htdocs/certs
         chroot $LOOPDIR /etc/openssl/generate-crl >> $LOGFILE 2>&1
     fi
     chroot $LOOPDIR /etc/init.d/depscan.sh --update >> $LOGFILE 2>&1
diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index 48d74950f..6a385dd28 100755
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-umlrootfs
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: build-umlrootfs 3471 2008-02-14 21:25:38Z andreas $
+# RCSID $Id: build-umlrootfs 4035 2008-06-05 07:25:27Z andreas $
 
 DIR=`dirname $0`
 
@@ -129,11 +129,10 @@ 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 " --enable-integrity-test" >> $INSTALLSHELL
 
 if [ "$USE_LIBCURL" = "yes" ]
 then
-    echo -n " --enable-http" >> $INSTALLSHELL
+    echo -n " --enable-curl" >> $INSTALLSHELL
 fi
 
 if [ "$USE_LDAP" = "yes" ]
@@ -151,11 +150,31 @@ then
     echo -n " --enable-eap-sim" >> $INSTALLSHELL
     fi
 
-if [ "$USE_P2P" = "yes" ]
+if [ "$USE_EAP_MD5" = "yes" ]
 then
-    echo -n " --enable-p2p" >> $INSTALLSHELL
+    echo -n " --enable-eap-md5" >> $INSTALLSHELL
+    fi
+
+if [ "$USE_SQL" = "yes" ]
+then
+    echo -n " --enable-sql --enable-sqlite" >> $INSTALLSHELL
+    fi
+
+if [ "$USE_MEDIATION" = "yes" ]
+then
+    echo -n " --enable-mediation" >> $INSTALLSHELL
+fi
+
+if [ "$USE_OPENSSL" = "yes" ]
+then
+    echo -n " --enable-openssl" >> $INSTALLSHELL
 fi
     
+if [ "$USE_INTEGRITY_TEST" = "yes" ]
+then
+    echo -n " --enable-integrity-test" >> $INSTALLSHELL
+fi
+
 if [ "$USE_LEAK_DETECTIVE" = "yes" ]
 then
     echo -n " --enable-leak-detective" >> $INSTALLSHELL
@@ -172,6 +191,12 @@ rm -f $INSTALLSHELL
 cgecho "done"
 
 ######################################################
+# copying default /etc/ipsec.d/tables.sql to the root filesystem
+#
+cecho " * Copying '$HOSTCONFIGDIR/default/etc/ipsec.d/tables.sql' to the root filesystem"
+cp -fp $HOSTCONFIGDIR/default/etc/ipsec.d/tables.sql $LOOPDIR/etc/ipsec.d/tables.sql
+
+######################################################
 # copying the host's ssh public key
 #
 
diff --git a/testing/scripts/gstart-umls b/testing/scripts/gstart-umls
new file mode 100755
index 000000000..40869d0a8
--- /dev/null
+++ b/testing/scripts/gstart-umls
@@ -0,0 +1,127 @@
+#!/bin/bash
+# starts the UML instances in an gnome-terminal (requires X11R6)
+#
+# Copyright (C) 2004  Eric Marchionni, Patrik Rayo
+# Zuercher Hochschule Winterthur
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
+#
+# RCSID $Id: gstart-umls 3912 2008-05-08 08:22:07Z andreas $
+
+DIR=`dirname $0`
+
+source $DIR/function.sh
+
+[ -f $DIR/../testing.conf ] || die "Configuration file 'testing.conf' not found"
+
+source $DIR/../testing.conf
+
+if [ "$#" -eq 0 ]
+then
+    HOSTS=$STRONGSWANHOSTS
+else
+    HOSTS=$*
+fi
+
+BOOTING_HOSTS=""
+count_max=12
+count=0
+
+#position of xterm window on the desktop
+x0=8
+y0=52
+dx=12
+dy=24
+
+for host in $HOSTS
+do
+    up=0
+
+    if [ -d ~/.uml/${host} ]
+    then
+	pid=`cat ~/.uml/${host}/pid`
+	up=`ps up $pid | wc -l`
+    fi
+    
+    if [ $up -eq 2 ]
+    then
+	cecho " * Great, ${host} is already running!"
+    else
+	rm -rf ~/.uml/${host}
+	BOOTING_HOSTS="$BOOTING_HOSTS ${host}"
+	let "count_max += 12"
+
+	UMLHOSTFS=$BUILDDIR/root-fs/gentoo-fs-${host}
+	[ -f  $UMLHOSTFS ] || die "!! uml root file system '$UMLHOSTFS' not found"
+
+	cecho-n " * Starting ${host}.."
+	eval gnome-terminal --title=${host} --geometry="+${x0}+${y0}" --show-menubar --execute "$UMLKERNEL \
+            umid=${host} \
+	    ubda=$UMLHOSTFS \
+	    \$SWITCH_${host} \
+	    mem=${MEM}M con=pty con0=fd:0,fd:1" &
+        cgecho "done"
+    fi
+    let "x0+=dx"
+    let "y0+=dy"
+    sleep 15
+done
+
+if [ -z "$BOOTING_HOSTS" ]
+then
+    exit 0
+fi
+
+cecho " * Waiting for the uml instances to finish booting"
+
+for host in $BOOTING_HOSTS
+do
+    cecho-n " * Checking on $host.."
+
+    while [ $count -lt $count_max ] && [ ! -d ~/.uml/$host ]
+    do
+	cecho-n "."
+	sleep 5
+	let "count+=1"
+    done
+
+    if [ $count -ge $count_max ]
+    then
+	cecho "exit"
+	exit 1
+    fi
+
+    up=`uml_mconsole $host proc net/route 2> /dev/null | grep eth0 | wc -l`
+
+    while [ $count -lt $count_max ] && [ $up -eq 0 ]
+    do
+	cecho-n "."
+	sleep 5
+	up=`uml_mconsole $host proc net/route 2> /dev/null | grep eth0 | wc -l`
+	let "count+=1"
+    done
+
+    if [ $count -ge $count_max ]
+    then
+	cecho "exit"
+	exit 1
+    else
+	cgecho "up"
+    fi
+
+    if [ "$host" = "alice" ]
+    then
+	eval ipv4_${host}="`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`"
+	ssh root@$ipv4_alice /etc/init.d/net.eth1 stop
+    fi
+done
+
+cecho " * All uml instances are up now"
diff --git a/testing/scripts/kstart-umls b/testing/scripts/kstart-umls
index b953ddeac..62cbf83cf 100755
--- a/testing/scripts/kstart-umls
+++ b/testing/scripts/kstart-umls
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: kstart-umls 3470 2008-02-14 21:24:54Z andreas $
+# RCSID $Id: kstart-umls 3514 2008-02-29 17:00:07Z andreas $
 
 DIR=`dirname $0`
 
@@ -120,7 +120,7 @@ do
     if [ "$host" = "alice" ]
     then
 	eval ipv4_${host}="`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`"
-	ssh $ipv4_alice /etc/init.d/net.eth1 stop
+	ssh root@$ipv4_alice /etc/init.d/net.eth1 stop
     fi
 done
 
diff --git a/testing/scripts/load-testconfig b/testing/scripts/load-testconfig
index e4dd63d59..873e4d1ee 100755
--- a/testing/scripts/load-testconfig
+++ b/testing/scripts/load-testconfig
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: load-testconfig 3273 2007-10-08 20:18:34Z andreas $
+# RCSID $Id: load-testconfig 3935 2008-05-12 20:06:58Z andreas $
 
 DIR=`dirname $0`
 
@@ -47,7 +47,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 -rp $TESTSDIR/$testname/hosts/$host/etc $HOSTLOGIN:/ > /dev/null 2>&1
+	scp -r $TESTSDIR/$testname/hosts/$host/etc $HOSTLOGIN:/ > /dev/null 2>&1
     done
 fi
 
diff --git a/testing/scripts/restore-defaults b/testing/scripts/restore-defaults
index dc2ebb312..3af0ec665 100755
--- a/testing/scripts/restore-defaults
+++ b/testing/scripts/restore-defaults
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: restore-defaults 3273 2007-10-08 20:18:34Z andreas $
+# RCSID $Id: restore-defaults 3935 2008-05-12 20:06:58Z andreas $
 
 DIR=`dirname $0`
 
@@ -48,6 +48,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 -rp $HOSTCONFIGDIR/${host}/etc $HOSTLOGIN:/ > /dev/null 2>&1
+	scp -r $HOSTCONFIGDIR/${host}/etc $HOSTLOGIN:/ > /dev/null 2>&1
     done
 fi
diff --git a/testing/scripts/start-switches b/testing/scripts/start-switches
index 118a2250e..eb3fa4742 100755
--- a/testing/scripts/start-switches
+++ b/testing/scripts/start-switches
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: start-switches 3273 2007-10-08 20:18:34Z andreas $
+# RCSID $Id: start-switches 3590 2008-03-13 14:20:20Z martin $
 
 DIR=`dirname $0`
 
diff --git a/testing/scripts/start-umls b/testing/scripts/start-umls
index 50cd65da4..7490cdf0b 100755
--- a/testing/scripts/start-umls
+++ b/testing/scripts/start-umls
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: start-umls 3273 2007-10-08 20:18:34Z andreas $
+# RCSID $Id: start-umls 3590 2008-03-13 14:20:20Z martin $
 
 DIR=`dirname $0`
 
@@ -107,6 +107,12 @@ do
     else
 	cgecho "up"
     fi
+
+    if [ "$host" = "alice" ]
+    then
+	eval ipv4_${host}="`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`"
+	ssh root@$ipv4_alice /etc/init.d/net.eth1 stop
+    fi
 done
 
 cecho " * All uml instances are up now"
diff --git a/testing/scripts/xstart-umls b/testing/scripts/xstart-umls
index 8cd76c133..8d2a70c4d 100755
--- a/testing/scripts/xstart-umls
+++ b/testing/scripts/xstart-umls
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: xstart-umls 3273 2007-10-08 20:18:34Z andreas $
+# RCSID $Id: xstart-umls 3590 2008-03-13 14:20:20Z martin $
 
 DIR=`dirname $0`
 
@@ -116,6 +116,12 @@ do
     else
 	cgecho "up"
     fi
+
+    if [ "$host" = "alice" ]
+    then
+	eval ipv4_${host}="`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`"
+	ssh root@$ipv4_alice /etc/init.d/net.eth1 stop
+    fi
 done
 
 cecho " * All uml instances are up now"