version bump to 4.2.0

diff --git a/NEWS b/NEWS
index 40df9cecdf24e7c1275cc41c3a6ca812ddd0d85b..c346a5323aa8db67a76b383dfe5868bfb973da46 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+strongswan-4.2.0
+----------------
+
+
+
 strongswan-4.1.11
 -----------------
 

diff --git a/configure.in b/configure.in
index 39623eba0dbededf01120bb1bd823b160b1ad15f..6d0ffbea4c2744e01919b89094d234da03048e56 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,7 @@ dnl ===========================
 dnl  initialize & set some vars
 dnl ===========================
 
-AC_INIT(strongSwan,4.1.11)
+AC_INIT(strongSwan,4.2.0)
 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 dcfc6f6b51596e07f9546d7607e0379729c9df1d..28c8261c77fb9966436357c2af1f79b6acaca596 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.1.11")
+       DEC_MD5_VID(STRONGSWAN,       "strongSwan 4.2.0")
+       DEC_MD5_VID(STRONGSWAN_4_1_11,"strongSwan 4.1.11")
        DEC_MD5_VID(STRONGSWAN_4_1_10,"strongSwan 4.1.10")
        DEC_MD5_VID(STRONGSWAN_4_1_9, "strongSwan 4.1.9")
        DEC_MD5_VID(STRONGSWAN_4_1_8, "strongSwan 4.1.8")

diff --git a/src/pluto/vendor.h b/src/pluto/vendor.h
index 7b5c419034cf2b684ecd094a212a9b62932e5e37..3ed647c4e86fd74790168d812a1cabf9fbe128ec 100644 (file)
--- a/src/pluto/vendor.h
+++ b/src/pluto/vendor.h
@@ -114,6 +114,7 @@ enum known_vendorid {
   VID_STRONGSWAN_4_1_8         = 96,
   VID_STRONGSWAN_4_1_9         = 97,
   VID_STRONGSWAN_4_1_10                = 98,
+  VID_STRONGSWAN_4_1_11                = 99,
 
   /* 101 - 200 : NAT-Traversal */
   VID_NATT_STENBERG_01         =101,