Merge pull request #524 from OpenVPN/master-merge

Merge 2.6.8 release to master
OpenVPN · Nov 20, 2023 · 022a078 · 022a078
2 parents 9253312 + 2dffed8
commit 022a078
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 7 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -29,7 +29,7 @@ jobs:
           submodules: true
 
       - name: Restore from cache and install vcpkg
-        uses: lukka/run-vcpkg@6fe69898af670ac05f4a8427cc5cff4fb361cee5 # v11.2
+        uses: lukka/run-vcpkg@d42250cb2f1d4b925fe4e8abbdc9753dd3b53056 # v11.3
         with:
           vcpkgDirectory: '${{ github.workspace }}/src/vcpkg'
           vcpkgJsonGlob: '**/src/openvpn/contrib/vcpkg-manifests/windows/vcpkg.json'

diff --git a/debian-sbuild/openvpn-dco-dkms/changelog-0.2.20231117 b/debian-sbuild/openvpn-dco-dkms/changelog-0.2.20231117
@@ -0,0 +1,8 @@
+openvpn-dco-dkms (0.2.20231117-debian0) stable; urgency=medium
+
+  * ovpn-dco: Fix non-RHEL kernel builds (David Sommerseth, f2a8a33)
+  * ovpn-dco: rework RHEL compatibility checks and include RHEL9.3 (Antonio Quartulli, eb44394)
+  * ovpn-dco: warn if peer is dead in ovpn_tcp_read_sock() (Antonio Quartulli, 0613e71)
+  * ovpn-dco: fix refcount imbalance upon RX in case of full ring (Antonio Quartulli, 7b7a28f)
+
+ -- Yuriy Darnobyt <yuriy.darnobyt@openvpn.net>  Thu, 16 Nov 2023 15:11:55 +0100
diff --git a/debian-sbuild/openvpn/changelog-2.6.8 b/debian-sbuild/openvpn/changelog-2.6.8
@@ -0,0 +1,11 @@
+openvpn (2.6.8-debian0) stable; urgency=medium
+
+  * preparing release 2.6.8 (Gert Doering, 3b0d9489)
+  * Warn if pushed options require DHCP (Lev Stipakov, 6127858f)
+  * Make --dns options apply for tap-windows6 driver (Lev Stipakov, 0acba3cc)
+  * Do not check key_state buffers that are in S_UNDEF state (Arne Schwabe, b90ec6da)
+  * config.h: fix incorrect defines for _wopen() (Lev Stipakov, 0c174e4e)
+  * doc: Correct typos in multiple documentation files (Aquila Macedo, 457f468a)
+  * platform.c: Do not depend Windows build on HAVE_CHDIR (Frank Lichtenheld, b705517b)
+
+ -- Yuriy Darnobyt <yuriy.darnobyt@openvpn.net>  Fri, 17 Nov 2023 08:23:51 +0100
diff --git a/release/vars.example b/release/vars.example
@@ -19,18 +19,18 @@ GIT_AUTHOR="Frank Lichtenheld <frank.lichtenheld@openvpn.net>"
 WINDOWS_SIGNING_KEY_FP="31DA19926259519C9EA312C71935B13C33FC6E7E"
 
 # Version numbers
-OPENVPN_PREVIOUS_VERSION="${OPENVPN_PREVIOUS_VERSION:-2.6.6}"
+OPENVPN_PREVIOUS_VERSION="${OPENVPN_PREVIOUS_VERSION:-2.6.7}"
 OPENVPN_CURRENT_VERSION="${OPENVPN_CURRENT_VERSION:-2.7_git}"
 OPENVPN_CURRENT_TAG="${OPENVPN_CURRENT_TAG:-HEAD}"
 OPENVPN_PREVIOUS_TAG="refs/tags/v$OPENVPN_PREVIOUS_VERSION"
 
 OPENVPN_GUI_CURRENT_MAJ_VERSION=11
-OPENVPN_GUI_CURRENT_MIN_VERSION=45
+OPENVPN_GUI_CURRENT_MIN_VERSION=46
 OPENVPN_GUI_CURRENT_FULL_VERSION="$OPENVPN_GUI_CURRENT_MAJ_VERSION.$OPENVPN_GUI_CURRENT_MIN_VERSION.0.0"
 OPENVPN_GUI_BRANCH="master"
 
-OPENVPN_DCO_PREVIOUS_VERSION="${OPENVPN_DCO_PREVIOUS_VERSION:-0.2.20230426}"
-OPENVPN_DCO_CURRENT_VERSION="${OPENVPN_DCO_CURRENT_VERSION:-0.2.20231010}"
+OPENVPN_DCO_PREVIOUS_VERSION="${OPENVPN_DCO_PREVIOUS_VERSION:-0.2.20231010}"
+OPENVPN_DCO_CURRENT_VERSION="${OPENVPN_DCO_CURRENT_VERSION:-0.2.20231117}"
 OPENVPN_DCO_CURRENT_TAG="${OPENVPN_DCO_CURRENT_TAG:-refs/tags/v$OPENVPN_DCO_CURRENT_VERSION}"
 OPENVPN_DCO_PREVIOUS_TAG="refs/tags/v$OPENVPN_DCO_PREVIOUS_VERSION"
 

diff --git a/src/openvpn-gui b/src/openvpn-gui
diff --git a/src/ovpn-dco b/src/ovpn-dco
+1 −13		Makefile
+11 −3		drivers/net/ovpn-dco/tcp.c
+28 −8		linux-compat.h