From 51070635a5b1c91f4cc8a368af58f0c0396fd1ab Mon Sep 17 00:00:00 2001
From: Igor Sorokin <is@amnezia.org>
Date: Fri, 19 Jan 2024 03:15:27 +0300
Subject: [PATCH] Change to amneziawg-apple

---
 .gitmodules                                                 | 6 +++---
 client/3rd/amneziawg-apple                                  | 1 +
 client/3rd/awg-apple                                        | 1 -
 client/cmake/ios.cmake                                      | 2 +-
 client/ios/networkextension/CMakeLists.txt                  | 2 +-
 .../WireGuardNetworkExtension-Bridging-Header.h             | 4 ++--
 client/platforms/ios/WireGuard-Bridging-Header.h            | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
 create mode 160000 client/3rd/amneziawg-apple
 delete mode 160000 client/3rd/awg-apple

diff --git a/.gitmodules b/.gitmodules
index c96dd6bc..ff50f897 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,6 +22,6 @@
 [submodule "client/3rd-prebuilt"]
 	path = client/3rd-prebuilt
 	url = https://github.com/amnezia-vpn/3rd-prebuilt
-[submodule "client/3rd/awg-apple"]
-	path = client/3rd/awg-apple
-	url = https://github.com/amnezia-vpn/awg-apple
+[submodule "client/3rd/amneziawg-apple"]
+	path = client/3rd/amneziawg-apple
+	url = https://github.com/amnezia-vpn/amneziawg-apple
diff --git a/client/3rd/amneziawg-apple b/client/3rd/amneziawg-apple
new file mode 160000
index 00000000..f23eee47
--- /dev/null
+++ b/client/3rd/amneziawg-apple
@@ -0,0 +1 @@
+Subproject commit f23eee4700ed4a2ef44a800d2c20466c9ab0222b
diff --git a/client/3rd/awg-apple b/client/3rd/awg-apple
deleted file mode 160000
index 09c0fc7f..00000000
--- a/client/3rd/awg-apple
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 09c0fc7f70bdf68f6953ea959d8a18952603fe94
diff --git a/client/cmake/ios.cmake b/client/cmake/ios.cmake
index 7aa9f1a9..3234578e 100644
--- a/client/cmake/ios.cmake
+++ b/client/cmake/ios.cmake
@@ -97,7 +97,7 @@ target_compile_options(${PROJECT} PRIVATE
     -DVPN_NE_BUNDLEID=\"${BUILD_IOS_APP_IDENTIFIER}.network-extension\"
 )
 
-set(WG_APPLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rd/awg-apple/Sources)
+set(WG_APPLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rd/amneziawg-apple/Sources)
 
 target_sources(${PROJECT} PRIVATE
 #    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosvpnprotocol.swift
diff --git a/client/ios/networkextension/CMakeLists.txt b/client/ios/networkextension/CMakeLists.txt
index 16769ea3..fb1bd3c1 100644
--- a/client/ios/networkextension/CMakeLists.txt
+++ b/client/ios/networkextension/CMakeLists.txt
@@ -58,7 +58,7 @@ target_link_libraries(networkextension PRIVATE ${FW_UI_KIT})
 target_compile_options(networkextension PRIVATE -DGROUP_ID=\"${BUILD_IOS_GROUP_IDENTIFIER}\")
 target_compile_options(networkextension PRIVATE -DNETWORK_EXTENSION=1)
 
-set(WG_APPLE_SOURCE_DIR ${CLIENT_ROOT_DIR}/3rd/awg-apple/Sources)
+set(WG_APPLE_SOURCE_DIR ${CLIENT_ROOT_DIR}/3rd/amneziawg-apple/Sources)
 
 target_sources(networkextension PRIVATE
     ${WG_APPLE_SOURCE_DIR}/WireGuardKit/WireGuardAdapter.swift
diff --git a/client/ios/networkextension/WireGuardNetworkExtension-Bridging-Header.h b/client/ios/networkextension/WireGuardNetworkExtension-Bridging-Header.h
index 44d0b6b0..2cca0fc8 100644
--- a/client/ios/networkextension/WireGuardNetworkExtension-Bridging-Header.h
+++ b/client/ios/networkextension/WireGuardNetworkExtension-Bridging-Header.h
@@ -1,6 +1,6 @@
 #include "wireguard-go-version.h"
-#include "3rd/awg-apple/Sources/WireGuardKitGo/wireguard.h"
-#include "3rd/awg-apple/Sources/WireGuardKitC/WireGuardKitC.h"
+#include "3rd/amneziawg-apple/Sources/WireGuardKitGo/wireguard.h"
+#include "3rd/amneziawg-apple/Sources/WireGuardKitC/WireGuardKitC.h"
 
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/client/platforms/ios/WireGuard-Bridging-Header.h b/client/platforms/ios/WireGuard-Bridging-Header.h
index fbccb2d4..0183367b 100644
--- a/client/platforms/ios/WireGuard-Bridging-Header.h
+++ b/client/platforms/ios/WireGuard-Bridging-Header.h
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "3rd/awg-apple/Sources/WireGuardKitC/WireGuardKitC.h"
+#include "3rd/amneziawg-apple/Sources/WireGuardKitC/WireGuardKitC.h"
 
 #include <stdbool.h>
 #include <stdint.h>