diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2012-06-19 19:34:26 +0200 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2012-06-19 19:34:26 +0200 |
| commit | f2fc138e8edb3967afe285b51aefbe4ab5395478 (patch) | |
| tree | ef69ae2e7b2d6dd7075b9605cb5e4c256394af1a /testing | |
| parent | 5d227c79a93f70931fc1a28b932173ddc8cac69a (diff) | |
| download | strongswan-f2fc138e8edb3967afe285b51aefbe4ab5395478.tar.bz2 strongswan-f2fc138e8edb3967afe285b51aefbe4ab5395478.tar.xz | |
upgraded UML options to 5.0.0
Diffstat (limited to 'testing')
| -rwxr-xr-x | testing/scripts/build-umlrootfs | 10 | ||||
| -rwxr-xr-x | testing/testing.conf | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs index f9dc31770..27ba0bf58 100755 --- a/testing/scripts/build-umlrootfs +++ b/testing/scripts/build-umlrootfs @@ -312,6 +312,11 @@ then echo -n " --enable-socket-dynamic" >> $INSTALLSHELL fi +if [ "$USE_SOCKET_RAW" = "yes" ] +then + echo -n " --enable-socket-raw" >> $INSTALLSHELL +fi + if [ "$USE_DHCP" = "yes" ] then echo -n " --enable-dhcp" >> $INSTALLSHELL @@ -352,11 +357,6 @@ then echo -n " --enable-ha" >> $INSTALLSHELL fi -if [ "$USE_PLUTO" = "yes" ] -then - echo -n " --enable-pluto" >> $INSTALLSHELL -fi - if [ "$USE_AF_ALG" = "yes" ] then echo -n " --enable-af-alg" >> $INSTALLSHELL diff --git a/testing/testing.conf b/testing/testing.conf index 36e99d222..393e42fec 100755 --- a/testing/testing.conf +++ b/testing/testing.conf @@ -19,13 +19,14 @@ UMLTESTDIR=~/strongswan-testing # Bzipped kernel sources # (file extension .tar.bz2 required) -KERNEL=$UMLTESTDIR/linux-3.3.4.tar.bz2 +KERNEL=$UMLTESTDIR/linux-3.4.3.tar.bz2 # Extract kernel version KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'` # Kernel configuration file -KERNELCONFIG=$UMLTESTDIR/.config-3.3 +KERNELCONFIG=$UMLTESTDIR/.config-3.4 + # Bzipped uml patch for kernel UMLPATCH=$UMLTESTDIR/ha-3.0.patch.bz2 @@ -70,6 +71,7 @@ USE_TEST_VECTORS="yes" USE_GCRYPT="yes" USE_SOCKET_DEFAULT="yes" USE_SOCKET_DYNAMIC="yes" +USE_SOCKET_RAW="yes" USE_DHCP="yes" USE_FARP="yes" USE_ADDRBLOCK="yes" @@ -78,7 +80,6 @@ USE_CCM="yes" USE_GCM="yes" USE_CMAC="yes" USE_HA="yes" -USE_PLUTO="yes" USE_AF_ALG="yes" USE_WHITELIST="yes" USE_XAUTH_GENERIC="yes" |