support of SQL databases in UML scenarios

diff --git a/testing/INSTALL b/testing/INSTALL
index ce26c9e..7326e0d 100644 (file)
--- a/testing/INSTALL
+++ b/testing/INSTALL
@@ -53,7 +53,7 @@ are required for the strongSwan testing environment:
     * A vanilla Linux kernel on which the UML kernel will be based on.
       We recommend the use of
 
-      http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.2.tar.bz2
+      http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.4.tar.bz2
 
     * Starting with Linux kernel 2.6.9 no patch must be applied any more in order
       to make the vanilla kernel UML-capable. For older kernels you'll find
@@ -71,7 +71,7 @@ are required for the strongSwan testing environment:
 
     * The latest strongSwan distribution
 
-      http://download.strongswan.org/strongswan-4.1.11.tar.gz
+      http://download.strongswan.org/strongswan-4.2.0.tar.gz
 
 
 3. Creating the environment

diff --git a/testing/do-tests.in b/testing/do-tests.in
index c83fc1d..56a3b7d 100755 (executable)
--- a/testing/do-tests.in
+++ b/testing/do-tests.in
@@ -469,13 +469,20 @@ do
                    $TESTRESULTDIR/${host}.$file  > /dev/null 2>&1
            done
 
+               if [ $SUBDIR = "sql" ]
+               then
+                       scp $HOSTLOGIN:/etc/ipsec.d/ipsec.sql \
+                       $TESTRESULTDIR/${host}.ipsec.sql  > /dev/null 2>&1
+               else
+                       touch $TESTRESULTDIR/${host}.ipsec.sql
+               fi
            ssh $HOSTLOGIN ip route list table $SOURCEIP_ROUTING_TABLE \
                    > $TESTRESULTDIR/${host}.iproute 2>/dev/null
            ssh $HOSTLOGIN $IPTABLES -v -n -L \
                    > $TESTRESULTDIR/${host}.iptables 2>/dev/null
            cat >> $TESTRESULTDIR/index.html <<@EOF
     <h3>$host</h3>
-      <table border="0" cellspacing="0" width="400">
+      <table border="0" cellspacing="0" width="600">
       <tr>
        <td>
          <ul>
@@ -491,7 +498,12 @@ do
            <li><a href="$host.daemon.log">daemon.log</a></li>
            <li><a href="$host.iproute">ip route list table $SOURCEIP_ROUTING_TABLE</a></li>
            <li><a href="$host.iptables">$IPTABLES -L</a></li>
-       </ul>
+         </ul>
+      </td>
+       <td valign="top">
+         <ul>
+           <li><a href="$host.ipsec.sql">ipsec.sql</a></li>
+         </ul>
       </td>
     </tr>
     </table>

diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index 38160b7..cb49b73 100755 (executable)
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-umlrootfs
@@ -129,7 +129,6 @@ 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
@@ -151,16 +150,21 @@ then
     echo -n " --enable-eap-sim" >> $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_INTEGRITY_TEST" = "yes" ]
 then
     echo -n " --enable-integrity-test" >> $INSTALLSHELL
 fi
-        
+
 if [ "$USE_LEAK_DETECTIVE" = "yes" ]
 then
     echo -n " --enable-leak-detective" >> $INSTALLSHELL

diff --git a/testing/testing.conf b/testing/testing.conf
index 884b261..fd5e7e1 100755 (executable)
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -21,7 +21,7 @@ UMLTESTDIR=~/strongswan-testing
 
 # Bzipped kernel sources
 # (file extension .tar.bz2 required)
-KERNEL=$UMLTESTDIR/linux-2.6.24.2.tar.bz2
+KERNEL=$UMLTESTDIR/linux-2.6.24.4.tar.bz2
 
 # Extract kernel version
 KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
@@ -34,12 +34,13 @@ KERNELCONFIG=$UMLTESTDIR/.config-2.6.24
 #UMLPATCH=$UMLTESTDIR/uml_jmpbuf-2.6.18.patch.bz2
 
 # Bzipped source of strongSwan
-STRONGSWAN=$UMLTESTDIR/strongswan-4.2.0.tar.bz2
+STRONGSWAN=$UMLTESTDIR/strongswan-4.2.1.tar.bz2
 
 # strongSwan compile options (use "yes" or "no")
 USE_LIBCURL="yes"
 USE_LDAP="yes"
 USE_EAP_AKA="yes"
+USE_SQL="yes"
 USE_MEDIATION="yes"
 USE_INTEGRITY_TEST="no"
 USE_LEAK_DETECTIVE="no"