From 10e1164da308948a185cd604104ac992e7868234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Em=C4=ABls?= <emils@mullvad.net>
Date: Wed, 17 Jul 2024 14:29:22 +0200
Subject: [PATCH] Update wireguard-apple

---
 ios/MullvadVPN.xcodeproj/project.pbxproj                        | 2 +-
 .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved   | 2 +-
 .../WireGuardAdapter/WireGuardAdapterError+Localization.swift   | 2 ++
 ios/build-wireguard-go.sh                                       | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj
index 2e683686dab7..e4b9a2a532f4 100644
--- a/ios/MullvadVPN.xcodeproj/project.pbxproj
+++ b/ios/MullvadVPN.xcodeproj/project.pbxproj
@@ -9111,7 +9111,7 @@
 			repositoryURL = "https://github.com/mullvad/wireguard-apple.git";
 			requirement = {
 				kind = revision;
-				revision = 15242e1698fc45261285d7417ed2cd5130d7332e;
+				revision = 5f24cdf1aa7fc1802f1695473aab95b4451e4ba0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 929180afa433..e169091f3c2b 100644
--- a/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -14,7 +14,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mullvad/wireguard-apple.git",
       "state" : {
-        "revision" : "15242e1698fc45261285d7417ed2cd5130d7332e"
+        "revision" : "5f24cdf1aa7fc1802f1695473aab95b4451e4ba0"
       }
     }
   ],
diff --git a/ios/PacketTunnel/WireGuardAdapter/WireGuardAdapterError+Localization.swift b/ios/PacketTunnel/WireGuardAdapter/WireGuardAdapterError+Localization.swift
index 6a88af373d0b..69806809d491 100644
--- a/ios/PacketTunnel/WireGuardAdapter/WireGuardAdapterError+Localization.swift
+++ b/ios/PacketTunnel/WireGuardAdapter/WireGuardAdapterError+Localization.swift
@@ -35,6 +35,8 @@ extension WireGuardAdapterError: LocalizedError {
 
         case let .startWireGuardBackend(code):
             return "Failure to start WireGuard backend (error code: \(code))."
+        case .noInterfaceIp:
+            return "Interface has no IP address specified."
         }
     }
 }
diff --git a/ios/build-wireguard-go.sh b/ios/build-wireguard-go.sh
index 60b3b0078473..7952b4dc2c09 100755
--- a/ios/build-wireguard-go.sh
+++ b/ios/build-wireguard-go.sh
@@ -37,6 +37,8 @@ fi
 WIREGUARD_KIT_GO_PATH="$RESOLVED_SOURCE_PACKAGES_PATH/checkouts/wireguard-apple/Sources/WireGuardKitGo"
 echo "WireGuardKitGo path resolved to $WIREGUARD_KIT_GO_PATH"
 
+export PATH=/opt/homebrew/opt/go@1.20/bin:$PATH
+
 # Run make
 # shellcheck disable=SC2086
 /usr/bin/make -C "$WIREGUARD_KIT_GO_PATH" $ACTION