diff --git a/debian-sbuild/openvpn-dco-dkms/changelog-0.2.20240619 b/debian-sbuild/openvpn-dco-dkms/changelog-0.2.20240619 new file mode 100644 index 00000000..8178cc10 --- /dev/null +++ b/debian-sbuild/openvpn-dco-dkms/changelog-0.2.20240619 @@ -0,0 +1,6 @@ +openvpn-dco-dkms (0.2.20240619-debian0) stable; urgency=medium + + * ovpn-dco: add missing include for MODULE_ALIAS_GENL_FAMILY (Antonio Quartulli, 4a58dbe) + * ovpn-dco: fix gso.h compat code for RHEL 9.4 (Antonio Quartulli, 2b17b01) + + -- Frank Lichtenheld Tue, 18 Jun 2024 14:48:52 +0200 diff --git a/debian-sbuild/openvpn/changelog-2.6.11 b/debian-sbuild/openvpn/changelog-2.6.11 new file mode 100644 index 00000000..25afc190 --- /dev/null +++ b/debian-sbuild/openvpn/changelog-2.6.11 @@ -0,0 +1,23 @@ +openvpn (2.6.11-debian0) stable; urgency=medium + + * preparing release 2.6.11 (Gert Doering, ddf6bf6d) + * interactive.c: Improve access control for gui<->service pipe (Lev Stipakov, 51301eb6) + * Properly handle null bytes and invalid characters in control messages (Arne Schwabe, 90e7a858) + * Implement server_poll_timeout for socks (5andr0, 94bfb712) + * Remove "experimental" denotation for --fast-io (Frank Lichtenheld, d5c4c643) + * Implement Windows CA template match for Crypto-API selector (Heiko Wundram, dfbe11ac) + * LZO: do not use lzoutils.h macros (Frank Lichtenheld, 1ae753e4) + * Allow to set ifmode for existing DCO interfaces in FreeBSD (Franco Fichtner, 2f2ff186) + * Only schedule_exit() once (Reynir Björnsson, 65fb67cd) + * Workaround issue in LibreSSL crashing when enumerating digests/ciphers (Arne Schwabe, 8aed156b) + * Only run coverity scan in OpenVPN/OpenVPN repository (Arne Schwabe, 56fc48e8) + * Replace macos11 with macos14 in github runners (Arne Schwabe, 18520e5a) + * misc.c: remove unused code (Lev Stipakov, f50c6770) + * script-options.rst: Update ifconfig_* variables (Frank Lichtenheld, ea0d9c70) + * Add bracket in fingerprint message and do not warn about missing verification (Arne Schwabe, e36359aa) + * phase2_tcp_server: fix Coverity issue 'Dereference after null check' (Frank Lichtenheld, 5591af17) + * Use snprintf instead of sprintf for get_ssl_library_version (Arne Schwabe, 11ca69cf) + * documentation: make section levels consistent (Frank Lichtenheld, 7993084c) + * samples: Update sample configurations (Frank Lichtenheld, 371cc587) + + -- Frank Lichtenheld Thu, 20 Jun 2024 11:37:03 +0200 diff --git a/release/vars.example b/release/vars.example index d5355402..e2fa9ad7 100644 --- a/release/vars.example +++ b/release/vars.example @@ -25,22 +25,22 @@ WINDOWS_SIGNING_KEY_FP="31DA19926259519C9EA312C71935B13C33FC6E7E" MSI_BUILD_ONLY="NO" # Version numbers -OPENVPN_PREVIOUS_VERSION="${OPENVPN_PREVIOUS_VERSION:-2.6.9}" -OPENVPN_CURRENT_VERSION="${OPENVPN_CURRENT_VERSION:-2.6.10}" +OPENVPN_PREVIOUS_VERSION="${OPENVPN_PREVIOUS_VERSION:-2.6.10}" +OPENVPN_CURRENT_VERSION="${OPENVPN_CURRENT_VERSION:-2.6.11}" 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=48 +OPENVPN_GUI_CURRENT_MIN_VERSION=49 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.20240320}" -OPENVPN_DCO_CURRENT_VERSION="${OPENVPN_DCO_CURRENT_VERSION:-0.2.20240612}" +OPENVPN_DCO_PREVIOUS_VERSION="${OPENVPN_DCO_PREVIOUS_VERSION:-0.2.20240612}" +OPENVPN_DCO_CURRENT_VERSION="${OPENVPN_DCO_CURRENT_VERSION:-0.2.20240619}" 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" -INSTALLER_BUILD=4 +INSTALLER_BUILD=1 INSTALLER_VERSION="I"$(printf "%03d\n" $INSTALLER_BUILD) # Debian packaging scripts do not allow underscores (e.g "2.4_alpha2") DEBIAN_UPSTREAM_VERSION=`echo $OPENVPN_CURRENT_VERSION|sed s/"_"/"-"/g` diff --git a/src/openvpn b/src/openvpn index 51301eb6..ddf6bf6d 160000 --- a/src/openvpn +++ b/src/openvpn @@ -1 +1 @@ -Subproject commit 51301eb6c233c284270e3f4ed0c7f5781f2b5c62 +Subproject commit ddf6bf6d2a13583535c417532e96e8a8af77f977 diff --git a/src/openvpn-gui b/src/openvpn-gui index 4547dd95..67940974 160000 --- a/src/openvpn-gui +++ b/src/openvpn-gui @@ -1 +1 @@ -Subproject commit 4547dd95fc343f90f49bd2770d9f7946f3a1bbbe +Subproject commit 6794097462efd78bb41c7a18d0cc63a4c9044292 diff --git a/windows-msi/version.m4 b/windows-msi/version.m4 index 300ef79c..bd3ce8fb 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.10-I004]) +define([PACKAGE_VERSION], [2.6.11-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.1004]) +define([PRODUCT_VERSION], [2.6.1101]) dnl The MSI product code MUST change on each product release. -define([PRODUCT_CODE], [{7BEBE28C-FC55-4F3B-B7A1-38DABE3E987F}]) +define([PRODUCT_CODE], [{534786E0-D08A-4E56-946D-E82D47EDB796}]) 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.