From 50ae86017ccf94b1f2ce559df196af13c7908d8c Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Tue, 18 Nov 2008 00:02:59 +0000
Subject: [PATCH] version bump to 4.2.10

---
 configure.in         | 2 +-
 src/pluto/vendor.c   | 3 ++-
 src/pluto/vendor.h   | 1 +
 testing/INSTALL      | 4 ++--
 testing/testing.conf | 4 ++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/configure.in b/configure.in
index 54ff358d1..ba04f1b13 100644
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,7 @@ dnl ===========================
 dnl  initialize & set some vars
 dnl ===========================
 
-AC_INIT(strongSwan,4.2.9)
+AC_INIT(strongSwan,4.2.10)
 AM_INIT_AUTOMAKE(tar-ustar)
 AC_C_BIGENDIAN
 AC_SUBST(confdir, '${sysconfdir}')
diff --git a/src/pluto/vendor.c b/src/pluto/vendor.c
index 39b80250f..a490b7079 100644
--- a/src/pluto/vendor.c
+++ b/src/pluto/vendor.c
@@ -206,7 +206,8 @@ static struct vid_struct _vid_tab[] = {
 	/*
 	 * strongSwan
 	 */
-	DEC_MD5_VID(STRONGSWAN,       "strongSwan 4.2.9")
+	DEC_MD5_VID(STRONGSWAN,       "strongSwan 4.2.10")
+	DEC_MD5_VID(STRONGSWAN_4_2_9, "strongSwan 4.2.9")
 	DEC_MD5_VID(STRONGSWAN_4_2_8, "strongSwan 4.2.8")
 	DEC_MD5_VID(STRONGSWAN_4_2_7, "strongSwan 4.2.7")
 	DEC_MD5_VID(STRONGSWAN_4_2_6, "strongSwan 4.2.6")
diff --git a/src/pluto/vendor.h b/src/pluto/vendor.h
index 9a0c969a8..fa1c44faa 100644
--- a/src/pluto/vendor.h
+++ b/src/pluto/vendor.h
@@ -125,6 +125,7 @@ enum known_vendorid {
   VID_STRONGSWAN_4_2_6		=106,
   VID_STRONGSWAN_4_2_7		=107,
   VID_STRONGSWAN_4_2_8		=108,
+  VID_STRONGSWAN_4_2_9		=109,
 
   /* 101 - 200 : NAT-Traversal */
   VID_NATT_STENBERG_01		=151,
diff --git a/testing/INSTALL b/testing/INSTALL
index 0da7efdd2..9ac654b54 100644
--- 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.27.5.tar.bz2
+      http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.6.tar.bz2
 
     * The Linux kernel 2.6.26 requires the following patch for the uml guest kernel
       to successfully start up:
@@ -70,7 +70,7 @@ are required for the strongSwan testing environment:
 
     * The latest strongSwan distribution
 
-      http://download.strongswan.org/strongswan-4.2.9.tar.bz2
+      http://download.strongswan.org/strongswan-4.2.10.tar.bz2
 
 
 3. Creating the environment
diff --git a/testing/testing.conf b/testing/testing.conf
index 58ff83562..f7362fcf5 100755
--- 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.27.tar.bz2
+KERNEL=$UMLTESTDIR/linux-2.6.27.6.tar.bz2
 
 # Extract kernel version
 KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
@@ -33,7 +33,7 @@ KERNELCONFIG=$UMLTESTDIR/.config-2.6.27
 UMLPATCH=$UMLTESTDIR/uml-2.6.26.patch.bz2
 
 # Bzipped source of strongSwan
-STRONGSWAN=$UMLTESTDIR/strongswan-4.2.9.tar.bz2
+STRONGSWAN=$UMLTESTDIR/strongswan-4.2.10.tar.bz2
 
 # strongSwan compile options (use "yes" or "no")
 USE_LIBCURL="yes"