aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.in2
-rw-r--r--src/pluto/vendor.c3
-rw-r--r--src/pluto/vendor.h1
-rw-r--r--testing/INSTALL2
-rwxr-xr-xtesting/testing.conf2
5 files changed, 6 insertions, 4 deletions
diff --git a/configure.in b/configure.in
index 1ce53edc6..9531bb361 100644
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,7 @@ dnl ===========================
dnl initialize & set some vars
dnl ===========================
-AC_INIT(strongSwan,4.2.5)
+AC_INIT(strongSwan,4.2.6)
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 f509e450b..af1c8a8aa 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.5")
+ DEC_MD5_VID(STRONGSWAN, "strongSwan 4.2.6")
+ DEC_MD5_VID(STRONGSWAN_4_2_5, "strongSwan 4.2.5")
DEC_MD5_VID(STRONGSWAN_4_2_4, "strongSwan 4.2.4")
DEC_MD5_VID(STRONGSWAN_4_2_3, "strongSwan 4.2.3")
DEC_MD5_VID(STRONGSWAN_4_2_2, "strongSwan 4.2.2")
diff --git a/src/pluto/vendor.h b/src/pluto/vendor.h
index 99293e086..e689c6220 100644
--- a/src/pluto/vendor.h
+++ b/src/pluto/vendor.h
@@ -121,6 +121,7 @@ enum known_vendorid {
VID_STRONGSWAN_4_2_2 =102,
VID_STRONGSWAN_4_2_3 =103,
VID_STRONGSWAN_4_2_4 =104,
+ VID_STRONGSWAN_4_2_5 =105,
/* 101 - 200 : NAT-Traversal */
VID_NATT_STENBERG_01 =151,
diff --git a/testing/INSTALL b/testing/INSTALL
index df7eb34a9..e5df4d6de 100644
--- a/testing/INSTALL
+++ b/testing/INSTALL
@@ -70,7 +70,7 @@ are required for the strongSwan testing environment:
* The latest strongSwan distribution
- http://download.strongswan.org/strongswan-4.2.5.tar.bz2
+ http://download.strongswan.org/strongswan-4.2.6.tar.bz2
3. Creating the environment
diff --git a/testing/testing.conf b/testing/testing.conf
index 2ac1fa069..9cbc1dd35 100755
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -33,7 +33,7 @@ KERNELCONFIG=$UMLTESTDIR/.config-2.6.26
UMLPATCH=$UMLTESTDIR/uml-2.6.26.patch.bz2
# Bzipped source of strongSwan
-STRONGSWAN=$UMLTESTDIR/strongswan-4.2.5.tar.bz2
+STRONGSWAN=$UMLTESTDIR/strongswan-4.2.6.tar.bz2
# strongSwan compile options (use "yes" or "no")
USE_LIBCURL="yes"