mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-19 06:26:14 -05:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d6e3a212f2 | ||
|
|
e45b4a4145 | ||
|
|
93a7f4bd10 | ||
|
|
d1401171d8 | ||
|
|
9591ca287e | ||
|
|
46c80ecc93 | ||
|
|
99d2a26d45 | ||
|
|
067037517e | ||
|
|
c04b49fe11 | ||
|
|
a044cb35ad |
No files matched your search
@@ -1,6 +1,15 @@
|
|||||||
name: Build
|
name: Build
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
gp_branch:
|
||||||
|
description: 'GlobalProtect-openconnect branch to use for the snapshot release'
|
||||||
|
required: true
|
||||||
|
default: dev
|
||||||
|
gpgui_branch:
|
||||||
|
description: 'gpgui branch to use for the snapshot release'
|
||||||
|
required: true
|
||||||
|
default: dev
|
||||||
push:
|
push:
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- LICENSE
|
- LICENSE
|
||||||
@@ -9,7 +18,6 @@ on:
|
|||||||
- .devcontainer
|
- .devcontainer
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- dev
|
|
||||||
- hotfix/*
|
- hotfix/*
|
||||||
- feature/*
|
- feature/*
|
||||||
- release/*
|
- release/*
|
||||||
@@ -21,7 +29,7 @@ concurrency:
|
|||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
# Include arm64 if ref is a tag
|
# Include arm64 for tagged releases and manual snapshot releases.
|
||||||
setup-matrix:
|
setup-matrix:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
outputs:
|
outputs:
|
||||||
@@ -30,8 +38,8 @@ jobs:
|
|||||||
- name: Set up matrix
|
- name: Set up matrix
|
||||||
id: set-matrix
|
id: set-matrix
|
||||||
run: |
|
run: |
|
||||||
# Set the matrix to include arm64 if the ref is a tag or is the dev branch
|
# Set the matrix to include arm64 for tagged releases and manual snapshot releases.
|
||||||
if [[ "${{ github.ref }}" == "refs/tags/"* || "${{ github.ref }}" == "refs/heads/dev" ]]; then
|
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
|
echo 'matrix=[{"runner": "ubuntu-latest", "arch": "amd64"}, {"runner": "ubuntu-24.04-arm", "arch": "ubuntu-24.04-arm"}]' >> $GITHUB_OUTPUT
|
||||||
else
|
else
|
||||||
echo 'matrix=[{"runner": "ubuntu-latest", "arch": "amd64"}]' >> $GITHUB_OUTPUT
|
echo 'matrix=[{"runner": "ubuntu-latest", "arch": "amd64"}]' >> $GITHUB_OUTPUT
|
||||||
@@ -52,7 +60,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
token: ${{ secrets.GH_PAT }}
|
token: ${{ secrets.GH_PAT }}
|
||||||
repository: yuezk/GlobalProtect-openconnect
|
repository: yuezk/GlobalProtect-openconnect
|
||||||
ref: ${{ github.ref }}
|
ref: ${{ github.event_name == 'workflow_dispatch' && inputs.gp_branch || github.ref }}
|
||||||
path: source/gp
|
path: source/gp
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
|
|
||||||
@@ -69,7 +77,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Generate RPM spec file
|
- name: Generate RPM spec file
|
||||||
env:
|
env:
|
||||||
RELEASE_TAG: ${{ github.ref == 'refs/heads/dev' && 'snapshot' || github.ref_name }}
|
RELEASE_TAG: ${{ github.event_name == 'workflow_dispatch' && 'snapshot' || github.ref_name }}
|
||||||
run: |
|
run: |
|
||||||
cd source/gp
|
cd source/gp
|
||||||
|
|
||||||
@@ -88,7 +96,7 @@ jobs:
|
|||||||
source/artifacts/*
|
source/artifacts/*
|
||||||
|
|
||||||
tarball-offline:
|
tarball-offline:
|
||||||
if: ${{ github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/') }}
|
if: ${{ github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags/') }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs:
|
needs:
|
||||||
- tarball
|
- tarball
|
||||||
@@ -195,15 +203,15 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
token: ${{ secrets.GH_PAT }}
|
token: ${{ secrets.GH_PAT }}
|
||||||
repository: yuezk/GlobalProtect-openconnect
|
repository: yuezk/GlobalProtect-openconnect
|
||||||
ref: ${{ github.ref }}
|
ref: ${{ github.event_name == 'workflow_dispatch' && inputs.gp_branch || github.ref }}
|
||||||
path: gpgui-source/gp
|
path: gpgui-source/gp
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
- name: Checkout gpgui@${{ github.ref_name }}
|
- name: Checkout gpgui
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.GH_PAT }}
|
token: ${{ secrets.GH_PAT }}
|
||||||
repository: yuezk/gpgui
|
repository: yuezk/gpgui
|
||||||
ref: ${{ github.ref_name }}
|
ref: ${{ github.event_name == 'workflow_dispatch' && inputs.gpgui_branch || github.ref_name }}
|
||||||
path: gpgui-source/gpgui
|
path: gpgui-source/gpgui
|
||||||
- name: Tarball
|
- name: Tarball
|
||||||
run: |
|
run: |
|
||||||
@@ -234,7 +242,7 @@ jobs:
|
|||||||
gpgui-source/*.bin.tar.xz.sha256
|
gpgui-source/*.bin.tar.xz.sha256
|
||||||
|
|
||||||
gh-release:
|
gh-release:
|
||||||
if: ${{ github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/') }}
|
if: ${{ github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags/') }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs:
|
needs:
|
||||||
- tarball
|
- tarball
|
||||||
@@ -251,7 +259,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
token: ${{ secrets.GH_PAT }}
|
token: ${{ secrets.GH_PAT }}
|
||||||
repository: yuezk/GlobalProtect-openconnect
|
repository: yuezk/GlobalProtect-openconnect
|
||||||
ref: ${{ github.ref }}
|
ref: ${{ github.event_name == 'workflow_dispatch' && inputs.gp_branch || github.ref }}
|
||||||
path: gh-release/gp
|
path: gh-release/gp
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
|
|
||||||
@@ -263,6 +271,6 @@ jobs:
|
|||||||
- name: Create GH release
|
- name: Create GH release
|
||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ secrets.GH_PAT }}
|
GH_TOKEN: ${{ secrets.GH_PAT }}
|
||||||
RELEASE_TAG: ${{ github.ref == 'refs/heads/dev' && 'snapshot' || github.ref_name }}
|
RELEASE_TAG: ${{ github.event_name == 'workflow_dispatch' && 'snapshot' || github.ref_name }}
|
||||||
run: |
|
run: |
|
||||||
cd gh-release/gp/scripts && ./gh-release.sh "$RELEASE_TAG"
|
cd gh-release/gp/scripts && ./gh-release.sh "$RELEASE_TAG"
|
||||||
@@ -0,0 +1,142 @@
|
|||||||
|
name: Publish AUR git package
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
build-package:
|
||||||
|
type: boolean
|
||||||
|
description: "Build the package before publishing"
|
||||||
|
required: true
|
||||||
|
default: true
|
||||||
|
publish:
|
||||||
|
type: boolean
|
||||||
|
description: "Push PKGBUILD, .SRCINFO, and gp.install to AUR"
|
||||||
|
required: true
|
||||||
|
default: true
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
paths:
|
||||||
|
- packaging/aur/globalprotect-openconnect-git/**
|
||||||
|
- .github/workflows/publish-aur-git.yaml
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
aur:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
container: archlinux:base-devel
|
||||||
|
defaults:
|
||||||
|
run:
|
||||||
|
shell: bash
|
||||||
|
env:
|
||||||
|
AUR_PACKAGE_DIR: packaging/aur/globalprotect-openconnect-git
|
||||||
|
AUR_REPO: ssh://[email protected]/globalprotect-openconnect-git.git
|
||||||
|
steps:
|
||||||
|
- name: Install checkout tools
|
||||||
|
run: pacman -Syu --noconfirm --needed git openssh
|
||||||
|
|
||||||
|
- name: Checkout GlobalProtect-openconnect
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- name: Install build tools
|
||||||
|
run: |
|
||||||
|
pacman -Syu --noconfirm --needed \
|
||||||
|
appmenu-gtk-module \
|
||||||
|
cargo \
|
||||||
|
curl \
|
||||||
|
desktop-file-utils \
|
||||||
|
file \
|
||||||
|
git \
|
||||||
|
libappindicator-gtk3 \
|
||||||
|
libsecret \
|
||||||
|
libxml2 \
|
||||||
|
namcap \
|
||||||
|
openconnect \
|
||||||
|
openssl \
|
||||||
|
pkgconf \
|
||||||
|
librsvg \
|
||||||
|
shared-mime-info \
|
||||||
|
vpnc \
|
||||||
|
wget \
|
||||||
|
webkit2gtk-4.1
|
||||||
|
|
||||||
|
- name: Save committed .SRCINFO
|
||||||
|
if: ${{ github.event_name == 'push' }}
|
||||||
|
run: cp "$AUR_PACKAGE_DIR/.SRCINFO" /tmp/committed.SRCINFO
|
||||||
|
|
||||||
|
- name: Prepare build user
|
||||||
|
run: |
|
||||||
|
useradd -m builder
|
||||||
|
chown -R builder:builder "$GITHUB_WORKSPACE"
|
||||||
|
|
||||||
|
- name: Refresh VCS package version
|
||||||
|
if: ${{ github.event_name == 'workflow_dispatch' }}
|
||||||
|
run: |
|
||||||
|
cd "$AUR_PACKAGE_DIR"
|
||||||
|
runuser -u builder -- makepkg --nobuild --noconfirm --cleanbuild
|
||||||
|
|
||||||
|
- name: Regenerate .SRCINFO
|
||||||
|
run: |
|
||||||
|
cd "$AUR_PACKAGE_DIR"
|
||||||
|
runuser -u builder -- makepkg --printsrcinfo > .SRCINFO
|
||||||
|
|
||||||
|
- name: Check committed .SRCINFO
|
||||||
|
if: ${{ github.event_name == 'push' }}
|
||||||
|
run: |
|
||||||
|
cmp -s /tmp/committed.SRCINFO "$AUR_PACKAGE_DIR/.SRCINFO" || {
|
||||||
|
diff -u /tmp/committed.SRCINFO "$AUR_PACKAGE_DIR/.SRCINFO"
|
||||||
|
echo ".SRCINFO is out of date. Regenerate it with makepkg --printsrcinfo." >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
- name: Run namcap
|
||||||
|
run: |
|
||||||
|
cd "$AUR_PACKAGE_DIR"
|
||||||
|
runuser -u builder -- namcap PKGBUILD
|
||||||
|
|
||||||
|
- name: Build package
|
||||||
|
if: ${{ github.event_name == 'workflow_dispatch' && inputs['build-package'] }}
|
||||||
|
run: |
|
||||||
|
cd "$AUR_PACKAGE_DIR"
|
||||||
|
runuser -u builder -- makepkg --noconfirm --clean --cleanbuild
|
||||||
|
|
||||||
|
- name: Configure SSH
|
||||||
|
if: ${{ github.event_name == 'workflow_dispatch' && inputs.publish }}
|
||||||
|
env:
|
||||||
|
AUR_SSH_PRIVATE_KEY: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
|
||||||
|
run: |
|
||||||
|
if [[ -z "$AUR_SSH_PRIVATE_KEY" ]]; then
|
||||||
|
echo "AUR_SSH_PRIVATE_KEY is required to publish to AUR" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
install -d -m 700 ~/.ssh
|
||||||
|
printf '%s\n' "$AUR_SSH_PRIVATE_KEY" > ~/.ssh/aur
|
||||||
|
chmod 600 ~/.ssh/aur
|
||||||
|
ssh-keyscan -t rsa,ecdsa,ed25519 aur.archlinux.org > ~/.ssh/known_hosts
|
||||||
|
|
||||||
|
- name: Publish to AUR
|
||||||
|
if: ${{ github.event_name == 'workflow_dispatch' && inputs.publish }}
|
||||||
|
env:
|
||||||
|
GIT_SSH_COMMAND: ssh -i /github/home/.ssh/aur -o UserKnownHostsFile=/github/home/.ssh/known_hosts -o StrictHostKeyChecking=yes
|
||||||
|
run: |
|
||||||
|
workdir="$(mktemp -d)"
|
||||||
|
git clone "$AUR_REPO" "$workdir/aur"
|
||||||
|
|
||||||
|
cp "$AUR_PACKAGE_DIR"/PKGBUILD "$workdir/aur/PKGBUILD"
|
||||||
|
cp "$AUR_PACKAGE_DIR"/.SRCINFO "$workdir/aur/.SRCINFO"
|
||||||
|
cp "$AUR_PACKAGE_DIR"/gp.install "$workdir/aur/gp.install"
|
||||||
|
|
||||||
|
cd "$workdir/aur"
|
||||||
|
if git diff --quiet; then
|
||||||
|
echo "AUR package is already up to date"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
git config user.name "github-actions[bot]"
|
||||||
|
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||||
|
git add PKGBUILD .SRCINFO gp.install
|
||||||
|
git commit -m "Update globalprotect-openconnect-git"
|
||||||
|
git push origin master
|
||||||
@@ -11,12 +11,7 @@ on:
|
|||||||
required: false
|
required: false
|
||||||
default: "1"
|
default: "1"
|
||||||
series:
|
series:
|
||||||
description: 'Ubuntu series to publish'
|
description: 'Space-separated Ubuntu series. Leave empty to publish all supported series.'
|
||||||
type: "string"
|
|
||||||
required: false
|
|
||||||
default: ""
|
|
||||||
excluded_series:
|
|
||||||
description: 'Additional Ubuntu series to exclude from publishing'
|
|
||||||
type: "string"
|
type: "string"
|
||||||
required: false
|
required: false
|
||||||
default: ""
|
default: ""
|
||||||
@@ -30,20 +25,63 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Check tag exists
|
- name: Check tag exists
|
||||||
uses: mukunku/[email protected]
|
env:
|
||||||
id: check-tag
|
GH_TOKEN: ${{ github.token }}
|
||||||
with:
|
TAG: ${{ inputs.tag }}
|
||||||
tag: ${{ inputs.tag }}
|
|
||||||
- name: Exit if tag does not exist
|
|
||||||
run: |
|
run: |
|
||||||
if [[ "${{ steps.check-tag.outputs.exists }}" == "false" ]]; then
|
if ! gh api "repos/${{ github.repository }}/git/ref/tags/$TAG" >/dev/null 2>&1; then
|
||||||
echo "Tag ${{ inputs.tag }} does not exist"
|
echo "Tag $TAG does not exist"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
publish-ppa:
|
resolve-series:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
outputs:
|
||||||
|
matrix: ${{ steps.resolve.outputs.matrix }}
|
||||||
|
steps:
|
||||||
|
- name: Resolve Ubuntu series
|
||||||
|
id: resolve
|
||||||
|
env:
|
||||||
|
INPUT_SERIES: ${{ inputs.series }}
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y distro-info distro-info-data
|
||||||
|
|
||||||
|
if [[ "$INPUT_SERIES" == *","* ]]; then
|
||||||
|
echo "Use space-separated series, for example: jammy noble" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
series=()
|
||||||
|
if [[ -z "${INPUT_SERIES// }" ]]; then
|
||||||
|
while IFS= read -r item; do
|
||||||
|
[[ -n "$item" ]] && series+=("$item")
|
||||||
|
done < <(ubuntu-distro-info --supported)
|
||||||
|
else
|
||||||
|
read -r -a series <<< "$INPUT_SERIES"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "${#series[@]}" -eq 0 ]]; then
|
||||||
|
echo "No Ubuntu series resolved" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
for item in "${series[@]}"; do
|
||||||
|
ubuntu-distro-info --series "$item" >/dev/null
|
||||||
|
done
|
||||||
|
|
||||||
|
matrix="$(printf '%s\n' "${series[@]}" | jq -R . | jq -s -c '{series: .}')"
|
||||||
|
echo "Resolved matrix: $matrix"
|
||||||
|
echo "matrix=$matrix" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
publish-ppa:
|
||||||
|
needs: [check, resolve-series]
|
||||||
|
name: publish-ppa (${{ matrix.series }})
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix: ${{ fromJSON(needs.resolve-series.outputs.matrix) }}
|
||||||
steps:
|
steps:
|
||||||
- uses: pnpm/action-setup@v5
|
- uses: pnpm/action-setup@v5
|
||||||
with:
|
with:
|
||||||
@@ -94,10 +132,8 @@ jobs:
|
|||||||
gpg_passphrase: ${{ secrets.PPA_GPG_PASSPHRASE }}
|
gpg_passphrase: ${{ secrets.PPA_GPG_PASSPHRASE }}
|
||||||
tarball: publish-ppa/globalprotect-openconnect-*.tar.gz
|
tarball: publish-ppa/globalprotect-openconnect-*.tar.gz
|
||||||
debian_dir: publish-ppa/globalprotect-openconnect-*/.build/debian
|
debian_dir: publish-ppa/globalprotect-openconnect-*/.build/debian
|
||||||
deb_email: "[email protected]"
|
deb_email: ${{ vars.DEB_EMAIL }}
|
||||||
deb_fullname: "Kevin Yue"
|
deb_fullname: ${{ vars.DEB_FULLNAME }}
|
||||||
extra_ppa: "yuezk/globalprotect-openconnect"
|
extra_ppa: "yuezk/globalprotect-openconnect"
|
||||||
# Ubuntu 18.04 and 20.04 are excluded because tauri2 no longer supports them
|
series: ${{ matrix.series }}
|
||||||
excluded_series: "bionic focal ${{ inputs.excluded_series }}"
|
|
||||||
series: ${{ inputs.series }}
|
|
||||||
revision: ${{ inputs.revision }}
|
revision: ${{ inputs.revision }}
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
name: Update flake hashes
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
version:
|
||||||
|
description: "Release version. Defaults to Cargo.toml workspace version."
|
||||||
|
required: false
|
||||||
|
release:
|
||||||
|
types:
|
||||||
|
- published
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
pull-requests: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
update-flake-hashes:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout GlobalProtect-openconnect
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- name: Install Nix
|
||||||
|
uses: cachix/install-nix-action@v31
|
||||||
|
|
||||||
|
- name: Update flake hashes
|
||||||
|
env:
|
||||||
|
RELEASE_VERSION: ${{ github.event.release.tag_name || inputs.version }}
|
||||||
|
run: |
|
||||||
|
if [[ -n "$RELEASE_VERSION" ]]; then
|
||||||
|
scripts/update-flake-hashes.sh "$RELEASE_VERSION"
|
||||||
|
else
|
||||||
|
scripts/update-flake-hashes.sh
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Open pull request
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
|
RELEASE_VERSION: ${{ github.event.release.tag_name || inputs.version }}
|
||||||
|
run: |
|
||||||
|
if git diff --quiet -- flake.nix; then
|
||||||
|
echo "flake.nix hashes are already up to date"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
version="${RELEASE_VERSION:-$(grep '^version' Cargo.toml | head -1 | sed 's/version *= *"\(.*\)"/\1/')}"
|
||||||
|
version="${version#v}"
|
||||||
|
branch="chore/update-flake-hashes-v${version}"
|
||||||
|
|
||||||
|
git config user.name "github-actions[bot]"
|
||||||
|
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||||
|
git switch -c "$branch"
|
||||||
|
git add flake.nix
|
||||||
|
git commit -m "chore: update flake hashes for v${version}"
|
||||||
|
git push --force-with-lease origin "$branch"
|
||||||
|
|
||||||
|
if gh pr view "$branch" --json number > /tmp/flake-pr.json 2> /dev/null; then
|
||||||
|
pr_number="$(jq -r '.number' /tmp/flake-pr.json)"
|
||||||
|
gh pr edit "$pr_number" \
|
||||||
|
--title "chore: update flake hashes for v${version}" \
|
||||||
|
--body "Updates the Nix flake fetchzip hashes for v${version} release assets."
|
||||||
|
else
|
||||||
|
gh pr create \
|
||||||
|
--title "chore: update flake hashes for v${version}" \
|
||||||
|
--body "Updates the Nix flake fetchzip hashes for v${version} release assets." \
|
||||||
|
--base main \
|
||||||
|
--head "$branch"
|
||||||
|
fi
|
||||||
Generated
+8
-8
@@ -203,7 +203,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "auth"
|
name = "auth"
|
||||||
version = "2.5.2"
|
version = "2.5.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"block2",
|
"block2",
|
||||||
@@ -652,7 +652,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "common"
|
name = "common"
|
||||||
version = "2.5.2"
|
version = "2.5.3"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "compile-time"
|
name = "compile-time"
|
||||||
@@ -1685,7 +1685,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpapi"
|
name = "gpapi"
|
||||||
version = "2.5.2"
|
version = "2.5.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
@@ -1728,7 +1728,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpauth"
|
name = "gpauth"
|
||||||
version = "2.5.2"
|
version = "2.5.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"auth",
|
"auth",
|
||||||
@@ -1748,7 +1748,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpclient"
|
name = "gpclient"
|
||||||
version = "2.5.2"
|
version = "2.5.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"askama",
|
"askama",
|
||||||
@@ -1775,7 +1775,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpgui-helper"
|
name = "gpgui-helper"
|
||||||
version = "2.5.2"
|
version = "2.5.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"clap",
|
"clap",
|
||||||
@@ -1793,7 +1793,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpservice"
|
name = "gpservice"
|
||||||
version = "2.5.2"
|
version = "2.5.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"axum",
|
"axum",
|
||||||
@@ -3161,7 +3161,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "openconnect"
|
name = "openconnect"
|
||||||
version = "2.5.2"
|
version = "2.5.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"autotools",
|
"autotools",
|
||||||
"cc",
|
"cc",
|
||||||
|
|||||||
+1
-1
@@ -11,7 +11,7 @@ members = [
|
|||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
rust-version = "1.89"
|
rust-version = "1.89"
|
||||||
version = "2.5.2"
|
version = "2.5.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"
|
||||||
|
|||||||
@@ -1,5 +1,10 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 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)).
|
||||||
|
- Log whether systemd-resolved uses server-provided split DNS or global VPN DNS.
|
||||||
|
|
||||||
## 2.5.2 - 2026-05-06
|
## 2.5.2 - 2026-05-06
|
||||||
|
|
||||||
- Experimental: GUI/CLI add session expiry warnings and support automatic session extension when allowed by the portal.
|
- Experimental: GUI/CLI add session expiry warnings and support automatic session extension when allowed by the portal.
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
|
|
||||||
src = pkgs.fetchzip {
|
src = pkgs.fetchzip {
|
||||||
url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect-${version}.tar.gz";
|
url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect-${version}.tar.gz";
|
||||||
hash = "sha256-4hlWP7yvwk4rTvQWuh60D40DJ20GfHhLTYA5+dkc4Hc=";
|
hash = "sha256-MUkZSXaIFJJK8wD1jI8wk79TkB6tGa1bwBKdGhjQ/p4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cpu = pkgs.stdenv.hostPlatform.parsed.cpu.name;
|
cpu = pkgs.stdenv.hostPlatform.parsed.cpu.name;
|
||||||
@@ -43,8 +43,8 @@
|
|||||||
gpgui = pkgs.fetchzip {
|
gpgui = pkgs.fetchzip {
|
||||||
url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/gpgui_${cpu}.bin.tar.xz";
|
url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/gpgui_${cpu}.bin.tar.xz";
|
||||||
hash = {
|
hash = {
|
||||||
x86_64 = "sha256-SayWyWJBDoIgqQG/z7v4FEr0uYHNZDJHokHPYqIgrJ0=";
|
x86_64 = "sha256-t21j1bPq8QrQh7tN6epCk9VASGKrdHBB7vMXsHK2Pqk=";
|
||||||
aarch64 = "sha256-Q8yJW2ecv6zsuzzpfVAjSaDhLHQQJyVGFzZuLl0RV8Q=";
|
aarch64 = "sha256-jA8Zpev56iNJrbxYM1t1zRor+lX4kHxuSrzuwntWlwA=";
|
||||||
}.${cpu};
|
}.${cpu};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
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
|
||||||
|
url = https://github.com/yuezk/GlobalProtect-openconnect
|
||||||
|
install = gp.install
|
||||||
|
arch = x86_64
|
||||||
|
arch = aarch64
|
||||||
|
license = GPL3
|
||||||
|
makedepends = git
|
||||||
|
makedepends = pkg-config
|
||||||
|
makedepends = openconnect>=8.20
|
||||||
|
makedepends = webkit2gtk-4.1
|
||||||
|
makedepends = curl
|
||||||
|
makedepends = wget
|
||||||
|
makedepends = file
|
||||||
|
makedepends = openssl
|
||||||
|
makedepends = appmenu-gtk-module
|
||||||
|
makedepends = libappindicator-gtk3
|
||||||
|
makedepends = librsvg
|
||||||
|
makedepends = libsecret
|
||||||
|
makedepends = cargo
|
||||||
|
depends = vpnc
|
||||||
|
depends = openssl
|
||||||
|
depends = webkit2gtk-4.1
|
||||||
|
depends = libappindicator-gtk3
|
||||||
|
depends = libsecret
|
||||||
|
depends = libxml2
|
||||||
|
depends = shared-mime-info
|
||||||
|
depends = desktop-file-utils
|
||||||
|
optdepends = wmctrl: for window management
|
||||||
|
provides = globalprotect-openconnect
|
||||||
|
provides = gpclient
|
||||||
|
provides = gpservice
|
||||||
|
provides = gpauth
|
||||||
|
provides = gpgui
|
||||||
|
conflicts = globalprotect-openconnect
|
||||||
|
options = !strip
|
||||||
|
source = globalprotect-openconnect::git+https://github.com/yuezk/GlobalProtect-openconnect.git#branch=main
|
||||||
|
sha256sums = SKIP
|
||||||
|
|
||||||
|
pkgname = globalprotect-openconnect-git
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
# Maintainer: Kevin Yue <[email protected]>
|
||||||
|
|
||||||
|
_pkgname_prefix=globalprotect-openconnect
|
||||||
|
pkgname="${_pkgname_prefix}-git"
|
||||||
|
pkgver=2.5.1.r1.g24f9bbb
|
||||||
|
pkgrel=2
|
||||||
|
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"
|
||||||
|
license=('GPL3')
|
||||||
|
|
||||||
|
makedepends=(git pkg-config 'openconnect>=8.20' webkit2gtk-4.1 curl wget file openssl appmenu-gtk-module libappindicator-gtk3 librsvg libsecret cargo)
|
||||||
|
depends=(vpnc openssl webkit2gtk-4.1 libappindicator-gtk3 libsecret libxml2 shared-mime-info desktop-file-utils)
|
||||||
|
optdepends=('wmctrl: for window management')
|
||||||
|
|
||||||
|
conflicts=('globalprotect-openconnect')
|
||||||
|
provides=('globalprotect-openconnect' 'gpclient' 'gpservice' 'gpauth' 'gpgui')
|
||||||
|
|
||||||
|
install=gp.install
|
||||||
|
|
||||||
|
source=("${_pkgname_prefix}::git+https://github.com/yuezk/GlobalProtect-openconnect.git#branch=main")
|
||||||
|
|
||||||
|
sha256sums=("SKIP")
|
||||||
|
|
||||||
|
options=('!strip')
|
||||||
|
|
||||||
|
pkgver() {
|
||||||
|
cd "${_pkgname_prefix}"
|
||||||
|
|
||||||
|
git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
|
||||||
|
}
|
||||||
|
|
||||||
|
prepare() {
|
||||||
|
cd "${_pkgname_prefix}"
|
||||||
|
git submodule update --init --recursive
|
||||||
|
|
||||||
|
cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
|
||||||
|
}
|
||||||
|
|
||||||
|
build() {
|
||||||
|
# Must unset the CFLAGS, otherwise the build fails on linking openssl, don't know why
|
||||||
|
unset CFLAGS
|
||||||
|
|
||||||
|
cd "${_pkgname_prefix}"
|
||||||
|
cargo build --frozen --release
|
||||||
|
}
|
||||||
|
|
||||||
|
package() {
|
||||||
|
cd "${_pkgname_prefix}"
|
||||||
|
|
||||||
|
DESTDIR="$pkgdir" make install
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
post_install() {
|
||||||
|
update-mime-database /usr/share/mime
|
||||||
|
update-desktop-database -q
|
||||||
|
}
|
||||||
|
|
||||||
|
pre_upgrade() {
|
||||||
|
rm -f /usr/bin/gpgui
|
||||||
|
}
|
||||||
|
|
||||||
|
post_upgrade() {
|
||||||
|
update-mime-database /usr/share/mime
|
||||||
|
update-desktop-database -q
|
||||||
|
}
|
||||||
|
|
||||||
|
post_remove() {
|
||||||
|
rm -f /usr/bin/gpgui
|
||||||
|
update-mime-database /usr/share/mime
|
||||||
|
update-desktop-database -q
|
||||||
|
}
|
||||||
@@ -93,6 +93,18 @@ OS="`uname -s`"
|
|||||||
|
|
||||||
HOOKS_DIR=/etc/vpnc
|
HOOKS_DIR=/etc/vpnc
|
||||||
|
|
||||||
|
log_info() {
|
||||||
|
case "${LOG_LEVEL:-0}" in
|
||||||
|
''|*[!0-9]*)
|
||||||
|
return
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
if [ "$LOG_LEVEL" -ge 1 ]; then
|
||||||
|
echo "$SCRIPTNAME: $*" 1>&2
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# Use the PID of the controlling process (vpnc or OpenConnect) to
|
# Use the PID of the controlling process (vpnc or OpenConnect) to
|
||||||
# uniquely identify this VPN connection. Normally, the parent process
|
# uniquely identify this VPN connection. Normally, the parent process
|
||||||
# is a shell, and the grandparent's PID is the relevant one.
|
# is a shell, and the grandparent's PID is the relevant one.
|
||||||
@@ -891,6 +903,12 @@ modify_resolved_manager() {
|
|||||||
local if_index split_dns_list
|
local if_index split_dns_list
|
||||||
if_index=$(get_if_index $TUNDEV)
|
if_index=$(get_if_index $TUNDEV)
|
||||||
split_dns_list=$(echo $CISCO_SPLIT_DNS | tr ',' ' ')
|
split_dns_list=$(echo $CISCO_SPLIT_DNS | tr ',' ' ')
|
||||||
|
if [ -z "$split_dns_list" ]; then
|
||||||
|
split_dns_list='~.'
|
||||||
|
log_info "no split DNS domains provided; using VPN DNS as the default DNS route"
|
||||||
|
else
|
||||||
|
log_info "using server-provided split DNS domains"
|
||||||
|
fi
|
||||||
resolvectl_set_nameservers $if_index $INTERNAL_IP4_DNS
|
resolvectl_set_nameservers $if_index $INTERNAL_IP4_DNS
|
||||||
if [ -n "$CISCO_DEF_DOMAIN" ] || [ -n "$split_dns_list" ]; then
|
if [ -n "$CISCO_DEF_DOMAIN" ] || [ -n "$split_dns_list" ]; then
|
||||||
resolvectl_set_search $if_index $CISCO_DEF_DOMAIN $split_dns_list
|
resolvectl_set_search $if_index $CISCO_DEF_DOMAIN $split_dns_list
|
||||||
|
|||||||
Executable
+90
@@ -0,0 +1,90 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
REPO="yuezk/GlobalProtect-openconnect"
|
||||||
|
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
|
||||||
|
PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
|
||||||
|
FLAKE_FILE="$PROJECT_DIR/flake.nix"
|
||||||
|
|
||||||
|
usage() {
|
||||||
|
echo "Usage: $0 [version]"
|
||||||
|
echo
|
||||||
|
echo "Updates flake.nix fetchzip hashes from the published GitHub release assets."
|
||||||
|
echo "When version is omitted, the workspace package version from Cargo.toml is used."
|
||||||
|
}
|
||||||
|
|
||||||
|
if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
|
||||||
|
usage
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! command -v nix > /dev/null; then
|
||||||
|
echo "nix is required to calculate unpacked fetchzip hashes" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! command -v jq > /dev/null; then
|
||||||
|
echo "jq is required to read nix prefetch output" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
version="${1:-}"
|
||||||
|
if [[ -z "$version" ]]; then
|
||||||
|
version="$(grep '^version' "$PROJECT_DIR/Cargo.toml" | head -1 | sed 's/version *= *"\(.*\)"/\1/')"
|
||||||
|
fi
|
||||||
|
version="${version#v}"
|
||||||
|
|
||||||
|
if [[ -z "$version" ]]; then
|
||||||
|
echo "Could not determine release version" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
prefetch_hash() {
|
||||||
|
local url="$1"
|
||||||
|
local attempt
|
||||||
|
|
||||||
|
for attempt in {1..12}; do
|
||||||
|
if nix \
|
||||||
|
--extra-experimental-features nix-command \
|
||||||
|
store prefetch-file \
|
||||||
|
--hash-type sha256 \
|
||||||
|
--json \
|
||||||
|
--unpack \
|
||||||
|
"$url" \
|
||||||
|
| jq -r '.hash'; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Asset is not ready yet, retrying ($attempt/12): $url" >&2
|
||||||
|
sleep 10
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "Failed to prefetch release asset: $url" >&2
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
release_url() {
|
||||||
|
local asset="$1"
|
||||||
|
echo "https://github.com/$REPO/releases/download/v$version/$asset"
|
||||||
|
}
|
||||||
|
|
||||||
|
source_hash="$(prefetch_hash "$(release_url "globalprotect-openconnect-$version.tar.gz")")"
|
||||||
|
gpgui_x86_64_hash="$(prefetch_hash "$(release_url "gpgui_x86_64.bin.tar.xz")")"
|
||||||
|
gpgui_aarch64_hash="$(prefetch_hash "$(release_url "gpgui_aarch64.bin.tar.xz")")"
|
||||||
|
|
||||||
|
SOURCE_HASH="$source_hash" \
|
||||||
|
GPGUI_X86_64_HASH="$gpgui_x86_64_hash" \
|
||||||
|
GPGUI_AARCH64_HASH="$gpgui_aarch64_hash" \
|
||||||
|
perl -0pi -e '
|
||||||
|
s|(url = "https://github\.com/yuezk/GlobalProtect-openconnect/releases/download/v\$\{version\}/globalprotect-openconnect-\$\{version\}\.tar\.gz";\n\s*hash = ")[^"]+(";)|$1 . $ENV{"SOURCE_HASH"} . $2|e;
|
||||||
|
s|(x86_64 = ")[^"]+(";)|$1 . $ENV{"GPGUI_X86_64_HASH"} . $2|e;
|
||||||
|
s|(aarch64 = ")[^"]+(";)|$1 . $ENV{"GPGUI_AARCH64_HASH"} . $2|e;
|
||||||
|
' "$FLAKE_FILE"
|
||||||
|
|
||||||
|
grep -F "$source_hash" "$FLAKE_FILE" > /dev/null
|
||||||
|
grep -F "$gpgui_x86_64_hash" "$FLAKE_FILE" > /dev/null
|
||||||
|
grep -F "$gpgui_aarch64_hash" "$FLAKE_FILE" > /dev/null
|
||||||
|
|
||||||
|
echo "Updated flake.nix hashes for v$version"
|
||||||
Reference in new issue
Block a user