.github/workflows/publish.yaml

@@ -86,5 +86,4 @@ jobs:
         deb_email: "k3vinyue@gmail.com"
         deb_fullname: "Kevin Yue"
         extra_ppa: "yuezk/globalprotect-openconnect liushuyu-011/rust-bpo-1.75"
-        series: "focal"
         revision: ${{ inputs.revision }}

Cargo.lock

@@ -580,7 +580,7 @@ dependencies = [
 
 [[package]]
 name = "common"
-version = "2.3.10"
+version = "2.3.9"
 dependencies = [
  "is_executable",
 ]
@@ -1469,7 +1469,7 @@ dependencies = [
 
 [[package]]
 name = "gpapi"
-version = "2.3.10"
+version = "2.3.9"
 dependencies = [
  "anyhow",
  "base64 0.21.7",
@@ -1506,7 +1506,7 @@ dependencies = [
 
 [[package]]
 name = "gpauth"
-version = "2.3.10"
+version = "2.3.9"
 dependencies = [
  "anyhow",
  "clap",
@@ -1527,7 +1527,7 @@ dependencies = [
 
 [[package]]
 name = "gpclient"
-version = "2.3.10"
+version = "2.3.9"
 dependencies = [
  "anyhow",
  "clap",
@@ -1549,7 +1549,7 @@ dependencies = [
 
 [[package]]
 name = "gpgui-helper"
-version = "2.3.10"
+version = "2.3.9"
 dependencies = [
  "anyhow",
  "clap",
@@ -1567,7 +1567,7 @@ dependencies = [
 
 [[package]]
 name = "gpservice"
-version = "2.3.10"
+version = "2.3.9"
 dependencies = [
  "anyhow",
  "axum",
@@ -2753,7 +2753,7 @@ dependencies = [
 
 [[package]]
 name = "openconnect"
-version = "2.3.10"
+version = "2.3.9"
 dependencies = [
  "cc",
  "common",

Cargo.toml

@@ -11,7 +11,7 @@ members = [
 
 [workspace.package]
 rust-version = "1.70"
-version = "2.3.10"
+version = "2.3.9"
 authors = ["Kevin Yue <k3vinyue@gmail.com>"]
 homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
 edition = "2021"

apps/gpclient/src/connect.rs

@@ -87,8 +87,8 @@ pub(crate) struct ConnectArgs {
   #[arg(long, value_enum, default_value_t = ConnectArgs::default_os())]
   os: Os,
 
-  #[arg(long, help = "If not specified, it will be computed based on the --os option")]
-  os_version: Option<String>,
+  #[arg(long, default_value_t = ConnectArgs::default_os_version())]
+  os_version: String,
 
   #[arg(long, help = "Disable DTLS and ESP")]
   no_dtls: bool,
@@ -118,12 +118,8 @@ impl ConnectArgs {
     }
   }
 
-  fn os_version(&self) -> String {
-    if let Some(os_version) = self.os_version.as_deref() {
-      return os_version.to_string();
-    }
-
-    match self.os {
+  fn default_os_version() -> String {
+    match ConnectArgs::default_os() {
       Os::Linux => format!("Linux {}", whoami::distro()),
       Os::Windows => String::from("Microsoft Windows 11 Pro , 64-bit"),
       Os::Mac => String::from("Apple Mac OS X 13.4.0"),
@@ -150,7 +146,7 @@ impl<'a> ConnectHandler<'a> {
     GpParams::builder()
       .user_agent(&self.args.user_agent)
       .client_os(ClientOs::from(&self.args.os))
-      .os_version(self.args.os_version())
+      .os_version(self.args.os_version.clone())
       .ignore_tls_errors(self.shared_args.ignore_tls_errors)
       .certificate(self.args.certificate.clone())
       .sslkey(self.args.sslkey.clone())
@@ -363,7 +359,7 @@ impl<'a> ConnectHandler<'a> {
           .saml_request(prelogin.saml_request())
           .user_agent(&self.args.user_agent)
           .os(self.args.os.as_str())
-          .os_version(Some(&self.args.os_version()))
+          .os_version(Some(&self.args.os_version))
           .hidpi(self.args.hidpi)
           .fix_openssl(self.shared_args.fix_openssl)
           .ignore_tls_errors(self.shared_args.ignore_tls_errors)

changelog.md

@@ -1,9 +1,5 @@
 # Changelog
 
-## 2.3.10 - 2024-01-20
-
-- Disconnect the VPN when sleep (fix [#166](https://github.com/yuezk/GlobalProtect-openconnect/issues/166), [#267](https://github.com/yuezk/GlobalProtect-openconnect/issues/267))
-
 ## 2.3.9 - 2024-11-02
 
 - Enhance the OpenSSL compatibility mode (fix [#437](https://github.com/yuezk/GlobalProtect-openconnect/issues/437))