Preparing v2.4.2 release

Signed-off-by: David Sommerseth <davids@openvpn.net>

diff --git a/ChangeLog b/ChangeLog
index 450e0f53da510cc5ea6763092141d3e569801ae6..00c2e2f86c88c203e49019235c24ee45a4053c64 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,35 @@
 OpenVPN Change Log
 Copyright (C) 2002-2017 OpenVPN Technologies, Inc. <sales@openvpn.net>
 
+2017.05.11 -- Version 2.4.2
+David Sommerseth (5):
+      auth-token: Ensure tokens are always wiped on de-auth
+      docs: Fixed man-page warnings discoverd by rpmlint
+      Make --cipher/--auth none more explicit on the risks
+      plugin: Fix documentation typo for type_mask
+      plugin: Export secure_memzero() to plug-ins
+
+Hristo Venev (1):
+      Fix extract_x509_field_ssl for external objects, v2
+
+Selva Nair (1):
+      In auth-pam plugin clear the password after use
+
+Steffan Karger (10):
+      cleanup: merge packet_id_alloc_outgoing() into packet_id_write()
+      Don't run packet_id unit tests for --disable-crypto builds
+      Fix Changes.rst layout
+      Fix memory leak in x509_verify_cert_ku()
+      mbedtls: correctly check return value in pkcs11_certificate_dn()
+      Restore pre-NCP frame parameters for new sessions
+      Always clear username/password from memory on error
+      Document tls-crypt security considerations in man page
+      Don't assert out on receiving too-large control packets (CVE-2017-7478)
+      Drop packets instead of assert out if packet id rolls over (CVE-2017-7479)
+
+ValdikSS (1):
+      Set a low interface metric for tap adapter when block-outside-dns is in use
+
 2017.03.21 -- Version 2.4.1
 Antonio Quartulli (4):
       attempt to add IPv6 route even when no IPv6 address was configured

diff --git a/version.m4 b/version.m4
index 9636f739a7dab5b3555b9e5d84ac59ad91237f21..73ca1e8915196e0d72b05f925bd382884b239649 100644 (file)
--- a/version.m4
+++ b/version.m4
@@ -3,12 +3,12 @@ define([PRODUCT_NAME], [OpenVPN])
 define([PRODUCT_TARNAME], [openvpn])
 define([PRODUCT_VERSION_MAJOR], [2])
 define([PRODUCT_VERSION_MINOR], [4])
-define([PRODUCT_VERSION_PATCH], [.1])
+define([PRODUCT_VERSION_PATCH], [.2])
 m4_append([PRODUCT_VERSION], [PRODUCT_VERSION_MAJOR])
 m4_append([PRODUCT_VERSION], [PRODUCT_VERSION_MINOR], [[.]])
 m4_append([PRODUCT_VERSION], [PRODUCT_VERSION_PATCH], [[]])
 define([PRODUCT_BUGREPORT], [openvpn-users@lists.sourceforge.net])
-define([PRODUCT_VERSION_RESOURCE], [2,4,1,0])
+define([PRODUCT_VERSION_RESOURCE], [2,4,2,0])
 dnl define the TAP version
 define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901])
 define([PRODUCT_TAP_WIN_MIN_MAJOR], [9])