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

12 files changed, 44 insertions, 43 deletions

diff --git a/testing/scripts/build-hostconfig b/testing/scripts/build-hostconfig
index 0c2afd2c2..5d1c83060 100755
--- a/testing/scripts/build-hostconfig
+++ b/testing/scripts/build-hostconfig
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: build-hostconfig,v 1.3 2005/02/08 10:40:48 as Exp $
+# RCSID $Id: build-hostconfig 3273 2007-10-08 20:18:34Z andreas $
 
 DIR=`dirname $0`
 
@@ -121,4 +121,4 @@ do
     esac
 done
 
-cecho "done"
+cgecho "done"
diff --git a/testing/scripts/build-sshkeys b/testing/scripts/build-sshkeys
index 23f62e005..a26f0162c 100755
--- a/testing/scripts/build-sshkeys
+++ b/testing/scripts/build-sshkeys
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: build-sshkeys,v 1.2 2005/02/15 14:12:16 as Exp $
+# RCSID $Id: build-sshkeys 3273 2007-10-08 20:18:34Z andreas $
 
 DIR=`dirname $0`
 
@@ -37,25 +37,25 @@ if [ ! -f $LOGFILE ]
 then
     cecho-n " * Logfile '$LOGFILE' does not exist..creating.."
     touch $LOGFILE
-    cecho "done"
+    cgecho "done"
 fi
 
 if [ ! -d ~/.ssh ]
 then
     cecho-n " * Creating directory '~/.ssh'.."
     mkdir ~/.ssh
-    cecho "done"
+    cgecho "done"
 fi
 
 if [ -f ~/.ssh/known_hosts ]
 then
     cecho-n " * Backing up ~/.ssh/known_hosts to '~/.ssh/known_hosts.before_uml'.."
     cp -fp ~/.ssh/known_hosts ~/.ssh/known_hosts.before_uml
-    cecho "done"
+    cgecho "done"
 else
     cecho-n " * Creating '~/.ssh/known_hosts'"
     touch ~/.ssh/known_hosts
-    cecho "done"
+    cgecho "done"
 fi
 
 for host in $HOSTNAMEIPV4
@@ -68,7 +68,7 @@ do
     else
 	cecho-n " * Adding uml host $HOSTNAME ($IP) to '~/.ssh/known_hosts'.."
 	echo "$HOSTNAME,$IP `cat $DIR/../hosts/ssh_host_rsa_key.pub`" >> ~/.ssh/known_hosts
-	cecho "done"
+	cgecho "done"
     fi
 done
 
@@ -84,5 +84,5 @@ else
     cecho "not found"
     cecho-n " * Generating ssh rsa key pair.."
     echo "" | ssh-keygen -N "" -t rsa -f ~/.ssh/id_rsa >> $LOGFILE 2>&1
-    cecho "done"
+    cgecho "done"
 fi
diff --git a/testing/scripts/build-umlhostfs b/testing/scripts/build-umlhostfs
index 69ad9fe02..c73ce00d0 100755
--- a/testing/scripts/build-umlhostfs
+++ b/testing/scripts/build-umlhostfs
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: build-umlhostfs,v 1.3 2006/03/30 21:20:27 as Exp $
+# RCSID $Id: build-umlhostfs 3273 2007-10-08 20:18:34Z andreas $
 
 DIR=`dirname $0`
 
@@ -32,7 +32,7 @@ if [ ! -d $BUILDDIR ]
 then
     cecho-n " * Directory '$BUILDDIR' does not exist..creating.."
     mkdir $BUILDDIR
-    cecho "done"
+    cgecho "done"
 fi
 
 LOGFILE=${BUILDDIR}/testing.log
@@ -41,7 +41,7 @@ if [ ! -f $LOGFILE ]
 then
     cecho-n " * Logfile '$LOGFILE' does not exist..creating.."
     touch $LOGFILE
-    cecho "done"
+    cgecho "done"
 fi
 
 LOOPDIR=loop
@@ -76,4 +76,4 @@ do
     umount $LOOPDIR
 done
 
-cecho "done"
+cgecho "done"
diff --git a/testing/scripts/build-umlkernel b/testing/scripts/build-umlkernel
index 074d7847a..61dee8ff5 100755
--- a/testing/scripts/build-umlkernel
+++ b/testing/scripts/build-umlkernel
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: build-umlkernel,v 1.2 2005/01/09 21:54:25 as Exp $
+# RCSID $Id: build-umlkernel 3273 2007-10-08 20:18:34Z andreas $
 
 DIR=`dirname $0`
 
@@ -75,12 +75,12 @@ if [ ! -f $LOGFILE ]
 then
     cecho-n " * Logfile '$LOGFILE' does not exist..creating.."
     touch $LOGFILE
-    cecho "done"
+    cgecho "done"
 fi
 
 cecho-n " * Unpacking kernel.."
 tar xjf $KERNEL >> $LOGFILE 2>&1
-cecho "done"
+cgecho "done"
 
 KERNELDIR=${BUILDDIR}/linux-${KERNELVERSION}
 
@@ -109,7 +109,7 @@ if [ $UMLPATCH ]
 then
     cecho-n " * Applying uml patch.."
     bzcat $UMLPATCH | patch -p1 >> $LOGFILE 2>&1
-    cecho  "done"
+    cgecho  "done"
 fi
 
 #######################################################
@@ -125,10 +125,8 @@ make oldconfig ARCH=um >> $LOGFILE 2>&1
 
 cecho-n " * Now compiling uml kernel.."
 make linux ARCH=um  >> $LOGFILE 2>&1
-cecho "done"
+cgecho "done"
 
 cecho-n " * Copying uml kernel to '${BUILDDIR}/linux-uml-${KERNELVERSION}'.."
 mv linux ${BUILDDIR}/linux-uml-${KERNELVERSION}
-cecho "done"
-
-
+cgecho "done"
diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index f839e3e8e..3498f216e 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,v 1.11 2006/01/08 22:29:56 as Exp $
+# RCSID $Id: build-umlrootfs 3273 2007-10-08 20:18:34Z andreas $
 
 DIR=`dirname $0`
 
@@ -57,7 +57,7 @@ if [ ! -f $LOGFILE ]
 then
     cecho-n " * Logfile '$LOGFILE' does not exist..creating.."
     touch $LOGFILE
-    cecho "done"
+    cgecho "done"
 fi
 
 ROOTFSDIR=$BUILDDIR/root-fs
@@ -66,7 +66,7 @@ if [ ! -d $ROOTFSDIR ]
 then
     cecho-n " * Root file system directory '$ROOTFSDIR' does not exist..creating.."
     mkdir $ROOTFSDIR
-    cecho "done"
+    cgecho "done"
 fi
 
 cd $ROOTFSDIR
@@ -87,7 +87,7 @@ dd if=/dev/zero of=gentoo-fs count=$ROOTFSSIZE bs=1M >> $LOGFILE 2>&1
 mkreiserfs -q -f gentoo-fs       >> $LOGFILE 2>&1
 mount -o loop gentoo-fs $LOOPDIR >> $LOGFILE 2>&1
 tar xjpf $ROOTFS -C $LOOPDIR     >> $LOGFILE 2>&1
-cecho "done"
+cgecho "done"
 
 ######################################################
 # remove /etc/resolv.conf
@@ -129,6 +129,8 @@ echo "ln -sf /usr/share/zoneinfo/${TZUML} /etc/localtime" >> $INSTALLSHELL
 echo "cd /root/${STRONGSWANVERSION}" >> $INSTALLSHELL
 echo -n "./configure --sysconfdir=/etc" >> $INSTALLSHELL
 echo -n " --with-random-device=/dev/urandom" >> $INSTALLSHELL
+echo -n " --enable-integrity-test" >> $INSTALLSHELL
+
 if [ "$USE_LIBCURL" = "yes" ]
 then
     echo -n " --enable-http" >> $INSTALLSHELL
@@ -150,10 +152,8 @@ echo "ldconfig" >> $INSTALLSHELL
 
 cecho-n " * Compiling $STRONGSWANVERSION within the root file system as chroot.."
 chroot $LOOPDIR /bin/bash /install.sh >> $LOGFILE 2>&1
-cecho "done"
-
 rm -f $INSTALLSHELL
-
+cgecho "done"
 
 ######################################################
 # copying the host's ssh public key
diff --git a/testing/scripts/function.sh b/testing/scripts/function.sh
index aa944924c..f147e782e 100755
--- a/testing/scripts/function.sh
+++ b/testing/scripts/function.sh
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: function.sh,v 1.3 2005/02/16 22:20:52 as Exp $
+# RCSID $Id: function.sh 3273 2007-10-08 20:18:34Z andreas $
 
 
 ############################################
@@ -24,6 +24,9 @@
 function cecho {
     echo -e "\033[1;31m$1\033[0m"
 }
+function cgecho {
+    echo -e "\033[1;32m$1\033[0m"
+}
 
 function cecho-n {
     echo -en "\033[1;31m$1\033[0m"
diff --git a/testing/scripts/kstart-umls b/testing/scripts/kstart-umls
index eeaa959e8..91ec00b60 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,v 1.6 2005/08/30 22:13:12 as Exp $
+# RCSID $Id: kstart-umls 3273 2007-10-08 20:18:34Z andreas $
 
 DIR=`dirname $0`
 
@@ -68,7 +68,7 @@ do
 	    ubda=$UMLHOSTFS \
 	    \$SWITCH_${host} \
 	    mem=${MEM}M con=pty con0=fd:0,fd:1" &
-        cecho "\033[1;32mdone"
+        cgecho "done"
     fi
     let "x0+=dx"
     let "y0+=dy"
@@ -114,7 +114,7 @@ do
 	cecho "exit"
 	exit 1
     else
-	cecho "\033[1;32mup"
+	cgecho "up"
     fi
 done
 
diff --git a/testing/scripts/load-testconfig b/testing/scripts/load-testconfig
index 6558018c2..e4dd63d59 100755
--- a/testing/scripts/load-testconfig
+++ b/testing/scripts/load-testconfig
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: load-testconfig,v 1.2 2004/12/13 21:02:42 as Exp $
+# RCSID $Id: load-testconfig 3273 2007-10-08 20:18:34Z andreas $
 
 DIR=`dirname $0`
 
diff --git a/testing/scripts/restore-defaults b/testing/scripts/restore-defaults
index b1dae1ea2..dc2ebb312 100755
--- a/testing/scripts/restore-defaults
+++ b/testing/scripts/restore-defaults
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: restore-defaults,v 1.2 2004/12/20 07:56:33 as Exp $
+# RCSID $Id: restore-defaults 3273 2007-10-08 20:18:34Z andreas $
 
 DIR=`dirname $0`
 
diff --git a/testing/scripts/start-switches b/testing/scripts/start-switches
index aab82b8ff..118a2250e 100755
--- a/testing/scripts/start-switches
+++ b/testing/scripts/start-switches
@@ -14,7 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: start-switches,v 1.2 2004/12/19 19:17:25 as Exp $
+# RCSID $Id: start-switches 3273 2007-10-08 20:18:34Z andreas $
 
 DIR=`dirname $0`
 
@@ -31,9 +31,9 @@ do
 	cecho " * Great, umlswitch$n is already running!"
     else
 	cecho-n " * Starting umlswitch$n.."
-	uml_switch -tap tap$n -unix /tmp/umlswitch$n >/dev/null 2>&1 </dev/null &
+	uml_switch -tap tap$n -unix /tmp/umlswitch$n -daemon >/dev/null 2>&1 </dev/null
 	sleep 2
 	eval ifconfig "tap$n \$IFCONFIG_$n up"
-	cecho "\033[1;32mdone"
+	cgecho "done"
     fi
 done
diff --git a/testing/scripts/start-umls b/testing/scripts/start-umls
index 1b875a696..50cd65da4 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,v 1.5 2005/08/30 22:13:12 as Exp $
+# RCSID $Id: start-umls 3273 2007-10-08 20:18:34Z andreas $
 
 DIR=`dirname $0`
 
@@ -62,7 +62,7 @@ do
 	    ubda=$UMLHOSTFS \
 	    \$SWITCH_${host} \
 	    mem=${MEM}M con=pty con0=fd:0,fd:1"
-        cecho "done"
+        cgecho "done"
     fi
 done
 
@@ -105,7 +105,7 @@ do
 	cecho "exit"
 	exit 1
     else
-	cecho "up"
+	cgecho "up"
     fi
 done
 
diff --git a/testing/scripts/xstart-umls b/testing/scripts/xstart-umls
index 9efbd1497..8cd76c133 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,v 1.6 2005/08/30 22:13:12 as Exp $
+# RCSID $Id: xstart-umls 3273 2007-10-08 20:18:34Z andreas $
 
 DIR=`dirname $0`
 
@@ -68,7 +68,7 @@ do
 	    ubda=$UMLHOSTFS \
 	    \$SWITCH_${host} \
 	    mem=${MEM}M con=pty con0=fd:0,fd:1" &
-        cecho "done"
+        cgecho "done"
     fi
     let "x0+=dx"
     let "y0+=dy"
@@ -114,7 +114,7 @@ do
 	cecho "exit"
 	exit 1
     else
-	cecho "up"
+	cgecho "up"
     fi
 done