version bump to 4.2.0

diff --git a/NEWS b/NEWS
index 37a70e5e20ebd449bb247c722a218ea0a3ddf90f..f3d1070bfa041c2f95b2f51002fd7d0bec3fb23c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+strongswan-4.2.0
+----------------
+
+-
+
+
 strongswan-4.1.10
 -----------------
 
@@ -18,6 +24,7 @@ strongswan-4.1.10
   interface to EAP modules has been slightly changed, so make sure to 
   check the changes if you're already rolling your own modules.
 
+
 strongswan-4.1.9
 ----------------
 

diff --git a/configure.in b/configure.in
index 4b0b0ed56f15df20131f560b92ad46c1ffbe9d9f..50e203f9b5f24b7aa59cfd78e6535a03997e2469 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,7 @@ dnl ===========================
 dnl  initialize & set some vars
 dnl ===========================
 
-AC_INIT(strongSwan,4.1.10)
+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 95ec36ba51f5d221a99f728e3f3df4109565c84b..d161643083d008f8cdbb7e54b030ff613aecaa4c 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.10")
+       DEC_MD5_VID(STRONGSWAN,       "strongSwan 4.2.0")
+       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")
        DEC_MD5_VID(STRONGSWAN_4_1_7, "strongSwan 4.1.7")

diff --git a/src/pluto/vendor.h b/src/pluto/vendor.h
index 83556cc2afec8cce5805eb55f1cd96c726185260..7b5c419034cf2b684ecd094a212a9b62932e5e37 100644 (file)
--- a/src/pluto/vendor.h
+++ b/src/pluto/vendor.h
@@ -113,6 +113,7 @@ enum known_vendorid {
   VID_STRONGSWAN_4_1_7         = 95,
   VID_STRONGSWAN_4_1_8         = 96,
   VID_STRONGSWAN_4_1_9         = 97,
+  VID_STRONGSWAN_4_1_10                = 98,
 
   /* 101 - 200 : NAT-Traversal */
   VID_NATT_STENBERG_01         =101,