From 53a778a1a4d9cb8883826d242e8b1ee9d4d9438b Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Thu, 12 Nov 2026 23:01:11 +0800 Subject: [PATCH 1/3] release: GP Connect 3.4.0 --- Cargo.lock | 24 ++++++++++++------------ Cargo.toml | 2 +- changelog.md | 18 ++++++++++++++++++ flake.lock | 6 +++--- 4 files changed, 34 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6959de6..9a65147 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -292,7 +292,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "auth" -version = "3.3.1" +version = "3.4.0" dependencies = [ "anyhow", "block2", @@ -547,7 +547,7 @@ dependencies = [ [[package]] name = "browser-launcher" -version = "3.3.1" +version = "3.4.0" dependencies = [ "anyhow", "log", @@ -911,7 +911,7 @@ dependencies = [ [[package]] name = "common" -version = "3.3.1" +version = "3.4.0" dependencies = [ "tempfile", ] @@ -2115,7 +2115,7 @@ dependencies = [ [[package]] name = "gpapi" -version = "3.3.1" +version = "3.4.0" dependencies = [ "anyhow", "base64 0.23.1", @@ -2176,7 +2176,7 @@ dependencies = [ [[package]] name = "gpauth" -version = "3.3.1" +version = "3.4.0" dependencies = [ "anyhow", "auth", @@ -2195,7 +2195,7 @@ dependencies = [ [[package]] name = "gpclient" -version = "3.3.1" +version = "3.4.0" dependencies = [ "anyhow", "clap", @@ -2226,7 +2226,7 @@ dependencies = [ [[package]] name = "gpgui-helper" -version = "3.3.1" +version = "3.4.0" dependencies = [ "anyhow", "clap", @@ -2247,7 +2247,7 @@ dependencies = [ [[package]] name = "gphip" -version = "3.3.1" +version = "3.4.0" dependencies = [ "anyhow", "askama", @@ -2264,7 +2264,7 @@ dependencies = [ [[package]] name = "gpservice" -version = "3.3.1" +version = "3.4.0" dependencies = [ "anyhow", "axum", @@ -2299,7 +2299,7 @@ dependencies = [ [[package]] name = "gptunnel" -version = "3.3.1" +version = "3.4.0" dependencies = [ "gpapi", "log", @@ -2311,7 +2311,7 @@ dependencies = [ [[package]] name = "gpvpnc" -version = "3.3.1" +version = "3.4.0" dependencies = [ "log", ] @@ -3825,7 +3825,7 @@ dependencies = [ [[package]] name = "openconnect" -version = "3.3.1" +version = "3.4.0" dependencies = [ "autotools", "cc", diff --git a/Cargo.toml b/Cargo.toml index 85d8a0b..2d2128e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ members = [ [workspace.package] rust-version = "1.91" -version = "3.3.1" +version = "3.4.0" authors = ["Kevin Yue "] homepage = "https://github.com/yuezk/GlobalProtect-openconnect" edition = "2024" diff --git a/changelog.md b/changelog.md index 287b2bc..783e243 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,23 @@ # Changelog +## 3.4.0 + +### Added + +- Added gateway selection and switching directly from the system tray or macOS menu bar. + +### Improved + +- Added a Retry Activation action to recover from temporary license activation failures without re-entering the key. +- Made sign-in prompts and connection errors visible when connecting or switching gateways from the tray. + +### Fixed + +- Fixed a Native Shell crash after license activation. +- Fixed the macOS Tauri interface opening unexpectedly after signing in from the tray while the main window was hidden. +- Fixed the Native Shell update button text becoming unreadable when pressed. +- Fixed Linux Nix builds using unavailable WebKitGTK dependencies. + ## 3.3.1 ### Improved diff --git a/flake.lock b/flake.lock index 8059b63..d4e4a7e 100644 --- a/flake.lock +++ b/flake.lock @@ -63,11 +63,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1793977579, - "narHash": "sha256-WrSODdZFVIs/Hh2NzC0bY+ROByi0bATg8WfePX8dPj8=", + "lastModified": 1794285365, + "narHash": "sha256-wZbTou+ANeUoN7ojuMBOPU9D4qMZ96MLxcDp2BzmIUY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4fe25e12eb9f4c744966dd3de5a05246cf098601", + "rev": "9ac0edc06bfb33e6c0000be79d98ef8d89e26503", "type": "github" }, "original": { From e122ad83806cecf9b5ab8345b0c44bf8c1350113 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Fri, 13 Nov 2026 00:00:30 +0800 Subject: [PATCH 2/3] release: validate Nix packages for v3.4.0 --- flake.lock | 6 +++--- flake.nix | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index d4e4a7e..486976a 100644 --- a/flake.lock +++ b/flake.lock @@ -63,11 +63,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1794285365, - "narHash": "sha256-wZbTou+ANeUoN7ojuMBOPU9D4qMZ96MLxcDp2BzmIUY=", + "lastModified": 1794408178, + "narHash": "sha256-OUDRQTMmN/6cQ/ebDsazUmLj84RxSLaHznKv5As9E1k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ac0edc06bfb33e6c0000be79d98ef8d89e26503", + "rev": "9397dcb09c9598a33509fbc0cce699bd4e6c84d5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 61a6a58..fbe3122 100644 --- a/flake.nix +++ b/flake.nix @@ -29,8 +29,8 @@ cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml); pname = "globalprotect-openconnect"; version = cargoToml.workspace.package.version; - releaseTag = "v3.3.1"; - releaseVersion = "3.3.1"; + releaseTag = "v3.4.0"; + releaseVersion = "3.4.0"; toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; @@ -55,8 +55,8 @@ cpu = pkgs.stdenv.hostPlatform.parsed.cpu.name; gpguiHashes = { - x86_64 = "sha256-yFXqpxmY222xm6Z8WgNsZgbWUwbYE3qWEeGqZxD7wTU="; - aarch64 = "sha256-8+GaeDAqX3kvjd8a7Tzv9AjtnefaZO0h4sXzOltG5GY="; + x86_64 = "sha256-2qZQICnK5fa18suhnqeYnDI1z+SGqXJa1ZXI2NhfQP0="; + aarch64 = "sha256-iOM3+Qte/6C4Gs/e9jVvx5DtBFq7DG2PNDCsGwPMeY0="; }; gpguiArchive = pkgs.fetchurl { @@ -70,8 +70,8 @@ }; binaryHashes = { - x86_64 = "sha256-JXUYT6DRMvN67No4jgJMcp0PyOzib8l0lPHM6muhb9w="; - aarch64 = "sha256-JhYLZTZvw+jdu5ewqrWSnNSW66ub1J2S4rhhwcrR43E="; + x86_64 = "sha256-hBnfMAS3qEby9Dyc3ysH8tdGQwarXqo9xtY1gbN8gJI="; + aarch64 = "sha256-lW1yQQD1G633tdBGBhVEAEQvMtnntK3mMU9M69x9ID0="; }; binaryArchive = pkgs.fetchurl { From a5e8c7abe50714d55ba87eae881e440d91144a63 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Fri, 13 Nov 2026 00:00:31 +0800 Subject: [PATCH 3/3] release: derive AUR version from the promoted tag --- packaging/aur/globalprotect-openconnect-git/PKGBUILD | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packaging/aur/globalprotect-openconnect-git/PKGBUILD b/packaging/aur/globalprotect-openconnect-git/PKGBUILD index 5d8e016..1fb867b 100644 --- a/packaging/aur/globalprotect-openconnect-git/PKGBUILD +++ b/packaging/aur/globalprotect-openconnect-git/PKGBUILD @@ -28,12 +28,7 @@ options=('!strip' '!lto') pkgver() { cd "${_pkgname_prefix}" - local version - version="$(awk -F '"' ' - /^\[workspace.package\]$/ { in_workspace = 1; next } - in_workspace && /^version = / { print $2; exit } - ' Cargo.toml)" - printf '%s.r%s.g%s\n' "$version" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' } prepare() {