Add rust dep for ppa

Set rust version
Add build dependencies
2025-05-20 07:26:58 -04:00 · 2024-02-25 13:33:53 +08:00 · 2024-02-25 12:42:25 +08:00 · 2024-02-25 11:50:24 +08:00 · 2024-02-25 10:57:02 +08:00 · 2024-02-25 10:37:52 +08:00
39 changed files with 575 additions and 960 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,5 +8,5 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true

-[{Makefile,Makefile.in}]
+[Makefile]
 indent_style = tab
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -9,148 +9,392 @@ on:
    branches:
      - main
      - dev
-      - hotfix/*
-      - feature/*
-      - release/*
    tags:
      - latest
      - v*.*.*
 jobs:
-  # Include arm64 if ref is a tag
-  setup-matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - name: Set up matrix
-        id: set-matrix
-        run: |
-          if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
-            echo "matrix=[\"ubuntu-latest\", \"arm64\"]" >> $GITHUB_OUTPUT
-          else
-            echo "matrix=[\"ubuntu-latest\"]" >> $GITHUB_OUTPUT
-          fi
-
  tarball:
    runs-on: ubuntu-latest
-    needs: [setup-matrix]
    steps:
    - uses: pnpm/action-setup@v2
      with:
        version: 8
-    - name: Prepare workspace
-      run: rm -rf source && mkdir source
    - name: Checkout GlobalProtect-openconnect
      uses: actions/checkout@v3
      with:
        token: ${{ secrets.GH_PAT }}
        repository: yuezk/GlobalProtect-openconnect
-        ref: ${{ github.ref }}
-        path: source/gp
+        path: gp
    - name: Create tarball
      run: |
-        cd source/gp
+        cd gp
        make tarball
    - name: Upload tarball
      uses: actions/upload-artifact@v3
      with:
-        name: artifact-source
-        if-no-files-found: error
+        name: artifact-tarball
        path: |
-          source/gp/.build/tarball/*.tar.gz
-
-  build-gp:
-    needs:
-    - setup-matrix
-    - tarball
-    strategy:
-      matrix:
-        os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
-    runs-on: ${{ matrix.os }}
+          globalprotect-openconnect-*.tar.gz
+  deb:
+    runs-on: ubuntu-latest
+    needs: [tarball]
+    container:
+      image: yuezk/gpdev:main
+      credentials:
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
+        password: ${{ secrets.DOCKER_HUB_TOKEN }}
    steps:
-    - name: Prepare workspace
-      run: rm -rf build-gp && mkdir build-gp
    - name: Download tarball
      uses: actions/download-artifact@v3
      with:
-        name: artifact-source
-        path: build-gp
-    - name: Docker Login
-      run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-    - name: Build gp in Docker
+        name: artifact-tarball
+    - name: Build DEB package
      run: |
-        docker run --rm -v $(pwd)/build-gp:/gp yuezk/gpdev:gp-builder
+        tar -xzf globalprotect-openconnect-*.tar.gz
+        cd globalprotect-openconnect-*
+        make deb
+    - name: Install DEB package
+      run: |
+        sudo dpkg -i globalprotect-openconnect_*.deb

-  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
-        ref: ${{ github.ref }}
-        path: gpgui-source/gp
-    - name: Checkout gpgui@${{ github.ref_name }}
-      uses: actions/checkout@v3
-      with:
-        token: ${{ secrets.GH_PAT }}
-        repository: yuezk/gpgui
-        ref: ${{ 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 --rm -v $(pwd)/gpgui-source:/gpgui yuezk/gpdev:gpgui-builder
-    - name: Install gpgui in Docker
-      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
+        gpclient --version
+        gpservice --version
+        gpauth --version
+        gpgui-helper --version
+    - name: Upload DEB package
      uses: actions/upload-artifact@v3
      with:
-        name: artifact-gpgui-${{ matrix.os }}
-        if-no-files-found: error
+        name: artifact-deb
        path: |
-          gpgui-source/*.bin.tar.xz
-          gpgui-source/*.bin.tar.xz.sha256
+          globalprotect-openconnect_*.deb

-  gh-release:
-    if: startsWith(github.ref, 'refs/tags/')
+  rpm:
    runs-on: ubuntu-latest
-    needs:
-      - build-gp
-      - build-gpgui
-
+    needs: [tarball]
+    container:
+      image: yuezk/gpdev:rpm-builder
+      credentials:
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
+        password: ${{ secrets.DOCKER_HUB_TOKEN }}
    steps:
-    - name: Prepare workspace
-      run: rm -rf gh-release && mkdir gh-release
-    - name: Download all artifacts
+    - name: Download tarball
      uses: actions/download-artifact@v3
      with:
-        path: gh-release
-    - name: Create GH release
-      uses: softprops/action-gh-release@v1
+        name: artifact-tarball
+    - name: Build RPM package
+      run: |
+        tar -xzf globalprotect-openconnect-*.tar.gz
+        cd globalprotect-openconnect-*/
+        make rpm
+    - name: Install RPM package
+      run: |
+        cd globalprotect-openconnect-*/
+        ls -l .build/rpm
+        sudo rpm -i ".build/rpm/globalprotect-openconnect*.$(uname -m).rpm"
+
+        gpclient --version
+        gpservice --version
+        gpauth --version
+        gpgui-helper --version
+
+    - name: Upload RPM package
+      uses: actions/upload-artifact@v3
      with:
-        token: ${{ secrets.GH_PAT }}
-        prerelease: ${{ contains(github.ref, 'latest') }}
-        fail_on_unmatched_files: true
-        files: |
-          gh-release/artifact-*/*
+        name: artifact-rpm
+        path: |
+          globalprotect-openconnect-*/.build/rpm/*.rpm
+
+  # Include arm64 if ref is a tag
+  # setup-matrix:
+  #   runs-on: ubuntu-latest
+  #   outputs:
+  #     matrix: ${{ steps.set-matrix.outputs.matrix }}
+  #   steps:
+  #     - name: Set up matrix
+  #       id: set-matrix
+  #       run: |
+  #         if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
+  #           echo "matrix=[\"amd64\", \"arm64\"]" >> $GITHUB_OUTPUT
+  #         else
+  #           echo "matrix=[\"amd64\"]" >> $GITHUB_OUTPUT
+  #         fi
+
+  # build-fe:
+  #   runs-on: ubuntu-latest
+  #   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
+  #       with:
+  #         version: 8
+
+  #     - name: Install dependencies
+  #       run: |
+  #         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
+  #       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: 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
+  #       run: |
+  #         ./gpgui/scripts/build-tarball.sh
+
+  #     - name: Upload tarball
+  #       uses: actions/upload-artifact@v3
+  #       with:
+  #         name: artifact-tarball
+  #         path: |
+  #           gpgui/.tmp/tarball/*.tar.gz
+
+  # package-rpm:
+  #   needs: [setup-matrix, package-tarball]
+  #   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 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: |
+  #         docker run \
+  #           --rm \
+  #           -v $(pwd):/${{ github.workspace }} \
+  #           -w ${{ github.workspace }} \
+  #           --platform linux/${{ matrix.arch }} \
+  #           yuezk/gpdev:rpm-builder \
+  #           "./gpgui/scripts/build-rpm.sh"
+
+  #     - name: Upload rpm artifacts
+  #       uses: actions/upload-artifact@v3
+  #       with:
+  #         name: artifact-${{ matrix.arch }}-rpm
+  #         path: |
+  #           gpgui/.tmp/artifact/*.rpm
+
+  # 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:
+  #   if: startsWith(github.ref, 'refs/tags/')
+  #   runs-on: ubuntu-latest
+  #   needs:
+  #     - package-rpm
+  #     - package-pkgbuild
+
+  #   steps:
+  #     - name: Download artifact
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         path: 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
+  #       uses: softprops/action-gh-release@v1
+  #       with:
+  #         token: ${{ secrets.GH_PAT }}
+  #         prerelease: ${{ contains(github.ref, 'latest') }}
+  #         fail_on_unmatched_files: true
+  #         files: |
+  #           artifact/artifact-*/*
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -1,89 +0,0 @@
-name: Publish Packages
-
-on:
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: 'Tag to publish'
-        required: true
-      revision:
-        description: 'Package revision'
-        required: true
-        default: "1"
-      ppa:
-        description: 'Publish to PPA'
-        type: boolean
-        required: true
-        default: true
-      obs:
-        description: 'Publish to OBS'
-        type: boolean
-        required: true
-        default: true
-      aur:
-        description: 'Publish to AUR'
-        type: boolean
-        required: true
-        default: true
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Check tag exists
-      uses: mukunku/tag-exists-action@v1.6.0
-      id: check-tag
-      with:
-        tag: ${{ inputs.tag }}
-    - name: Exit if tag does not exist
-      run: |
-        if [[ "${{ steps.check-tag.outputs.exists }}" == "false" ]]; then
-          echo "Tag ${{ inputs.tag }} does not exist"
-          exit 1
-        fi
-
-  publish-ppa:
-    needs: check
-    if: ${{ inputs.ppa }}
-    runs-on: ubuntu-latest
-    steps:
-    - uses: pnpm/action-setup@v2
-      with:
-        version: 8
-    - name: Prepare workspace
-      run: rm -rf publish-ppa && mkdir publish-ppa
-    - name: Download ${{ inputs.tag }} source code
-      uses: robinraju/release-downloader@v1.9
-      with:
-        token: ${{ secrets.GH_PAT }}
-        tag: ${{ inputs.tag }}
-        fileName: globalprotect-openconnect-*.tar.gz
-        tarBall: false
-        zipBall: false
-        out-file-path: publish-ppa
-    - name: Make the offline tarball
-      run: |
-        cd publish-ppa
-        tar -xf globalprotect-openconnect-*.tar.gz
-        cd globalprotect-openconnect-*/
-
-        make tarball OFFLINE=1
-
-        # Prepare the debian directory with custom files
-        mkdir -p .build/debian
-        sed 's/@RUST@/rust-all(>=1.70)/g' packaging/deb/control.in > .build/debian/control
-        sed 's/@OFFLINE@/1/g' packaging/deb/rules.in > .build/debian/rules
-        cp packaging/deb/postrm .build/debian/postrm
-
-    - name: Publish to PPA
-      uses: yuezk/publish-ppa-package@dev
-      with:
-        repository: "yuezk/globalprotect-openconnect"
-        gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }}
-        gpg_passphrase: ${{ secrets.PPA_GPG_PASSPHRASE }}
-        tarball: publish-ppa/globalprotect-openconnect-*/.build/tarball/*.tar.gz
-        debian_dir: publish-ppa/globalprotect-openconnect-*/.build/debian
-        deb_email: "k3vinyue@gmail.com"
-        deb_fullname: "Kevin Yue"
-        extra_ppa: "liushuyu-011/rust-bpo-1.75"
-        revision: ${{ inputs.revision }}
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -1,148 +0,0 @@
-name: Release Packages
-
-on:
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: 'Tag to release'
-        required: true
-      arch:
-        type: choice
-        description: 'Architecture to build'
-        required: true
-        default: all
-        options:
-          - all
-          - x86_64
-          - arm64
-      release-deb:
-        type: boolean
-        description: 'Build DEB package'
-        required: true
-        default: true
-      release-rpm:
-        type: boolean
-        description: 'Build RPM package'
-        required: true
-        default: true
-      release-pkg:
-        type: boolean
-        description: 'Build PKG package'
-        required: true
-        default: true
-      release-binary:
-        type: boolean
-        description: 'Build binary package'
-        required: true
-        default: true
-      gh-release:
-        type: boolean
-        description: 'Update GitHub release'
-        required: true
-        default: true
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Check tag exists
-      uses: mukunku/tag-exists-action@v1.6.0
-      id: check-tag
-      with:
-        tag: ${{ inputs.tag }}
-    - name: Exit if tag does not exist
-      run: |
-        if [[ "${{ steps.check-tag.outputs.exists }}" == "false" ]]; then
-          echo "Tag ${{ inputs.tag }} does not exist"
-          exit 1
-        fi
-
-  setup-matrix:
-    needs:
-    - check
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.result }}
-    steps:
-    - name: Set up matrix
-      id: set-matrix
-      uses: actions/github-script@v7
-      with:
-        result-encoding: string
-        script: |
-          const inputs = ${{ toJson(inputs) }}
-          const { arch } = inputs
-          const osMap = {
-            "all": ["ubuntu-latest", "arm64"],
-            "x86_64": ["ubuntu-latest"],
-            "arm64": ["arm64"]
-          }
-
-          const package = Object.entries(inputs)
-            .filter(([key, value]) => key.startsWith('release-') && value)
-            .map(([key, value]) => key.replace('release-', ''))
-
-          return JSON.stringify({
-            os: osMap[arch],
-            package,
-          })
-
-  build:
-    needs:
-    - setup-matrix
-    strategy:
-      matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
-    runs-on: ${{ matrix.os }}
-    steps:
-    - name: Prepare workspace
-      run: rm -rf build-${{ matrix.package }} && mkdir -p build-${{ matrix.package }}
-    - name: Download ${{ inputs.tag }} source code
-      uses: robinraju/release-downloader@v1.9
-      with:
-        token: ${{ secrets.GH_PAT }}
-        tag: ${{ inputs.tag }}
-        fileName: globalprotect-openconnect-*.tar.gz
-        tarBall: false
-        zipBall: false
-        out-file-path: build-${{ matrix.package }}
-    - name: Docker Login
-      run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-    - name: Build ${{ matrix.package }} package in Docker
-      run: |
-        docker run --rm -v $(pwd)/build-${{ matrix.package }}:/${{ matrix.package }} -e INCLUDE_GUI=1 yuezk/gpdev:${{ matrix.package }}-builder
-
-    - name: Install ${{ matrix.package }} package in Docker
-      run: |
-        docker run --rm -v $(pwd)/build-${{ matrix.package }}:/${{ matrix.package }} yuezk/gpdev:${{ matrix.package }}-builder \
-          bash install.sh
-
-    - name: Upload ${{ matrix.package }} package
-      uses: actions/upload-artifact@v3
-      with:
-        name: artifact-${{ matrix.os }}-${{ matrix.package }}
-        if-no-files-found: error
-        path: |
-          build-${{ matrix.package }}/artifacts/*
-
-  gh-release:
-    needs:
-    - build
-    runs-on: ubuntu-latest
-    if: ${{ inputs.gh-release }}
-    steps:
-    - name: Prepare workspace
-      run: rm -rf gh-release && mkdir gh-release
-    - name: Download artifact
-      uses: actions/download-artifact@v3
-      with:
-        path: gh-release
-    - name: Update release
-      uses: softprops/action-gh-release@v1
-      with:
-        token: ${{ secrets.GH_PAT }}
-        prerelease: ${{ contains(github.ref, 'latest') }}
-        fail_on_unmatched_files: true
-        tag_name: ${{ inputs.tag }}
-        files: |
-          gh-release/artifact-*/*
-
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -562,13 +562,6 @@ dependencies = [
 "memchr",
 ]

-[[package]]
-name = "common"
-version = "2.1.2"
-dependencies = [
- "is_executable",
-]
-
 [[package]]
 name = "compile-time"
 version = "0.2.0"
@@ -1430,7 +1423,7 @@ dependencies = [

 [[package]]
 name = "gpapi"
-version = "2.1.2"
+version = "2.0.0"
 dependencies = [
 "anyhow",
 "base64 0.21.5",
@@ -1462,7 +1455,7 @@ dependencies = [

 [[package]]
 name = "gpauth"
-version = "2.1.2"
+version = "2.0.0"
 dependencies = [
 "anyhow",
 "clap",
@@ -1482,11 +1475,10 @@ dependencies = [

 [[package]]
 name = "gpclient"
-version = "2.1.2"
+version = "2.0.0"
 dependencies = [
 "anyhow",
 "clap",
- "common",
 "compile-time",
 "directories",
 "env_logger",
@@ -1504,7 +1496,7 @@ dependencies = [

 [[package]]
 name = "gpgui-helper"
-version = "2.1.2"
+version = "2.0.0"
 dependencies = [
 "anyhow",
 "clap",
@@ -1522,7 +1514,7 @@ dependencies = [

 [[package]]
 name = "gpservice"
-version = "2.1.2"
+version = "2.0.0"
 dependencies = [
 "anyhow",
 "axum",
@@ -1535,10 +1527,8 @@ dependencies = [
 "openconnect",
 "serde",
 "serde_json",
- "tar",
 "tokio",
 "tokio-util",
- "xz2",
 ]

 [[package]]
@@ -2208,17 +2198,6 @@ dependencies = [
 "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]]
 name = "mac"
 version = "0.1.1"
@@ -2308,9 +2287,9 @@ dependencies = [

 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
 dependencies = [
 "libc",
 "log",
@@ -2527,10 +2506,10 @@ dependencies = [

 [[package]]
 name = "openconnect"
-version = "2.1.2"
+version = "2.0.0"
 dependencies = [
 "cc",
- "common",
+ "is_executable",
 "log",
 ]

@@ -4155,9 +4134,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.36.0"
+version = "1.35.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
 dependencies = [
 "backtrace",
 "bytes",
@@ -5145,15 +5124,6 @@ version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 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]]
 name = "zeroize"
 version = "1.7.0"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ members = ["crates/*", "apps/gpclient", "apps/gpservice", "apps/gpauth", "apps/g

 [workspace.package]
 rust-version = "1.70"
-version = "2.1.2"
+version = "2.0.0"
 authors = ["Kevin Yue <k3vinyue@gmail.com>"]
 homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
 edition = "2021"
--- a/186
+++ b/186
@@ -1,8 +1,4 @@
-.SHELLFLAGS += -e
-
 OFFLINE ?= 0
-BUILD_FE ?= 1
-INCLUDE_GUI ?= 0
 CARGO ?= cargo

 VERSION = $(shell $(CARGO) metadata --no-deps --format-version 1 | jq -r '.packages[0].version')
@@ -11,7 +7,6 @@ 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
@@ -27,54 +22,28 @@ default: build
 version:
 	@echo $(VERSION)

-clean-tarball:
-	rm -rf .build/tarball
-	rm -rf .vendor
-	rm -rf vendor.tar.xz
-	rm -rf .cargo
+# Generate a vendor tarball and a .cargo/config.toml file
+cargo-vendor:
+	mkdir -p .cargo

-# Create a tarball, include the cargo dependencies if OFFLINE is set to 1
-tarball: clean-tarball
-	if [ $(BUILD_FE) -eq 1 ]; then \
-		echo "Building frontend..."; \
-		cd apps/gpgui-helper && pnpm install && pnpm build; \
-	fi
+	$(CARGO) vendor .vendor > .cargo/config.toml
+	tar -cJf vendor.tar.xz .vendor

-	# Remove node_modules to reduce the tarball size
+tarball: clean clean-tarball build-fe cargo-vendor
 	rm -rf apps/gpgui-helper/node_modules

-	mkdir -p .cargo
-	mkdir -p .build/tarball
+	tar --transform 's,^,${PKG}/,' -czf ../${PKG}.tar.gz * .cargo

-	# 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
+# Extract the vendor tarball to the .vendor directory if it exists
+extract-vendor:
+	if [ -f vendor.tar.xz ]; then tar -xJf vendor.tar.xz; fi

-	@echo "Creating tarball..."
-	tar --exclude .vendor --exclude target --transform 's,^,${PKG}/,' -czf .build/tarball/${PKG}.tar.gz * .cargo
-
-download-gui:
-	rm -rf .build/gpgui
-
-	if [ $(INCLUDE_GUI) -eq 1 ]; then \
-		echo "Downloading GlobalProtect GUI..."; \
-		mkdir -p .build/gpgui; \
-		curl -sSL https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v$(VERSION)/gpgui_$(VERSION)_$(shell uname -m).bin.tar.xz -o .build/gpgui/gpgui_$(VERSION)_x$(shell uname -m).bin.tar.xz; \
-		tar -xJf .build/gpgui/*.tar.xz -C .build/gpgui; \
-	else \
-		echo "Skipping GlobalProtect GUI download (INCLUDE_GUI=0)"; \
-	fi
-
-build: download-gui build-fe build-rs
+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 \
+	if [ $(OFFLINE) -eq 0 ]; then \
 		cd apps/gpgui-helper && pnpm install && pnpm build; \
 	fi

@@ -83,13 +52,9 @@ build-fe:
 		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"
+build-rs: extract-vendor
+	$(CARGO) build $(CARGO_BUILD_ARGS) -p gpauth
+	# $(CARGO) build $(CARGO_BUILD_ARGS) -p gpgui-helper --features "tauri/custom-protocol"

 clean:
 	$(CARGO) clean
@@ -97,18 +62,16 @@ clean:
 	rm -rf .vendor
 	rm -rf apps/gpgui-helper/node_modules

-install:
-	@echo "Installing $(PKG_NAME)..."
+clean-tarball:
+	rm -rf vendor.tar.xz
+	rm -rf ../$(PKG).tar.gz

+install:
 	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

-	if [ -f .build/gpgui/gpgui_*/gpgui ]; then \
-		install -Dm755 .build/gpgui/gpgui_*/gpgui $(DESTDIR)/usr/bin/gpgui; \
-	fi
-
 	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
@@ -117,13 +80,10 @@ install:
 	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
@@ -132,61 +92,40 @@ uninstall:
 	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
+init-debian:
+	rm -rf .vendor
+	rm -rf debian

-# 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
+	debmake

-	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.in .build/deb/$(PKG)/debian/rules
-	cp -f packaging/deb/postrm .build/deb/$(PKG)/debian/postrm
-
-	sed -i "s/@OFFLINE@/$(OFFLINE)/g" .build/deb/$(PKG)/debian/rules
-
-	rm -f .build/deb/$(PKG)/debian/changelog
+	cp -f packaging/deb/control.in debian/control
+	cp -f packaging/deb/rules debian/rules
+	rm -f debian/changelog

 deb: init-debian
-	# Remove the rust build depdency from the control file
-	sed -i "s/@RUST@//g" .build/deb/$(PKG)/debian/control
+	sed -i "s/@RUST@//g" debian/control

-	cd .build/deb/$(PKG) && dch --create --distribution unstable --package $(PKG_NAME) --newversion $(VERSION)-$(REVISION) "Bugfix and improvements."
+	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
+	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
-	sed -i "s/@RUST@/rust-all(>=1.70)/g" .build/deb/$(PKG)/debian/control
+# Usage: make ppa SERIES=focal
+ppa: init-debian
+	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)"

-	rm -rf .build/deb/$(PKG)/debian/changelog
-	cd .build/deb/$(PKG) && dch --create --distribution $(SERIES) --package $(PKG_NAME) --newversion $(VERSION)-$(REVISION)ppa$(PPA_REVISION)~ubuntu$(SERIES_VER) "Bugfix and improvements."
+	dch --create --distribution $(SERIES) --package $(PKG_NAME) --newversion $(VERSION)-$(REVISION)ppa$(PPA_REVISION)~ubuntu$(SERIES_VER) "Bugfix and improvements."

-	cd .build/deb/$(PKG) && echo "y" | debuild -e PATH -S -sa -k"$(GPG_KEY_ID)" -p"gpg --batch --passphrase $(GPG_KEY_PASS) --pinentry-mode loopback"
+	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 \
-		cd .build/deb/$(PKG) && dput ppa:yuezk/globalprotect-openconnect ../*.changes; \
-	else \
-		echo "Skipping ppa publish (PUBLISH=0)"; \
-	fi
-
-clean-rpm:
-	rm -rf .build/rpm
+publish-ppa: ppa
+	dput ppa:yuezk/globalprotect-openconnect ../*.changes

 # Generate RPM sepc file
-init-rpm: clean-rpm
+init-rpm:
+	rm -rf .build/rpm
 	mkdir -p .build/rpm

 	cp packaging/rpm/globalprotect-openconnect.spec.in .build/rpm/globalprotect-openconnect.spec
@@ -194,20 +133,26 @@ init-rpm: clean-rpm

 	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
+# Ensure ../globalprotect-openconnect-*.tar.gz exists.
+rpm: init-rpm
+	if [ ! -f ../$(PKG).tar.gz ]; then \
+		echo "Missing ../$(PKG).tar.gz"; \
+		exit 1; \
+	fi
+
 	rm -rf $(HOME)/rpmbuild
 	rpmdev-setuptree

-	cp .build/tarball/${PKG}.tar.gz $(HOME)/rpmbuild/SOURCES/${PKG_NAME}.tar.gz
+	cp ../$(PKG).tar.gz $(HOME)/rpmbuild/SOURCES/$(PKG_NAME).tar.gz
+
 	rpmbuild -ba .build/rpm/globalprotect-openconnect.spec

-	# Copy RPM package from build directory
+	# Copy RPM package
 	cp $(HOME)/rpmbuild/RPMS/$(shell uname -m)/$(PKG_NAME)*.rpm .build/rpm

 	# Copy the SRPM only for x86_64.
@@ -215,41 +160,20 @@ rpm: init-rpm tarball
 		cp $(HOME)/rpmbuild/SRPMS/$(PKG_NAME)*.rpm .build/rpm; \
 	fi

-clean-pkgbuild:
+init-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
+	if [ ! -f ../$(PKG).tar.gz ]; then \
+		echo "Missing ../$(PKG).tar.gz"; \
+		exit 1; \
+	fi
+	cp ../$(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 INCLUDE_GUI=$(INCLUDE_GUI)
-	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
--- a/README.md
+++ b/README.md
@@ -53,6 +53,15 @@ The GUI version is also available after you installed it. You can launch it from

 ## Installation

+> [!Note]
+>
+> This instruction is for the 2.x version. The 1.x version is still available on the [1.x](https://github.com/yuezk/GlobalProtect-openconnect/tree/1.x) branch, you can build it from the source code by following the instructions in the `README.md` file.
+
+> [!Warning]
+>
+> The client requires `openconnect >= 8.20, pkexec, and gnome-keyring`, please make sure you have them installed.
+> Installing the client from PPA will automatically install the required version of `openconnect`.
+
 ### Debian/Ubuntu based distributions

 #### Install from PPA
@@ -94,7 +103,7 @@ Download the latest package from [releases](https://github.com/yuezk/GlobalProte
 sudo pacman -U globalprotect-openconnect-*.pkg.tar.zst
 ```

-### Fedora 38 and later / Fedora Rawhide
+### Fedora/OpenSUSE/CentOS/RHEL

 #### Install from COPR

@@ -105,56 +114,29 @@ sudo dnf copr enable yuezk/globalprotect-openconnect
 sudo dnf install globalprotect-openconnect
 ```

-### openSUSE Leap 15.6 / openSUSE Tumbleweed
-
-#### Install from OBS (openSUSE Build Service)
+#### Install from OBS (OpenSUSE Build Service)

 The package is also available on [OBS](https://build.opensuse.org/package/show/home:yuezk/globalprotect-openconnect) for various RPM-based distributions. You can follow the instructions [on this page](https://software.opensuse.org//download.html?project=home%3Ayuezk&package=globalprotect-openconnect) to install it.

-### Other RPM-based distributions
-
 #### Install from RPM package

 Download the latest RPM package from [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page.

-```bash
-sudo rpm -i globalprotect-openconnect-*.rpm
-```
-
 ### Other distributions

 - Install `openconnect >= 8.20`, `webkit2gtk`, `libsecret`, `libayatana-appindicator` or `libappindicator-gtk3`.
- Download `globalprotect-openconnect_${version}_${arch}.bin.tar.xz` from [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page.
- Extract the tarball with `tar -xJf globalprotect-openconnect_${version}_${arch}.bin.tar.xz`.
- Run `sudo make install` to install the client.
-
-## Build from source
-
-You can also build the client from source, steps are as follows:
-
-### Prerequisites
-
- [Install Rust](https://www.rust-lang.org/tools/install)
- Install Tauri dependencies: https://tauri.app/v1/guides/getting-started/prerequisites/#setting-up-linux
- Install `perl`
- Install `openconnect >= 8.20` and `libopenconnect-dev` (or `openconnect-devel` on RPM-based distributions)
- Install `pkexec`, `gnome-keyring` (or `pam_kwallet` on KDE)
-
-### Build
-
-1. Download the source code tarball from [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page. Choose `globalprotect-openconnect-${version}.tar.gz`.
-2. Extract the tarball with `tar -xzf globalprotect-openconnect-${version}.tar.gz`.
-3. Enter the source directory and run `make build BUILD_FE=0` to build the client.
-3. Run `sudo make install` to install the client. (Note, `DESTDIR` is not supported)
+- Download `globalprotect-openconnect.tar.gz` from [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page.
+- Extract the tarball and run `make build` to build the client.
+- Run `make install` to install the client.

 ## FAQ

 1. How to deal with error `Secure Storage not ready`
-
+  
   You need to install the `gnome-keyring` package, and restart the system (See [#321](https://github.com/yuezk/GlobalProtect-openconnect/issues/321), [#316](https://github.com/yuezk/GlobalProtect-openconnect/issues/316)).

 2. How to deal with error `(gpauth:18869): Gtk-WARNING **: 10:33:37.566: cannot open display:`
-
+  
   If you encounter this error when using the CLI version, try to run the command with `sudo -E` (See [#316](https://github.com/yuezk/GlobalProtect-openconnect/issues/316)).

 ## About Trial
--- a/apps/gpauth/tauri.conf.json
+++ b/apps/gpauth/tauri.conf.json
@@ -22,8 +22,8 @@
        "all": true,
        "request": true,
        "scope": [
-          "http://*",
-          "https://*"
+          "http://**",
+          "https://**"
        ]
      }
    },
--- a/apps/gpclient/Cargo.toml
+++ b/apps/gpclient/Cargo.toml
@@ -6,7 +6,6 @@ edition.workspace = true
 license.workspace = true

 [dependencies]
-common = { path = "../../crates/common" }
 gpapi = { path = "../../crates/gpapi", features = ["clap"] }
 openconnect = { path = "../../crates/openconnect" }
 anyhow.workspace = true
--- a/apps/gpclient/src/connect.rs
+++ b/apps/gpclient/src/connect.rs
@@ -1,14 +1,12 @@
 use std::{fs, sync::Arc};

 use clap::Args;
-use common::vpn_utils::find_csd_wrapper;
 use gpapi::{
  clap::args::Os,
  credential::{Credential, PasswordCredential},
-  error::PortalError,
  gateway::gateway_login,
  gp_params::{ClientOs, GpParams},
-  portal::{prelogin, retrieve_config, Prelogin},
+  portal::{prelogin, retrieve_config, PortalError, Prelogin},
  process::{
    auth_launcher::SamlAuthLauncher,
    users::{get_non_root_user, get_user_by_name},
@@ -33,12 +31,6 @@ pub(crate) struct ConnectArgs {
  #[arg(long, short, help = "The VPNC script to use")]
  script: Option<String>,

-  #[arg(
-    long,
-    help = "Use the default CSD wrapper to generate the HIP report and send it to the server"
-  )]
-  hip: bool,
-
  #[arg(long, help = "Same as the '--csd-user' option in the openconnect command")]
  csd_user: Option<String>,

@@ -120,19 +112,16 @@ impl<'a> ConnectHandler<'a> {
    let selected_gateway = match &self.args.gateway {
      Some(gateway) => portal_config
        .find_gateway(gateway)
-        .ok_or_else(|| anyhow::anyhow!("Cannot find gateway specified: {}", gateway))?,
+        .ok_or_else(|| anyhow::anyhow!("Cannot find gateway {}", gateway))?,
      None => {
        portal_config.sort_gateways(prelogin.region());
        let gateways = portal_config.gateways();

        if gateways.len() > 1 {
-          let gateway = Select::new("Which gateway do you want to connect to?", gateways)
+          Select::new("Which gateway do you want to connect to?", gateways)
            .with_vim_mode(true)
-            .prompt()?;
-          info!("Connecting to the selected gateway: {}", gateway);
-          gateway
+            .prompt()?
        } else {
-          info!("Connecting to the only available gateway: {}", gateways[0]);
          gateways[0]
        }
      }
@@ -153,8 +142,6 @@ impl<'a> ConnectHandler<'a> {
  }

  async fn connect_gateway_with_prelogin(&self, gateway: &str) -> anyhow::Result<()> {
-    info!("Performing the gateway authentication...");
-
    let mut gp_params = self.build_gp_params();
    gp_params.set_is_gateway(true);

@@ -167,23 +154,16 @@ impl<'a> ConnectHandler<'a> {
  }

  async fn connect_gateway(&self, gateway: &str, cookie: &str) -> anyhow::Result<()> {
-    let mtu = self.args.mtu.unwrap_or(0);
    let csd_uid = get_csd_uid(&self.args.csd_user)?;
-    let csd_wrapper = if self.args.csd_wrapper.is_some() {
-      self.args.csd_wrapper.clone()
-    } else if self.args.hip {
-      find_csd_wrapper()
-    } else {
-      None
-    };
+    let mtu = self.args.mtu.unwrap_or(0);

    let vpn = Vpn::builder(gateway, cookie)
-      .script(self.args.script.clone())
      .user_agent(self.args.user_agent.clone())
+      .script(self.args.script.clone())
      .csd_uid(csd_uid)
-      .csd_wrapper(csd_wrapper)
+      .csd_wrapper(self.args.csd_wrapper.clone())
      .mtu(mtu)
-      .build()?;
+      .build();

    let vpn = Arc::new(vpn);
    let vpn_clone = vpn.clone();
--- a/apps/gpgui-helper/package.json
+++ b/apps/gpgui-helper/package.json
@@ -18,7 +18,7 @@
    "react-dom": "^18.2.0"
  },
  "devDependencies": {
-    "@tauri-apps/cli": "^1.5.6",
+    "@tauri-apps/cli": "^1.5.0",
    "@types/node": "^20.8.10",
    "@types/react": "^18.2.15",
    "@types/react-dom": "^18.2.7",
@@ -31,6 +31,6 @@
    "eslint-plugin-react-hooks": "^4.6.0",
    "prettier": "3.1.0",
    "typescript": "^5.0.2",
-    "vite": "^4.5.2"
+    "vite": "^4.4.4"
  }
 }
--- a/apps/gpgui-helper/pnpm-lock.yaml
+++ b/apps/gpgui-helper/pnpm-lock.yaml
@@ -29,8 +29,8 @@ dependencies:

 devDependencies:
  '@tauri-apps/cli':
-    specifier: ^1.5.6
-    version: 1.5.6
+    specifier: ^1.5.0
+    version: 1.5.0
  '@types/node':
    specifier: ^20.8.10
    version: 20.8.10
@@ -48,7 +48,7 @@ devDependencies:
    version: 6.12.0(eslint@8.54.0)(typescript@5.0.2)
  '@vitejs/plugin-react':
    specifier: ^4.0.3
-    version: 4.0.3(vite@4.5.2)
+    version: 4.0.3(vite@4.4.4)
  eslint:
    specifier: ^8.54.0
    version: 8.54.0
@@ -68,8 +68,8 @@ devDependencies:
    specifier: ^5.0.2
    version: 5.0.2
  vite:
-    specifier: ^4.5.2
-    version: 4.5.2(@types/node@20.8.10)
+    specifier: ^4.4.4
+    version: 4.4.4(@types/node@20.8.10)

 packages:

@@ -940,8 +940,8 @@ packages:
    engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
    dev: false

-  /@tauri-apps/cli-darwin-arm64@1.5.6:
-    resolution: {integrity: sha512-NNvG3XLtciCMsBahbDNUEvq184VZmOveTGOuy0So2R33b/6FDkuWaSgWZsR1mISpOuP034htQYW0VITCLelfqg==}
+  /@tauri-apps/cli-darwin-arm64@1.5.0:
+    resolution: {integrity: sha512-wvEfcSBjlh1G8uBiylMNFgBtAyk4mXfvDFcGyigf/2ui7Wve6fcAFDJdTVwiHOZ4Wxnw6BD3lIkVMQdDpE+nFg==}
    engines: {node: '>= 10'}
    cpu: [arm64]
    os: [darwin]
@@ -949,8 +949,8 @@ packages:
    dev: true
    optional: true

-  /@tauri-apps/cli-darwin-x64@1.5.6:
-    resolution: {integrity: sha512-nkiqmtUQw3N1j4WoVjv81q6zWuZFhBLya/RNGUL94oafORloOZoSY0uTZJAoeieb3Y1YK0rCHSDl02MyV2Fi4A==}
+  /@tauri-apps/cli-darwin-x64@1.5.0:
+    resolution: {integrity: sha512-pWzLMAMslx3dkLyq1f4PpuEhgUs8mPISM5nQoHfgYYchJk6Ip1YtWupo56h5QjqyRNPUsSYT8DVGIw0Oi8auXQ==}
    engines: {node: '>= 10'}
    cpu: [x64]
    os: [darwin]
@@ -958,8 +958,8 @@ packages:
    dev: true
    optional: true

-  /@tauri-apps/cli-linux-arm-gnueabihf@1.5.6:
-    resolution: {integrity: sha512-z6SPx+axZexmWXTIVPNs4Tg7FtvdJl9EKxYN6JPjOmDZcqA13iyqWBQal2DA/GMZ1Xqo3vyJf6EoEaKaliymPQ==}
+  /@tauri-apps/cli-linux-arm-gnueabihf@1.5.0:
+    resolution: {integrity: sha512-hP3nAd0TjxblIAgriXhdX33sKXwbkY3CKsWBVB3O+5DOGy7XzKosIt0KaqiV8BHI2pbHMVOwTZuvjdK8pPLULQ==}
    engines: {node: '>= 10'}
    cpu: [arm]
    os: [linux]
@@ -967,8 +967,8 @@ packages:
    dev: true
    optional: true

-  /@tauri-apps/cli-linux-arm64-gnu@1.5.6:
-    resolution: {integrity: sha512-QuQjMQmpsCbzBrmtQiG4uhnfAbdFx3nzm+9LtqjuZlurc12+Mj5MTgqQ3AOwQedH3f7C+KlvbqD2AdXpwTg7VA==}
+  /@tauri-apps/cli-linux-arm64-gnu@1.5.0:
+    resolution: {integrity: sha512-/AwGSjUplzeiGWbKP8rAW4gQx5umWiaQJ0ifx6NakA/sIrhRXPYTobwzg4ixw31ALQNXaEosJCkmvXyHUvoUYw==}
    engines: {node: '>= 10'}
    cpu: [arm64]
    os: [linux]
@@ -976,8 +976,8 @@ packages:
    dev: true
    optional: true

-  /@tauri-apps/cli-linux-arm64-musl@1.5.6:
-    resolution: {integrity: sha512-8j5dH3odweFeom7bRGlfzDApWVOT4jIq8/214Wl+JeiNVehouIBo9lZGeghZBH3XKFRwEvU23i7sRVjuh2s8mg==}
+  /@tauri-apps/cli-linux-arm64-musl@1.5.0:
+    resolution: {integrity: sha512-OFzKMkg3bmBjr/BYQ1kx4QOHL+JSkzX+Cw8RcG7CKnq8QoJyg8N0K0UTskgsVwlCN4l7bxeuSLvEveg4SBA2AQ==}
    engines: {node: '>= 10'}
    cpu: [arm64]
    os: [linux]
@@ -985,8 +985,8 @@ packages:
    dev: true
    optional: true

-  /@tauri-apps/cli-linux-x64-gnu@1.5.6:
-    resolution: {integrity: sha512-gbFHYHfdEGW0ffk8SigDsoXks6USpilF6wR0nqB/JbWzbzFR/sBuLVNQlJl1RKNakyJHu+lsFxGy0fcTdoX8xA==}
+  /@tauri-apps/cli-linux-x64-gnu@1.5.0:
+    resolution: {integrity: sha512-V2stfUH3Qrc3cIXAd+cKbJruS1oJqqGd40GTVcKOKlRk9Ef9H3WNUQ5PyWKj1t1rk8AxjcBO/vK+Unkuy1WSCw==}
    engines: {node: '>= 10'}
    cpu: [x64]
    os: [linux]
@@ -994,8 +994,8 @@ packages:
    dev: true
    optional: true

-  /@tauri-apps/cli-linux-x64-musl@1.5.6:
-    resolution: {integrity: sha512-9v688ogoLkeFYQNgqiSErfhTreLUd8B3prIBSYUt+x4+5Kcw91zWvIh+VSxL1n3KCGGsM7cuXhkGPaxwlEh1ug==}
+  /@tauri-apps/cli-linux-x64-musl@1.5.0:
+    resolution: {integrity: sha512-qpcGeesuksxzE7lC3RCnikTY9DCRMnAYwhWa9i8MA7pKDX1IXaEvAaXrse44XCZUohxLLgn2k2o6Pb+65dDijQ==}
    engines: {node: '>= 10'}
    cpu: [x64]
    os: [linux]
@@ -1003,8 +1003,8 @@ packages:
    dev: true
    optional: true

-  /@tauri-apps/cli-win32-arm64-msvc@1.5.6:
-    resolution: {integrity: sha512-DRNDXFNZb6y5IZrw+lhTTA9l4wbzO4TNRBAlHAiXUrH+pRFZ/ZJtv5WEuAj9ocVSahVw2NaK5Yaold4NPAxHog==}
+  /@tauri-apps/cli-win32-arm64-msvc@1.5.0:
+    resolution: {integrity: sha512-Glt/AEWwbFmFnQuoPRbB6vMzCIT9jYSpD59zRP8ljhRSzwDHE59q5nXOrheLKICwMmaXqtAuCIq9ndDBKghwoQ==}
    engines: {node: '>= 10'}
    cpu: [arm64]
    os: [win32]
@@ -1012,8 +1012,8 @@ packages:
    dev: true
    optional: true

-  /@tauri-apps/cli-win32-ia32-msvc@1.5.6:
-    resolution: {integrity: sha512-oUYKNR/IZjF4fsOzRpw0xesl2lOjhsQEyWlgbpT25T83EU113Xgck9UjtI7xemNI/OPCv1tPiaM1e7/ABdg5iA==}
+  /@tauri-apps/cli-win32-ia32-msvc@1.5.0:
+    resolution: {integrity: sha512-k+R2VI8eZJfRjaRS8LwbkjMBKFaKcWtA/byaFnGDDUnb3VM/WFW++3KjC5Ne2wXpxFW9RVaFiBNIpmRcExI0Qw==}
    engines: {node: '>= 10'}
    cpu: [ia32]
    os: [win32]
@@ -1021,8 +1021,8 @@ packages:
    dev: true
    optional: true

-  /@tauri-apps/cli-win32-x64-msvc@1.5.6:
-    resolution: {integrity: sha512-RmEf1os9C8//uq2hbjXi7Vgz9ne7798ZxqemAZdUwo1pv3oLVZSz1/IvZmUHPdy2e6zSeySqWu1D0Y3QRNN+dg==}
+  /@tauri-apps/cli-win32-x64-msvc@1.5.0:
+    resolution: {integrity: sha512-jEwq9UuUldVyDJ/dsYoHFuZfNZIkxbeDYSMELfZXsRvWWEA8xRYeTkH38S++KU1eBl5dTK0LbxhztEB2HjRT1g==}
    engines: {node: '>= 10'}
    cpu: [x64]
    os: [win32]
@@ -1030,21 +1030,21 @@ packages:
    dev: true
    optional: true

-  /@tauri-apps/cli@1.5.6:
-    resolution: {integrity: sha512-k4Y19oVCnt7WZb2TnDzLqfs7o98Jq0tUoVMv+JQSzuRDJqaVu2xMBZ8dYplEn+EccdR5SOMyzaLBJWu38TVK1A==}
+  /@tauri-apps/cli@1.5.0:
+    resolution: {integrity: sha512-usY7Ncfkxl2f/ufjWDtp+eJsodlj8ipMKExIt160KR+tx0GtQgLtxRnrKxe1o7wu18Pkqd5JIuWMaOmT3YZeYA==}
    engines: {node: '>= 10'}
    hasBin: true
    optionalDependencies:
-      '@tauri-apps/cli-darwin-arm64': 1.5.6
-      '@tauri-apps/cli-darwin-x64': 1.5.6
-      '@tauri-apps/cli-linux-arm-gnueabihf': 1.5.6
-      '@tauri-apps/cli-linux-arm64-gnu': 1.5.6
-      '@tauri-apps/cli-linux-arm64-musl': 1.5.6
-      '@tauri-apps/cli-linux-x64-gnu': 1.5.6
-      '@tauri-apps/cli-linux-x64-musl': 1.5.6
-      '@tauri-apps/cli-win32-arm64-msvc': 1.5.6
-      '@tauri-apps/cli-win32-ia32-msvc': 1.5.6
-      '@tauri-apps/cli-win32-x64-msvc': 1.5.6
+      '@tauri-apps/cli-darwin-arm64': 1.5.0
+      '@tauri-apps/cli-darwin-x64': 1.5.0
+      '@tauri-apps/cli-linux-arm-gnueabihf': 1.5.0
+      '@tauri-apps/cli-linux-arm64-gnu': 1.5.0
+      '@tauri-apps/cli-linux-arm64-musl': 1.5.0
+      '@tauri-apps/cli-linux-x64-gnu': 1.5.0
+      '@tauri-apps/cli-linux-x64-musl': 1.5.0
+      '@tauri-apps/cli-win32-arm64-msvc': 1.5.0
+      '@tauri-apps/cli-win32-ia32-msvc': 1.5.0
+      '@tauri-apps/cli-win32-x64-msvc': 1.5.0
    dev: true

  /@types/json-schema@7.0.14:
@@ -1229,7 +1229,7 @@ packages:
    resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
    dev: true

-  /@vitejs/plugin-react@4.0.3(vite@4.5.2):
+  /@vitejs/plugin-react@4.0.3(vite@4.4.4):
    resolution: {integrity: sha512-pwXDog5nwwvSIzwrvYYmA2Ljcd/ZNlcsSG2Q9CNDBwnsd55UGAyr2doXtB5j+2uymRCnCfExlznzzSFbBRcoCg==}
    engines: {node: ^14.18.0 || >=16.0.0}
    peerDependencies:
@@ -1239,7 +1239,7 @@ packages:
      '@babel/plugin-transform-react-jsx-self': 7.22.5(@babel/core@7.23.2)
      '@babel/plugin-transform-react-jsx-source': 7.22.5(@babel/core@7.23.2)
      react-refresh: 0.14.0
-      vite: 4.5.2(@types/node@20.8.10)
+      vite: 4.4.4(@types/node@20.8.10)
    transitivePeerDependencies:
      - supports-color
    dev: true
@@ -2979,8 +2979,8 @@ packages:
      punycode: 2.3.1
    dev: true

-  /vite@4.5.2(@types/node@20.8.10):
-    resolution: {integrity: sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==}
+  /vite@4.4.4(@types/node@20.8.10):
+    resolution: {integrity: sha512-4mvsTxjkveWrKDJI70QmelfVqTm+ihFAb6+xf4sjEU2TmUCTlVX87tmg/QooPEMQb/lM9qGHT99ebqPziEd3wg==}
    engines: {node: ^14.18.0 || >=16.0.0}
    hasBin: true
    peerDependencies:
--- a/apps/gpgui-helper/src-tauri/src/updater.rs
+++ b/apps/gpgui-helper/src-tauri/src/updater.rs
@@ -80,20 +80,12 @@ impl GuiUpdater {
  pub async fn update(&self) {
    info!("Update GUI, version: {}", self.version);

-    #[cfg(debug_assertions)]
-    let release_tag = "latest";
-    #[cfg(not(debug_assertions))]
-    let release_tag = format!("v{}", self.version);
-
    #[cfg(target_arch = "x86_64")]
-    let arch = "x86_64";
+    let arch = "amd64";
    #[cfg(target_arch = "aarch64")]
-    let arch = "aarch64";
+    let arch = "arm64";

-    let file_url = format!(
-      "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/{}/gpgui_{}_{}.bin.tar.xz",
-      release_tag, self.version, arch
-    );
+    let file_url = format!("https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v{}/gpgui-linux-{}", self.version, arch);
    let checksum_url = format!("{}.sha256", file_url);

    info!("Downloading file: {}", file_url);
--- a/apps/gpservice/Cargo.toml
+++ b/apps/gpservice/Cargo.toml
@@ -18,5 +18,3 @@ serde_json.workspace = true
 env_logger.workspace = true
 log.workspace = true
 compile-time.workspace = true
-xz2 = "0.1"
-tar = "0.4"
--- a/apps/gpservice/src/handlers.rs
+++ b/apps/gpservice/src/handlers.rs
@@ -1,12 +1,4 @@
-use std::{
-  borrow::Cow,
-  fs::{File, Permissions},
-  io::BufReader,
-  ops::ControlFlow,
-  os::unix::fs::PermissionsExt,
-  path::PathBuf,
-  sync::Arc,
-};
+use std::{borrow::Cow, fs::Permissions, ops::ControlFlow, os::unix::fs::PermissionsExt, path::PathBuf, sync::Arc};

 use anyhow::bail;
 use axum::{
@@ -25,9 +17,7 @@ use gpapi::{
  GP_GUI_BINARY,
 };
 use log::{info, warn};
-use tar::Archive;
 use tokio::fs;
-use xz2::read::XzDecoder;

 use crate::ws_server::WsServerContext;

@@ -70,7 +60,6 @@ pub async fn update_gui(State(ctx): State<Arc<WsServerContext>>, body: Bytes) ->
  Ok(())
 }

-// Unpack GPGUI archive, gpgui_2.0.0_{arch}.bin.tar.xz and install it
 async fn install_gui(src: &str) -> anyhow::Result<()> {
  let path = PathBuf::from(GP_GUI_BINARY);
  let Some(dir) = path.parent() else {
@@ -79,27 +68,8 @@ async fn install_gui(src: &str) -> anyhow::Result<()> {

  fs::create_dir_all(dir).await?;

-  // Unpack the archive
-  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
+  // Copy the file to the final location and make it executable
+  fs::copy(src, GP_GUI_BINARY).await?;
  fs::set_permissions(GP_GUI_BINARY, Permissions::from_mode(0o755)).await?;

  Ok(())
--- a/apps/gpservice/src/vpn_task.rs
+++ b/apps/gpservice/src/vpn_task.rs
@@ -4,7 +4,7 @@ use gpapi::service::{
  request::{ConnectRequest, WsRequest},
  vpn_state::VpnState,
 };
-use log::{info, warn};
+use log::info;
 use openconnect::Vpn;
 use tokio::sync::{mpsc, oneshot, watch, RwLock};
 use tokio_util::sync::CancellationToken;
@@ -31,29 +31,22 @@ impl VpnTaskContext {
      return;
    }

-    let vpn_state_tx = self.vpn_state_tx.clone();
    let info = req.info().clone();
    let vpn_handle = Arc::clone(&self.vpn_handle);
    let args = req.args();
-    let vpn = match Vpn::builder(req.gateway().server(), args.cookie())
-      .script(args.vpnc_script())
+    let vpn = Vpn::builder(req.gateway().server(), args.cookie())
      .user_agent(args.user_agent())
+      .script(args.vpnc_script())
      .csd_uid(args.csd_uid())
      .csd_wrapper(args.csd_wrapper())
      .mtu(args.mtu())
      .os(args.openconnect_os())
-      .build()
-    {
-      Ok(vpn) => vpn,
-      Err(err) => {
-        warn!("Failed to create VPN: {}", err);
-        vpn_state_tx.send(VpnState::Disconnected).ok();
-        return;
-      }
-    };
+      .build();

    // Save the VPN handle
    vpn_handle.write().await.replace(vpn);
+
+    let vpn_state_tx = self.vpn_state_tx.clone();
    let connect_info = Box::new(info.clone());
    vpn_state_tx.send(VpnState::Connecting(connect_info)).ok();

--- a/changelog.md
+++ b/changelog.md
@@ -1,22 +1,5 @@
 # Changelog

-## 2.1.2 - 2024-03-29
-
- Treat portal as gateway when the gateway login is failed (fix #338)
-
-## 2.1.1 - 2024-03-25
-
- Add the `--hip` option to enable HIP report
- Fix not working in OpenSuse 15.5 (fix #336, #322)
- Treat portal as gateway when the gateway login is failed (fix #338)
- Improve the error message (fix #327)
-
-## 2.1.0 - 2024-02-27
-
- Update distribution channel for `gpgui` to complaint with the GPL-3 license.
- Add `mtu` option.
- Retry auth if failed to obtain the auth cookie
-
 ## 2.0.0 - 2024-02-05

 - Refactor using Tauri
--- a/crates/common/Cargo.toml
+++ b/crates/common/Cargo.toml
@@ -1,11 +0,0 @@
-[package]
-name = "common"
-rust-version.workspace = true
-version.workspace = true
-authors.workspace = true
-homepage.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[dependencies]
-is_executable.workspace = true
--- a/crates/common/src/lib.rs
+++ b/crates/common/src/lib.rs
@@ -1 +0,0 @@
-pub mod vpn_utils;
--- a/crates/common/src/vpn_utils.rs
+++ b/crates/common/src/vpn_utils.rs
@@ -1,41 +0,0 @@
-use is_executable::IsExecutable;
-use std::path::Path;
-
-pub use is_executable::is_executable;
-
-const VPNC_SCRIPT_LOCATIONS: [&str; 6] = [
-  "/usr/local/share/vpnc-scripts/vpnc-script",
-  "/usr/local/sbin/vpnc-script",
-  "/usr/share/vpnc-scripts/vpnc-script",
-  "/usr/sbin/vpnc-script",
-  "/etc/vpnc/vpnc-script",
-  "/etc/openconnect/vpnc-script",
-];
-
-const CSD_WRAPPER_LOCATIONS: [&str; 3] = [
-  #[cfg(target_arch = "x86_64")]
-  "/usr/lib/x86_64-linux-gnu/openconnect/hipreport.sh",
-  #[cfg(target_arch = "aarch64")]
-  "/usr/lib/aarch64-linux-gnu/openconnect/hipreport.sh",
-  "/usr/lib/openconnect/hipreport.sh",
-  "/usr/libexec/openconnect/hipreport.sh",
-];
-
-fn find_executable(locations: &[&str]) -> Option<String> {
-  for location in locations.iter() {
-    let path = Path::new(location);
-    if path.is_executable() {
-      return Some(location.to_string());
-    }
-  }
-
-  None
-}
-
-pub fn find_vpnc_script() -> Option<String> {
-  find_executable(&VPNC_SCRIPT_LOCATIONS)
-}
-
-pub fn find_csd_wrapper() -> Option<String> {
-  find_executable(&CSD_WRAPPER_LOCATIONS)
-}
--- a/crates/gpapi/src/error.rs
+++ b/crates/gpapi/src/error.rs
@@ -1,11 +0,0 @@
-use thiserror::Error;
-
-#[derive(Error, Debug)]
-pub enum PortalError {
-  #[error("Portal prelogin error: {0}")]
-  PreloginError(String),
-  #[error("Portal config error: {0}")]
-  ConfigError(String),
-  #[error("Network error: {0}")]
-  NetworkError(String),
-}
--- a/crates/gpapi/src/gateway/login.rs
+++ b/crates/gpapi/src/gateway/login.rs
@@ -1,14 +1,13 @@
 use anyhow::bail;
-use log::{info, warn};
+use log::info;
 use reqwest::Client;
 use roxmltree::Document;
 use urlencoding::encode;

 use crate::{
  credential::Credential,
-  error::PortalError,
  gp_params::GpParams,
-  utils::{normalize_server, parse_gp_error, remove_url_scheme},
+  utils::{normalize_server, remove_url_scheme},
 };

 pub async fn gateway_login(gateway: &str, cred: &Credential, gp_params: &GpParams) -> anyhow::Result<String> {
@@ -29,24 +28,11 @@ pub async fn gateway_login(gateway: &str, cred: &Credential, gp_params: &GpParam

  info!("Gateway login, user_agent: {}", gp_params.user_agent());

-  let res = client
-    .post(&login_url)
-    .form(&params)
-    .send()
-    .await
-    .map_err(|e| anyhow::anyhow!(PortalError::NetworkError(e.to_string())))?;
-
+  let res = client.post(&login_url).form(&params).send().await?;
  let status = res.status();

  if status.is_client_error() || status.is_server_error() {
-    let (reason, res) = parse_gp_error(res).await;
-
-    warn!(
-      "Gateway login error: reason={}, status={}, response={}",
-      reason, status, res
-    );
-
-    bail!("Gateway login error, reason: {}", reason);
+    bail!("Gateway login error: {}", status)
  }

  let res_xml = res.text().await?;
--- a/crates/gpapi/src/lib.rs
+++ b/crates/gpapi/src/lib.rs
@@ -1,6 +1,5 @@
 pub mod auth;
 pub mod credential;
-pub mod error;
 pub mod gateway;
 pub mod gp_params;
 pub mod portal;
--- a/crates/gpapi/src/portal/config.rs
+++ b/crates/gpapi/src/portal/config.rs
@@ -1,5 +1,5 @@
 use anyhow::bail;
-use log::{info, warn};
+use log::info;
 use reqwest::{Client, StatusCode};
 use roxmltree::Document;
 use serde::Serialize;
@@ -7,10 +7,10 @@ use specta::Type;

 use crate::{
  credential::{AuthCookieCredential, Credential},
-  error::PortalError,
  gateway::{parse_gateways, Gateway},
  gp_params::GpParams,
-  utils::{normalize_server, parse_gp_error, remove_url_scheme, xml},
+  portal::PortalError,
+  utils::{normalize_server, remove_url_scheme, xml},
 };

 #[derive(Debug, Serialize, Type)]
@@ -102,12 +102,7 @@ pub async fn retrieve_config(portal: &str, cred: &Credential, gp_params: &GpPara

  info!("Portal config, user_agent: {}", gp_params.user_agent());

-  let res = client
-    .post(&url)
-    .form(&params)
-    .send()
-    .await
-    .map_err(|e| anyhow::anyhow!(PortalError::NetworkError(e.to_string())))?;
+  let res = client.post(&url).form(&params).send().await?;
  let status = res.status();

  if status == StatusCode::NOT_FOUND {
@@ -115,14 +110,7 @@ pub async fn retrieve_config(portal: &str, cred: &Credential, gp_params: &GpPara
  }

  if status.is_client_error() || status.is_server_error() {
-    let (reason, res) = parse_gp_error(res).await;
-
-    warn!(
-      "Portal config error: reason={}, status={}, response={}",
-      reason, status, res
-    );
-
-    bail!("Portal config error, reason: {}", reason);
+    bail!("Portal config error: {}", status)
  }

  let res_xml = res.text().await.map_err(|e| PortalError::ConfigError(e.to_string()))?;
--- a/crates/gpapi/src/portal/mod.rs
+++ b/crates/gpapi/src/portal/mod.rs
@@ -3,3 +3,13 @@ mod prelogin;

 pub use config::*;
 pub use prelogin::*;
+
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum PortalError {
+  #[error("Portal prelogin error: {0}")]
+  PreloginError(String),
+  #[error("Portal config error: {0}")]
+  ConfigError(String),
+}
--- a/crates/gpapi/src/portal/prelogin.rs
+++ b/crates/gpapi/src/portal/prelogin.rs
@@ -1,14 +1,14 @@
 use anyhow::bail;
-use log::{info, warn};
+use log::info;
 use reqwest::{Client, StatusCode};
 use roxmltree::Document;
 use serde::Serialize;
 use specta::Type;

 use crate::{
-  error::PortalError,
  gp_params::GpParams,
-  utils::{base64, normalize_server, parse_gp_error, xml},
+  portal::PortalError,
+  utils::{base64, normalize_server, xml},
 };

 const REQUIRED_PARAMS: [&str; 8] = [
@@ -118,12 +118,7 @@ pub async fn prelogin(portal: &str, gp_params: &GpParams) -> anyhow::Result<Prel
    .user_agent(user_agent)
    .build()?;

-  let res = client
-    .post(&prelogin_url)
-    .form(&params)
-    .send()
-    .await
-    .map_err(|e| anyhow::anyhow!(PortalError::NetworkError(e.to_string())))?;
+  let res = client.post(&prelogin_url).form(&params).send().await?;
  let status = res.status();

  if status == StatusCode::NOT_FOUND {
@@ -131,10 +126,6 @@ pub async fn prelogin(portal: &str, gp_params: &GpParams) -> anyhow::Result<Prel
  }

  if status.is_client_error() || status.is_server_error() {
-    let (reason, res) = parse_gp_error(res).await;
-
-    warn!("Prelogin error: reason={}, status={}, response={}", reason, status, res);
-
    bail!("Prelogin error: {}", status)
  }

--- a/crates/gpapi/src/utils/mod.rs
+++ b/crates/gpapi/src/utils/mod.rs
@@ -1,4 +1,4 @@
-use reqwest::{Response, Url};
+use reqwest::Url;

 pub(crate) mod xml;

@@ -41,18 +41,3 @@ pub fn normalize_server(server: &str) -> anyhow::Result<String> {
 pub fn remove_url_scheme(s: &str) -> String {
  s.replace("http://", "").replace("https://", "")
 }
-
-pub(crate) async fn parse_gp_error(res: Response) -> (String, String) {
-  let reason = res
-    .headers()
-    .get("x-private-pan-globalprotect")
-    .map_or_else(|| "<none>", |v| v.to_str().unwrap_or("<invalid header>"))
-    .to_string();
-
-  let res = res.text().await.map_or_else(
-    |_| "<failed to read response>".to_string(),
-    |v| if v.is_empty() { "<empty>".to_string() } else { v },
-  );
-
-  (reason, res)
-}
--- a/crates/openconnect/Cargo.toml
+++ b/crates/openconnect/Cargo.toml
@@ -6,8 +6,8 @@ license.workspace = true
 links = "openconnect"

 [dependencies]
-common = { path = "../common" }
 log.workspace = true
+is_executable.workspace = true

 [build-dependencies]
 cc = "1"
--- a/crates/openconnect/src/lib.rs
+++ b/crates/openconnect/src/lib.rs
@@ -1,4 +1,5 @@
 mod ffi;
 mod vpn;
+mod vpnc_script;

 pub use vpn::*;
--- a/crates/openconnect/src/vpn.rs
+++ b/crates/openconnect/src/vpn.rs
@@ -1,13 +1,11 @@
 use std::{
  ffi::{c_char, CString},
-  fmt,
  sync::{Arc, RwLock},
 };

-use common::vpn_utils::{find_vpnc_script, is_executable};
 use log::info;

-use crate::ffi;
+use crate::{ffi, vpnc_script::find_default_vpnc_script};

 type OnConnectedCallback = Arc<RwLock<Option<Box<dyn FnOnce() + 'static + Send + Sync>>>>;

@@ -79,31 +77,11 @@ impl Vpn {
  }
 }

-#[derive(Debug)]
-pub struct VpnError<'a> {
-  message: &'a str,
-}
-
-impl<'a> VpnError<'a> {
-  fn new(message: &'a str) -> Self {
-    Self { message }
-  }
-}
-
-impl fmt::Display for VpnError<'_> {
-  fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-    write!(f, "{}", self.message)
-  }
-}
-
-impl std::error::Error for VpnError<'_> {}
-
 pub struct VpnBuilder {
  server: String,
  cookie: String,
-  script: Option<String>,
-
  user_agent: Option<String>,
+  script: Option<String>,
  os: Option<String>,

  csd_uid: u32,
@@ -117,25 +95,22 @@ impl VpnBuilder {
    Self {
      server: server.to_string(),
      cookie: cookie.to_string(),
-      script: None,
-
      user_agent: None,
+      script: None,
      os: None,
-
      csd_uid: 0,
      csd_wrapper: None,
-
      mtu: 0,
    }
  }

-  pub fn script<T: Into<Option<String>>>(mut self, script: T) -> Self {
-    self.script = script.into();
+  pub fn user_agent<T: Into<Option<String>>>(mut self, user_agent: T) -> Self {
+    self.user_agent = user_agent.into();
    self
  }

-  pub fn user_agent<T: Into<Option<String>>>(mut self, user_agent: T) -> Self {
-    self.user_agent = user_agent.into();
+  pub fn script<T: Into<Option<String>>>(mut self, script: T) -> Self {
+    self.script = script.into();
    self
  }

@@ -159,27 +134,12 @@ impl VpnBuilder {
    self
  }

-  pub fn build(self) -> Result<Vpn, VpnError<'static>> {
-    let script = match self.script {
-      Some(script) => {
-        if !is_executable(&script) {
-          return Err(VpnError::new("vpnc script is not executable"));
-        }
-        script
-      }
-      None => find_vpnc_script().ok_or_else(|| VpnError::new("Failed to find vpnc-script"))?,
-    };
-
-    if let Some(csd_wrapper) = &self.csd_wrapper {
-      if !is_executable(csd_wrapper) {
-        return Err(VpnError::new("CSD wrapper is not executable"));
-      }
-    }
-
+  pub fn build(self) -> Vpn {
    let user_agent = self.user_agent.unwrap_or_default();
+    let script = self.script.or_else(find_default_vpnc_script).unwrap_or_default();
    let os = self.os.unwrap_or("linux".to_string());

-    Ok(Vpn {
+    Vpn {
      server: Self::to_cstring(&self.server),
      cookie: Self::to_cstring(&self.cookie),
      user_agent: Self::to_cstring(&user_agent),
@@ -194,7 +154,7 @@ impl VpnBuilder {
      mtu: self.mtu,

      callback: Default::default(),
-    })
+    }
  }

  fn to_cstring(value: &str) -> CString {
--- a/crates/openconnect/src/vpnc_script.rs
+++ b/crates/openconnect/src/vpnc_script.rs
@@ -0,0 +1,23 @@
+use is_executable::IsExecutable;
+use std::path::Path;
+
+const VPNC_SCRIPT_LOCATIONS: [&str; 5] = [
+  "/usr/local/share/vpnc-scripts/vpnc-script",
+  "/usr/local/sbin/vpnc-script",
+  "/usr/share/vpnc-scripts/vpnc-script",
+  "/usr/sbin/vpnc-script",
+  "/etc/vpnc/vpnc-script",
+];
+
+pub(crate) fn find_default_vpnc_script() -> Option<String> {
+  for location in VPNC_SCRIPT_LOCATIONS.iter() {
+    let path = Path::new(location);
+    if path.is_executable() {
+      return Some(location.to_string());
+    }
+  }
+
+  log::warn!("vpnc-script not found");
+
+  None
+}
--- a/packaging/binary/Makefile.in
+++ b/packaging/binary/Makefile.in
@@ -1,31 +0,0 @@
-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 -Dm755 artifacts/usr/bin/gpgui $(DESTDIR)/usr/bin/gpgui
-
-	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
--- a/packaging/deb/control.in
+++ b/packaging/deb/control.in
@@ -3,16 +3,7 @@ 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),
-  libxml2,
-  libsecret-1-0,
-  libayatana-appindicator3-1,
-  gnome-keyring,
-  libwebkit2gtk-4.0-dev,
-  libopenconnect-dev (>= 8.20),@RUST@
+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
--- a/packaging/deb/postrm
+++ b/packaging/deb/postrm
@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-    purge|remove|upgrade)
-        # Remove the gpgui binary downloaded at runtime
-        rm -f /usr/bin/gpgui
-    ;;
-
-    *)
-    ;;
-esac
-
-exit 0
--- a/packaging/deb/rules
+++ b/packaging/deb/rules
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+export OFFLINE = 1
+
+%:
+	dh $@
--- a/packaging/deb/rules.in
+++ b/packaging/deb/rules.in
@@ -1,7 +0,0 @@
-#!/usr/bin/make -f
-
-export OFFLINE = @OFFLINE@
-export BUILD_FE = 0
-
-%:
-	dh $@ --no-parallel
--- a/packaging/pkgbuild/PKGBUILD.in
+++ b/packaging/pkgbuild/PKGBUILD.in
@@ -21,15 +21,10 @@ options=('!strip')

 build() {
  cd "$pkgname-$pkgver"
-
-  # Must unset the CFLAGS, otherwise the build fails
-  unset CFLAGS
-
-  make build OFFLINE=@OFFLINE@ BUILD_FE=0
+  make build OFFLINE=1
 }

 package() {
  cd "$pkgname-$pkgver"
-
  make install DESTDIR="$pkgdir"
 }
--- a/packaging/rpm/globalprotect-openconnect.spec.in
+++ b/packaging/rpm/globalprotect-openconnect.spec.in
@@ -15,9 +15,9 @@ BuildRequires:  jq
 BuildRequires:  pkg-config
 BuildRequires:  openconnect-devel
 BuildRequires:  openssl-devel
+BuildRequires:  curl
 BuildRequires:  wget
 BuildRequires:  file
-BuildRequires:  perl

 BuildRequires:  (webkit2gtk4.0-devel or webkit2gtk3-soup2-devel)
 BuildRequires:  (libappindicator-gtk3-devel or libappindicator3-1)
@@ -34,20 +34,18 @@ A GUI for GlobalProtect VPN, based on OpenConnect, supports the SSO authenticati
 %prep
 %setup

-%postun
-rm -f %{_bindir}/gpgui
-
 %build
-# The injected RUSTFLAGS could fail the build
-unset RUSTFLAGS
-make build OFFLINE=@OFFLINE@ BUILD_FE=0
+make build OFFLINE=1

 %install
 %make_install

 %files
 %defattr(-,root,root)
-%{_bindir}/*
+%{_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
Author	SHA1	Message	Date
Kevin Yue	3daad748ae	Add rust dep for ppa	2024-02-25 13:33:53 +08:00
Kevin Yue	5bca84c9cf	Set rust version	2024-02-25 12:42:25 +08:00
Kevin Yue	3a6eca2ed2	Add build dependencies	2024-02-25 11:50:24 +08:00
Kevin Yue	141d66cbde	Fix rpm install	2024-02-25 10:57:02 +08:00
Kevin Yue	f44cd85971	Use .build folder	2024-02-25 10:37:52 +08:00
Kevin Yue	55b119d0f2	Install rpm	2024-02-25 10:32:47 +08:00
Kevin Yue	df1bcd6571	Install rpm	2024-02-25 09:59:21 +08:00
Kevin Yue	a19789f1e3	Update rpm packaging	2024-02-25 09:55:52 +08:00
Kevin Yue	a0891e9f04	Update build.yaml	2024-02-24 22:51:27 +08:00
Kevin Yue	5586daf9e5	Add rpm target	2024-02-24 22:32:58 +08:00
Kevin Yue	d2d45910cb	Fix CI	2024-02-23 21:59:47 +08:00
Kevin Yue	df4bbe0059	Preserve env for debuild	2024-02-23 21:12:12 +08:00
Kevin Yue	aa0f6bf5bb	CI build deb	2024-02-23 06:07:16 -05:00
Kevin Yue	48e22f4f78	Add make ppa	2024-02-23 06:06:59 -05:00
Kevin Yue	480229b69f	Fix archive name	2024-02-22 08:29:42 -05:00
Kevin Yue	c446763a05	Improve makefile	2024-02-22 08:20:52 -05:00
Kevin Yue	cfdba00a01	Make tarball	2024-02-21 22:19:34 +08:00
Kevin Yue	5404386972	Add packaging	2024-02-21 07:36:17 -05:00
Kevin Yue	4be877bf8c	Add gpgui-helper (#326 )	2024-02-21 20:34:14 +08:00