From 3ba4d12139e1ce73b43b22912eb49c27c85921d8 Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Mon, 31 Jan 2011 05:47:39 +0100
Subject: [PATCH] updated testing.conf UML configuration file

---
 testing/testing.conf | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/testing/testing.conf b/testing/testing.conf
index f3dfebf5e..06f95712b 100755
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -19,7 +19,7 @@ UMLTESTDIR=~/strongswan-testing
 
 # Bzipped kernel sources
 # (file extension .tar.bz2 required)
-KERNEL=$UMLTESTDIR/linux-2.6.36.tar.bz2
+KERNEL=$UMLTESTDIR/linux-2.6.36.2.tar.bz2
 
 # Extract kernel version
 KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
@@ -28,7 +28,7 @@ KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
 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.5.1.tar.bz2
@@ -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"
@@ -67,9 +69,10 @@ USE_CTR="yes"
 USE_CCM="yes"
 USE_GCM="yes"
 USE_HA="yes"
+USE_CISCO_QUIRKS="no"
 
 # Gentoo linux root filesystem
-ROOTFS=$UMLTESTDIR/gentoo-fs-20100830.tar.bz2
+ROOTFS=$UMLTESTDIR/gentoo-fs-20101120.tar.bz2
 
 # Size of the finished root filesystem in MB
 ROOTFSSIZE=800