From 71c0352c85136b1fd673b02f75ccbe7bb80bbc72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linus=20F=C3=A4rnstrand?= <faern@faern.net>
Date: Mon, 3 Jul 2023 10:38:35 +0200
Subject: [PATCH 1/2] Deny old clap versions in our dependency tree

---
 deny.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/deny.toml b/deny.toml
index 9285d2202cd0..17ea05b1f0f5 100644
--- a/deny.toml
+++ b/deny.toml
@@ -84,6 +84,8 @@ deny = [
     { name = "openssl-sys" },
     { name = "openssl-src" },
     { name = "openssl-probe" },
+    { name = "clap", version = "2" },
+    { name = "clap", version = "3" },
 ]
 skip = []
 skip-tree = []

From 501b0091532d224353955470734644452a67d877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linus=20F=C3=A4rnstrand?= <faern@faern.net>
Date: Thu, 29 Jun 2023 10:58:27 +0200
Subject: [PATCH 2/2] Remove default features from cbindgen to get rid of clap
 3

---
 Cargo.lock                                    | 51 +++----------------
 .../shadowsocks-proxy/Cargo.toml              |  2 +-
 2 files changed, 8 insertions(+), 45 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c8b52245ce42..7b64c6add349 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -386,7 +386,6 @@ version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6358dedf60f4d9b8db43ad187391afe959746101346fe51bb978126bec61dfb"
 dependencies = [
- "clap 3.2.25",
  "heck",
  "indexmap",
  "log",
@@ -468,21 +467,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "clap"
-version = "3.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
-dependencies = [
- "atty",
- "bitflags",
- "clap_lex 0.2.4",
- "indexmap",
- "strsim 0.10.0",
- "termcolor",
- "textwrap",
-]
-
 [[package]]
 name = "clap"
 version = "4.2.7"
@@ -503,7 +487,7 @@ dependencies = [
  "anstream",
  "anstyle",
  "bitflags",
- "clap_lex 0.4.1",
+ "clap_lex",
  "once_cell",
  "strsim 0.10.0",
 ]
@@ -514,7 +498,7 @@ version = "4.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a19591b2ab0e3c04b588a0e04ddde7b9eaa423646d1b4a8092879216bf47473"
 dependencies = [
- "clap 4.2.7",
+ "clap",
 ]
 
 [[package]]
@@ -529,15 +513,6 @@ dependencies = [
  "syn 2.0.15",
 ]
 
-[[package]]
-name = "clap_lex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
-
 [[package]]
 name = "clap_lex"
 version = "0.4.1"
@@ -2020,7 +1995,7 @@ dependencies = [
  "anyhow",
  "base64 0.13.0",
  "chrono",
- "clap 4.2.7",
+ "clap",
  "clap_complete",
  "env_logger 0.10.0",
  "futures",
@@ -2044,7 +2019,7 @@ dependencies = [
  "android_logger",
  "cfg-if",
  "chrono",
- "clap 4.2.7",
+ "clap",
  "ctrlc",
  "dirs-next",
  "duct",
@@ -2173,7 +2148,7 @@ dependencies = [
 name = "mullvad-problem-report"
 version = "0.0.0"
 dependencies = [
- "clap 4.2.7",
+ "clap",
  "dirs-next",
  "duct",
  "env_logger 0.10.0",
@@ -2218,7 +2193,7 @@ dependencies = [
 name = "mullvad-setup"
 version = "0.0.0"
 dependencies = [
- "clap 4.2.7",
+ "clap",
  "env_logger 0.10.0",
  "err-derive",
  "lazy_static",
@@ -2238,7 +2213,7 @@ name = "mullvad-types"
 version = "0.0.0"
 dependencies = [
  "chrono",
- "clap 4.2.7",
+ "clap",
  "err-derive",
  "ipnetwork",
  "jnix",
@@ -2513,12 +2488,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "os_str_bytes"
-version = "6.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
-
 [[package]]
 name = "oslog"
 version = "0.2.0"
@@ -3931,12 +3900,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "textwrap"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
-
 [[package]]
 name = "thiserror"
 version = "1.0.30"
diff --git a/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml b/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml
index 4edc6f36be73..161dbf2e933b 100644
--- a/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml
+++ b/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml
@@ -22,4 +22,4 @@ log = "0.4"
 oslog = "0.2"
 
 [target.'cfg(any(target_os = "macos", target_os = "ios"))'.build-dependencies]
-cbindgen = "0.24"
+cbindgen = { version = "0.24.3", default-features = false }