From 5902bee5ff0f4af6ffc0d3cd480e749c2952b775 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Wed, 5 Aug 2026 10:16:07 +0800 Subject: [PATCH 1/3] chore: prepare 2.6.5 release --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 2 +- changelog.md | 6 ++++++ flake.nix | 2 +- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cfc4033..176aa5c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -214,7 +214,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "auth" -version = "2.6.4" +version = "2.6.5" dependencies = [ "anyhow", "block2", @@ -705,7 +705,7 @@ dependencies = [ [[package]] name = "common" -version = "2.6.4" +version = "2.6.5" [[package]] name = "compile-time" @@ -1732,7 +1732,7 @@ dependencies = [ [[package]] name = "gpapi" -version = "2.6.4" +version = "2.6.5" dependencies = [ "anyhow", "base64 0.22.1", @@ -1776,7 +1776,7 @@ dependencies = [ [[package]] name = "gpauth" -version = "2.6.4" +version = "2.6.5" dependencies = [ "anyhow", "auth", @@ -1796,7 +1796,7 @@ dependencies = [ [[package]] name = "gpclient" -version = "2.6.4" +version = "2.6.5" dependencies = [ "anyhow", "askama", @@ -1825,7 +1825,7 @@ dependencies = [ [[package]] name = "gpgui-helper" -version = "2.6.4" +version = "2.6.5" dependencies = [ "anyhow", "clap", @@ -1843,7 +1843,7 @@ dependencies = [ [[package]] name = "gpservice" -version = "2.6.4" +version = "2.6.5" dependencies = [ "anyhow", "axum", @@ -3191,7 +3191,7 @@ dependencies = [ [[package]] name = "openconnect" -version = "2.6.4" +version = "2.6.5" dependencies = [ "autotools", "cc", diff --git a/Cargo.toml b/Cargo.toml index 8d4a4c8..d5bb32d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ members = [ [workspace.package] rust-version = "1.89" -version = "2.6.4" +version = "2.6.5" authors = ["Kevin Yue "] homepage = "https://github.com/yuezk/GlobalProtect-openconnect" edition = "2024" diff --git a/changelog.md b/changelog.md index 807d0cc..986ac47 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,11 @@ # Changelog +## 2.6.5 + +### Fixed + +- Fixed duplicate tray icons caused by both Tauri configuration and application code creating a tray icon (fix [#464](https://github.com/yuezk/GlobalProtect-openconnect/issues/464)). + ## 2.6.4 ### Fixed diff --git a/flake.nix b/flake.nix index d0acd2c..0df611d 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml); pname = "globalprotect-openconnect"; version = cargoToml.workspace.package.version; - releaseTag = "v2.6.4"; + releaseTag = "v2.6.5"; toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; From 6f860d3dff0c13354e9e290d52982516ff1f3ad6 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Wed, 5 Aug 2026 10:27:19 +0800 Subject: [PATCH 2/3] fix: avoid reformatting VPN progress messages --- changelog.md | 1 + crates/openconnect/src/ffi/vpn.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 986ac47..f923ac2 100644 --- a/changelog.md +++ b/changelog.md @@ -5,6 +5,7 @@ ### Fixed - Fixed duplicate tray icons caused by both Tauri configuration and application code creating a tray icon (fix [#464](https://github.com/yuezk/GlobalProtect-openconnect/issues/464)). +- Fixed a potential crash when VPN progress messages contain printf-style format specifiers. ## 2.6.4 diff --git a/crates/openconnect/src/ffi/vpn.c b/crates/openconnect/src/ffi/vpn.c index 1c98df6..2ec8703 100644 --- a/crates/openconnect/src/ffi/vpn.c +++ b/crates/openconnect/src/ffi/vpn.c @@ -35,7 +35,7 @@ static void print_progress(__attribute__((unused)) void *_vpninfo, int level, if (message == NULL) { ERROR("Failed to format log message"); } else { - LOG(level, message); + vpn_log(level, message); free(message); } } From e98fd7894a2b132fe4cd5ede2c9accc88f54f133 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Wed, 5 Aug 2026 11:04:10 +0800 Subject: [PATCH 3/3] ci: build FreeBSD package on 14.4 --- .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 2f56da3..c571233 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -421,7 +421,7 @@ jobs: if: ${{ matrix.os == 'freebsd' }} uses: vmactions/freebsd-vm@v1 with: - release: "14.3" + release: "14.4" arch: ${{ matrix.arch }} usesh: true prepare: |