mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-18 14:06:14 -05:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
53a778a1a4 | ||
|
|
d1815a02a1 | ||
|
|
1547d0c1e9 | ||
|
|
6e99d8d81f | ||
|
|
408536807c |
No files matched your search
Generated
+12
-12
@@ -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",
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ members = [
|
||||
|
||||
[workspace.package]
|
||||
rust-version = "1.91"
|
||||
version = "3.3.1"
|
||||
version = "3.4.0"
|
||||
authors = ["Kevin Yue <[email protected]>"]
|
||||
homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
|
||||
edition = "2024"
|
||||
|
||||
@@ -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
|
||||
|
||||
Generated
+3
-3
@@ -63,11 +63,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1793795574,
|
||||
"narHash": "sha256-pgG/CO+txdf2sA2z6DsM+2G3F9ajfIp/3BMC4wfKMDY=",
|
||||
"lastModified": 1794285365,
|
||||
"narHash": "sha256-wZbTou+ANeUoN7ojuMBOPU9D4qMZ96MLxcDp2BzmIUY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "13e53762c5afaf384d4614e94527a9ccfafe41d0",
|
||||
"rev": "9ac0edc06bfb33e6c0000be79d98ef8d89e26503",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -29,8 +29,8 @@
|
||||
cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
|
||||
pname = "globalprotect-openconnect";
|
||||
version = cargoToml.workspace.package.version;
|
||||
releaseTag = "v3.3.0";
|
||||
releaseVersion = "3.3.0";
|
||||
releaseTag = "v3.3.1";
|
||||
releaseVersion = "3.3.1";
|
||||
|
||||
toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
|
||||
|
||||
@@ -55,8 +55,8 @@
|
||||
cpu = pkgs.stdenv.hostPlatform.parsed.cpu.name;
|
||||
|
||||
gpguiHashes = {
|
||||
x86_64 = "sha256-6+rt47Cu/6uLwM3FgUaP/0qvTALF+UJRFD2nkybNCTg=";
|
||||
aarch64 = "sha256-auCDdt6LMwnYJ0B9oneoPYAVfEGa/1GkIs8XkXXv85U=";
|
||||
x86_64 = "sha256-yFXqpxmY222xm6Z8WgNsZgbWUwbYE3qWEeGqZxD7wTU=";
|
||||
aarch64 = "sha256-8+GaeDAqX3kvjd8a7Tzv9AjtnefaZO0h4sXzOltG5GY=";
|
||||
};
|
||||
|
||||
gpguiArchive = pkgs.fetchurl {
|
||||
@@ -70,8 +70,8 @@
|
||||
};
|
||||
|
||||
binaryHashes = {
|
||||
x86_64 = "sha256-nsVNOfZ1JxT1mTyiHS3VYyBjbKm5+XsHC/v/fkWwK7A=";
|
||||
aarch64 = "sha256-EjvkgYpOsaktnNE+Xta/GoKjILQzijW0U2bN1e/FiAQ=";
|
||||
x86_64 = "sha256-JXUYT6DRMvN67No4jgJMcp0PyOzib8l0lPHM6muhb9w=";
|
||||
aarch64 = "sha256-JhYLZTZvw+jdu5ewqrWSnNSW66ub1J2S4rhhwcrR43E=";
|
||||
};
|
||||
|
||||
binaryArchive = pkgs.fetchurl {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
pkgbase = globalprotect-openconnect-git
|
||||
pkgdesc = A GUI client for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method.
|
||||
pkgver = 2.5.1.r1.g24f9bbb
|
||||
pkgrel = 2
|
||||
pkgver = 3.3.1.r623.g4085368
|
||||
pkgrel = 1
|
||||
url = https://github.com/yuezk/GlobalProtect-openconnect
|
||||
install = gp.install
|
||||
arch = x86_64
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
_pkgname_prefix=globalprotect-openconnect
|
||||
pkgname="${_pkgname_prefix}-git"
|
||||
pkgver=2.5.1.r1.g24f9bbb
|
||||
pkgrel=2
|
||||
pkgver=3.3.1.r623.g4085368
|
||||
pkgrel=1
|
||||
pkgdesc="A GUI client for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method."
|
||||
arch=(x86_64 aarch64)
|
||||
url="https://github.com/yuezk/GlobalProtect-openconnect"
|
||||
|
||||
@@ -36,13 +36,13 @@ PY
|
||||
|
||||
branch="chore/promote-$tag"
|
||||
git switch -c "$branch" origin/main
|
||||
git merge --no-commit --no-ff "$release_sha"
|
||||
git merge --ff --no-edit "$release_sha"
|
||||
cp "$artifact_dir/flake.nix" "$artifact_dir/flake.lock" .
|
||||
python3 "$script_dir/validate-release-version.py" --version "${tag#v}"
|
||||
# Check against Cargo too: overriding the expectation above is only for artifacts.
|
||||
python3 "$script_dir/validate-release-version.py"
|
||||
git add flake.nix flake.lock
|
||||
if ! git diff --cached --quiet || [[ -f "$(git rev-parse --git-path MERGE_HEAD)" ]]; then
|
||||
git commit -m "release: promote $tag sources and Nix packages together"
|
||||
if ! git diff --cached --quiet; then
|
||||
git commit -m "release: validate Nix packages for $tag"
|
||||
fi
|
||||
echo "Prepared $branch. Review the candidate, push normally, and open one PR against main."
|
||||
echo "Prepared $branch. Open one PR against main and use a regular merge to preserve $tag in main's history."
|
||||
@@ -119,7 +119,7 @@ class SourceSelectionTests(unittest.TestCase):
|
||||
|
||||
|
||||
class PromotionTests(unittest.TestCase):
|
||||
def test_sources_and_flake_are_committed_together_preserving_main_work(self):
|
||||
def test_promotion_keeps_tag_history_and_adds_flake_commit(self):
|
||||
with tempfile.TemporaryDirectory() as temp:
|
||||
root = Path(temp)
|
||||
repo, origin, artifact = root / 'repo', root / 'origin.git', root / 'artifact'
|
||||
@@ -149,7 +149,8 @@ class PromotionTests(unittest.TestCase):
|
||||
self.assertEqual(git(repo, 'show', f'{old}:Cargo.toml'), '[workspace.package]\nversion = "3.1.0"')
|
||||
self.assertTrue((repo / 'infrastructure').exists())
|
||||
self.assertTrue((repo / 'feature').exists())
|
||||
self.assertEqual(git(repo, 'rev-list', '--parents', '-1', 'HEAD').split()[1:], [main, release])
|
||||
self.assertEqual(git(repo, 'rev-list', '--parents', '-1', 'HEAD^').split()[1:], [main, release])
|
||||
self.assertEqual(git(repo, 'diff', '--name-only', 'HEAD^', 'HEAD'), 'flake.nix')
|
||||
self.assertEqual(git(repo, 'status', '--porcelain'), '')
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user