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

1 files changed, 10 insertions, 6 deletions

diff --git a/testing/testing.conf b/testing/testing.conf
index e86f60ae2..c7852d28f 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.31.5.tar.bz2
+KERNEL=$UMLTESTDIR/linux-2.6.33.3.tar.bz2
 
 # Extract kernel version
 KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
 
 # Kernel configuration file
-KERNELCONFIG=$UMLTESTDIR/.config-2.6.31
+KERNELCONFIG=$UMLTESTDIR/.config-2.6.33
 
 # Bzipped uml patch for kernel
-#UMLPATCH=$UMLTESTDIR/aead_init.patch.bz2
+UMLPATCH=$UMLTESTDIR/aes_gmac.patch.bz2
 
 # Bzipped source of strongSwan
-STRONGSWAN=$UMLTESTDIR/strongswan-4.3.6.tar.bz2
+STRONGSWAN=$UMLTESTDIR/strongswan-4.4.0.tar.bz2
 
 # strongSwan compile options (use "yes" or "no")
 USE_LIBCURL="yes"
@@ -49,15 +49,19 @@ USE_BLOWFISH="yes"
 USE_KERNEL_PFKEY="yes"
 USE_INTEGRITY_TEST="yes"
 USE_LEAK_DETECTIVE="yes"
-USE_LOAD_TESTS="yes"
+USE_LOAD_TESTER="yes"
 USE_TEST_VECTORS="yes"
 USE_GCRYPT="yes"
+USE_SOCKET_DEFAULT="yes"
+USE_SOCKET_DYNAMIC="yes"
+USE_DHCP="yes"
+USE_FARP="yes"
 
 # Gentoo linux root filesystem
 ROOTFS=$UMLTESTDIR/gentoo-fs-20090615.tar.bz2
 
 # Size of the finished root filesystem in MB
-ROOTFSSIZE=600
+ROOTFSSIZE=700
 
 # Amount of Memory to use per UML [MB].
 # If "auto" is stated 1/12 of total host ram will be used.