Preparing release 2.5.4v2.5.4

version.m4, ChangeLog, Changes.rst

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

3 files changed, 66 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 5b66ea7..b0ee674 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,38 @@
 OpenVPN Change Log
 Copyright (C) 2002-2021 OpenVPN Inc <sales@openvpn.net>
 
+2021.10.04 -- Version 2.5.4
+
+Antonio Quartulli (3):
+      route.c: pass the right parameter to IN6_IS_ADDR_UNSPECIFIED
+      configure: search also for rst2{man, html}.py
+      networking: add networking API net_addr_ll_set() and use it on Linux
+
+Arne Schwabe (1):
+      Move examples into openvpn-examples(5) man page
+
+David Korczynski (1):
+      Fix argv leaks in add_route() and add_route_ipv6()
+
+David Sommerseth (2):
+      doc: Use generic rules for man/html generation
+      man: Clarify IV_HWADDR
+
+Gert Doering (1):
+      Add error reporting to get_console_input_win32().
+
+Lev Stipakov (3):
+      Fix console prompts with redirected log
+      Add building man page on Windows
+      GitHub Actions: remove Ubuntu 16.04 environment
+
+Max Fillinger (1):
+      Update Fox e-mail address in copyright notices
+
+Selva Nair (1):
+      Minor doc correction: tls-crypt-v2 key generation
+
+
 2021.06.17 -- Version 2.5.3
 
 Arne Schwabe (3):
diff --git a/Changes.rst b/Changes.rst
index df2e890..ba5ee1a 100644
--- a/Changes.rst
+++ b/Changes.rst
@@ -1,3 +1,35 @@
+Overview of changes in 2.5.4
+============================
+Bugfixes
+--------
+- fix prompting for password on windows console if stderr redirection
+  is in use - this breaks 2.5.x on Win11/ARM, and might also break
+  on Win11/adm64 when released.
+
+- fix setting MAC address on TAP adapters (--lladdr) to use sitnl
+  (was overlooked, and still used "ifconfig" calls)
+
+- various improvements for man page building (rst2man/rst2html etc)
+
+- minor bugfix with IN6_IS_ADDR_UNSPECIFIED() use (breaks build on
+  at least one platform strictly checking this)
+
+- fix minor memory leak under certain conditions in add_route() and
+  add_route_ipv6()
+
+User-visible Changes
+--------------------
+- documentation improvements
+
+- copyright updates where needed
+
+- better error reporting when win32 console access fails
+
+New features
+------------
+- also build man page on Windows builds
+
+
 Overview of changes in 2.5.3
 ============================
 Bugfixes
diff --git a/version.m4 b/version.m4
index 4b0d677..f47b4bf 100644
--- 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], [.3])
+define([PRODUCT_VERSION_PATCH], [.4])
 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,3,0])
+define([PRODUCT_VERSION_RESOURCE], [2,5,4,0])
 dnl define the TAP version
 define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901])
 define([PRODUCT_TAP_WIN_MIN_MAJOR], [9])