From: Gert Doering <gert@greenie.muc.de>
Date: Thu, 11 May 2023 06:09:04 +0000 (+0200)
Subject: preparing release 2.6.4
X-Git-Tag: v2.6.4^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4f749f14a8edc75cefedda276ac6a38ecbc1595;p=thirdparty%2Fopenvpn.git

preparing release 2.6.4

version.m4, ChangeLog, Changes.rst
---

diff --git a/ChangeLog b/ChangeLog
index 32e9ffcca..a9b16781e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,28 @@
 OpenVPN ChangeLog
 Copyright (C) 2002-2023 OpenVPN Inc <sales@openvpn.net>
 
+2023.05.11 -- Version 2.6.4
+
+Arne Schwabe (3):
+      Remove unused variable line
+      Add Apache2 linking with for new commits
+      Fix compile error on TARGET_ANDROID
+
+Frank Lichtenheld (2):
+      man page: Remove cruft from --topology documentation
+      tests: do not include t_client.sh in dist
+
+Kristof Provost (1):
+      DCO: support key rotation notifications
+
+Michael Nix (1):
+      fix typo in help text: --ignore-unknown-option
+
+Selva Nair (2):
+      Format Windows error message in Unicode
+      Bugfix: dangling pointer passed to pkcs11-helper
+
+
 2023.04.13 -- Version 2.6.3
 
 Frank Lichtenheld (3):
diff --git a/Changes.rst b/Changes.rst
index f4d7487c9..1496a3429 100644
--- a/Changes.rst
+++ b/Changes.rst
@@ -1,3 +1,34 @@
+Overview of changes in 2.6.4
+============================
+
+User visible changes
+--------------------
+- License amendment: all NEW commits fall under a modified license that
+  explicitly permits linking with Apache2 libraries (mbedTLS, OpenSSL) -
+  see COPYING for details.  Existing code will fall under the new license
+  as soon as all contributors have agreed to the change - work ongoing.
+
+New features
+------------
+- DCO: support kernel-triggered key rotation (avoid IV reuse after 2^32
+  packets).  This is the userland side, accepting a message from kernel,
+  and initiating a TLS renegotiation.  As of release, only implemented in
+  FreeBSD kernel.
+
+Bug fixes
+---------
+- fix pkcs#11 usage with OpenSSL 3.x and PSS signing (Github #323)
+
+- fix compile error on TARGET_ANDROID
+
+- fix typo in help text
+
+- manpage updates (--topology)
+
+- encoding of non-ASCII windows error messages in log + management fixed
+  (use UTF8 "as for everything else", not ANSI codepages)  (Github #319)
+
+
 Overview of changes in 2.6.3
 ============================
 
diff --git a/version.m4 b/version.m4
index 2776b8267..3a902e83b 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], [6])
-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,6,3,0])
+define([PRODUCT_VERSION_RESOURCE], [2,6,4,0])
 dnl define the TAP version
 define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901])
 define([PRODUCT_TAP_WIN_MIN_MAJOR], [9])