Compare commits

..
Author SHA1 Message Date
Kevin Yue 225acf13aa fix: use stable NixOS desktop launcher path 2026-06-24 09:26:07 +08:00
github-actions[bot] 3276ac0f9a chore: update flake hashes for v2.6.3 (#630) [no ci] 2026-06-23 21:57:51 +08:00
Kevin Yue 0b037e158c chore: prepare 2.6.3 release
- Fix NixOS GUI authorization after package updates.

- Treat Ctrl+C initiated OpenConnect disconnect as a successful shutdown.

- Update snapshot flake hash automation for prebuilt Nix packages.

- Bump gp workspace version and changelog to 2.6.3.
2026-06-23 20:06:04 +08:00
5 changed files with 44 additions and 25 deletions

No files matched your search

Generated
+8 -8
View File
@@ -214,7 +214,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]] [[package]]
name = "auth" name = "auth"
version = "2.6.2" version = "2.6.3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"block2", "block2",
@@ -705,7 +705,7 @@ dependencies = [
[[package]] [[package]]
name = "common" name = "common"
version = "2.6.2" version = "2.6.3"
[[package]] [[package]]
name = "compile-time" name = "compile-time"
@@ -1732,7 +1732,7 @@ dependencies = [
[[package]] [[package]]
name = "gpapi" name = "gpapi"
version = "2.6.2" version = "2.6.3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64 0.22.1", "base64 0.22.1",
@@ -1776,7 +1776,7 @@ dependencies = [
[[package]] [[package]]
name = "gpauth" name = "gpauth"
version = "2.6.2" version = "2.6.3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"auth", "auth",
@@ -1796,7 +1796,7 @@ dependencies = [
[[package]] [[package]]
name = "gpclient" name = "gpclient"
version = "2.6.2" version = "2.6.3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"askama", "askama",
@@ -1825,7 +1825,7 @@ dependencies = [
[[package]] [[package]]
name = "gpgui-helper" name = "gpgui-helper"
version = "2.6.2" version = "2.6.3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@@ -1843,7 +1843,7 @@ dependencies = [
[[package]] [[package]]
name = "gpservice" name = "gpservice"
version = "2.6.2" version = "2.6.3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"axum", "axum",
@@ -3191,7 +3191,7 @@ dependencies = [
[[package]] [[package]]
name = "openconnect" name = "openconnect"
version = "2.6.2" version = "2.6.3"
dependencies = [ dependencies = [
"autotools", "autotools",
"cc", "cc",
+1 -1
View File
@@ -11,7 +11,7 @@ members = [
[workspace.package] [workspace.package]
rust-version = "1.89" rust-version = "1.89"
version = "2.6.2" version = "2.6.3"
authors = ["Kevin Yue <[email protected]>"] authors = ["Kevin Yue <[email protected]>"]
homepage = "https://github.com/yuezk/GlobalProtect-openconnect" homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
edition = "2024" edition = "2024"
+8
View File
@@ -1,5 +1,13 @@
# Changelog # Changelog
## 2.6.3
### Fixed
- Fixed NixOS GUI launch authorization after package updates.
- Fixed disconnect handling so a normal Ctrl+C logout no longer reports an error.
- Fixed snapshot flake hash update automation for prebuilt Nix packages.
## 2.6.2 ## 2.6.2
### Fixed ### Fixed
+11 -8
View File
@@ -26,7 +26,7 @@
cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml); cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
pname = "globalprotect-openconnect"; pname = "globalprotect-openconnect";
version = cargoToml.workspace.package.version; version = cargoToml.workspace.package.version;
releaseTag = "snapshot"; releaseTag = "v2.6.3";
toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
@@ -37,14 +37,14 @@
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/${releaseTag}/globalprotect-openconnect-${version}.tar.gz"; url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/${releaseTag}/globalprotect-openconnect-${version}.tar.gz";
hash = "sha256-FVovTNkVzAQHdkpKAmLpdauALnxJqzKIY6uTJYSpA8k="; hash = "sha256-cp7KRUwVJsyg8m7O70k/uo6WwLqCPbFCnWtXzHn1GgU=";
}; };
cpu = pkgs.stdenv.hostPlatform.parsed.cpu.name; cpu = pkgs.stdenv.hostPlatform.parsed.cpu.name;
gpguiHashes = { gpguiHashes = {
x86_64 = "sha256-72EmKF1EZx45ohU0TAGSQcuacjFqoHancHSQoMCXWEg="; x86_64 = "sha256-HbZYZOr0Vei/wBNQUxZNOSEfHlJV3PP8CzhL34Ixm9I=";
aarch64 = "sha256-Kl7WUkeMVz1qJg8m0o/22rs1TVZP8EV1d6MvyouW7Xw="; aarch64 = "sha256-aHou275EwrWqUVsGmW8f6zfVIKuhqW0m+ZdGD7hq7jM=";
}; };
gpgui = pkgs.fetchzip { gpgui = pkgs.fetchzip {
@@ -53,8 +53,8 @@
}; };
binaryHashes = { binaryHashes = {
x86_64 = "sha256-NwZmlVW/+GSyed3R7xnejxb+8NzfVgBYvPhqiRaag0E="; x86_64 = "sha256-UA3GdjS69P3oYGQ9alE7T0Ro7+ZzzyY6VpIg2kgR+9Y=";
aarch64 = "sha256-WmsN2/8sdW39eqOsKHBs5wwFfAjQgTY3tOe6If5+SNg="; aarch64 = "sha256-1DCpSffjm0HA42aWnpPCa0WQP7XfgKYCBzikXW5hQwA=";
}; };
binaryPackage = pkgs.fetchzip { binaryPackage = pkgs.fetchzip {
@@ -91,7 +91,7 @@
rewriteSourceInstallPaths = '' rewriteSourceInstallPaths = ''
substituteInPlace $out/share/applications/gpgui.desktop \ substituteInPlace $out/share/applications/gpgui.desktop \
--replace-fail /usr/bin/gpclient $out/bin/gpclient --replace-fail /usr/bin/gpclient /run/current-system/sw/bin/gpclient
substituteInPlace $out/libexec/gpclient/hipreport.sh \ substituteInPlace $out/libexec/gpclient/hipreport.sh \
--replace-fail /usr/bin/gpclient $out/bin/gpclient --replace-fail /usr/bin/gpclient $out/bin/gpclient
@@ -107,7 +107,7 @@
rewriteHostInstallPaths = '' rewriteHostInstallPaths = ''
substituteInPlace $out/share/applications/gpgui.desktop \ substituteInPlace $out/share/applications/gpgui.desktop \
--replace-fail /usr/bin/gpclient $out/bin/gpclient --replace-fail /usr/bin/gpclient /run/current-system/sw/bin/gpclient
substituteInPlace $out/share/polkit-1/actions/com.yuezk.gpgui.policy \ substituteInPlace $out/share/polkit-1/actions/com.yuezk.gpgui.policy \
--replace-fail /usr/bin/gpservice $out/bin/gpservice --replace-fail /usr/bin/gpservice $out/bin/gpservice
@@ -238,6 +238,9 @@
"--bind-try" "--bind-try"
"/run/wrappers" "/run/wrappers"
"/run/wrappers" "/run/wrappers"
"--ro-bind-try"
"/etc/gpgui"
"/etc/gpgui"
]; ];
}; };
+16 -8
View File
@@ -29,19 +29,27 @@ if [[ "$release_tag" != "v$version" ]]; then
body="Updates the Nix flake fetchzip hashes for v${version} using ${release_tag} release assets." body="Updates the Nix flake fetchzip hashes for v${version} using ${release_tag} release assets."
fi fi
branch="chore/update-flake-hashes-${branch_suffix}"
git config user.name "github-actions[bot]" git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
if [[ "$release_tag" == "snapshot" ]]; then
source_branch="${GITHUB_REF_NAME:-$(git branch --show-current)}"
source_branch_slug="$(printf '%s' "$source_branch" | sed -E 's#[/[:space:]]+#-#g; s#[^A-Za-z0-9._-]##g; s#^-+##; s#-+$##')"
branch="chore/flake-${source_branch_slug}"
git switch -C "$branch"
git add flake.nix
git commit -m "$title"
git push --force origin "$branch"
echo "Updated snapshot flake hashes on branch $branch from $source_branch; skipping PR creation"
exit 0
fi
branch="chore/update-flake-hashes-${branch_suffix}"
git switch -C "$branch" git switch -C "$branch"
git add flake.nix git add flake.nix
git commit -m "$title" git commit -m "$title"
git push --force-with-lease origin "$branch" git push --force origin "$branch"
if [[ "$release_tag" == "snapshot" ]]; then
echo "Updated snapshot flake hashes on branch $branch; skipping PR creation"
exit 0
fi
if gh pr view "$branch" --json number > /tmp/flake-pr.json 2> /dev/null; then if gh pr view "$branch" --json number > /tmp/flake-pr.json 2> /dev/null; then
pr_number="$(jq -r '.number' /tmp/flake-pr.json)" pr_number="$(jq -r '.number' /tmp/flake-pr.json)"