From db67c87db3c9089ea8d2e14f617bf3d9e2af261f Mon Sep 17 00:00:00 2001
From: Rene Mayrhofer <rene@mayrhofer.eu.org>
Date: Wed, 9 Jul 2008 21:02:41 +0000
Subject: [svn-upgrade] Integrating new upstream version, strongswan (4.2.4)

---
 testing/scripts/build-umlrootfs | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

(limited to 'testing/scripts/build-umlrootfs')

diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index 48d74950f..6a385dd28 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 3471 2008-02-14 21:25:38Z andreas $
+# RCSID $Id: build-umlrootfs 4035 2008-06-05 07:25:27Z andreas $
 
 DIR=`dirname $0`
 
@@ -129,11 +129,10 @@ 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
+    echo -n " --enable-curl" >> $INSTALLSHELL
 fi
 
 if [ "$USE_LDAP" = "yes" ]
@@ -151,11 +150,31 @@ then
     echo -n " --enable-eap-sim" >> $INSTALLSHELL
     fi
 
-if [ "$USE_P2P" = "yes" ]
+if [ "$USE_EAP_MD5" = "yes" ]
 then
-    echo -n " --enable-p2p" >> $INSTALLSHELL
+    echo -n " --enable-eap-md5" >> $INSTALLSHELL
+    fi
+
+if [ "$USE_SQL" = "yes" ]
+then
+    echo -n " --enable-sql --enable-sqlite" >> $INSTALLSHELL
+    fi
+
+if [ "$USE_MEDIATION" = "yes" ]
+then
+    echo -n " --enable-mediation" >> $INSTALLSHELL
+fi
+
+if [ "$USE_OPENSSL" = "yes" ]
+then
+    echo -n " --enable-openssl" >> $INSTALLSHELL
 fi
     
+if [ "$USE_INTEGRITY_TEST" = "yes" ]
+then
+    echo -n " --enable-integrity-test" >> $INSTALLSHELL
+fi
+
 if [ "$USE_LEAK_DETECTIVE" = "yes" ]
 then
     echo -n " --enable-leak-detective" >> $INSTALLSHELL
@@ -171,6 +190,12 @@ chroot $LOOPDIR /bin/bash /install.sh >> $LOGFILE 2>&1
 rm -f $INSTALLSHELL
 cgecho "done"
 
+######################################################
+# copying default /etc/ipsec.d/tables.sql to the root filesystem
+#
+cecho " * Copying '$HOSTCONFIGDIR/default/etc/ipsec.d/tables.sql' to the root filesystem"
+cp -fp $HOSTCONFIGDIR/default/etc/ipsec.d/tables.sql $LOOPDIR/etc/ipsec.d/tables.sql
+
 ######################################################
 # copying the host's ssh public key
 #
-- 
cgit v1.2.3