From 890103a16a975a16184ab48dd6a0c8e18c9d61d5 Mon Sep 17 00:00:00 2001 From: Yaroslav Gurov <31506978+ygurov@users.noreply.github.com> Date: Wed, 17 Jun 2026 14:56:53 +0200 Subject: [PATCH] fix: update amneziawg (#2743) * chore(conan): update amneziawg * fix(conan): use cmake 4.2+ to support MSVC26 * fix(ci/cd): use the latest cmake generator available on windows --- .github/workflows/deploy.yml | 2 +- conanfile.py | 8 ++++---- recipes/awg-android/conanfile.py | 2 +- recipes/awg-apple/conanfile.py | 4 ++-- recipes/awg-go/conanfile.py | 4 ++-- recipes/awg-windows/conanfile.py | 4 ++-- recipes/openvpn/conanfile.py | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2c566aacc..778cd2b35 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -157,7 +157,7 @@ jobs: run: pip install "conan==2.28.0" - name: 'Build dependencies' - run: cmake -S . -B build -G "Visual Studio 17 2022" -DPREBUILTS_ONLY=1 + run: cmake -S . -B build -DPREBUILTS_ONLY=1 - name: 'Authorize in remote' if: github.ref == 'refs/heads/dev' diff --git a/conanfile.py b/conanfile.py index 76dd5c40e..a106056a1 100644 --- a/conanfile.py +++ b/conanfile.py @@ -19,12 +19,12 @@ class AmneziaVPN(ConanFile): if has_service: if os == "Windows": - self.requires("awg-windows/0.1.8") + self.requires("awg-windows/0.1.9") self.requires("tap-windows6/9.27.0") self.requires("win-split-tunnel/1.2.5.0") self.requires("wintun/0.14.1") else: - self.requires("awg-go/0.2.16") + self.requires("awg-go/0.2.18") self.requires("amnezia-xray-bindings/1.1.0") self.requires("tun2socks/2.6.0") @@ -32,13 +32,13 @@ class AmneziaVPN(ConanFile): self.requires("v2ray-rules-dat/202603162227") if has_ne: - self.requires("awg-apple/2.0.1") + self.requires("awg-apple/2.0.2") self.requires("hev-socks5-tunnel/2.15.0", options={"as_framework": True}) self.requires("openvpnadapter/1.0.0") if os == "Android": self.requires("amnezia-libxray/1.0.0") - self.requires("awg-android/1.1.7") + self.requires("awg-android/2.0.1") self.requires("openvpn-pt-android/1.0.0") # expicitly use libssh@amnezia to prevent it from being downloaded from conan-center diff --git a/recipes/awg-android/conanfile.py b/recipes/awg-android/conanfile.py index 246f4be2c..fcd59ed18 100644 --- a/recipes/awg-android/conanfile.py +++ b/recipes/awg-android/conanfile.py @@ -9,7 +9,7 @@ import platform class AwgAndroid(ConanFile): name = "awg-android" - version = "1.1.7" + version = "2.0.1" settings = "os", "arch", "build_type", "compiler" def configure(self): diff --git a/recipes/awg-apple/conanfile.py b/recipes/awg-apple/conanfile.py index 434eaa1f7..080e236b7 100644 --- a/recipes/awg-apple/conanfile.py +++ b/recipes/awg-apple/conanfile.py @@ -9,7 +9,7 @@ import os class AwgApple(ConanFile): name = "awg-apple" - version = "2.0.1" + version = "2.0.2" settings = "os", "arch", "compiler" @property @@ -39,7 +39,7 @@ class AwgApple(ConanFile): def source(self): get(self, f"https://github.com/amnezia-vpn/amneziawg-apple/archive/refs/tags/v{self.version}.zip", - sha256="9fe4f8cfbb6a751558b54b7979db3a5ea46e49731912aae99f093e84a1433e97", strip_root=True + sha256="a04f49eac9f82bbf5dd9031bab188d44de2b3482efde1b6e970821de1d5a3c5d", strip_root=True ) def generate(self): diff --git a/recipes/awg-go/conanfile.py b/recipes/awg-go/conanfile.py index ae39623e6..7305029e1 100644 --- a/recipes/awg-go/conanfile.py +++ b/recipes/awg-go/conanfile.py @@ -8,7 +8,7 @@ import os class AwgGo(ConanFile): name = "awg-go" - version = "0.2.16" + version = "0.2.18" package_type = "application" settings = "os", "arch" @@ -42,7 +42,7 @@ class AwgGo(ConanFile): def source(self): get(self, f"https://github.com/amnezia-vpn/amneziawg-go/archive/refs/tags/v{self.version}.zip", - sha256="34da7d4189f215f3930de441548bc2a0c89d54d347a4fb85cb9c715fce6413aa", strip_root=True + sha256="58eefbd012e79bd1525f0e02d748979e9480acc1a339df8ceb3b9ffafcedb1ba", strip_root=True ) def generate(self): diff --git a/recipes/awg-windows/conanfile.py b/recipes/awg-windows/conanfile.py index 49632d276..1ef119493 100644 --- a/recipes/awg-windows/conanfile.py +++ b/recipes/awg-windows/conanfile.py @@ -8,7 +8,7 @@ import os class AwgWindows(ConanFile): name = "awg-windows" - version = "0.1.8" + version = "0.1.9" settings = "os", "arch" @property @@ -63,7 +63,7 @@ class AwgWindows(ConanFile): def source(self): get(self, f"https://github.com/amnezia-vpn/amneziawg-windows/archive/refs/tags/v{self.version}.zip", - sha256="1de472832b332515c96cdf14ea887edde42ed7ad173675280c51baa9a3ef62f2", strip_root=True) + sha256="5c29a75cb2beae291cc51b64840a39f838da5f300b9e956f7964813a687ec74c", strip_root=True) def generate(self): tc = AutotoolsToolchain(self) diff --git a/recipes/openvpn/conanfile.py b/recipes/openvpn/conanfile.py index d568e84df..9e141455e 100644 --- a/recipes/openvpn/conanfile.py +++ b/recipes/openvpn/conanfile.py @@ -28,7 +28,7 @@ class Openvpn(ConanFile): def build_requirements(self): if self._is_windows: - self.tool_requires("cmake/[>=3.14 <4]") + self.tool_requires("cmake/[>=4.2]") else: self.tool_requires("libtool/2.4.7") self.tool_requires("automake/1.16.5")