From 726e67ebb072e0103ef61f80df3395477cb555e6 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Sun, 6 Aug 2023 16:21:01 -0400
Subject: [PATCH 1/2] Use prebuilt binary for MacOS WireGuard

---
 client/3rd-prebuilt      |  2 +-
 client/cmake/macos.cmake | 56 ----------------------------------------
 2 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt
index 249798ad..f339911d 160000
--- a/client/3rd-prebuilt
+++ b/client/3rd-prebuilt
@@ -1 +1 @@
-Subproject commit 249798adee8eb60c6eaf71aeb00dbfe91bea04a3
+Subproject commit f339911dcb75d8a199e508cc2c2f32851cf211b8
diff --git a/client/cmake/macos.cmake b/client/cmake/macos.cmake
index ec173da4..75ccf516 100644
--- a/client/cmake/macos.cmake
+++ b/client/cmake/macos.cmake
@@ -42,60 +42,4 @@ execute_process(
 )
 message("OSX_SDK_PATH is: ${OSX_SDK_PATH}")
 
-# Build the Wireguard Go tunnel
-file(GLOB_RECURSE WIREGUARD_GO_DEPS ${CMAKE_CURRENT_SOURCE_DIR}/3rd/wireguard-go/*.go)
-set(WIREGUARD_GO_ENV
-    GOCACHE=${CMAKE_BINARY_DIR}/go-cache
-    CC=${CMAKE_C_COMPILER}
-    CXX=${CMAKE_CXX_COMPILER}
-    GOOS=darwin
-    CGO_ENABLED=1
-    GO111MODULE=on
-    CGO_CFLAGS='-g -O3 -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -isysroot ${OSX_SDK_PATH}'
-    CGO_LDFLAGS='-g -O3 -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -isysroot ${OSX_SDK_PATH}'
-)
 
-if(NOT CMAKE_OSX_ARCHITECTURES)
-    foreach(OSXARCH ${CMAKE_OSX_ARCHITECTURES})
-        message("Build wg for OSXARCH: ${OSXARCH}")
-
-        string(REPLACE "x86_64" "amd64" GOARCH ${OSXARCH})
-        add_custom_command(
-            OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/wireguard-go-${OSXARCH}
-            COMMENT "Building wireguard-go for ${OSXARCH}"
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rd/wireguard-go
-            DEPENDS
-                ${WIREGUARD_GO_DEPS}
-                ${CMAKE_CURRENT_SOURCE_DIR}/3rd/wireguard-go/go.mod
-                ${CMAKE_CURRENT_SOURCE_DIR}/3rd/wireguard-go/go.sum
-            COMMAND ${CMAKE_COMMAND} -E env ${WIREGUARD_GO_ENV} GOARCH=${GOARCH}
-                    ${GOLANG_BUILD_TOOL} build -buildmode exe -buildvcs=false -trimpath -v
-                        -o ${CMAKE_CURRENT_BINARY_DIR}/wireguard-go-${OSXARCH}
-        )
-        list(APPEND WG_GO_ARCH_BUILDS ${CMAKE_CURRENT_BINARY_DIR}/wireguard-go-${OSXARCH}/wireguard)
-    endforeach()
-
-    add_custom_target(build_wireguard_go
-        COMMENT "Building wireguard-go"
-        DEPENDS ${WG_GO_ARCH_BUILDS}
-        COMMAND lipo -create -output ${CMAKE_CURRENT_BINARY_DIR}/wireguard-go ${WG_GO_ARCH_BUILDS}
-    )
-else()
-    # This only builds for the host architecture.
-    add_custom_target(build_wireguard_go
-        COMMENT "Building wireguard-go"
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rd/wireguard-go
-        DEPENDS
-            ${WIREGUARD_GO_DEPS}
-            ${CMAKE_CURRENT_SOURCE_DIR}/3rd/wireguard-go/go.mod
-            ${CMAKE_CURRENT_SOURCE_DIR}/3rd/wireguard-go/go.sum
-        COMMAND ${CMAKE_COMMAND} -E env ${WIREGUARD_GO_ENV}
-                ${GOLANG_BUILD_TOOL} build -buildmode exe -buildvcs=false -trimpath -v
-                    -o ${CMAKE_CURRENT_BINARY_DIR}/wireguard-go
-    )
-endif()
-add_dependencies(${PROJECT} build_wireguard_go)
-osx_bundle_files(${PROJECT}
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/wireguard-go
-    DESTINATION MacOS/
-)

From 822ef8829ea2f51e63c4e417acee2565dcdff329 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Sun, 6 Aug 2023 16:24:39 -0400
Subject: [PATCH 2/2] Remove unused wireguard-go submodule

---
 .gitmodules             | 3 ---
 client/3rd/wireguard-go | 1 -
 2 files changed, 4 deletions(-)
 delete mode 160000 client/3rd/wireguard-go

diff --git a/.gitmodules b/.gitmodules
index 02583aa9..ce6c5f14 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,6 +28,3 @@
 [submodule "client/3rd-prebuilt"]
 	path = client/3rd-prebuilt
 	url = https://github.com/amnezia-vpn/3rd-prebuilt
-[submodule "client/3rd/wireguard-go"]
-	path = client/3rd/wireguard-go
-	url = https://github.com/WireGuard/wireguard-go
diff --git a/client/3rd/wireguard-go b/client/3rd/wireguard-go
deleted file mode 160000
index 052af4a8..00000000
--- a/client/3rd/wireguard-go
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 052af4a8072bbbd3bfe7edf46fe3c1b350f71f08