version bump to 4.2.14

diff --git a/NEWS b/NEWS
index 4709b07..a3dec14 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+strongswan-4.2.14
+-----------------
+
+-
+
+
 strongswan-4.2.13
 -----------------
 

diff --git a/configure.in b/configure.in
index 81909c0..fc21494 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,7 @@ dnl ===========================
 dnl  initialize & set some vars
 dnl ===========================
 
-AC_INIT(strongSwan,4.2.13)
+AC_INIT(strongSwan,4.2.14)
 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 41c9622..f548779 100644 (file)
--- 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.13")
+       DEC_MD5_VID(STRONGSWAN,       "strongSwan 4.2.14")
+       DEC_MD5_VID(STRONGSWAN_4_2_13,"strongSwan 4.2.13")
        DEC_MD5_VID(STRONGSWAN_4_2_12,"strongSwan 4.2.12")
        DEC_MD5_VID(STRONGSWAN_4_2_11,"strongSwan 4.2.11")
        DEC_MD5_VID(STRONGSWAN_4_2_10,"strongSwan 4.2.10")

diff --git a/src/pluto/vendor.h b/src/pluto/vendor.h
index f349a41..e61c098 100644 (file)
--- a/src/pluto/vendor.h
+++ b/src/pluto/vendor.h
@@ -129,6 +129,7 @@ enum known_vendorid {
   VID_STRONGSWAN_4_2_10                =110,
   VID_STRONGSWAN_4_2_11                =111,
   VID_STRONGSWAN_4_2_12                =112,
+  VID_STRONGSWAN_4_2_13                =113,
 
   /* 101 - 200 : NAT-Traversal */
   VID_NATT_STENBERG_01         =151,

diff --git a/testing/INSTALL b/testing/INSTALL
index f5e1986..b5dd61f 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.28.6.tar.bz2
+      http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.8.tar.bz2
 
     * The Linux kernel 2.6.28 does not require any patches for the uml guest kernel
       to successfully start up.
@@ -68,7 +68,7 @@ are required for the strongSwan testing environment:
 
     * The latest strongSwan distribution
 
-      http://download.strongswan.org/strongswan-4.2.13.tar.bz2
+      http://download.strongswan.org/strongswan-4.2.14.tar.bz2
 
 
 3. Creating the environment

diff --git a/testing/testing.conf b/testing/testing.conf
index 386e474..120f703 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.28.6.tar.bz2
+KERNEL=$UMLTESTDIR/linux-2.6.28.8.tar.bz2
 
 # Extract kernel version
 KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
@@ -33,7 +33,7 @@ KERNELCONFIG=$UMLTESTDIR/.config-2.6.28
 #UMLPATCH=$UMLTESTDIR/uml-2.6.26.patch.bz2
 
 # Bzipped source of strongSwan
-STRONGSWAN=$UMLTESTDIR/strongswan-4.2.13.tar.bz2
+STRONGSWAN=$UMLTESTDIR/strongswan-4.2.14.tar.bz2
 
 # strongSwan compile options (use "yes" or "no")
 USE_LIBCURL="yes"