Imported Upstream version 4.5.1

1 files changed, 11 insertions, 7 deletions

diff --git a/testing/testing.conf b/testing/testing.conf
index b9cb4bb30..b078ab2c0 100755
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -19,19 +19,19 @@ UMLTESTDIR=~/strongswan-testing
 
 # Bzipped kernel sources
 # (file extension .tar.bz2 required)
-KERNEL=$UMLTESTDIR/linux-2.6.35.2.tar.bz2
+KERNEL=$UMLTESTDIR/linux-2.6.36.2.tar.bz2
 
 # Extract kernel version
 KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
 
 # Kernel configuration file
-KERNELCONFIG=$UMLTESTDIR/.config-2.6.35
+KERNELCONFIG=$UMLTESTDIR/.config-2.6.36
 
 # Bzipped uml patch for kernel
-#UMLPATCH=$UMLTESTDIR/xfrm_mark.patch.bz2
+UMLPATCH=$UMLTESTDIR/ha-2.6.36.patch.bz2
 
 # Bzipped source of strongSwan
-STRONGSWAN=$UMLTESTDIR/strongswan-4.4.2.tar.bz2
+STRONGSWAN=$UMLTESTDIR/strongswan-4.5.1.tar.bz2
 
 # strongSwan compile options (use "yes" or "no")
 USE_LIBCURL="yes"
@@ -48,13 +48,15 @@ USE_EAP_TNC="yes"
 USE_TNC_IMC="yes"
 USE_TNC_IMV="yes"
 USE_TNCCS_11="yes"
+USE_TNCCS_20="yes"
+USE_TNCCS_DYNAMIC="yes"
 USE_SQL="yes"
 USE_MEDIATION="yes"
 USE_OPENSSL="yes"
 USE_BLOWFISH="yes"
 USE_KERNEL_PFKEY="yes"
 USE_INTEGRITY_TEST="yes"
-USE_LEAK_DETECTIVE="yes"
+USE_LEAK_DETECTIVE="no"
 USE_LOAD_TESTER="yes"
 USE_TEST_VECTORS="yes"
 USE_GCRYPT="yes"
@@ -66,12 +68,14 @@ USE_ADDRBLOCK="yes"
 USE_CTR="yes"
 USE_CCM="yes"
 USE_GCM="yes"
+USE_HA="yes"
+USE_CISCO_QUIRKS="no"
 
 # Gentoo linux root filesystem
-ROOTFS=$UMLTESTDIR/gentoo-fs-20100805.tar.bz2
+ROOTFS=$UMLTESTDIR/gentoo-fs-20101120.tar.bz2
 
 # Size of the finished root filesystem in MB
-ROOTFSSIZE=700
+ROOTFSSIZE=800
 
 # Amount of Memory to use per UML [MB].
 # If "auto" is stated 1/12 of total host ram will be used.