docs: update README for manual installation

Related: #437

.github/workflows/publish.yaml

@@ -76,7 +76,7 @@ jobs:
         cp packaging/deb/postrm .build/debian/postrm
 
     - name: Publish to PPA
-      uses: yuezk/publish-ppa-package@dev
+      uses: yuezk/publish-ppa-package@v2
       with:
         repository: "yuezk/globalprotect-openconnect"
         gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }}
@@ -85,5 +85,5 @@ jobs:
         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"
+        extra_ppa: "yuezk/globalprotect-openconnect liushuyu-011/rust-bpo-1.75"
         revision: ${{ inputs.revision }}

.github/workflows/release.yaml

@@ -1,4 +1,4 @@
-name: Release Packages
+name: GH Release Packages
 
 on:
   workflow_dispatch:

Cargo.lock

@@ -579,7 +579,7 @@ dependencies = [
 
 [[package]]
 name = "common"
-version = "2.3.8"
+version = "2.3.9"
 dependencies = [
  "is_executable",
 ]
@@ -1449,7 +1449,7 @@ dependencies = [
 
 [[package]]
 name = "gpapi"
-version = "2.3.8"
+version = "2.3.9"
 dependencies = [
  "anyhow",
  "base64 0.21.5",
@@ -1485,7 +1485,7 @@ dependencies = [
 
 [[package]]
 name = "gpauth"
-version = "2.3.8"
+version = "2.3.9"
 dependencies = [
  "anyhow",
  "clap",
@@ -1506,7 +1506,7 @@ dependencies = [
 
 [[package]]
 name = "gpclient"
-version = "2.3.8"
+version = "2.3.9"
 dependencies = [
  "anyhow",
  "clap",
@@ -1528,7 +1528,7 @@ dependencies = [
 
 [[package]]
 name = "gpgui-helper"
-version = "2.3.8"
+version = "2.3.9"
 dependencies = [
  "anyhow",
  "clap",
@@ -1546,7 +1546,7 @@ dependencies = [
 
 [[package]]
 name = "gpservice"
-version = "2.3.8"
+version = "2.3.9"
 dependencies = [
  "anyhow",
  "axum",
@@ -2625,7 +2625,7 @@ dependencies = [
 
 [[package]]
 name = "openconnect"
-version = "2.3.8"
+version = "2.3.9"
 dependencies = [
  "cc",
  "common",

Cargo.toml

@@ -5,7 +5,7 @@ members = ["crates/*", "apps/gpclient", "apps/gpservice", "apps/gpauth", "apps/g
 
 [workspace.package]
 rust-version = "1.70"
-version = "2.3.8"
+version = "2.3.9"
 authors = ["Kevin Yue <k3vinyue@gmail.com>"]
 homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
 edition = "2021"

README.md

@@ -85,17 +85,13 @@ sudo apt-get install globalprotect-openconnect
 
 #### **Ubuntu 24.04 and later**
 
-The `libwebkit2gtk-4.0-37` package was [removed](https://bugs.launchpad.net/ubuntu/+source/webkit2gtk/+bug/2061914) from its repo, before [the issue](https://github.com/yuezk/GlobalProtect-openconnect/issues/351) gets resolved, you need to install them manually:
+The `libwebkit2gtk-4.0-37` package was [removed](https://bugs.launchpad.net/ubuntu/+source/webkit2gtk/+bug/2061914) from its repo. You can use the [`deb-install.sh`](./scripts/deb-install.sh) script to install the package:
 
 ```bash
-wget http://launchpadlibrarian.net/704701349/libwebkit2gtk-4.0-37_2.43.3-1_amd64.deb
-wget http://launchpadlibrarian.net/704701345/libjavascriptcoregtk-4.0-18_2.43.3-1_amd64.deb
-
-sudo dpkg --install *.deb
+curl -o- https://raw.githubusercontent.com/yuezk/GlobalProtect-openconnect/main/scripts/deb-install.sh \
+  | bash -s -- 2.3.9
 ```
 
-And the latest package is not available in the PPA, you can follow the [Install from deb package](#install-from-deb-package) section to install the latest package.
-
 #### **Ubuntu 18.04**
 
 The latest package is not available in the PPA either, but you still needs to add the `ppa:yuezk/globalprotect-openconnect` repo beforehand to use the required `openconnect` package. Then you can follow the [Install from deb package](#install-from-deb-package) section to install the latest package.

apps/gpclient/src/cli.rs

@@ -50,7 +50,7 @@ struct Cli {
   #[command(subcommand)]
   command: CliCommand,
 
-  #[arg(long, help = "Get around the OpenSSL `unsafe legacy renegotiation` error")]
+  #[arg(long, help = "Uses extended compatibility mode for OpenSSL operations to support a broader range of systems and formats.")]
   fix_openssl: bool,
   #[arg(long, help = "Ignore the TLS errors")]
   ignore_tls_errors: bool,

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.3.9 - 2024-11-02
+
+- Enhance the OpenSSL compatibility mode (fix [#437](https://github.com/yuezk/GlobalProtect-openconnect/issues/437))
+
 ## 2.3.8 - 2024-10-31
 
 - GUI: support configure the external browser to use for authentication (fix [#423](https://github.com/yuezk/GlobalProtect-openconnect/issues/423))

crates/gpapi/src/utils/openssl.rs

@@ -10,12 +10,24 @@ pub fn openssl_conf() -> String {
 
 [openssl_init]
 ssl_conf = ssl_sect
+providers = provider_sect
 
 [ssl_sect]
 system_default = system_default_sect
 
 [system_default_sect]
-Options = {}",
+Options = {}
+
+[provider_sect]
+default = default_sect
+legacy = legacy_sect
+
+[default_sect]
+activate = 1
+
+[legacy_sect]
+activate = 1
+",
     option
   )
 }

scripts/deb-install.sh

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+set -e
+
+# Usage: ./deb-install.sh <version>
+
+usage() {
+  echo "Usage: $0 <version>"
+  echo "Example: $0 2.3.9"
+  exit 1
+}
+
+if [ $# -ne 1 ]; then
+  usage
+fi
+
+VERSION=$1
+
+# Check the architecture, only support x86_64 and aarch64/arm64
+ARCH=$(uname -m)
+
+# Normalize the architecture name
+if [ "$ARCH" == "x86_64" ]; then
+  ARCH="amd64"
+elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "arm64" ]; then
+  ARCH="arm64"
+else
+  echo "Unsupported architecture: $ARCH"
+  exit 1
+fi
+
+LIB_JAVASCRIPT_x86="http://launchpadlibrarian.net/704701345/libjavascriptcoregtk-4.0-18_2.43.3-1_amd64.deb"
+LIB_WEBKIT_x86="http://launchpadlibrarian.net/704701349/libwebkit2gtk-4.0-37_2.43.3-1_amd64.deb"
+
+LIB_JAVASCRIPT_arm="http://launchpadlibrarian.net/704735771/libjavascriptcoregtk-4.0-18_2.43.3-1_arm64.deb"
+LIB_WEBKIT_arm="http://launchpadlibrarian.net/704735777/libwebkit2gtk-4.0-37_2.43.3-1_arm64.deb"
+
+DEB_URL="https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${VERSION}/globalprotect-openconnect_${VERSION}-1_${ARCH}.deb"
+
+# Install the dependencies
+if [ "$ARCH" == "amd64" ]; then
+  wget -O /tmp/libjavascriptcoregtk.deb $LIB_JAVASCRIPT_x86
+  wget -O /tmp/libwebkit2gtk.deb $LIB_WEBKIT_x86
+else
+  wget -O /tmp/libjavascriptcoregtk.deb $LIB_JAVASCRIPT_arm
+  wget -O /tmp/libwebkit2gtk.deb $LIB_WEBKIT_arm
+fi
+
+sudo dpkg -i /tmp/libjavascriptcoregtk.deb /tmp/libwebkit2gtk.deb
+
+# Install the package
+wget -O /tmp/globalprotect-openconnect.deb $DEB_URL
+sudo apt install --fix-broken -y /tmp/globalprotect-openconnect.deb
+
+# Clean up
+rm /tmp/libjavascriptcoregtk.deb /tmp/libwebkit2gtk.deb /tmp/globalprotect-openconnect.deb
+
+echo ""
+echo "GlobalProtect OpenConnect VPN client has been installed successfully."