Compare commits

...
6 Commits
10 changed files with 201 additions and 24 deletions

No files matched your search

+63 -8
View File
@@ -29,7 +29,6 @@ concurrency:
cancel-in-progress: true
jobs:
# Include arm64 for tagged releases and manual snapshot releases.
setup-matrix:
runs-on: ubuntu-latest
outputs:
@@ -38,12 +37,7 @@ jobs:
- name: Set up matrix
id: set-matrix
run: |
# Set the matrix to include arm64 for tagged releases and manual snapshot releases.
if [[ "${{ github.ref }}" == "refs/tags/"* || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
echo 'matrix=[{"runner": "ubuntu-latest", "arch": "amd64"}, {"runner": "ubuntu-24.04-arm", "arch": "ubuntu-24.04-arm"}]' >> $GITHUB_OUTPUT
else
echo 'matrix=[{"runner": "ubuntu-latest", "arch": "amd64"}]' >> $GITHUB_OUTPUT
fi
echo 'matrix=[{"runner": "ubuntu-latest", "arch": "amd64"}, {"runner": "ubuntu-24.04-arm", "arch": "ubuntu-24.04-arm"}]' >> $GITHUB_OUTPUT
tarball:
runs-on: ubuntu-latest
@@ -141,9 +135,10 @@ jobs:
- setup-matrix
- tarball
strategy:
fail-fast: false
matrix:
os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
package: [deb, rpm, pkg, binary, ubuntu-rolling]
package: [deb, rpm, pkg, apk, binary, ubuntu-rolling]
runs-on: ${{ matrix.os.runner }}
name: build-gp (${{ matrix.package }}, ${{ matrix.os.arch }})
steps:
@@ -188,6 +183,7 @@ jobs:
needs:
- setup-matrix
strategy:
fail-fast: false
matrix:
os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
runs-on: ${{ matrix.os.runner }}
@@ -241,6 +237,64 @@ jobs:
gpgui-source/*.bin.tar.xz
gpgui-source/*.bin.tar.xz.sha256
build-gpgui-musl:
needs:
- setup-matrix
strategy:
fail-fast: false
matrix:
os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
runs-on: ${{ matrix.os.runner }}
name: build-gpgui-musl (${{ matrix.os.arch }})
steps:
- uses: pnpm/action-setup@v5
with:
version: 9
- name: Prepare workspace
run: rm -rf gpgui-source && mkdir gpgui-source
- name: Checkout GlobalProtect-openconnect
uses: actions/checkout@v6
with:
token: ${{ secrets.GH_PAT }}
repository: yuezk/GlobalProtect-openconnect
ref: ${{ github.event_name == 'workflow_dispatch' && inputs.gp_branch || github.ref }}
path: gpgui-source/gp
submodules: recursive
- name: Checkout gpgui
uses: actions/checkout@v6
with:
token: ${{ secrets.GH_PAT }}
repository: yuezk/gpgui
ref: ${{ github.event_name == 'workflow_dispatch' && inputs.gpgui_branch || github.ref_name }}
path: gpgui-source/gpgui
- name: Tarball
run: |
cd gpgui-source
tar -czf gpgui.tar.gz gpgui gp
- name: Docker Login
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
- name: Build gpgui in Docker
run: |
docker run --pull=always --rm \
-e COREPACK_INTEGRITY_KEYS=0 \
-v $(pwd)/gpgui-source:/workspace yuezk/gpdev:gpgui-alpine-builder-tauri2
- name: Install gpgui in Docker
run: |
cd gpgui-source
tar -xJf *.bin.tar.xz
docker run --pull=always --rm \
-e COREPACK_INTEGRITY_KEYS=0 \
-v $(pwd):/workspace yuezk/gpdev:gpgui-alpine-builder-tauri2 \
bash -c "cd /workspace/gpgui_*/ && ./gpgui --version"
- name: Upload gpgui
uses: actions/upload-artifact@v7
with:
name: artifact-gpgui-musl-${{ matrix.os.arch }}
if-no-files-found: error
path: |
gpgui-source/*.bin.tar.xz
gpgui-source/*.bin.tar.xz.sha256
gh-release:
if: ${{ github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags/') }}
runs-on: ubuntu-latest
@@ -249,6 +303,7 @@ jobs:
- tarball-offline
- build-gp
- build-gpgui
- build-gpgui-musl
steps:
- name: Prepare workspace
+5
View File
@@ -30,6 +30,11 @@ on:
description: 'Build PKG package'
required: true
default: true
release-apk:
type: boolean
description: 'Build APK package'
required: true
default: true
release-binary:
type: boolean
description: 'Build binary package'
Generated
+8 -8
View File
@@ -203,7 +203,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]]
name = "auth"
version = "2.5.3"
version = "2.5.4"
dependencies = [
"anyhow",
"block2",
@@ -652,7 +652,7 @@ dependencies = [
[[package]]
name = "common"
version = "2.5.3"
version = "2.5.4"
[[package]]
name = "compile-time"
@@ -1685,7 +1685,7 @@ dependencies = [
[[package]]
name = "gpapi"
version = "2.5.3"
version = "2.5.4"
dependencies = [
"anyhow",
"base64 0.22.1",
@@ -1728,7 +1728,7 @@ dependencies = [
[[package]]
name = "gpauth"
version = "2.5.3"
version = "2.5.4"
dependencies = [
"anyhow",
"auth",
@@ -1748,7 +1748,7 @@ dependencies = [
[[package]]
name = "gpclient"
version = "2.5.3"
version = "2.5.4"
dependencies = [
"anyhow",
"askama",
@@ -1775,7 +1775,7 @@ dependencies = [
[[package]]
name = "gpgui-helper"
version = "2.5.3"
version = "2.5.4"
dependencies = [
"anyhow",
"clap",
@@ -1793,7 +1793,7 @@ dependencies = [
[[package]]
name = "gpservice"
version = "2.5.3"
version = "2.5.4"
dependencies = [
"anyhow",
"axum",
@@ -3161,7 +3161,7 @@ dependencies = [
[[package]]
name = "openconnect"
version = "2.5.3"
version = "2.5.4"
dependencies = [
"autotools",
"cc",
+1 -1
View File
@@ -11,7 +11,7 @@ members = [
[workspace.package]
rust-version = "1.89"
version = "2.5.3"
version = "2.5.4"
authors = ["Kevin Yue <[email protected]>"]
homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
edition = "2024"
+23 -2
View File
@@ -7,6 +7,7 @@ RUST_VERSION ?= 1.89
IGNORE_RUST_VERSION ?= 0
VERSION = $(shell grep '^version' Cargo.toml | head -1 | sed 's/version *= *"\(.*\)"/\1/')
GUI_LIBC_SUFFIX ?= $(shell ldd --version 2>&1 | grep -qi musl && echo -musl || true)
REVISION ?= 1
RPM_SOURCE ?= %{name}.tar.gz
@@ -77,8 +78,8 @@ download-gui:
if [ $(INCLUDE_GUI) -eq 1 ]; then \
echo "Downloading GlobalProtect GUI..."; \
mkdir -p .build/gpgui; \
curl -sSL https://github.com/yuezk/GlobalProtect-openconnect/releases/download/$(RELEASE_TAG)/gpgui_$(shell uname -m).bin.tar.xz \
-o .build/gpgui/gpgui_$(shell uname -m).bin.tar.xz; \
curl -sSL https://github.com/yuezk/GlobalProtect-openconnect/releases/download/$(RELEASE_TAG)/gpgui_$(shell uname -m)$(GUI_LIBC_SUFFIX).bin.tar.xz \
-o .build/gpgui/gpgui_$(shell uname -m)$(GUI_LIBC_SUFFIX).bin.tar.xz; \
tar -xJf .build/gpgui/*.tar.xz -C .build/gpgui; \
else \
echo "Skipping GlobalProtect GUI download (INCLUDE_GUI=0)"; \
@@ -270,6 +271,26 @@ init-pkgbuild: clean-pkgbuild tarball
pkgbuild: init-pkgbuild
cd .build/pkgbuild && makepkg -s --noconfirm
clean-apk:
rm -rf .build/apk
init-apk: clean-apk tarball
mkdir -p .build/apk
cp .build/tarball/${PKG}.tar.gz .build/apk
cp packaging/apk/APKBUILD.in .build/apk/APKBUILD
sed -i "s/@PKG_NAME@/$(PKG_NAME)/g" .build/apk/APKBUILD
sed -i "s/@VERSION@/$(VERSION)/g" .build/apk/APKBUILD
sed -i "s/@REVISION@/$(REVISION)/g" .build/apk/APKBUILD
checksum=$$(sha512sum .build/apk/${PKG}.tar.gz | cut -d' ' -f1); \
sed -i "s/@SHA512@/$$checksum/g" .build/apk/APKBUILD
apk: init-apk
cd .build/apk && abuild -r -P "$(CURDIR)/.build/apk/packages"
find .build/apk/packages -type f -name "$(PKG_NAME)-*.apk" -exec cp {} .build/apk \;
clean-binary:
rm -rf .build/binary
+11
View File
@@ -20,6 +20,7 @@ A modern GlobalProtect VPN client for Linux, built on OpenConnect with full supp
- [Fedora 38+ / Rawhide](#fedora-38--rawhide)
- [openSUSE Leap 15.6+ / Tumbleweed](#opensuse-leap-156--tumbleweed)
- [Other RPM-based Distributions](#other-rpm-based-distributions)
- [Alpine Linux](#alpine-linux)
- [Gentoo](#gentoo)
- [NixOS](#nixos)
- [Other Distributions](#other-distributions)
@@ -186,6 +187,16 @@ Download the latest RPM package from the [releases](https://github.com/yuezk/Glo
sudo rpm -i globalprotect-openconnect-*.rpm
```
### Alpine Linux
Download the latest `.apk` package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page, then install:
```bash
sudo apk add --allow-untrusted globalprotect-openconnect-*.apk
```
The package uses Alpine's native musl build. Make sure the `community` repository is enabled so GUI dependencies such as `webkit2gtk-4.1`, `libsecret`, and `libayatana-appindicator` can be resolved. GUI-launched connections use polkit, and VPN tunnel creation requires `/dev/net/tun`.
### Gentoo
Available via the `guru` and `lamdness` overlays:
+8 -2
View File
@@ -15,6 +15,12 @@ const SNAPSHOT: &str = match option_env!("SNAPSHOT") {
None => "false",
};
#[cfg(target_env = "musl")]
const GUI_LIBC_SUFFIX: &str = "-musl";
#[cfg(not(target_env = "musl"))]
const GUI_LIBC_SUFFIX: &str = "";
pub struct ProgressNotifier {
win: WebviewWindow,
}
@@ -110,8 +116,8 @@ impl GuiUpdater {
};
let file_url = format!(
"https://github.com/yuezk/GlobalProtect-openconnect/releases/download/{}/gpgui_{}.bin.tar.xz",
release_tag, arch
"https://github.com/yuezk/GlobalProtect-openconnect/releases/download/{}/gpgui_{}{}.bin.tar.xz",
release_tag, arch, GUI_LIBC_SUFFIX
);
let checksum_url = format!("{}.sha256", file_url);
+5
View File
@@ -1,5 +1,10 @@
# Changelog
## 2.5.4 - 2026-05-08
- Add Alpine/musl gpgui release assets for x86_64 and aarch64.
- Use the musl gpgui asset when the helper or package build runs on musl Linux.
## 2.5.3 - 2026-05-08
- Fix systemd-resolved DNS routing when no split-DNS domains are provided (fix [#604](https://github.com/yuezk/GlobalProtect-openconnect/issues/604)).
+3 -3
View File
@@ -35,7 +35,7 @@
src = pkgs.fetchzip {
url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect-${version}.tar.gz";
hash = "sha256-MUkZSXaIFJJK8wD1jI8wk79TkB6tGa1bwBKdGhjQ/p4=";
hash = "sha256-KgmWKp04jXsQuptXbxAdRP92Bgn46cm8+PboJ+lRc20=";
};
cpu = pkgs.stdenv.hostPlatform.parsed.cpu.name;
@@ -43,8 +43,8 @@
gpgui = pkgs.fetchzip {
url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/gpgui_${cpu}.bin.tar.xz";
hash = {
x86_64 = "sha256-t21j1bPq8QrQh7tN6epCk9VASGKrdHBB7vMXsHK2Pqk=";
aarch64 = "sha256-jA8Zpev56iNJrbxYM1t1zRor+lX4kHxuSrzuwntWlwA=";
x86_64 = "sha256-hBiEreTOqfCudXNM4FZnQEdUT3mHenTodqGONx03YUA=";
aarch64 = "sha256-9gLCRE0gA0PxX4yKoV51aiJa31VuAGiHck429iMY7rA=";
}.${cpu};
};
in
+74
View File
@@ -0,0 +1,74 @@
# Maintainer: Kevin Yue <[email protected]>
pkgname=@PKG_NAME@
pkgver=@VERSION@
pkgrel=@REVISION@
pkgdesc="A GUI client for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method."
url="https://github.com/yuezk/GlobalProtect-openconnect"
arch="x86_64 aarch64"
license="GPL-3.0-only"
depends="
gmp
gnutls
libayatana-appindicator
libsecret
libxml2
lz4
nettle
openssl
p11-kit
polkit
webkit2gtk-4.1
xdg-utils
zlib
"
makedepends="
autoconf
automake
cargo
file
gettext-dev
gmp-dev
gnutls-dev
gtk+3.0-dev
libayatana-appindicator-dev
libsecret-dev
librsvg-dev
libtool
libxml2-dev
lz4-dev
make
nettle-dev
openssl-dev
p11-kit-dev
patch
pkgconf
zlib-dev
"
source="$pkgname-$pkgver.tar.gz"
builddir="$srcdir/$pkgname-$pkgver"
options="!check"
build() {
cd "$builddir"
unset CFLAGS
unset RUSTFLAGS
make build \
INCLUDE_GUI="${INCLUDE_GUI:-0}" \
BUILD_GUI_HELPER="${BUILD_GUI_HELPER:-1}" \
LIBXML2_STATIC="${LIBXML2_STATIC:-1}"
}
package() {
cd "$builddir"
make install \
DESTDIR="$pkgdir" \
BUILD_GUI_HELPER="${BUILD_GUI_HELPER:-1}"
}
sha512sums="
@SHA512@ $pkgname-$pkgver.tar.gz
"