merged multi-auth branch back into trunk

This commit is contained in:
Martin Willi
2009-04-14 10:34:24 +00:00
parent 6e5c8d9413
commit a44bb9345f
230 changed files with 6163 additions and 4193 deletions
+17 -16
View File
@@ -30,10 +30,10 @@ KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
KERNELCONFIG=$UMLTESTDIR/.config-2.6.29
# Bzipped uml patch for kernel
#UMLPATCH=$UMLTESTDIR/uml-2.6.26.patch.bz2
#UMLPATCH=$UMLTESTDIR/aead_init.patch.bz2
# Bzipped source of strongSwan
STRONGSWAN=$UMLTESTDIR/strongswan-4.2.14.tar.bz2
STRONGSWAN=$UMLTESTDIR/strongswan-4.3.0.tar.bz2
# strongSwan compile options (use "yes" or "no")
USE_LIBCURL="yes"
@@ -50,6 +50,7 @@ USE_OPENSSL="yes"
USE_KERNEL_PFKEY="yes"
USE_INTEGRITY_TEST="yes"
USE_LEAK_DETECTIVE="yes"
USE_LOAD_TESTS="yes"
# Gentoo linux root filesystem
ROOTFS=$UMLTESTDIR/gentoo-fs-20090325.tar.bz2
@@ -74,7 +75,7 @@ TESTRESULTSDIR=$UMLTESTDIR/testresults
# Path to a full strongswan tree on the host system, which is
# mounted into /root/strongswan-shared. This gives us an easy
# way to apply and test changes instantly.
SHAREDTREE=/home/martin/strongswan/trunk
#SHAREDTREE=/home/martin/strongswan/trunk
# Timezone for the UMLs, look in /usr/share/zoneinfo!
TZUML="Europe/Zurich"
@@ -89,13 +90,13 @@ ENABLE_BUILD_HOSTCONFIG="yes"
ENABLE_BUILD_UMLROOTFS="yes"
ENABLE_BUILD_UMLHOSTFS="yes"
ENABLE_START_TESTING="yes"
ENABLE_DO_TESTS="yes"
ENABLE_DO_TESTS="no"
ENABLE_STOP_TESTING="no"
##############################################################
# How to start the UMLs?
#
# Start the UML instance in a KDE konsole (requires KDE)
# Start the UML instance in KDE konsole (requires KDE)
# UMLSTARTMODE="konsole"
# Start the UML instance in a gnome-terminal (requires gnome)
UMLSTARTMODE="gnome-terminal"
@@ -166,14 +167,14 @@ IFCONFIG_2="10.2.0.254 netmask 255.255.0.0"
##############################################################
# Network interfaces of the UML instances
#
SWITCH_alice="eth0=daemon,fe:fd:0a:01:00:0a,unix,/tmp/umlswitch1 \
eth1=daemon,fe:fd:c0:a8:00:32,unix,/tmp/umlswitch0"
SWITCH_venus="eth0=daemon,fe:fd:0a:01:00:14,unix,/tmp/umlswitch1"
SWITCH_moon="eth0=daemon,fe:fd:c0:a8:00:01,unix,/tmp/umlswitch0 \
eth1=daemon,fe:fd:0a:01:00:01,unix,/tmp/umlswitch1"
SWITCH_carol="eth0=daemon,fe:fd:c0:a8:00:64,unix,/tmp/umlswitch0"
SWITCH_winnetou="eth0=daemon,fe:fd:c0:a8:00:96,unix,/tmp/umlswitch0"
SWITCH_dave="eth0=daemon,fe:fd:c0:a8:00:c8,unix,/tmp/umlswitch0"
SWITCH_sun="eth0=daemon,fe:fd:c0:a8:00:02,unix,/tmp/umlswitch0 \
eth1=daemon,fe:fd:0a:02:00:01,unix,/tmp/umlswitch2"
SWITCH_bob="eth0=daemon,fe:fd:0a:02:00:0a,unix,/tmp/umlswitch2"
SWITCH_alice="eth0=tuntap,tap1_alice,fe:fd:0a:01:00:0a \
eth1=tuntap,tap0_alice,fe:fd:c0:a8:00:32"
SWITCH_venus="eth0=tuntap,tap1_venus,fe:fd:0a:01:00:14"
SWITCH_moon="eth0=tuntap,tap0_moon,fe:fd:c0:a8:00:01 \
eth1=tuntap,tap1_moon,fe:fd:0a:01:00:01"
SWITCH_carol="eth0=tuntap,tap0_carol,fe:fd:c0:a8:00:64"
SWITCH_winnetou="eth0=tuntap,tap0_winnetou,fe:fd:c0:a8:00:96"
SWITCH_dave="eth0=tuntap,tap0_dave,fe:fd:c0:a8:00:c8"
SWITCH_sun="eth0=tuntap,tap0_sun,fe:fd:c0:a8:00:02 \
eth1=tuntap,tap2_sun,fe:fd:0a:02:00:01"
SWITCH_bob="eth0=tuntap,tap2_bob,fe:fd:0a:02:00:0a"