mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2025-04-29 14:16:26 -04:00
Add packaging
This commit is contained in:
parent
4be877bf8c
commit
e50cacf333
@ -7,3 +7,6 @@ indent_size = 2
|
|||||||
end_of_line = lf
|
end_of_line = lf
|
||||||
insert_final_newline = true
|
insert_final_newline = true
|
||||||
trim_trailing_whitespace = true
|
trim_trailing_whitespace = true
|
||||||
|
|
||||||
|
[Makefile]
|
||||||
|
indent_style = tab
|
||||||
|
436
.github/workflows/build.yaml
vendored
436
.github/workflows/build.yaml
vendored
@ -1,4 +1,4 @@
|
|||||||
name: Build GPGUI
|
name: Build
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
@ -8,6 +8,7 @@ on:
|
|||||||
- .devcontainer
|
- .devcontainer
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
- dev
|
||||||
tags:
|
tags:
|
||||||
- latest
|
- latest
|
||||||
- v*.*.*
|
- v*.*.*
|
||||||
@ -22,282 +23,239 @@ jobs:
|
|||||||
id: set-matrix
|
id: set-matrix
|
||||||
run: |
|
run: |
|
||||||
if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
|
if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
|
||||||
echo "matrix=[\"amd64\", \"arm64\"]" >> $GITHUB_OUTPUT
|
echo "matrix=[\"ubuntu-latest\", \"arm64\"]" >> $GITHUB_OUTPUT
|
||||||
else
|
else
|
||||||
echo "matrix=[\"amd64\"]" >> $GITHUB_OUTPUT
|
echo "matrix=[\"ubuntu-latest\"]" >> $GITHUB_OUTPUT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
build-fe:
|
tarball:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
needs: [setup-matrix]
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout gpgui repo
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.GH_PAT }}
|
|
||||||
repository: yuezk/gpgui
|
|
||||||
|
|
||||||
- name: Install Node.js
|
|
||||||
uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: 18
|
|
||||||
|
|
||||||
- uses: pnpm/action-setup@v2
|
- uses: pnpm/action-setup@v2
|
||||||
with:
|
with:
|
||||||
version: 8
|
version: 8
|
||||||
|
- name: Prepare workspace
|
||||||
- name: Install dependencies
|
run: rm -rf source && mkdir source
|
||||||
run: |
|
- name: Checkout GlobalProtect-openconnect
|
||||||
cd app
|
|
||||||
pnpm install
|
|
||||||
- name: Build
|
|
||||||
run: |
|
|
||||||
cd app
|
|
||||||
pnpm run build
|
|
||||||
|
|
||||||
- name: Upload artifacts
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: gpgui-fe
|
|
||||||
path: app/dist
|
|
||||||
|
|
||||||
build-tauri-amd64:
|
|
||||||
needs: [build-fe]
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout gpgui repo
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.GH_PAT }}
|
|
||||||
repository: yuezk/gpgui
|
|
||||||
path: gpgui
|
|
||||||
|
|
||||||
- name: Checkout gp repo
|
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.GH_PAT }}
|
token: ${{ secrets.GH_PAT }}
|
||||||
repository: yuezk/GlobalProtect-openconnect
|
repository: yuezk/GlobalProtect-openconnect
|
||||||
path: gp
|
path: source/gp
|
||||||
|
|
||||||
- name: Download gpgui-fe artifact
|
|
||||||
uses: actions/download-artifact@v3
|
|
||||||
with:
|
|
||||||
name: gpgui-fe
|
|
||||||
path: gpgui/app/dist
|
|
||||||
|
|
||||||
- name: Login to Docker Hub
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
|
||||||
password: ${{ secrets.DOCKER_HUB_TOKEN }}
|
|
||||||
|
|
||||||
- name: Build Tauri in Docker
|
|
||||||
run: |
|
|
||||||
docker run \
|
|
||||||
--rm \
|
|
||||||
-v $(pwd):/${{ github.workspace }} \
|
|
||||||
-w ${{ github.workspace }} \
|
|
||||||
-e CI=true \
|
|
||||||
yuezk/gpdev:main \
|
|
||||||
"./gpgui/scripts/build.sh"
|
|
||||||
|
|
||||||
- name: Upload artifacts
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: artifact-amd64-tauri
|
|
||||||
path: |
|
|
||||||
gpgui/.tmp/artifact
|
|
||||||
|
|
||||||
build-tauri-arm64:
|
|
||||||
if: startsWith(github.ref, 'refs/tags/')
|
|
||||||
needs: [build-fe]
|
|
||||||
runs-on: self-hosted
|
|
||||||
steps:
|
|
||||||
- name: Checkout gpgui repo
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.GH_PAT }}
|
|
||||||
repository: yuezk/gpgui
|
|
||||||
path: gpgui
|
|
||||||
|
|
||||||
- name: Checkout gp repo
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.GH_PAT }}
|
|
||||||
repository: yuezk/GlobalProtect-openconnect
|
|
||||||
path: gp
|
|
||||||
|
|
||||||
- name: Download gpgui-fe artifact
|
|
||||||
uses: actions/download-artifact@v3
|
|
||||||
with:
|
|
||||||
name: gpgui-fe
|
|
||||||
path: gpgui/app/dist
|
|
||||||
- name: Build Tauri
|
|
||||||
run: |
|
|
||||||
./gpgui/scripts/build.sh
|
|
||||||
|
|
||||||
- name: Upload artifacts
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: artifact-arm64-tauri
|
|
||||||
path: |
|
|
||||||
gpgui/.tmp/artifact
|
|
||||||
|
|
||||||
package-tarball:
|
|
||||||
needs: [build-tauri-amd64, build-tauri-arm64]
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout gpgui repo
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.GH_PAT }}
|
|
||||||
repository: yuezk/gpgui
|
|
||||||
path: gpgui
|
|
||||||
|
|
||||||
- name: Download artifact-amd64-tauri
|
|
||||||
uses: actions/download-artifact@v3
|
|
||||||
with:
|
|
||||||
name: artifact-amd64-tauri
|
|
||||||
path: gpgui/.tmp/artifact
|
|
||||||
|
|
||||||
- name: Download artifact-arm64-tauri
|
|
||||||
uses: actions/download-artifact@v3
|
|
||||||
with:
|
|
||||||
name: artifact-arm64-tauri
|
|
||||||
path: gpgui/.tmp/artifact
|
|
||||||
|
|
||||||
- name: Create tarball
|
- name: Create tarball
|
||||||
run: |
|
run: |
|
||||||
./gpgui/scripts/build-tarball.sh
|
cd source/gp
|
||||||
|
make tarball
|
||||||
- name: Upload tarball
|
- name: Upload tarball
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: artifact-tarball
|
name: artifact-source
|
||||||
|
if-no-files-found: error
|
||||||
path: |
|
path: |
|
||||||
gpgui/.tmp/tarball/*.tar.gz
|
source/gp/.build/tarball/*.tar.gz
|
||||||
|
|
||||||
package-rpm:
|
build-deb:
|
||||||
needs: [setup-matrix, package-tarball]
|
needs:
|
||||||
runs-on: ubuntu-latest
|
- setup-matrix
|
||||||
|
- tarball
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
arch: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
|
os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout gpgui repo
|
- name: Prepare workspace
|
||||||
|
run: rm -rf build-deb && mkdir build-deb
|
||||||
|
- name: Download tarball
|
||||||
|
uses: actions/download-artifact@v3
|
||||||
|
with:
|
||||||
|
name: artifact-source
|
||||||
|
path: build-deb
|
||||||
|
- name: Docker Login
|
||||||
|
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
|
||||||
|
- name: Build DEB package in Docker
|
||||||
|
run: |
|
||||||
|
docker run --rm -v $(pwd)/build-deb:/deb yuezk/gpdev:deb-builder
|
||||||
|
- name: Install DEB package in Docker
|
||||||
|
run: |
|
||||||
|
docker run --rm -v $(pwd)/build-deb:/deb yuezk/gpdev:deb-builder \
|
||||||
|
bash -c "sudo dpkg -i /deb/*.deb; gpclient --version; gpservice --version; gpauth --version; gpgui-helper --version;"
|
||||||
|
- name: Upload DEB package
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: artifact-deb-${{ matrix.os }}
|
||||||
|
if-no-files-found: error
|
||||||
|
path: |
|
||||||
|
build-deb/*.deb
|
||||||
|
|
||||||
|
build-rpm:
|
||||||
|
needs:
|
||||||
|
- setup-matrix
|
||||||
|
- tarball
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
steps:
|
||||||
|
- name: Prepare workspace
|
||||||
|
run: rm -rf build-rpm && mkdir build-rpm
|
||||||
|
- name: Download tarball
|
||||||
|
uses: actions/download-artifact@v3
|
||||||
|
with:
|
||||||
|
name: artifact-source
|
||||||
|
path: build-rpm
|
||||||
|
- name: Docker Login
|
||||||
|
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
|
||||||
|
- name: Build RPM package in Docker
|
||||||
|
run: |
|
||||||
|
docker run --rm -v $(pwd)/build-rpm:/rpm yuezk/gpdev:rpm-builder
|
||||||
|
- name: Install RPM package in Docker
|
||||||
|
run: |
|
||||||
|
docker run --rm -v $(pwd)/build-rpm:/rpm yuezk/gpdev:rpm-builder \
|
||||||
|
bash -c "sudo rpm -i /rpm/*.$(uname -m).rpm; gpclient --version; gpservice --version; gpauth --version; gpgui-helper --version;"
|
||||||
|
- name: Upload RPM package
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: artifact-rpm-${{ matrix.os }}
|
||||||
|
if-no-files-found: error
|
||||||
|
path: |
|
||||||
|
build-rpm/*.rpm
|
||||||
|
|
||||||
|
build-pkgbuild:
|
||||||
|
needs:
|
||||||
|
- setup-matrix
|
||||||
|
- tarball
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
steps:
|
||||||
|
- name: Prepare workspace
|
||||||
|
run: rm -rf build-pkgbuild && mkdir build-pkgbuild
|
||||||
|
- name: Download tarball
|
||||||
|
uses: actions/download-artifact@v3
|
||||||
|
with:
|
||||||
|
name: artifact-source
|
||||||
|
path: build-pkgbuild
|
||||||
|
- name: Docker Login
|
||||||
|
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
|
||||||
|
- name: Build PKGBUILD package in Docker
|
||||||
|
run: |
|
||||||
|
docker run --rm -v $(pwd)/build-pkgbuild:/pkgbuild yuezk/gpdev:pkgbuild
|
||||||
|
- name: Install PKGBUILD package in Docker
|
||||||
|
run: |
|
||||||
|
docker run --rm -v $(pwd)/build-pkgbuild:/pkgbuild yuezk/gpdev:pkgbuild \
|
||||||
|
bash -c "sudo pacman -U --noconfirm /pkgbuild/*.pkg.tar.zst; gpclient --version; gpservice --version; gpauth --version; gpgui-helper --version;"
|
||||||
|
- name: Upload PKGBUILD package
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: artifact-pkgbuild-${{ matrix.os }}
|
||||||
|
if-no-files-found: error
|
||||||
|
path: |
|
||||||
|
build-pkgbuild/*.pkg.tar.zst
|
||||||
|
|
||||||
|
build-binary:
|
||||||
|
needs:
|
||||||
|
- setup-matrix
|
||||||
|
- tarball
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
steps:
|
||||||
|
- name: Prepare workspace
|
||||||
|
run: rm -rf build-binary && mkdir build-binary
|
||||||
|
- name: Download tarball
|
||||||
|
uses: actions/download-artifact@v3
|
||||||
|
with:
|
||||||
|
name: artifact-source
|
||||||
|
path: build-binary
|
||||||
|
- name: Docker Login
|
||||||
|
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
|
||||||
|
- name: Build binary in Docker
|
||||||
|
run: |
|
||||||
|
docker run --rm -v $(pwd)/build-binary:/binary yuezk/gpdev:binary-builder
|
||||||
|
- name: Install binary in Docker
|
||||||
|
run: |
|
||||||
|
cd build-binary
|
||||||
|
tar -xJf ./*.bin.tar.xz
|
||||||
|
docker run --rm -v $(pwd):/binary yuezk/gpdev:binary-builder \
|
||||||
|
bash -c "cd /binary/globalprotect-openconnect*/ && sudo make install && gpclient --version && gpservice --version && gpauth --version && gpgui-helper --version;"
|
||||||
|
- name: Upload binary
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: artifact-binary-${{ matrix.os }}
|
||||||
|
if-no-files-found: error
|
||||||
|
path: |
|
||||||
|
build-binary/*.bin.tar.xz
|
||||||
|
build-binary/*.bin.tar.xz.sha256
|
||||||
|
|
||||||
|
build-gpgui:
|
||||||
|
needs:
|
||||||
|
- setup-matrix
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
steps:
|
||||||
|
- uses: pnpm/action-setup@v2
|
||||||
|
with:
|
||||||
|
version: 8
|
||||||
|
- name: Prepare workspace
|
||||||
|
run: rm -rf gpgui-source && mkdir gpgui-source
|
||||||
|
- name: Checkout GlobalProtect-openconnect
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.GH_PAT }}
|
||||||
|
repository: yuezk/GlobalProtect-openconnect
|
||||||
|
path: gpgui-source/gp
|
||||||
|
- name: Checkout gpgui
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.GH_PAT }}
|
token: ${{ secrets.GH_PAT }}
|
||||||
repository: yuezk/gpgui
|
repository: yuezk/gpgui
|
||||||
path: gpgui
|
path: gpgui-source/gpgui
|
||||||
|
- name: Tarball
|
||||||
- name: Download package tarball
|
|
||||||
uses: actions/download-artifact@v3
|
|
||||||
with:
|
|
||||||
name: artifact-tarball
|
|
||||||
path: gpgui/.tmp/artifact
|
|
||||||
|
|
||||||
- name: Set up QEMU
|
|
||||||
uses: docker/setup-qemu-action@v3
|
|
||||||
with:
|
|
||||||
platforms: ${{ matrix.arch }}
|
|
||||||
|
|
||||||
- name: Login to Docker Hub
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
|
||||||
password: ${{ secrets.DOCKER_HUB_TOKEN }}
|
|
||||||
|
|
||||||
- name: Create RPM package
|
|
||||||
run: |
|
run: |
|
||||||
docker run \
|
cd gpgui-source
|
||||||
--rm \
|
tar -czf gpgui.tar.gz gpgui gp
|
||||||
-v $(pwd):/${{ github.workspace }} \
|
- name: Docker Login
|
||||||
-w ${{ github.workspace }} \
|
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
|
||||||
--platform linux/${{ matrix.arch }} \
|
- name: Build gpgui in Docker
|
||||||
yuezk/gpdev:rpm-builder \
|
run: |
|
||||||
"./gpgui/scripts/build-rpm.sh"
|
docker run --rm -v $(pwd)/gpgui-source:/gpgui yuezk/gpdev:gpgui-builder
|
||||||
|
- name: Install gpgui in Docker
|
||||||
- name: Upload rpm artifacts
|
run: |
|
||||||
|
cd gpgui-source
|
||||||
|
tar -xJf *.bin.tar.xz
|
||||||
|
docker run --rm -v $(pwd):/gpgui yuezk/gpdev:gpgui-builder \
|
||||||
|
bash -c "cd /gpgui/gpgui_*/ && ./gpgui --version"
|
||||||
|
- name: Upload gpgui
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: artifact-${{ matrix.arch }}-rpm
|
name: artifact-gpgui-${{ matrix.os }}
|
||||||
|
if-no-files-found: error
|
||||||
path: |
|
path: |
|
||||||
gpgui/.tmp/artifact/*.rpm
|
gpgui-source/*.bin.tar.xz
|
||||||
|
gpgui-source/*.bin.tar.xz.sha256
|
||||||
package-pkgbuild:
|
|
||||||
needs: [setup-matrix, build-tauri-amd64, build-tauri-arm64]
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
arch: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
|
|
||||||
steps:
|
|
||||||
- name: Checkout gpgui repo
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.GH_PAT }}
|
|
||||||
repository: yuezk/gpgui
|
|
||||||
path: gpgui
|
|
||||||
|
|
||||||
- name: Download artifact-${{ matrix.arch }}
|
|
||||||
uses: actions/download-artifact@v3
|
|
||||||
with:
|
|
||||||
name: artifact-${{ matrix.arch }}-tauri
|
|
||||||
path: gpgui/.tmp/artifact
|
|
||||||
|
|
||||||
- name: Set up QEMU
|
|
||||||
uses: docker/setup-qemu-action@v3
|
|
||||||
with:
|
|
||||||
platforms: ${{ matrix.arch }}
|
|
||||||
|
|
||||||
- name: Login to Docker Hub
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
|
||||||
password: ${{ secrets.DOCKER_HUB_TOKEN }}
|
|
||||||
|
|
||||||
- name: Generate PKGBUILD
|
|
||||||
run: |
|
|
||||||
export CI_ARCH=${{ matrix.arch }}
|
|
||||||
./gpgui/scripts/generate-pkgbuild.sh
|
|
||||||
|
|
||||||
- name: Build PKGBUILD package
|
|
||||||
run: |
|
|
||||||
# Build package
|
|
||||||
docker run \
|
|
||||||
--rm \
|
|
||||||
-v $(pwd)/gpgui/.tmp/pkgbuild:/pkgbuild \
|
|
||||||
--platform linux/${{ matrix.arch }} \
|
|
||||||
yuezk/gpdev:pkgbuild
|
|
||||||
|
|
||||||
- name: Upload pkgbuild artifacts
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: artifact-${{ matrix.arch }}-pkgbuild
|
|
||||||
path: |
|
|
||||||
gpgui/.tmp/pkgbuild/*.pkg.tar.zst
|
|
||||||
|
|
||||||
gh-release:
|
gh-release:
|
||||||
if: startsWith(github.ref, 'refs/tags/')
|
if: startsWith(github.ref, 'refs/tags/')
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs:
|
needs:
|
||||||
- package-rpm
|
- build-deb
|
||||||
- package-pkgbuild
|
- build-rpm
|
||||||
|
- build-pkgbuild
|
||||||
|
- build-binary
|
||||||
|
- build-gpgui
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Download artifact
|
- name: Prepare workspace
|
||||||
|
run: rm -rf build-artifact && mkdir build-artifact
|
||||||
|
- name: Download all artifacts
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v3
|
||||||
with:
|
with:
|
||||||
path: artifact
|
path: build-artifact
|
||||||
# pattern: artifact-*
|
|
||||||
# merge-multiple: true
|
|
||||||
|
|
||||||
# - name: Generate checksum
|
|
||||||
# uses: jmgilman/actions-generate-checksum@v1
|
|
||||||
# with:
|
|
||||||
# output: checksums.txt
|
|
||||||
# patterns: |
|
|
||||||
# artifact/*
|
|
||||||
|
|
||||||
- name: Create GH release
|
- name: Create GH release
|
||||||
uses: softprops/action-gh-release@v1
|
uses: softprops/action-gh-release@v1
|
||||||
with:
|
with:
|
||||||
@ -305,4 +263,4 @@ jobs:
|
|||||||
prerelease: ${{ contains(github.ref, 'latest') }}
|
prerelease: ${{ contains(github.ref, 'latest') }}
|
||||||
fail_on_unmatched_files: true
|
fail_on_unmatched_files: true
|
||||||
files: |
|
files: |
|
||||||
artifact/artifact-*/*
|
build-artifact/artifact-*/*
|
||||||
|
5
.gitignore
vendored
5
.gitignore
vendored
@ -2,3 +2,8 @@
|
|||||||
/target
|
/target
|
||||||
.pnpm-store
|
.pnpm-store
|
||||||
.env
|
.env
|
||||||
|
.vendor
|
||||||
|
*.tar.xz
|
||||||
|
|
||||||
|
.cargo
|
||||||
|
.build
|
||||||
|
36
Cargo.lock
generated
36
Cargo.lock
generated
@ -903,19 +903,6 @@ dependencies = [
|
|||||||
"syn 1.0.109",
|
"syn 1.0.109",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "downloader"
|
|
||||||
version = "0.2.7"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d05213e96f184578b5f70105d4d0a644a168e99e12d7bea0b200c15d67b5c182"
|
|
||||||
dependencies = [
|
|
||||||
"futures",
|
|
||||||
"rand 0.8.5",
|
|
||||||
"reqwest",
|
|
||||||
"thiserror",
|
|
||||||
"tokio",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dtoa"
|
name = "dtoa"
|
||||||
version = "1.0.9"
|
version = "1.0.9"
|
||||||
@ -1514,7 +1501,6 @@ dependencies = [
|
|||||||
"anyhow",
|
"anyhow",
|
||||||
"clap",
|
"clap",
|
||||||
"compile-time",
|
"compile-time",
|
||||||
"downloader",
|
|
||||||
"env_logger",
|
"env_logger",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"gpapi",
|
"gpapi",
|
||||||
@ -1541,8 +1527,10 @@ dependencies = [
|
|||||||
"openconnect",
|
"openconnect",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
|
"tar",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tokio-util",
|
"tokio-util",
|
||||||
|
"xz2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -2212,6 +2200,17 @@ dependencies = [
|
|||||||
"tracing-subscriber",
|
"tracing-subscriber",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "lzma-sys"
|
||||||
|
version = "0.1.20"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"libc",
|
||||||
|
"pkg-config",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mac"
|
name = "mac"
|
||||||
version = "0.1.1"
|
version = "0.1.1"
|
||||||
@ -5138,6 +5137,15 @@ version = "0.13.6"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
|
checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "xz2"
|
||||||
|
version = "0.1.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
|
||||||
|
dependencies = [
|
||||||
|
"lzma-sys",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zeroize"
|
name = "zeroize"
|
||||||
version = "1.7.0"
|
version = "1.7.0"
|
||||||
|
@ -4,6 +4,7 @@ resolver = "2"
|
|||||||
members = ["crates/*", "apps/gpclient", "apps/gpservice", "apps/gpauth", "apps/gpgui-helper/src-tauri"]
|
members = ["crates/*", "apps/gpclient", "apps/gpservice", "apps/gpauth", "apps/gpgui-helper/src-tauri"]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
|
rust-version = "1.70"
|
||||||
version = "2.0.0"
|
version = "2.0.0"
|
||||||
authors = ["Kevin Yue <k3vinyue@gmail.com>"]
|
authors = ["Kevin Yue <k3vinyue@gmail.com>"]
|
||||||
homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
|
homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
|
||||||
|
234
Makefile
Normal file
234
Makefile
Normal file
@ -0,0 +1,234 @@
|
|||||||
|
OFFLINE ?= 0
|
||||||
|
BUILD_FE ?= 1
|
||||||
|
CARGO ?= cargo
|
||||||
|
|
||||||
|
VERSION = $(shell $(CARGO) metadata --no-deps --format-version 1 | jq -r '.packages[0].version')
|
||||||
|
REVISION ?= 1
|
||||||
|
PPA_REVISION ?= 1
|
||||||
|
PKG_NAME = globalprotect-openconnect
|
||||||
|
PKG = $(PKG_NAME)-$(VERSION)
|
||||||
|
SERIES ?= $(shell lsb_release -cs)
|
||||||
|
PUBLISH ?= 0
|
||||||
|
|
||||||
|
export DEBEMAIL = k3vinyue@gmail.com
|
||||||
|
export DEBFULLNAME = Kevin Yue
|
||||||
|
|
||||||
|
CARGO_BUILD_ARGS = --release
|
||||||
|
|
||||||
|
ifeq ($(OFFLINE), 1)
|
||||||
|
CARGO_BUILD_ARGS += --frozen
|
||||||
|
endif
|
||||||
|
|
||||||
|
default: build
|
||||||
|
|
||||||
|
version:
|
||||||
|
@echo $(VERSION)
|
||||||
|
|
||||||
|
clean-tarball:
|
||||||
|
rm -rf .build/tarball
|
||||||
|
rm -rf .vendor
|
||||||
|
rm -rf vendor.tar.xz
|
||||||
|
rm -rf .cargo
|
||||||
|
|
||||||
|
# Create a tarball, include the cargo dependencies if OFFLINE is set to 1
|
||||||
|
tarball: clean-tarball
|
||||||
|
if [ $(BUILD_FE) -eq 1 ]; then \
|
||||||
|
cd apps/gpgui-helper && pnpm install && pnpm build; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Remove node_modules to reduce the tarball size
|
||||||
|
rm -rf apps/gpgui-helper/node_modules
|
||||||
|
|
||||||
|
mkdir -p .cargo
|
||||||
|
mkdir -p .build/tarball
|
||||||
|
|
||||||
|
# If OFFLINE is set to 1, vendor all cargo dependencies
|
||||||
|
if [ $(OFFLINE) -eq 1 ]; then \
|
||||||
|
$(CARGO) vendor .vendor > .cargo/config.toml; \
|
||||||
|
tar -cJf vendor.tar.xz .vendor; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
tar --exclude .vendor --exclude target --transform 's,^,${PKG}/,' -czf .build/tarball/${PKG}.tar.gz * .cargo
|
||||||
|
|
||||||
|
build: build-fe build-rs
|
||||||
|
|
||||||
|
# Install and build the frontend
|
||||||
|
# If OFFLINE is set to 1, skip it
|
||||||
|
build-fe:
|
||||||
|
if [ $(OFFLINE) -eq 1 ] || [ $(BUILD_FE) -eq 0 ]; then \
|
||||||
|
echo "Skipping frontend build (OFFLINE=1 or BUILD_FE=0)"; \
|
||||||
|
else \
|
||||||
|
cd apps/gpgui-helper && pnpm install && pnpm build; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -d apps/gpgui-helper/dist ]; then \
|
||||||
|
echo "Error: frontend build failed"; \
|
||||||
|
exit 1; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
build-rs:
|
||||||
|
if [ $(OFFLINE) -eq 1 ]; then \
|
||||||
|
tar -xJf vendor.tar.xz; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
$(CARGO) build $(CARGO_BUILD_ARGS) -p gpclient -p gpservice -p gpauth
|
||||||
|
$(CARGO) build $(CARGO_BUILD_ARGS) -p gpgui-helper --features "tauri/custom-protocol"
|
||||||
|
|
||||||
|
clean:
|
||||||
|
$(CARGO) clean
|
||||||
|
rm -rf .build
|
||||||
|
rm -rf .vendor
|
||||||
|
rm -rf apps/gpgui-helper/node_modules
|
||||||
|
|
||||||
|
install:
|
||||||
|
@echo "Installing $(PKG_NAME)..."
|
||||||
|
|
||||||
|
install -Dm755 target/release/gpclient $(DESTDIR)/usr/bin/gpclient
|
||||||
|
install -Dm755 target/release/gpauth $(DESTDIR)/usr/bin/gpauth
|
||||||
|
install -Dm755 target/release/gpservice $(DESTDIR)/usr/bin/gpservice
|
||||||
|
install -Dm755 target/release/gpgui-helper $(DESTDIR)/usr/bin/gpgui-helper
|
||||||
|
|
||||||
|
install -Dm644 packaging/files/usr/share/applications/gpgui.desktop $(DESTDIR)/usr/share/applications/gpgui.desktop
|
||||||
|
install -Dm644 packaging/files/usr/share/icons/hicolor/scalable/apps/gpgui.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/gpgui.svg
|
||||||
|
install -Dm644 packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/gpgui.png
|
||||||
|
install -Dm644 packaging/files/usr/share/icons/hicolor/128x128/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/gpgui.png
|
||||||
|
install -Dm644 packaging/files/usr/share/icons/hicolor/256x256@2/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/256x256@2/apps/gpgui.png
|
||||||
|
install -Dm644 packaging/files/usr/share/polkit-1/actions/com.yuezk.gpgui.policy $(DESTDIR)/usr/share/polkit-1/actions/com.yuezk.gpgui.policy
|
||||||
|
|
||||||
|
uninstall:
|
||||||
|
@echo "Uninstalling $(PKG_NAME)..."
|
||||||
|
|
||||||
|
rm -f $(DESTDIR)/usr/bin/gpclient
|
||||||
|
rm -f $(DESTDIR)/usr/bin/gpauth
|
||||||
|
rm -f $(DESTDIR)/usr/bin/gpservice
|
||||||
|
rm -f $(DESTDIR)/usr/bin/gpgui-helper
|
||||||
|
rm -f $(DESTDIR)/usr/bin/gpgui
|
||||||
|
|
||||||
|
rm -f $(DESTDIR)/usr/share/applications/gpgui.desktop
|
||||||
|
rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/gpgui.svg
|
||||||
|
rm -f $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/gpgui.png
|
||||||
|
rm -f $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/gpgui.png
|
||||||
|
rm -f $(DESTDIR)/usr/share/icons/hicolor/256x256@2/apps/gpgui.png
|
||||||
|
rm -f $(DESTDIR)/usr/share/polkit-1/actions/com.yuezk.gpgui.policy
|
||||||
|
|
||||||
|
clean-debian:
|
||||||
|
rm -rf .build/deb
|
||||||
|
|
||||||
|
# Generate the debian package structure, without the changelog
|
||||||
|
init-debian: clean-debian tarball
|
||||||
|
mkdir -p .build/deb
|
||||||
|
cp .build/tarball/${PKG}.tar.gz .build/deb
|
||||||
|
|
||||||
|
tar -xzf .build/deb/${PKG}.tar.gz -C .build/deb
|
||||||
|
cd .build/deb/${PKG} && debmake
|
||||||
|
|
||||||
|
cp -f packaging/deb/control.in .build/deb/$(PKG)/debian/control
|
||||||
|
cp -f packaging/deb/rules .build/deb/$(PKG)/debian/rules
|
||||||
|
|
||||||
|
sed -i "s/@OFFLINE@/$(OFFLINE)/g" .build/deb/$(PKG)/debian/rules
|
||||||
|
|
||||||
|
rm -f .build/deb/$(PKG)/debian/changelog
|
||||||
|
|
||||||
|
deb: init-debian
|
||||||
|
# Remove the rust build depdency from the control file
|
||||||
|
sed -i "s/@RUST@//g" .build/deb/$(PKG)/debian/control
|
||||||
|
|
||||||
|
cd .build/deb/$(PKG) && dch --create --distribution unstable --package $(PKG_NAME) --newversion $(VERSION)-$(REVISION) "Bugfix and improvements."
|
||||||
|
|
||||||
|
cd .build/deb/$(PKG) && debuild --preserve-env -e PATH -us -uc -b
|
||||||
|
|
||||||
|
check-ppa:
|
||||||
|
if [ $(OFFLINE) -eq 0 ]; then \
|
||||||
|
echo "Error: ppa build requires offline mode (OFFLINE=1)"; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Usage: make ppa SERIES=focal OFFLINE=1 PUBLISH=1
|
||||||
|
ppa: check-ppa init-debian
|
||||||
|
cd .build/deb/${PKG}
|
||||||
|
|
||||||
|
sed -i "s/@RUST@/rust-all(>=1.70)/g" debian/control
|
||||||
|
|
||||||
|
$(eval SERIES_VER = $(shell distro-info --series $(SERIES) -r | cut -d' ' -f1))
|
||||||
|
@echo "Building for $(SERIES) $(SERIES_VER)"
|
||||||
|
|
||||||
|
dch --create --distribution $(SERIES) --package $(PKG_NAME) --newversion $(VERSION)-$(REVISION)ppa$(PPA_REVISION)~ubuntu$(SERIES_VER) "Bugfix and improvements."
|
||||||
|
|
||||||
|
echo "y" | debuild -e PATH -S -sa -k"$(GPG_KEY_ID)" -p"gpg --batch --passphrase $(GPG_KEY_PASS) --pinentry-mode loopback"
|
||||||
|
|
||||||
|
if [ $(PUBLISH) -eq 1 ]; then \
|
||||||
|
dput ppa:yuezk/globalprotect-openconnect ../*.changes; \
|
||||||
|
else
|
||||||
|
echo "Skipping ppa publish (PUBLISH=0)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
clean-rpm:
|
||||||
|
rm -rf .build/rpm
|
||||||
|
|
||||||
|
# Generate RPM sepc file
|
||||||
|
init-rpm: clean-rpm
|
||||||
|
mkdir -p .build/rpm
|
||||||
|
|
||||||
|
cp packaging/rpm/globalprotect-openconnect.spec.in .build/rpm/globalprotect-openconnect.spec
|
||||||
|
cp packaging/rpm/globalprotect-openconnect.changes.in .build/rpm/globalprotect-openconnect.changes
|
||||||
|
|
||||||
|
sed -i "s/@VERSION@/$(VERSION)/g" .build/rpm/globalprotect-openconnect.spec
|
||||||
|
sed -i "s/@REVISION@/$(REVISION)/g" .build/rpm/globalprotect-openconnect.spec
|
||||||
|
sed -i "s/@OFFLINE@/$(OFFLINE)/g" .build/rpm/globalprotect-openconnect.spec
|
||||||
|
sed -i "s/@DATE@/$(shell date "+%a %b %d %Y")/g" .build/rpm/globalprotect-openconnect.spec
|
||||||
|
|
||||||
|
sed -i "s/@VERSION@/$(VERSION)/g" .build/rpm/globalprotect-openconnect.changes
|
||||||
|
sed -i "s/@DATE@/$(shell LC_ALL=en.US date -u "+%a %b %e %T %Z %Y")/g" .build/rpm/globalprotect-openconnect.changes
|
||||||
|
|
||||||
|
rpm: init-rpm tarball
|
||||||
|
rm -rf $(HOME)/rpmbuild
|
||||||
|
rpmdev-setuptree
|
||||||
|
|
||||||
|
cp .build/tarball/${PKG}.tar.gz $(HOME)/rpmbuild/SOURCES/${PKG_NAME}.tar.gz
|
||||||
|
rpmbuild -ba .build/rpm/globalprotect-openconnect.spec
|
||||||
|
|
||||||
|
# Copy RPM package from build directory
|
||||||
|
cp $(HOME)/rpmbuild/RPMS/$(shell uname -m)/$(PKG_NAME)*.rpm .build/rpm
|
||||||
|
|
||||||
|
# Copy the SRPM only for x86_64.
|
||||||
|
if [ "$(shell uname -m)" = "x86_64" ]; then \
|
||||||
|
cp $(HOME)/rpmbuild/SRPMS/$(PKG_NAME)*.rpm .build/rpm; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
clean-pkgbuild:
|
||||||
|
rm -rf .build/pkgbuild
|
||||||
|
|
||||||
|
init-pkgbuild: clean-pkgbuild tarball
|
||||||
|
mkdir -p .build/pkgbuild
|
||||||
|
|
||||||
|
cp .build/tarball/${PKG}.tar.gz .build/pkgbuild
|
||||||
|
cp packaging/pkgbuild/PKGBUILD.in .build/pkgbuild/PKGBUILD
|
||||||
|
|
||||||
|
sed -i "s/@PKG_NAME@/$(PKG_NAME)/g" .build/pkgbuild/PKGBUILD
|
||||||
|
sed -i "s/@VERSION@/$(VERSION)/g" .build/pkgbuild/PKGBUILD
|
||||||
|
sed -i "s/@REVISION@/$(REVISION)/g" .build/pkgbuild/PKGBUILD
|
||||||
|
sed -i "s/@OFFLINE@/$(OFFLINE)/g" .build/pkgbuild/PKGBUILD
|
||||||
|
|
||||||
|
pkgbuild: init-pkgbuild
|
||||||
|
cd .build/pkgbuild && makepkg -s --noconfirm
|
||||||
|
|
||||||
|
clean-binary:
|
||||||
|
rm -rf .build/binary
|
||||||
|
|
||||||
|
binary: clean-binary tarball
|
||||||
|
mkdir -p .build/binary
|
||||||
|
|
||||||
|
cp .build/tarball/${PKG}.tar.gz .build/binary
|
||||||
|
tar -xzf .build/binary/${PKG}.tar.gz -C .build/binary
|
||||||
|
|
||||||
|
mkdir -p .build/binary/$(PKG_NAME)_$(VERSION)/artifacts
|
||||||
|
|
||||||
|
make -C .build/binary/${PKG} build OFFLINE=$(OFFLINE) BUILD_FE=0
|
||||||
|
make -C .build/binary/${PKG} install DESTDIR=$(PWD)/.build/binary/$(PKG_NAME)_$(VERSION)/artifacts
|
||||||
|
|
||||||
|
cp packaging/binary/Makefile.in .build/binary/$(PKG_NAME)_$(VERSION)/Makefile
|
||||||
|
|
||||||
|
# Create a tarball for the binary package
|
||||||
|
tar -cJf .build/binary/$(PKG_NAME)_$(VERSION)_$(shell uname -m).bin.tar.xz -C .build/binary $(PKG_NAME)_$(VERSION)
|
||||||
|
|
||||||
|
# Generate sha256sum
|
||||||
|
cd .build/binary && sha256sum $(PKG_NAME)_$(VERSION)_$(shell uname -m).bin.tar.xz | cut -d' ' -f1 > $(PKG_NAME)_$(VERSION)_$(shell uname -m).bin.tar.xz.sha256
|
1
apps/gpgui-helper/.gitignore
vendored
1
apps/gpgui-helper/.gitignore
vendored
@ -22,3 +22,4 @@ dist-ssr
|
|||||||
*.njsproj
|
*.njsproj
|
||||||
*.sln
|
*.sln
|
||||||
*.sw?
|
*.sw?
|
||||||
|
.vite
|
||||||
|
@ -18,7 +18,6 @@ clap.workspace = true
|
|||||||
compile-time.workspace = true
|
compile-time.workspace = true
|
||||||
env_logger.workspace = true
|
env_logger.workspace = true
|
||||||
futures-util.workspace = true
|
futures-util.workspace = true
|
||||||
downloader = "0.2"
|
|
||||||
tempfile.workspace = true
|
tempfile.workspace = true
|
||||||
reqwest = { workspace = true, features = ["stream"] }
|
reqwest = { workspace = true, features = ["stream"] }
|
||||||
|
|
||||||
|
@ -80,12 +80,20 @@ impl GuiUpdater {
|
|||||||
pub async fn update(&self) {
|
pub async fn update(&self) {
|
||||||
info!("Update GUI, version: {}", self.version);
|
info!("Update GUI, version: {}", self.version);
|
||||||
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(debug_assertions)]
|
||||||
let arch = "amd64";
|
let release_tag = "latest";
|
||||||
#[cfg(target_arch = "aarch64")]
|
#[cfg(not(debug_assertions))]
|
||||||
let arch = "arm64";
|
let release_tag = format!("v{}", self.version);
|
||||||
|
|
||||||
let file_url = format!("https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v{}/gpgui-linux-{}", self.version, arch);
|
#[cfg(target_arch = "x86_64")]
|
||||||
|
let arch = "x86_64";
|
||||||
|
#[cfg(target_arch = "aarch64")]
|
||||||
|
let arch = "aarch64";
|
||||||
|
|
||||||
|
let file_url = format!(
|
||||||
|
"https://github.com/yuezk/GlobalProtect-openconnect/releases/download/{}/gpgui_{}_{}.bin.tar.xz",
|
||||||
|
release_tag, self.version, arch
|
||||||
|
);
|
||||||
let checksum_url = format!("{}.sha256", file_url);
|
let checksum_url = format!("{}.sha256", file_url);
|
||||||
|
|
||||||
info!("Downloading file: {}", file_url);
|
info!("Downloading file: {}", file_url);
|
||||||
|
@ -18,3 +18,5 @@ serde_json.workspace = true
|
|||||||
env_logger.workspace = true
|
env_logger.workspace = true
|
||||||
log.workspace = true
|
log.workspace = true
|
||||||
compile-time.workspace = true
|
compile-time.workspace = true
|
||||||
|
xz2 = "0.1"
|
||||||
|
tar = "0.4"
|
||||||
|
@ -1,4 +1,12 @@
|
|||||||
use std::{borrow::Cow, fs::Permissions, ops::ControlFlow, os::unix::fs::PermissionsExt, path::PathBuf, sync::Arc};
|
use std::{
|
||||||
|
borrow::Cow,
|
||||||
|
fs::{File, Permissions},
|
||||||
|
io::BufReader,
|
||||||
|
ops::ControlFlow,
|
||||||
|
os::unix::fs::PermissionsExt,
|
||||||
|
path::PathBuf,
|
||||||
|
sync::Arc,
|
||||||
|
};
|
||||||
|
|
||||||
use anyhow::bail;
|
use anyhow::bail;
|
||||||
use axum::{
|
use axum::{
|
||||||
@ -17,7 +25,9 @@ use gpapi::{
|
|||||||
GP_GUI_BINARY,
|
GP_GUI_BINARY,
|
||||||
};
|
};
|
||||||
use log::{info, warn};
|
use log::{info, warn};
|
||||||
|
use tar::Archive;
|
||||||
use tokio::fs;
|
use tokio::fs;
|
||||||
|
use xz2::read::XzDecoder;
|
||||||
|
|
||||||
use crate::ws_server::WsServerContext;
|
use crate::ws_server::WsServerContext;
|
||||||
|
|
||||||
@ -60,6 +70,7 @@ pub async fn update_gui(State(ctx): State<Arc<WsServerContext>>, body: Bytes) ->
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Unpack GPGUI archive, gpgui_2.0.0_{arch}.bin.tar.xz and install it
|
||||||
async fn install_gui(src: &str) -> anyhow::Result<()> {
|
async fn install_gui(src: &str) -> anyhow::Result<()> {
|
||||||
let path = PathBuf::from(GP_GUI_BINARY);
|
let path = PathBuf::from(GP_GUI_BINARY);
|
||||||
let Some(dir) = path.parent() else {
|
let Some(dir) = path.parent() else {
|
||||||
@ -68,8 +79,27 @@ async fn install_gui(src: &str) -> anyhow::Result<()> {
|
|||||||
|
|
||||||
fs::create_dir_all(dir).await?;
|
fs::create_dir_all(dir).await?;
|
||||||
|
|
||||||
// Copy the file to the final location and make it executable
|
// Unpack the archive
|
||||||
fs::copy(src, GP_GUI_BINARY).await?;
|
info!("Unpacking GUI archive");
|
||||||
|
let tar = XzDecoder::new(BufReader::new(File::open(src)?));
|
||||||
|
let mut ar = Archive::new(tar);
|
||||||
|
|
||||||
|
for entry in ar.entries()? {
|
||||||
|
let mut entry = entry?;
|
||||||
|
let path = entry.path()?;
|
||||||
|
|
||||||
|
if let Some(name) = path.file_name() {
|
||||||
|
let name = name.to_string_lossy();
|
||||||
|
|
||||||
|
if name == "gpgui" {
|
||||||
|
let mut file = File::create(GP_GUI_BINARY)?;
|
||||||
|
std::io::copy(&mut entry, &mut file)?;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Make the binary executable
|
||||||
fs::set_permissions(GP_GUI_BINARY, Permissions::from_mode(0o755)).await?;
|
fs::set_permissions(GP_GUI_BINARY, Permissions::from_mode(0o755)).await?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
9
changelog.md
Normal file
9
changelog.md
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
# Changelog
|
||||||
|
|
||||||
|
## 2.0.0 - 2024-02-05
|
||||||
|
|
||||||
|
- Refactor using Tauri
|
||||||
|
- Support HIP report
|
||||||
|
- Support pass vpn-slice command
|
||||||
|
- Do not error when the region field is empty
|
||||||
|
- Update the auth window icon
|
30
packaging/binary/Makefile.in
Normal file
30
packaging/binary/Makefile.in
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
install:
|
||||||
|
@echo "===> Installing..."
|
||||||
|
|
||||||
|
install -Dm755 artifacts/usr/bin/gpclient $(DESTDIR)/usr/bin/gpclient
|
||||||
|
install -Dm755 artifacts/usr/bin/gpservice $(DESTDIR)/usr/bin/gpservice
|
||||||
|
install -Dm755 artifacts/usr/bin/gpauth $(DESTDIR)/usr/bin/gpauth
|
||||||
|
install -Dm755 artifacts/usr/bin/gpgui-helper $(DESTDIR)/usr/bin/gpgui-helper
|
||||||
|
|
||||||
|
install -Dm644 artifacts/usr/share/applications/gpgui.desktop $(DESTDIR)/usr/share/applications/gpgui.desktop
|
||||||
|
install -Dm644 artifacts/usr/share/icons/hicolor/scalable/apps/gpgui.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/gpgui.svg
|
||||||
|
install -Dm644 artifacts/usr/share/icons/hicolor/32x32/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/gpgui.png
|
||||||
|
install -Dm644 artifacts/usr/share/icons/hicolor/128x128/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/gpgui.png
|
||||||
|
install -Dm644 artifacts/usr/share/icons/hicolor/256x256@2/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/256x256@2/apps/gpgui.png
|
||||||
|
install -Dm644 artifacts/usr/share/polkit-1/actions/com.yuezk.gpgui.policy $(DESTDIR)/usr/share/polkit-1/actions/com.yuezk.gpgui.policy
|
||||||
|
|
||||||
|
uninstall:
|
||||||
|
@echo "===> Uninstalling from $(DESTDIR)..."
|
||||||
|
|
||||||
|
rm -f $(DESTDIR)/usr/bin/gpclient
|
||||||
|
rm -f $(DESTDIR)/usr/bin/gpservice
|
||||||
|
rm -f $(DESTDIR)/usr/bin/gpauth
|
||||||
|
rm -f $(DESTDIR)/usr/bin/gpgui-helper
|
||||||
|
rm -f $(DESTDIR)/usr/bin/gpgui
|
||||||
|
|
||||||
|
rm -f $(DESTDIR)/usr/share/applications/gpgui.desktop
|
||||||
|
rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/gpgui.svg
|
||||||
|
rm -f $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/gpgui.png
|
||||||
|
rm -f $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/gpgui.png
|
||||||
|
rm -f $(DESTDIR)/usr/share/icons/hicolor/256x256@2/apps/gpgui.png
|
||||||
|
rm -f $(DESTDIR)/usr/share/polkit-1/actions/com.yuezk.gpgui.policy
|
14
packaging/deb/control.in
Normal file
14
packaging/deb/control.in
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
Source: globalprotect-openconnect
|
||||||
|
Section: net
|
||||||
|
Priority: optional
|
||||||
|
Maintainer: Kevin Yue <k3vinyue@gmail.com>
|
||||||
|
Standards-Version: 4.1.4
|
||||||
|
Build-Depends: debhelper (>= 9), pkg-config, jq (>= 1), make (>= 4), openconnect (>= 8.20), libxml2, libsecret-1-0, libayatana-appindicator3-1, libwebkit2gtk-4.0-37, libgtk-3-0, gnome-keyring, @RUST@
|
||||||
|
Homepage: https://github.com/yuezk/GlobalProtect-openconnect
|
||||||
|
|
||||||
|
Package: globalprotect-openconnect
|
||||||
|
Architecture: any
|
||||||
|
Multi-Arch: foreign
|
||||||
|
Depends: ${misc:Depends}, ${shlibs:Depends}, openconnect (>=8.20), libxml2, libsecret-1-0, libayatana-appindicator3-1, gnome-keyring
|
||||||
|
Description: A GUI for GlobalProtect VPN
|
||||||
|
A GUI for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method.
|
6
packaging/deb/rules
Executable file
6
packaging/deb/rules
Executable file
@ -0,0 +1,6 @@
|
|||||||
|
#!/usr/bin/make -f
|
||||||
|
|
||||||
|
export OFFLINE = @OFFLINE@ BUILD_FE=0
|
||||||
|
|
||||||
|
%:
|
||||||
|
dh $@
|
11
packaging/files/usr/share/applications/gpgui.desktop
Normal file
11
packaging/files/usr/share/applications/gpgui.desktop
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
|
||||||
|
Type=Application
|
||||||
|
Name=GlobalProtect Openconnect VPN Client
|
||||||
|
Comment=A GUI for GlobalProtect VPN
|
||||||
|
GenericName=GlobalProtect VPN Client
|
||||||
|
Categories=Network;Dialup;
|
||||||
|
Exec=/usr/bin/gpclient launch-gui %u
|
||||||
|
MimeType=x-scheme-handler/globalprotectcallback;
|
||||||
|
Icon=gpgui
|
||||||
|
Keywords=GlobalProtect;Openconnect;SAML;connection;VPN;
|
BIN
packaging/files/usr/share/icons/hicolor/128x128/apps/gpgui.png
Normal file
BIN
packaging/files/usr/share/icons/hicolor/128x128/apps/gpgui.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 13 KiB |
BIN
packaging/files/usr/share/icons/hicolor/256x256@2/apps/gpgui.png
Normal file
BIN
packaging/files/usr/share/icons/hicolor/256x256@2/apps/gpgui.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 28 KiB |
BIN
packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png
Normal file
BIN
packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.5 KiB |
@ -0,0 +1,99 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
version="1.1"
|
||||||
|
id="Layer_1"
|
||||||
|
x="0px"
|
||||||
|
y="0px"
|
||||||
|
viewBox="0 0 96 96"
|
||||||
|
style="enable-background:new 0 0 96 96;"
|
||||||
|
xml:space="preserve"
|
||||||
|
sodipodi:docname="com.yuezk.qt.gpclient.svg"
|
||||||
|
inkscape:version="0.92.4 5da689c313, 2019-01-14"><metadata
|
||||||
|
id="metadata14"><rdf:RDF><cc:Work
|
||||||
|
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
|
||||||
|
id="defs12" /><sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="1920"
|
||||||
|
inkscape:window-height="1006"
|
||||||
|
id="namedview10"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="6.9532168"
|
||||||
|
inkscape:cx="7.9545315"
|
||||||
|
inkscape:cy="59.062386"
|
||||||
|
inkscape:window-x="0"
|
||||||
|
inkscape:window-y="0"
|
||||||
|
inkscape:window-maximized="1"
|
||||||
|
inkscape:current-layer="g8499" />
|
||||||
|
<style
|
||||||
|
type="text/css"
|
||||||
|
id="style2">
|
||||||
|
.st0{fill:#2980B9;}
|
||||||
|
.st1{fill:#3498DB;}
|
||||||
|
.st2{fill:#2ECC71;}
|
||||||
|
.st3{fill:#27AE60;}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<g
|
||||||
|
id="g8499"
|
||||||
|
transform="matrix(1.3407388,0,0,1.3407388,-16.409202,-16.355463)"><g
|
||||||
|
id="XMLID_1_">
|
||||||
|
<circle
|
||||||
|
r="32.5"
|
||||||
|
cy="48"
|
||||||
|
cx="48"
|
||||||
|
class="st0"
|
||||||
|
id="XMLID_3_"
|
||||||
|
style="fill:#2980b9" />
|
||||||
|
<path
|
||||||
|
d="m 48,15.5 v 65 C 65.9,80.5 80.5,65.7 80.5,48 80.5,30 65.9,15.5 48,15.5 Z"
|
||||||
|
class="st1"
|
||||||
|
id="XMLID_4_"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill:#3498db" />
|
||||||
|
<path
|
||||||
|
d="m 48,15.5 v 0.6 l 1.2,-0.3 c 0.3,-0.3 0.4,-0.3 0.6,-0.3 h -1.1 z m 7.3,0.9 c -0.1,0 0.4,0.9 1.1,1.8 0.8,1.5 1.1,2.1 1.3,2.1 0.3,-0.3 1.9,-1.2 3,-2.1 -1.7,-0.9 -3.5,-1.5 -5.4,-1.8 z m 10.3,6.2 c -0.1,0 -0.4,0 -0.9,0.6 l -0.8,0.9 0.6,0.6 c 0.3,0.6 0.8,0.9 1,1.2 0.5,0.6 0.6,0.6 0.1,1.5 -0.2,0.6 -0.3,0.9 -0.3,0.9 0.1,0.3 0.3,0.3 1.4,0.3 h 1.6 c 0.1,0 0.3,-0.6 0.4,-1.2 l 0.1,-0.9 -1.1,-0.9 c -1,-0.9 -1,-0.9 -1.4,-1.8 -0.3,-0.6 -0.6,-1.2 -0.7,-1.2 z m -3,2.4 c -0.2,0 -1.3,2.1 -1.3,2.4 0,0 0.3,0.6 0.7,0.9 0.4,0.3 0.7,0.6 0.7,0.6 0.1,0 1.2,-1.2 1.4,-1.5 C 64.2,27.1 64,26.8 63.5,26.2 63.1,25.5 62.7,25 62.6,25 Z m 9.5,1.1 0.2,0.3 c 0,0.3 -0.7,0.9 -1.4,1.5 -1.2,0.9 -1.4,1.2 -2,1.2 -0.6,0 -0.9,0.3 -1.8,0.9 -0.6,0.6 -1.2,0.9 -1.2,1.2 0,0 0.2,0.3 0.6,0.9 0.7,0.6 0.7,0.9 0.2,1.8 l -0.4,0.3 h -1.1 c -0.6,0 -1.5,0 -1.8,-0.3 -0.9,0 -0.8,0 -0.1,2.1 1,3 1.1,3.2 1.3,3.2 0.1,0 1.3,-1.2 2.8,-2.4 1.5,-1.2 2.7,-2.4 2.8,-2.4 l 0.6,0.3 c 0.4,0.3 0.5,0 1.3,-0.6 l 0.8,-0.6 0.8,0.6 c 1.9,1.2 2.2,1.5 2.3,2.4 0.2,1.5 0.3,1.8 0.5,1.8 0.1,0 1.3,-1.5 1.6,-1.8 0.1,-0.3 -0.1,-0.6 -1.1,-2.1 -0.7,-0.9 -1.1,-1.8 -1.1,-2.1 0,0 0.1,0 0.3,-0.3 0.2,0 0.4,0.3 1,0.9 -1.6,-2.3 -3.2,-4.7 -5.1,-6.8 z m 2.8,10.7 c -0.2,0 -0.9,0.9 -0.8,1.2 l 0.5,0.3 H 75 c 0.2,0 0.3,0 0.2,-0.3 C 75.1,37.4 75,36.8 74.9,36.8 Z M 72.3,38 h -2.4 l -2.4,0.3 -4.5,3.5 -4.4,3.8 v 3.5 c 0,2.1 0,3.8 0.1,3.8 0.1,0 0.7,0.9 1.5,1.5 0.8,0.9 1.5,1.5 1.8,1.8 0.4,0.3 0.5,0.3 4,0.6 l 3.4,0.3 1.6,0.9 c 0.8,0.6 1.5,1.2 1.6,1.2 0.1,0 -0.3,0.3 -0.6,0.6 l -0.6,0.6 1,1.2 c 0.5,0.6 1.3,1.5 1.7,1.8 l 0.6,0.9 v 1.7 0.9 c 3.7,-5 5.9,-11.5 6.1,-18.3 0.1,-2.7 -0.3,-5.3 -0.8,-8 l -0.6,-0.3 c -0.1,0 -0.5,0.3 -1,0.6 -0.5,0.3 -1,0.9 -1.1,0.9 -0.1,0 -0.8,-0.3 -1.8,-0.6 l -1.8,-0.6 v -0.9 c 0,-0.6 0,-0.9 -0.6,-1.5 z M 48,63.7 V 64 h 0.2 z"
|
||||||
|
class="st2"
|
||||||
|
id="XMLID_13_"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill:#2ecc71" />
|
||||||
|
<path
|
||||||
|
d="m 48,15.5 c -3.1,0 -6.2,0.5 -9,1.3 0.3,0.4 0.3,0.4 0.6,0.9 1.5,2.5 1.7,2.8 2.1,2.9 0.3,0 0.9,0.1 1.6,0.1 h 1.2 l 0.9,-2 0.8,-1.9 1.8,-0.6 z m -16.9,4.7 c -2.8,1.7 -5.4,3.9 -7.6,6.4 -3.8,4.3 -6.3,9.6 -7.4,15.4 0.5,0 0.9,-0.1 1.8,-0.1 2.8,0.1 2.5,0 3.4,1.4 0.5,0.8 0.6,0.8 1.4,0.8 1,0.1 0.9,0 0.5,-1.6 -0.2,-0.6 -0.3,-1.2 -0.3,-1.4 0,-0.2 0.5,-0.7 1.7,-1.6 1.9,-1.5 1.8,-1.3 1.5,-2.9 -0.1,-0.3 0.1,-0.6 0.6,-1.2 0.7,-0.7 0.7,-0.6 1.4,-0.6 h 0.7 l 0.1,-1.2 c 0.1,-0.7 0.1,-1.3 0.2,-1.3 0,0 1.9,-1.1 4.1,-2.3 2.2,-1.2 4.1,-2.2 4.2,-2.3 0.2,-0.2 -0.3,-0.8 -2.7,-3.8 -1.5,-1.9 -2.8,-3.6 -2.9,-3.7 z m -5.8,23 c -0.1,0 -0.1,0.3 -0.1,0.6 0,0.6 0,0.7 0.6,1 0.8,0.4 0.9,0.5 0.8,0.2 -0.1,-0.4 -1.2,-1.9 -1.3,-1.8 z m -3.4,2.1 -0.5,1.8 c 0.1,0.1 0.9,0.3 1.8,0.5 1,0.2 1.6,0.4 1.8,0.3 l 0.5,-1.3 z m -3.8,1 -1.1,0.6 c -0.6,0.3 -1.2,0.6 -1.4,0.6 h -0.1 c 0,1.4 0.1,2.8 0.3,4.2 l 0.6,0.4 1,-0.1 h 1 l 0.6,1.4 c 0.3,0.7 0.7,1.4 0.8,1.5 0.1,0.1 1,0.1 1.8,0.1 h 1.5 L 23,56.2 c 0,1.2 0,1.3 -0.6,2.2 -0.4,0.5 -0.6,1.2 -0.6,1.4 0,0.2 0.7,2.1 1.6,4.3 l 1.5,4 1.6,0.8 c 1.2,0.6 1.5,0.8 1.5,1 0,0.1 -0.4,2.1 -0.6,3.1 3,2.5 6.4,4.5 10.2,5.8 3.5,-3.6 6.8,-7.1 7.3,-7.6 l 0.7,-0.7 0.2,-1.9 c 0.2,-1.1 0.4,-2.1 0.4,-2.2 0,-0.1 0.5,-0.6 1,-1.2 0.5,-0.5 0.8,-1 0.8,-1.1 v -0.2 c -0.1,-0.1 -1.4,-1.1 -3,-2.2 l -3.1,-2.1 -1.1,-0.1 c -0.8,0 -1.2,0 -1.3,-0.2 C 39.4,59.2 39.2,58.5 39.1,57.7 39,56.9 38.9,56.2 38.8,56.1 38.8,56 38,56 37.1,56 36.2,56 35.4,55.9 35.3,55.8 35.2,55.7 35.2,55.1 35.1,54.3 35,53.6 34.9,53 34.8,52.9 34.7,52.8 33.7,52.7 32.5,52.6 30.5,52.5 30.1,52.5 29.1,52 l -1.2,-0.6 -1.6,0.7 -1.7,0.9 -1.8,-0.1 c -2,0 -1.9,0.2 -2.1,-1.6 C 20.6,50.7 20.6,50.1 20.5,50.1 20.4,50 20,50 19.6,49.9 L 18.9,49.7 19,49.2 c 0,-0.3 0,-1 0.1,-1.4 L 19.2,47 18.7,46.5 Z m 9.1,1.1 C 27.1,47.5 27.1,47.8 27,48 l -0.1,0.5 2.9,1.2 c 2.9,1.1 3.4,1.2 3.9,0.7 0.2,-0.2 0.1,-0.2 -0.3,-0.4 -0.3,-0.1 -1.7,-0.9 -3.2,-1.6 -1.7,-0.7 -2.9,-1.1 -3,-1 z"
|
||||||
|
class="st3"
|
||||||
|
id="XMLID_20_"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill:#27ae60" />
|
||||||
|
</g><g
|
||||||
|
transform="matrix(1.458069,0,0,1.458069,-22.631538,-19.615144)"
|
||||||
|
id="g7664"><path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="XMLID_6_"
|
||||||
|
class="st3"
|
||||||
|
d="m 38.8,56.1 c 0,1.2 1,2.2 2.2,2.2 h 15.2 c 1.2,0 2.2,-1 2.2,-2.2 V 45.3 c 0,-1.2 -1,-2.2 -2.2,-2.2 H 40.9 c -1.2,0 -2.2,1 -2.2,2.2 v 10.8 z"
|
||||||
|
style="fill:#f1aa27;fill-opacity:1" /><path
|
||||||
|
style="fill:#e6e6e6"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="XMLID_7_"
|
||||||
|
class="st4"
|
||||||
|
d="m 55.5,43.1 h -3.3 v -3.7 c 0,-2.1 -1.7,-3.8 -3.8,-3.8 -2.1,0 -3.8,1.7 -3.8,3.8 v 3.8 h -3.1 v -3.8 c 0,-3.9 3.2,-7 7,-7 3.9,0 7,3.2 7,7 z" /><path
|
||||||
|
style="fill:#e6e6e6;fill-opacity:1"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="XMLID_8_"
|
||||||
|
class="st5"
|
||||||
|
d="m 50.35,48.2 c 0,-1 -0.8,-1.8 -1.8,-1.8 -1,0 -1.8,0.8 -1.8,1.8 0,0.7 0.4,1.3 1,1.6 l -1,5.2 h 3.6 l -1,-5.2 c 0.6,-0.3 1,-0.9 1,-1.6 z" /></g></g></svg>
|
After Width: | Height: | Size: 6.7 KiB |
@ -0,0 +1,18 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
|
||||||
|
<policyconfig>
|
||||||
|
<vendor>The GlobalProtect-openconnect Project</vendor>
|
||||||
|
<vendor_url>https://github.com/yuezk/GlobalProtect-openconnect</vendor_url>
|
||||||
|
<icon_name>gpgui</icon_name>
|
||||||
|
<action id="com.yuezk.gpgui.service">
|
||||||
|
<description>Run GPService as root</description>
|
||||||
|
<message>Authentication is required to run the GPService as root</message>
|
||||||
|
<defaults>
|
||||||
|
<allow_any>auth_admin</allow_any>
|
||||||
|
<allow_inactive>auth_admin</allow_inactive>
|
||||||
|
<allow_active>yes</allow_active>
|
||||||
|
</defaults>
|
||||||
|
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gpservice</annotate>
|
||||||
|
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
|
||||||
|
</action>
|
||||||
|
</policyconfig>
|
35
packaging/pkgbuild/PKGBUILD.in
Normal file
35
packaging/pkgbuild/PKGBUILD.in
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
# Maintainer: Keinv Yue <k3vinyue@gmail.com>
|
||||||
|
|
||||||
|
_pkgname=@PKG_NAME@
|
||||||
|
pkgname=${_pkgname}
|
||||||
|
pkgver="@VERSION@"
|
||||||
|
pkgrel=@REVISION@
|
||||||
|
pkgdesc="A GUI 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=('make' 'pkg-config' 'rust' 'cargo' 'jq' 'webkit2gtk' 'curl' 'wget' 'file' 'openssl' 'appmenu-gtk-module' 'gtk3' 'libappindicator-gtk3' 'librsvg' 'libvips' 'libayatana-appindicator' 'openconnect' 'libsecret')
|
||||||
|
depends=('openconnect>=8.20' webkit2gtk libappindicator-gtk3 libayatana-appindicator libsecret libxml2)
|
||||||
|
optdepends=('wmctrl: for window management')
|
||||||
|
|
||||||
|
provides=('globalprotect-openconnect' 'gpclient' 'gpservice' 'gpauth' 'gpgui')
|
||||||
|
|
||||||
|
source=("${_pkgname}-${pkgver}.tar.gz")
|
||||||
|
sha256sums=('SKIP')
|
||||||
|
|
||||||
|
options=('!strip')
|
||||||
|
|
||||||
|
build() {
|
||||||
|
cd "$pkgname-$pkgver"
|
||||||
|
|
||||||
|
# Must unset the CFLAGS, otherwise the build fails
|
||||||
|
unset CFLAGS
|
||||||
|
|
||||||
|
make build OFFLINE=@OFFLINE@ BUILD_FE=0
|
||||||
|
}
|
||||||
|
|
||||||
|
package() {
|
||||||
|
cd "$pkgname-$pkgver"
|
||||||
|
|
||||||
|
make install DESTDIR="$pkgdir"
|
||||||
|
}
|
5
packaging/rpm/globalprotect-openconnect.changes.in
Normal file
5
packaging/rpm/globalprotect-openconnect.changes.in
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
@DATE@ - k3vinyue@gmail.com - @VERSION@
|
||||||
|
|
||||||
|
- Update to @VERSION@
|
||||||
|
* Bugfix and improvements.
|
72
packaging/rpm/globalprotect-openconnect.spec.in
Normal file
72
packaging/rpm/globalprotect-openconnect.spec.in
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
Name: globalprotect-openconnect
|
||||||
|
Version: @VERSION@
|
||||||
|
Release: @REVISION@
|
||||||
|
Summary: A GlobalProtect VPN client powered by OpenConnect
|
||||||
|
Group: Productivity/Networking/PPP
|
||||||
|
|
||||||
|
License: GPL-3.0
|
||||||
|
URL: https://github.com/yuezk/GlobalProtect-openconnect
|
||||||
|
Source: %{name}.tar.gz
|
||||||
|
|
||||||
|
BuildRequires: make
|
||||||
|
BuildRequires: rust
|
||||||
|
BuildRequires: cargo
|
||||||
|
BuildRequires: jq
|
||||||
|
BuildRequires: pkg-config
|
||||||
|
BuildRequires: openconnect-devel
|
||||||
|
BuildRequires: openssl-devel
|
||||||
|
BuildRequires: curl
|
||||||
|
BuildRequires: wget
|
||||||
|
BuildRequires: file
|
||||||
|
|
||||||
|
BuildRequires: (webkit2gtk4.0-devel or webkit2gtk3-soup2-devel)
|
||||||
|
BuildRequires: (libappindicator-gtk3-devel or libappindicator3-1)
|
||||||
|
BuildRequires: (librsvg2-devel or librsvg-devel)
|
||||||
|
|
||||||
|
Requires: openconnect >= 8.20, (libayatana-appindicator or libappindicator-gtk3)
|
||||||
|
Conflicts: globalprotect-openconnect-snapshot
|
||||||
|
|
||||||
|
%global debug_package %{nil}
|
||||||
|
|
||||||
|
%description
|
||||||
|
A GUI for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup
|
||||||
|
|
||||||
|
%build
|
||||||
|
# The injected RUSTFLAGS could fail the build
|
||||||
|
unset RUSTFLAGS
|
||||||
|
make build OFFLINE=@OFFLINE@ BUILD_FE=0
|
||||||
|
|
||||||
|
%install
|
||||||
|
%make_install
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{_bindir}/gpclient
|
||||||
|
%{_bindir}/gpservice
|
||||||
|
%{_bindir}/gpauth
|
||||||
|
%{_bindir}/gpgui-helper
|
||||||
|
%{_datadir}/applications/gpgui.desktop
|
||||||
|
%{_datadir}/icons/hicolor/32x32/apps/gpgui.png
|
||||||
|
%{_datadir}/icons/hicolor/128x128/apps/gpgui.png
|
||||||
|
%{_datadir}/icons/hicolor/256x256@2/apps/gpgui.png
|
||||||
|
%{_datadir}/icons/hicolor/scalable/apps/gpgui.svg
|
||||||
|
%{_datadir}/polkit-1/actions/com.yuezk.gpgui.policy
|
||||||
|
|
||||||
|
%dir %{_datadir}/icons/hicolor
|
||||||
|
%dir %{_datadir}/icons/hicolor/32x32
|
||||||
|
%dir %{_datadir}/icons/hicolor/32x32/apps
|
||||||
|
%dir %{_datadir}/icons/hicolor/128x128
|
||||||
|
%dir %{_datadir}/icons/hicolor/128x128/apps
|
||||||
|
%dir %{_datadir}/icons/hicolor/256x256@2
|
||||||
|
%dir %{_datadir}/icons/hicolor/256x256@2/apps
|
||||||
|
%dir %{_datadir}/icons/hicolor/scalable
|
||||||
|
%dir %{_datadir}/icons/hicolor/scalable/apps
|
||||||
|
%dir %{_datadir}/polkit-1
|
||||||
|
%dir %{_datadir}/polkit-1/actions
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* @DATE@ Kevin Yue <k3vinyue@gmail.com> - @VERSION@
|
||||||
|
- Bugfix and improvements
|
Loading…
x
Reference in New Issue
Block a user