From: Gert Doering <gert@greenie.muc.de>
Date: Wed, 17 Jul 2024 20:14:46 +0000 (+0200)
Subject: preparing release 2.6.12
X-Git-Tag: v2.6.12^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=038a94bae57a446cc74be9c8386ee475246836f1;p=thirdparty%2Fopenvpn.git

preparing release 2.6.12

version.m4, ChangeLog, Changes.rst

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

diff --git a/ChangeLog b/ChangeLog
index fd869a1e1..df1e2eea1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,18 @@
 OpenVPN ChangeLog
 Copyright (C) 2002-2024 OpenVPN Inc <sales@openvpn.net>
 
+2024.07.17 -- Version 2.6.12
+
+Arne Schwabe (1):
+      Allow trailing \r and \n in control channel message
+
+Frank Lichtenheld (1):
+      configure: Try to detect LZO with pkg-config
+
+Gianmarco De Gregori (1):
+      Http-proxy: fix bug preventing proxy credentials caching
+
+
 2024.06.20 -- Version 2.6.11
 
 5andr0 (1):
diff --git a/Changes.rst b/Changes.rst
index 5acebf364..3d5ec7636 100644
--- a/Changes.rst
+++ b/Changes.rst
@@ -1,3 +1,20 @@
+Overview of changes in 2.6.12
+=============================
+Bug fixes
+---------
+- the fix for CVE-2024-5594 (refuse control channel messages with
+  nonprintable characters) was too strict, breaking user configurations
+  with AUTH_FAIL messages having trailing CR/NL characters.  This often
+  happens if the AUTH_FAIL reason is set by a script.  Strip those before
+  testing the command buffer (Github: #568).  Also, add unit test.
+
+- Http-proxy: fix bug preventing proxy credentials caching (Trac: #1187)
+
+Code maintenance
+----------------
+- try to detect LZO installation with pkg-config (= on many systems
+  manually setting LZO_CFLAGS/LZO_LIBS should no longer be necessary)
+
 Overview of changes in 2.6.11
 =============================
 Security fixes
diff --git a/version.m4 b/version.m4
index 1d91f0642..a15077b6b 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], [.11])
+define([PRODUCT_VERSION_PATCH], [.12])
 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,11,0])
+define([PRODUCT_VERSION_RESOURCE], [2,6,12,0])
 dnl define the TAP version
 define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901])
 define([PRODUCT_TAP_WIN_MIN_MAJOR], [9])