From 5d25707a07de315b906655024c0e103a1c15afc4 Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Mon, 13 Nov 2023 00:43:23 +0000 Subject: [PATCH 1/4] chore(deps): update lukka/run-vcpkg action to v11.3 --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e1cdb1ec..e60163a1 100644 --- 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' From c13668b0ab7297a95453aa16702318c4b41e3247 Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Tue, 14 Nov 2023 15:12:08 +0000 Subject: [PATCH 2/4] chore(deps): update src/openvpn digest to 0c174e4 --- src/openvpn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn b/src/openvpn index 53c90333..0c174e4e 160000 --- a/src/openvpn +++ b/src/openvpn @@ -1 +1 @@ -Subproject commit 53c9033317b3b8fdcb55f81107e47037a88352f3 +Subproject commit 0c174e4e7b6caa1111fbf4773acdfbbcf122489d From 53042b8004bf3d123b3eced793be615ea8b583f9 Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Fri, 17 Nov 2023 09:10:05 +0000 Subject: [PATCH 3/4] chore(deps): update src/ovpn-dco digest to f2a8a33 --- src/ovpn-dco | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ovpn-dco b/src/ovpn-dco index dba96d20..f2a8a332 160000 --- a/src/ovpn-dco +++ b/src/ovpn-dco @@ -1 +1 @@ -Subproject commit dba96d203f960356b477291d6a58d30fc096fbe4 +Subproject commit f2a8a332a9cf85eddca3fa7df622ddec56a8e77c From e015ae9dbfc5483b64e865e3a4b97ed2944e9b46 Mon Sep 17 00:00:00 2001 From: Yuriy Darnobyt Date: Fri, 17 Nov 2023 12:31:50 +0200 Subject: [PATCH 4/4] Prepare release of 2.6.8-I001 Signed-off-by: Yuriy Darnobyt --- debian-sbuild/openvpn-dco-dkms/changelog-0.2.20231117 | 8 ++++++++ debian-sbuild/openvpn/changelog-2.6.8 | 11 +++++++++++ release/vars.example | 10 +++++----- src/openvpn | 2 +- src/openvpn-gui | 2 +- windows-msi/version.m4 | 6 +++--- 6 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 debian-sbuild/openvpn-dco-dkms/changelog-0.2.20231117 create mode 100644 debian-sbuild/openvpn/changelog-2.6.8 diff --git a/debian-sbuild/openvpn-dco-dkms/changelog-0.2.20231117 b/debian-sbuild/openvpn-dco-dkms/changelog-0.2.20231117 new file mode 100644 index 00000000..9ed1e880 --- /dev/null +++ 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 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 new file mode 100644 index 00000000..cf3879a8 --- /dev/null +++ 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 Fri, 17 Nov 2023 08:23:51 +0100 diff --git a/release/vars.example b/release/vars.example index 7ac171e6..233ebc06 100644 --- a/release/vars.example +++ b/release/vars.example @@ -19,18 +19,18 @@ GIT_AUTHOR="Yuriy Darnobyt " WINDOWS_SIGNING_KEY_FP="31DA19926259519C9EA312C71935B13C33FC6E7E" # Version numbers -OPENVPN_PREVIOUS_VERSION="${OPENVPN_PREVIOUS_VERSION:-2.6.6}" -OPENVPN_CURRENT_VERSION="${OPENVPN_CURRENT_VERSION:-2.6.7}" +OPENVPN_PREVIOUS_VERSION="${OPENVPN_PREVIOUS_VERSION:-2.6.7}" +OPENVPN_CURRENT_VERSION="${OPENVPN_CURRENT_VERSION:-2.6.8}" OPENVPN_CURRENT_TAG="${OPENVPN_CURRENT_TAG:-refs/tags/v$OPENVPN_CURRENT_VERSION}" 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 b/src/openvpn index 0c174e4e..3b0d9489 160000 --- a/src/openvpn +++ b/src/openvpn @@ -1 +1 @@ -Subproject commit 0c174e4e7b6caa1111fbf4773acdfbbcf122489d +Subproject commit 3b0d9489cc423da3e7af1e087b30ae7baaee7990 diff --git a/src/openvpn-gui b/src/openvpn-gui index e8f9fa58..813916ed 160000 --- a/src/openvpn-gui +++ b/src/openvpn-gui @@ -1 +1 @@ -Subproject commit e8f9fa58af9f36556f93bf0a63430df3e24a3e5b +Subproject commit 813916ede535d01b1f5ba45a34ba5ce1a9d37fc0 diff --git a/windows-msi/version.m4 b/windows-msi/version.m4 index e64b0694..5bcfea32 100644 --- a/windows-msi/version.m4 +++ b/windows-msi/version.m4 @@ -41,15 +41,15 @@ define([PRODUCT_NAME], [OpenVPN]) define([PRODUCT_PUBLISHER], [OpenVPN, Inc.]) dnl The package version as displayed by UI and used in filenames (no spaces, please). -define([PACKAGE_VERSION], [2.6.7-I001]) +define([PACKAGE_VERSION], [2.6.8-I001]) dnl The MSI product version in the form of n[.n[.n]] (numbers only). dnl The third field is 100*openvpn bugfix release + MSI build number. dnl So for the 2nd MSI build for OpenVPN 2.6.3 use 2.6.302 -define([PRODUCT_VERSION], [2.6.701]) +define([PRODUCT_VERSION], [2.6.801]) dnl The MSI product code MUST change on each product release. -define([PRODUCT_CODE], [{1716DD6C-A89F-4C31-9078-FDC36059D7B5}]) +define([PRODUCT_CODE], [{D3CE8B53-D2D0-4164-8075-34F4238D48C8}]) dnl The MSI upgrade codes MUST persist for all versions of the same product line. dnl Please use own upgrade codes when deploying a non-official OpenVPN release.