Preparing release 2.5_beta3

Version.m4, ChangeLog

Notable change: define([PRODUCT_VERSION_RESOURCE], [2,5,0,3])
-> that way, the resulting openvpn binary on windows will have a
new version number (2.5.0.3) which will make the .msi installers
replace it on upgrading.

Signed-off-by: Gert Doering <gert@greenie.muc.de>

diff --git a/ChangeLog b/ChangeLog
index de7a8f10b741ce3b4b98e839128eceb04385bb3b..f516b5afa4663e8568e8bd45bc9e98506d66545f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 OpenVPN Change Log
 Copyright (C) 2002-2020 OpenVPN Inc <sales@openvpn.net>
 
+2020.08.31 -- Version 2.5_beta3
+
+Arne Schwabe (1):
+      Fix client NCP OCC fallback when server and client cipher are identical
+
 2020.08.26 -- Version 2.5_beta2
 
 Arne Schwabe (1):

diff --git a/version.m4 b/version.m4
index 7271aa24d39c89246c3d63f789a1436564a6e6e5..db690c7d6e87fb92e7f92be859808ff8e8616f93 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], [5])
-define([PRODUCT_VERSION_PATCH], [_beta2])
+define([PRODUCT_VERSION_PATCH], [_beta3])
 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,5,0,0])
+define([PRODUCT_VERSION_RESOURCE], [2,5,0,3])
 dnl define the TAP version
 define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901])
 define([PRODUCT_TAP_WIN_MIN_MAJOR], [9])