preparing release 2.6.0

version.m4, ChangeLog, Changes.rst

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

diff --git a/ChangeLog b/ChangeLog
index 85712c03703b30228a78b4b7f78107cbe11fe6d4..0a77882a5e3def6aa4c9b0f5c392155ff4faddc0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,34 @@
 OpenVPN ChangeLog
 Copyright (C) 2002-2023 OpenVPN Inc <sales@openvpn.net>
 
+2023.01.25 -- Version 2.6.0
+
+Antonio Quartulli (1):
+      dco_linux: update license for ovpn_dco_linux.h
+
+Arne Schwabe (1):
+      Workaround: make ovpn-dco more reliable
+
+Gert Doering (3):
+      Fix OVPN_DEL_PEER_REASON_TRANSPORT_DISCONNECT breakage on FreeBSD+DCO
+      Repair special-casing of EEXIST for Linux/SITNL route install
+      preparing release 2.6.0
+
+Lev Stipakov (3):
+      openvpnmsica: remove dco installer custom actions
+      openvpnmsica: remove unused declarations
+      openvpnmsica: fix adapters discovery logic for DCO
+
+Selva Nair (4):
+      Define and use macros for route addition status code
+      Warn when pkcs11-id or pkcs11-id-management options are ignored
+      Cleanup route error and debug logging on Windows
+      Fix one more 'existing route may get deleted' case
+
+Timo Rothenpieler (1):
+      Don't clear capability bounding set on capng_change_id
+
+
 2023.01.12 -- Version 2.6_rc2
 
 Antonio Quartulli (4):

diff --git a/Changes.rst b/Changes.rst
index 8e1935aebdc6e70d1616b3b2b7fab9e65baf03f3..08822f1ded9d8764f572ea33173389a57412326d 100644 (file)
--- a/Changes.rst
+++ b/Changes.rst
@@ -1,3 +1,41 @@
+Overview of changes in 2.6.0, relative to 2.6_rc2
+=================================================
+
+(See below for changes in 2.6 relative to 2.5)
+
+New features
+------------
+- no new features relative to 2.6_rc2
+
+User-Visible Changes
+--------------------
+- no user-visible changes relative to 2.6_rc2
+
+Bugfixes / minor improvements
+-----------------------------
+- repair handling of "route already exists" errors for Linux/sitnl builds,
+  which would lead to erroneous attempts to remove routes later on, possibly
+  removing "non openvpn installed" routes.
+
+- repair error handling for Linux/iproute2 builds - this was ignoring
+  all errors on route installation, causing issues on route removal.
+
+- improve logging (errors and debug messages) for route handling on Windows
+
+- print warning if pkcs11-id or pkcs11-id-management options are used but
+  no pkcs11-providers has been selected
+
+- openvpnmsica: improve handling of win-dco driver (use MSM now)
+
+- for Linux/DCO builds, increase libnl buffer size to reduce propability
+  of ENOBUFS occurance if kernel-to-userland netlink queue overruns
+  (bandaid fix)
+
+- re-enable use of suid binaries in scripts run by OpenVPN - new
+  capability-handling code was too strict and cleared all capabilities,
+  breaking users' use of "sudo" (etc) in scripts (Github OpenVPN/openvpn#220).
+
+
 Overview of changes in 2.6_rc2
 ==============================
 New features

diff --git a/version.m4 b/version.m4
index 1e5c7c41680af7e3284e2eb474f28908632260d4..64dee8a4c4d1f4b21e8f0256e4c2c9592c6ced0d 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], [6])
-define([PRODUCT_VERSION_PATCH], [_rc2])
+define([PRODUCT_VERSION_PATCH], [.0])
 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,0,4])
+define([PRODUCT_VERSION_RESOURCE], [2,6,0,5])
 dnl define the TAP version
 define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901])
 define([PRODUCT_TAP_WIN_MIN_MAJOR], [9])