From 187ca778f23dc7a15b413741c3fc253d3bde19c0 Mon Sep 17 00:00:00 2001
From: Kevin Yue <yuezk001@gmail.com>
Date: Mon, 25 Mar 2024 21:15:24 +0800
Subject: [PATCH] Release 2.1.1

---
 Cargo.lock                   | 14 +++++++-------
 Cargo.toml                   |  2 +-
 apps/gpclient/src/connect.rs |  2 +-
 changelog.md                 |  7 +++++++
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c88d3986..3e87cb5e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -564,7 +564,7 @@ dependencies = [
 
 [[package]]
 name = "common"
-version = "2.1.0"
+version = "2.1.1"
 dependencies = [
  "is_executable",
 ]
@@ -1430,7 +1430,7 @@ dependencies = [
 
 [[package]]
 name = "gpapi"
-version = "2.1.0"
+version = "2.1.1"
 dependencies = [
  "anyhow",
  "base64 0.21.5",
@@ -1462,7 +1462,7 @@ dependencies = [
 
 [[package]]
 name = "gpauth"
-version = "2.1.0"
+version = "2.1.1"
 dependencies = [
  "anyhow",
  "clap",
@@ -1482,7 +1482,7 @@ dependencies = [
 
 [[package]]
 name = "gpclient"
-version = "2.1.0"
+version = "2.1.1"
 dependencies = [
  "anyhow",
  "clap",
@@ -1504,7 +1504,7 @@ dependencies = [
 
 [[package]]
 name = "gpgui-helper"
-version = "2.1.0"
+version = "2.1.1"
 dependencies = [
  "anyhow",
  "clap",
@@ -1522,7 +1522,7 @@ dependencies = [
 
 [[package]]
 name = "gpservice"
-version = "2.1.0"
+version = "2.1.1"
 dependencies = [
  "anyhow",
  "axum",
@@ -2527,7 +2527,7 @@ dependencies = [
 
 [[package]]
 name = "openconnect"
-version = "2.1.0"
+version = "2.1.1"
 dependencies = [
  "cc",
  "common",
diff --git a/Cargo.toml b/Cargo.toml
index d35029e1..0a37e762 100644
--- 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.0"
+version = "2.1.1"
 authors = ["Kevin Yue <k3vinyue@gmail.com>"]
 homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
 edition = "2021"
diff --git a/apps/gpclient/src/connect.rs b/apps/gpclient/src/connect.rs
index cab99df1..639501be 100644
--- a/apps/gpclient/src/connect.rs
+++ b/apps/gpclient/src/connect.rs
@@ -169,7 +169,7 @@ 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_user.is_some() {
+    let csd_wrapper = if self.args.csd_wrapper.is_some() {
       self.args.csd_wrapper.clone()
     } else if self.args.hip {
       find_csd_wrapper()
diff --git a/changelog.md b/changelog.md
index 1c2dcd3f..e6f2f3d0 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 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.