Skip to content

Commit 63ad5d8

Browse files
authored
Merge pull request #1128 from OpenVPN/master-merge
Master merge
2 parents 465fc2e + 6aa0400 commit 63ad5d8

File tree

6 files changed

+74
-10
lines changed

6 files changed

+74
-10
lines changed
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
openvpn (2.7~rc1-debian0) stable; urgency=medium
2+
3+
* OpenVPN Release 2.7_rc1 (Gert Doering, e37f7692)
4+
* Zeroize tls-crypt-v2 client keys (Max Fillinger, 9f71f906)
5+
* PUSH_UPDATE server: invalid read bug-fix and unit-tests improvements (Marco Baffo, 6b0208e9)
6+
* Add -lpathcch for mingw32 builds using autotools (Selva Nair, d5e6b724)
7+
* iservice: check return value of MultiByteToWideChar (Heiko Hund, fdd40725)
8+
* Ensure that get_sigtype always return non-NULL (Arne Schwabe, 9fa32e66)
9+
* Ensure return value of snprintf is correctly checked (Arne Schwabe, d7f86dda)
10+
* Fix warnings about conversion from int to unsigned char/uint8_t (Arne Schwabe, e7df8323)
11+
* fix key_state_gen_auth_control_files probably checking file creation (Arne Schwabe, 2f8cbf5b)
12+
* clean up environment variable handling in verify_user_pass_script (Arne Schwabe, 3fbba254)
13+
* manage: Change kill_by_addr to use better types for port/proto (Frank Lichtenheld, cd4cac16)
14+
* mudp/mtcp: Remove -Wconversion pragmas (Frank Lichtenheld, 3e63c01a)
15+
* iservice: use interface index with netsh (Heiko Hund, 5f6b5e38)
16+
* interactive.c: add the upper bound for startupdata size (Lev Stipakov, 37af2c95)
17+
* Remove --memstats feature (Arne Schwabe, 70627949)
18+
* Install host routes for out-of-subnet ifconfig-push addresses when DCO is enabled (Arne Schwabe, f938d991)
19+
* Fix logic when pushed cipher triggers tun reopen and ignore more options (Arne Schwabe, 911a69dc)
20+
* zeroize struct image in packet_id_persist_save() before writing to disk (Gert Doering, c58b6e73)
21+
* remove redundant PULL_DEFINED() macro definition (Gert Doering, e6ae2bc6)
22+
* crypto_backend: Change len argument of md_ctx_update to size_t (Frank Lichtenheld, 6607e4be)
23+
* gremlin: Avoid some conversion warnings (Frank Lichtenheld, 15b77d47)
24+
* management: ensure consistent BYTECOUNT timing on server (Ralf Lici, a5ee6a1d)
25+
* Warn if push is used without --mode server/--server/--server-bridge (Arne Schwabe, d6a0cf59)
26+
* tcp: apply CLOEXEC to accepted socket, not listener (Joshua Rogers, c0d96fd8)
27+
* sitnl: set FD_CLOEXEC on socket to prevent abuse (Antonio Quartulli, b9b54705)
28+
* Canonicalize config_dir before comparing with the config file location (Selva Nair, 05a8ba80)
29+
* mroute: Remove unused mask argument of mroute_get_in* (Frank Lichtenheld, 2ae18239)
30+
* Add ASSERT to afunix code that dev_node is always set up the way we expect (Arne Schwabe, 5bc0eae8)
31+
* dco-freebsd: fix peer stats storage on client instances (Ralf Lici, dc6b7578)
32+
* Avoid possible race condition that kill OpenVPN itself (Arne Schwabe, 18309ff6)
33+
* pkcs11_management_id_get: Free certificate object after use (Selva Nair, 87f639c8)
34+
* Remove perf.c/perf.h (Steffan Karger, 9c55e84e)
35+
* Do not try to use the encrypt-then-mac ciphers from OpenSSL 3.6.0 (Arne Schwabe, a69d9b66)
36+
* multi: Fix wrong usage of mroute_extract_openvpn_sockaddr (Frank Lichtenheld, 0abf6e71)
37+
* dco: remove dco_read/write_bytes from dco_context_t (Ralf Lici, 3e76d8f8)
38+
* dco-freebsd: store peer stats directly in c2 (Ralf Lici, bf01a965)
39+
* push_util: Fix conversion warnings (Frank Lichtenheld, a8b8e41c)
40+
* ssl_util: Fix conversion warning in get_num_elements (Frank Lichtenheld, f93a0f3f)
41+
* push_util: Make send_push_update static (Frank Lichtenheld, 160e994d)
42+
* PUSH_UPDATE server: remove old IP(s) from vhash after sending a message containing ifconfig(-ipv6) (Marco Baffo, 5e4c9a69)
43+
* options: warn and ignore --reneg-bytes/pkts when DCO is enabled (Ralf Lici, c9a32064)
44+
* proxy: factor out send code common with socks proxy (Frank Lichtenheld, 23d70b08)
45+
* proxy: factor out recv_char code common with socks proxy (Frank Lichtenheld, 94433716)
46+
* socket: Wrap winsock functions to avoid common conversion warnings (Frank Lichtenheld, 42459e22)
47+
* init: Fix datav2_enabled check in options import (Frank Lichtenheld, c124e503)
48+
* dhcp: Clean up type handling of write_dhcp_* (Frank Lichtenheld, b298a741)
49+
* win32: Change some APIs to use DWORD instead of size_t (Frank Lichtenheld, c4f7b418)
50+
* schedule: Fix conversion warning (Frank Lichtenheld, f79221a9)
51+
* CONTRIBUTING: Update outdated/obsolete information (Frank Lichtenheld, 0f95860d)
52+
* test_dhcp: Start a dhcp helper functions UT (Frank Lichtenheld, d78ebd4b)
53+
* doc: HTTPS upgrades and URL fixes throughout the tree (Christian Kujau, 8c53b12a)
54+
* doc: Fix hyperlinks in openvpn(8) (Christian Kujau, 3199fceb)
55+
56+
-- Yuriy Darnobyt <[email protected]> Fri, 31 Oct 2025 12:22:33 +0100
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
ovpn-backports (6.17.0.2025102200-debian0) stable; urgency=medium
2+
3+
* Generated sources for ovpn-net-next/main-6.17.0-2025102200 (GitHub Actions, 73f8cc3)
4+
* Generated sources for ovpn-net-next/main-6.17.0-2025102100 (GitHub Actions, 4ce2b88)
5+
* Generated sources for ovpn-net-next/main-6.17.0-2025102000 (GitHub Actions, 542f987)
6+
* Generated sources for ovpn-net-next/main-6.17.0-2025101700 (GitHub Actions, 7112c60)
7+
8+
-- Yuriy Darnobyt <[email protected]> Wed, 22 Oct 2025 09:52:57 +0000

release/vars.example

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@ GIT_AUTHOR="Yuriy Darnobyt <[email protected]>"
2323
MSI_BUILD_ONLY="NO"
2424

2525
# Version numbers
26-
OPENVPN_PREVIOUS_VERSION="${OPENVPN_PREVIOUS_VERSION:-2.7_beta2}"
27-
OPENVPN_CURRENT_VERSION="${OPENVPN_CURRENT_VERSION:-2.7_beta3}"
26+
OPENVPN_PREVIOUS_VERSION="${OPENVPN_PREVIOUS_VERSION:-2.7_beta3}"
27+
OPENVPN_CURRENT_VERSION="${OPENVPN_CURRENT_VERSION:-2.7_rc1}"
2828
OPENVPN_CURRENT_TAG="${OPENVPN_CURRENT_TAG:-HEAD}"
2929
OPENVPN_PREVIOUS_TAG="refs/tags/v$OPENVPN_PREVIOUS_VERSION"
3030

3131
OPENVPN_GUI_CURRENT_MAJ_VERSION=11
32-
OPENVPN_GUI_CURRENT_MIN_VERSION=56
32+
OPENVPN_GUI_CURRENT_MIN_VERSION=57
3333
OPENVPN_GUI_CURRENT_FULL_VERSION="$OPENVPN_GUI_CURRENT_MAJ_VERSION.$OPENVPN_GUI_CURRENT_MIN_VERSION.0.0"
3434
OPENVPN_GUI_BRANCH="master"
3535

36-
OPENVPN_DCO_PREVIOUS_VERSION="${OPENVPN_DCO_PREVIOUS_VERSION:-6.15.0.2025061700}"
37-
OPENVPN_DCO_CURRENT_VERSION="${OPENVPN_DCO_CURRENT_VERSION:-6.17.0.2025100701}"
38-
OPENVPN_DCO_CURRENT_TAG="${OPENVPN_DCO_CURRENT_TAG:-refs/tags/ovpn-net-next/main-6.17.0-2025100701}"
39-
OPENVPN_DCO_PREVIOUS_TAG="${OPENVPN_DCO_PREVIOUS_TAG:-refs/tags/ovpn-net-next/main-6.15.0-2025061700}"
36+
OPENVPN_DCO_PREVIOUS_VERSION="${OPENVPN_DCO_PREVIOUS_VERSION:-6.17.0.2025100701}"
37+
OPENVPN_DCO_CURRENT_VERSION="${OPENVPN_DCO_CURRENT_VERSION:-6.17.0.2025102200}"
38+
OPENVPN_DCO_CURRENT_TAG="${OPENVPN_DCO_CURRENT_TAG:-refs/tags/ovpn-net-next/main-6.17.0-2025102200}"
39+
OPENVPN_DCO_PREVIOUS_TAG="${OPENVPN_DCO_PREVIOUS_TAG:-refs/tags/ovpn-net-next/main-6.17.0-2025100701}"
4040

4141
INSTALLER_BUILD=1
4242
INSTALLER_VERSION="I"$(printf "%03d\n" $INSTALLER_BUILD)

release/vars.infrastructure.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ WINDOWS_MSI_WORKDIR=C:/buildbot/msbuild/openvpn-build
77

88
# need "internal" repos since we do only want to publish
99
# official tags once the release build was successful
10-
INTERNAL_GIT_REPO_OPENVPN_RO=git://buildbot-host.openvpn.in/openvpn
10+
INTERNAL_GIT_REPO_OPENVPN_RO=git://buildbot.community.aws.openvpn.in/openvpn
1111
INTERNAL_GIT_REPO_BUILD_RO=https://github.com/OpenVPN/openvpn-build.git
1212
[email protected]:OpenVPN/openvpn.git
1313

0 commit comments

Comments
 (0)