From 9599ee1597ac649b97bb37b20adb50ada42d05e7 Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Wed, 21 Jan 2009 03:14:52 +0000
Subject: [PATCH] version bump to 4.2.12

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

diff --git a/configure.in b/configure.in
index 52f597c407..724b939fa5 100644
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,7 @@ dnl ===========================
 dnl  initialize & set some vars
 dnl ===========================
 
-AC_INIT(strongSwan,4.2.11)
+AC_INIT(strongSwan,4.2.12)
 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 90c239e851..1e5bf8d5d5 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.11")
+	DEC_MD5_VID(STRONGSWAN,       "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")
 	DEC_MD5_VID(STRONGSWAN_4_2_9, "strongSwan 4.2.9")
 	DEC_MD5_VID(STRONGSWAN_4_2_8, "strongSwan 4.2.8")
diff --git a/src/pluto/vendor.h b/src/pluto/vendor.h
index 21b724d98d..19022d87eb 100644
--- a/src/pluto/vendor.h
+++ b/src/pluto/vendor.h
@@ -127,6 +127,7 @@ enum known_vendorid {
   VID_STRONGSWAN_4_2_8		=108,
   VID_STRONGSWAN_4_2_9		=109,
   VID_STRONGSWAN_4_2_10		=110,
+  VID_STRONGSWAN_4_2_11		=111,
 
   /* 101 - 200 : NAT-Traversal */
   VID_NATT_STENBERG_01		=151,
diff --git a/testing/INSTALL b/testing/INSTALL
index d12b34d0b2..e8ab20b70c 100644
--- a/testing/INSTALL
+++ b/testing/INSTALL
@@ -68,7 +68,7 @@ are required for the strongSwan testing environment:
 
     * The latest strongSwan distribution
 
-      http://download.strongswan.org/strongswan-4.2.11.tar.bz2
+      http://download.strongswan.org/strongswan-4.2.12.tar.bz2
 
 
 3. Creating the environment
diff --git a/testing/testing.conf b/testing/testing.conf
index bf802897c3..dae3fc8e72 100755
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -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.11.tar.bz2
+STRONGSWAN=$UMLTESTDIR/strongswan-4.2.12.tar.bz2
 
 # strongSwan compile options (use "yes" or "no")
 USE_LIBCURL="yes"