From 3b5e16b2a19ee55edd23c8654fb37cbc88c2823e Mon Sep 17 00:00:00 2001
From: Davide De Rosa <keeshux@gmail.com>
Date: Fri, 16 Jul 2021 21:26:59 +0200
Subject: [PATCH] Add support for --compress stub-v2

Via TunnelKit.
---
 Passepartout/App/Descriptible.swift |  2 +-
 Passepartout/App/iOS/CHANGELOG.md   |  3 ++-
 Passepartout/App/macOS/CHANGELOG.md |  3 ++-
 Podfile                             |  4 ++--
 Podfile.lock                        | 25 +++++++++++++++----------
 5 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/Passepartout/App/Descriptible.swift b/Passepartout/App/Descriptible.swift
index a8646e4c..e7af8ae7 100644
--- a/Passepartout/App/Descriptible.swift
+++ b/Passepartout/App/Descriptible.swift
@@ -53,7 +53,7 @@ extension OpenVPN.CompressionFraming: UIDescriptible {
         case .compLZO:
             return V.CompressionFraming.Value.lzo
             
-        case .compress:
+        case .compress, .compressV2:
             return V.CompressionFraming.Value.compress
         }
     }
diff --git a/Passepartout/App/iOS/CHANGELOG.md b/Passepartout/App/iOS/CHANGELOG.md
index 59e362ab..c77304dc 100644
--- a/Passepartout/App/iOS/CHANGELOG.md
+++ b/Passepartout/App/iOS/CHANGELOG.md
@@ -5,11 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 1.15.3 Beta 2663 (2021-06-26)
+## Unreleased
 
 ### Added
 
 - SurfShark provider.
+- Support for `--compress stub-v2`.
 
 ## 1.15.2 (2021-04-17)
 
diff --git a/Passepartout/App/macOS/CHANGELOG.md b/Passepartout/App/macOS/CHANGELOG.md
index 6a42522a..3c36512c 100644
--- a/Passepartout/App/macOS/CHANGELOG.md
+++ b/Passepartout/App/macOS/CHANGELOG.md
@@ -5,11 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 1.15.3 Beta 2663 (2021-06-26)
+## Unreleased
 
 ### Added
 
 - SurfShark provider.
+- Support for `--compress stub-v2`.
 
 ### Fixed
 
diff --git a/Podfile b/Podfile
index b595d11b..fa5b0fe2 100644
--- a/Podfile
+++ b/Podfile
@@ -7,8 +7,8 @@ $tunnelkit_name = 'TunnelKit'
 $tunnelkit_specs = ['Protocols/OpenVPN', 'Extra/LZO']
 
 def shared_pods
-    pod_version $tunnelkit_name, $tunnelkit_specs, '~> 3.3.2'
-    #pod_git $tunnelkit_name, $tunnelkit_specs, 'a658410'
+    #pod_version $tunnelkit_name, $tunnelkit_specs, '~> 3.3.2'
+    pod_git $tunnelkit_name, $tunnelkit_specs, 'f5fdc0c'
     #pod_path $tunnelkit_name, $tunnelkit_specs, '..'
     pod 'SSZipArchive'
     pod 'Kvitto', :git => 'https://github.com/keeshux/Kvitto', :branch => 'enable-macos-spec'
diff --git a/Podfile.lock b/Podfile.lock
index 603a19a8..8329e996 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -24,15 +24,15 @@ PODS:
   - OpenSSL-Apple (1.1.1k.11)
   - SSZipArchive (2.4.2)
   - SwiftyBeaver (1.9.5)
-  - TunnelKit/AppExtension (3.3.2):
+  - TunnelKit/AppExtension (3.3.3):
     - SwiftyBeaver
     - TunnelKit/Core
-  - TunnelKit/Core (3.3.2):
+  - TunnelKit/Core (3.3.3):
     - SwiftyBeaver
-  - TunnelKit/Extra/LZO (3.3.2)
-  - TunnelKit/Manager (3.3.2):
+  - TunnelKit/Extra/LZO (3.3.3)
+  - TunnelKit/Manager (3.3.3):
     - SwiftyBeaver
-  - TunnelKit/Protocols/OpenVPN (3.3.2):
+  - TunnelKit/Protocols/OpenVPN (3.3.3):
     - OpenSSL-Apple (~> 1.1.1h.10)
     - TunnelKit/AppExtension
     - TunnelKit/Core
@@ -52,8 +52,8 @@ DEPENDENCIES:
   - Kvitto (from `https://github.com/keeshux/Kvitto`, branch `enable-macos-spec`)
   - MBProgressHUD
   - SSZipArchive
-  - TunnelKit/Extra/LZO (~> 3.3.2)
-  - TunnelKit/Protocols/OpenVPN (~> 3.3.2)
+  - TunnelKit/Extra/LZO (from `https://github.com/passepartoutvpn/tunnelkit`, commit `f5fdc0c`)
+  - TunnelKit/Protocols/OpenVPN (from `https://github.com/passepartoutvpn/tunnelkit`, commit `f5fdc0c`)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -62,7 +62,6 @@ SPEC REPOS:
     - OpenSSL-Apple
     - SSZipArchive
     - SwiftyBeaver
-    - TunnelKit
 
 EXTERNAL SOURCES:
   Convenience:
@@ -71,6 +70,9 @@ EXTERNAL SOURCES:
   Kvitto:
     :branch: enable-macos-spec
     :git: https://github.com/keeshux/Kvitto
+  TunnelKit:
+    :commit: f5fdc0c
+    :git: https://github.com/passepartoutvpn/tunnelkit
 
 CHECKOUT OPTIONS:
   Convenience:
@@ -79,6 +81,9 @@ CHECKOUT OPTIONS:
   Kvitto:
     :commit: e263fcd1f40a6a482a0f1e424ba98009c4ad2b96
     :git: https://github.com/keeshux/Kvitto
+  TunnelKit:
+    :commit: f5fdc0c
+    :git: https://github.com/passepartoutvpn/tunnelkit
 
 SPEC CHECKSUMS:
   Convenience: c805c2aff569ff735c5d69c2c2b7a9bd110fa507
@@ -88,8 +93,8 @@ SPEC CHECKSUMS:
   OpenSSL-Apple: 3104e6d32de21815b68aeba31edaa6a78d90e7e0
   SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2
   SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82
-  TunnelKit: efebe7db85bdb4ea89fb3af569d4bb7321e7b65d
+  TunnelKit: 068ff24480fa0f10e2209f3e9a75cfed9b4d78ec
 
-PODFILE CHECKSUM: 419def201d8bed7d3cb5854165369a1eb039ddac
+PODFILE CHECKSUM: 65053fc8867b4ec1b933215ab49e6e2788caa969
 
 COCOAPODS: 1.10.1