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

5 files changed, 21 insertions, 6 deletions

diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index 6a385dd28..b54493de8 100755
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-umlrootfs
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: build-umlrootfs 4035 2008-06-05 07:25:27Z andreas $
+# RCSID $Id: build-umlrootfs 4425 2008-10-13 22:54:09Z andreas $
 
 DIR=`dirname $0`
 
@@ -148,6 +148,7 @@ fi
 if [ "$USE_EAP_SIM" = "yes" ]
 then
     echo -n " --enable-eap-sim" >> $INSTALLSHELL
+    echo -n " --enable-eap-sim-file" >> $INSTALLSHELL
     fi
 
 if [ "$USE_EAP_MD5" = "yes" ]
@@ -155,6 +156,11 @@ then
     echo -n " --enable-eap-md5" >> $INSTALLSHELL
     fi
 
+if [ "$USE_EAP_IDENTITY" = "yes" ]
+then
+    echo -n " --enable-eap-identity" >> $INSTALLSHELL
+fi
+
 if [ "$USE_SQL" = "yes" ]
 then
     echo -n " --enable-sql --enable-sqlite" >> $INSTALLSHELL
@@ -169,7 +175,12 @@ if [ "$USE_OPENSSL" = "yes" ]
 then
     echo -n " --enable-openssl" >> $INSTALLSHELL
 fi
-    
+
+if [ "$USE_KERNEL_PFKEY" = "yes" ]
+then
+    echo -n " --enable-kernel-pfkey" >> $INSTALLSHELL
+fi
+  
 if [ "$USE_INTEGRITY_TEST" = "yes" ]
 then
     echo -n " --enable-integrity-test" >> $INSTALLSHELL
diff --git a/testing/scripts/gstart-umls b/testing/scripts/gstart-umls
index 40869d0a8..e5e993661 100755
--- a/testing/scripts/gstart-umls
+++ b/testing/scripts/gstart-umls
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: gstart-umls 3912 2008-05-08 08:22:07Z andreas $
+# RCSID $Id: gstart-umls 4370 2008-10-07 04:56:50Z andreas $
 
 DIR=`dirname $0`
 
@@ -119,6 +119,7 @@ do
 
     if [ "$host" = "alice" ]
     then
+	sleep 5
 	eval ipv4_${host}="`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`"
 	ssh root@$ipv4_alice /etc/init.d/net.eth1 stop
     fi
diff --git a/testing/scripts/kstart-umls b/testing/scripts/kstart-umls
index 62cbf83cf..b67382a25 100755
--- a/testing/scripts/kstart-umls
+++ b/testing/scripts/kstart-umls
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: kstart-umls 3514 2008-02-29 17:00:07Z andreas $
+# RCSID $Id: kstart-umls 4370 2008-10-07 04:56:50Z andreas $
 
 DIR=`dirname $0`
 
@@ -119,6 +119,7 @@ do
 
     if [ "$host" = "alice" ]
     then
+	sleep 5
 	eval ipv4_${host}="`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`"
 	ssh root@$ipv4_alice /etc/init.d/net.eth1 stop
     fi
diff --git a/testing/scripts/start-umls b/testing/scripts/start-umls
index 7490cdf0b..823a53f5b 100755
--- a/testing/scripts/start-umls
+++ b/testing/scripts/start-umls
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: start-umls 3590 2008-03-13 14:20:20Z martin $
+# RCSID $Id: start-umls 4370 2008-10-07 04:56:50Z andreas $
 
 DIR=`dirname $0`
 
@@ -110,6 +110,7 @@ do
 
     if [ "$host" = "alice" ]
     then
+	sleep 5
 	eval ipv4_${host}="`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`"
 	ssh root@$ipv4_alice /etc/init.d/net.eth1 stop
     fi
diff --git a/testing/scripts/xstart-umls b/testing/scripts/xstart-umls
index 8d2a70c4d..f03452844 100755
--- a/testing/scripts/xstart-umls
+++ b/testing/scripts/xstart-umls
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: xstart-umls 3590 2008-03-13 14:20:20Z martin $
+# RCSID $Id: xstart-umls 4370 2008-10-07 04:56:50Z andreas $
 
 DIR=`dirname $0`
 
@@ -119,6 +119,7 @@ do
 
     if [ "$host" = "alice" ]
     then
+	sleep 5
 	eval ipv4_${host}="`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`"
 	ssh root@$ipv4_alice /etc/init.d/net.eth1 stop
     fi