conan: apple full-featured support

recipes/awg-apple/conanfile.py

@@ -1,59 +1,69 @@
 from conan import ConanFile
 from conan.errors import ConanInvalidConfiguration
 from conan.tools.layout import basic_layout
-from conan.tools.files import get, copy, collect_libs
+from conan.tools.files import get, copy, collect_libs, chdir
+from conan.tools.apple import is_apple_os
+from conan.tools.gnu import AutotoolsToolchain, Autotools
 
 import os
 
+_uniarch_separator = "|"
+
 class AwgApple(ConanFile):
     name = "awg-apple"
     version = "2.0.1"
 
     settings = "os", "arch"
-
-    _os_map = {
-        "iOS": "iphoneos",
-        "Macos": "macosx"
+    options = {
+        "as_framework": [True, False]
+    }
+    default_options = {
+        "as_framework": False
     }
 
-    _arch_map = {
-        "x86_64": "x86_64",
-        "armv8": "arm64"
-    }
+    @property
+    def goarch(self):
+        arch_map = {
+            "armv8": "arm64",
+            "x86_64": "x86_64",
+        }
+        archs = str(self.settings.arch).split(_uniarch_separator)
+        return " ".join(arch_map.get(arch, arch) for arch in archs)
 
     def build_requirements(self):
         self.tool_requires("go/1.26.0")
-        if self.settings.os == "Windows":
-            self.tool_requires("mingw-builds/15.1.0")
-        else:
-            self.build_requires("make/4.4.1")
-
-    def configure(self):
-        self._goos = self._os_map.get(str(self.settings.os))
-        if not self._goos:
-            raise ConanInvalidConfiguration(
-                f"{self.name} v{self.version} does not support {self._goos}"
-            )
-        
-        self._goarch = self._arch_map.get(str(self.settings.arch))
-        if not self._goarch:
-            raise ConanInvalidConfiguration(
-                f"{self.name} v{self.version} does not support {self._goarch}"
-            )
 
     def layout(self):
         basic_layout(self, build_folder=os.path.join(self.folders.source, "Sources/WireGuardKitGo"))
 
+    def validate(self):
+        if not is_apple_os(self):
+            raise ConanInvalidConfiguration(
+                f"{self.name} v{self.version} does not support {self.settings.os}"
+            )
+
     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
         )
 
+    def generate(self):
+        tc = AutotoolsToolchain(self)
+        sdk = self.settings.get_safe("os.sdk", "macosx")
+        tc.make_args = [
+            f"ARCHS={self.goarch}",
+            f"PLATFORM_NAME={sdk}"
+        ]
+        tc.generate()
+
     def build(self):
-        self.run(f"ARCHS={self._goarch} PLATFORM_NAME={self._goos} make")
+        autotools = Autotools(self)
+        autotools.make()
+        autotools.make("version-header")
 
     def package(self):
         copy(self, "wireguard.h", src=self.build_folder, dst=os.path.join(self.package_folder, "include"))
+        copy(self, "*.h", src=os.path.join(self.build_folder, "out"), dst=os.path.join(self.package_folder, "include"))
         copy(self, "*.a", src=os.path.join(self.build_folder, "out"), dst=os.path.join(self.package_folder, "lib"))
 
     def package_info(self):

recipes/hev-socks5-tunnel/conanfile.py

@@ -1,5 +1,99 @@
 from conan import ConanFile
+from conan.tools.layout import basic_layout
+from conan.tools.scm import Git
+from conan.tools.files import copy, collect_libs
+from conan.internal.model.pkg_type import PackageType
+from conan.tools.gnu import AutotoolsToolchain, Autotools
+from conan.tools.apple import is_apple_os
+
+import platform
+import os
+import shutil
+
+
+required_conan_version = ">=2.26"
+
 
 class HevSocks5Tunnel(ConanFile):
     name = "hev-socks5-tunnel"
-    version = "1.0.0"
+    version = "2.14.4"
+    settings = "os", "arch"
+    options = {
+        "shared": [True, False],
+        "as_framework": [True, False],
+    }
+    default_options = {
+        "shared": False,
+        "as_framework": False
+    }
+
+    def config_options(self):
+        if not is_apple_os(self):
+            del self.options.as_framework
+
+    def configure(self):
+        if self.options.get_safe("as_framework"):
+            self.options.shared = False
+
+    def layout(self):
+        basic_layout(self, build_folder=".")
+
+    def source(self):
+        git = Git(self)
+        git.clone(
+            url="https://github.com/heiher/hev-socks5-tunnel.git",
+            target=".",
+            args=["--recurse-submodules", "--branch", self.version]
+        )
+
+    def generate(self):
+        tc = AutotoolsToolchain(self)
+        tc.generate()
+
+    def build(self):
+        autotools = Autotools(self)
+        autotools.make("shared" if self.options.shared else "static")
+
+        if self.options.get_safe("as_framework"):
+            lib_path = os.path.join(self.build_folder, "bin", "libhev-socks5-tunnel.a")
+            self.run(
+                f"libtool -static -o {lib_path}"
+                f" {lib_path}"
+                f" {os.path.join(self.build_folder, "third-part", "lwip", "bin", "liblwip.a")}"
+                f" {os.path.join(self.build_folder, "third-part", "yaml", "bin", "libyaml.a")}"
+                f" {os.path.join(self.build_folder, "third-part", "hev-task-system", "bin", "libhev-task-system.a")}"
+            )
+
+            include_dir = os.path.join(self.build_folder, "framework_include")
+            copy(self, "hev-main.h", src=os.path.join(self.source_folder, "src"), dst=include_dir)
+            copy(self, "module.modulemap", src=os.path.join(self.source_folder), dst=include_dir)
+
+            self.run('xcodebuild -create-xcframework'
+                f' -library {lib_path}'
+                f' -headers {include_dir}'
+                f' -output {os.path.join(self.build_folder, "HevSocks5Tunnel.xcframework")}'
+            )
+
+    def package(self):
+        if self.options.get_safe("as_framework"):
+            shutil.copytree(src=os.path.join(self.build_folder, "HevSocks5Tunnel.xcframework"),
+                            dst=os.path.join(self.package_folder, "HevSocks5Tunnel.xcframework"))
+        else:
+            copy(self, "hev-main.h", src=os.path.join(self.source_folder, "src"), dst=os.path.join(self.package_folder, "include"))
+            copy(self, "*.a", src=os.path.join(self.build_folder, "bin"), dst=os.path.join(self.package_folder, "lib"))
+            copy(self, "*.so", src=os.path.join(self.build_folder, "bin"), dst=os.path.join(self.package_folder, "lib"))
+            copy(self, "*.a", src=os.path.join(self.build_folder, "bin", "third-part", "lwip"), dst=os.path.join(self.package_folder, "lib"))
+            copy(self, "*.so", src=os.path.join(self.build_folder, "bin", "third-part", "lwip"), dst=os.path.join(self.package_folder, "lib"))
+            copy(self, "*.a", src=os.path.join(self.build_folder, "bin", "third-part", "yaml"), dst=os.path.join(self.package_folder, "lib"))
+            copy(self, "*.so", src=os.path.join(self.build_folder, "bin", "third-part", "yaml"), dst=os.path.join(self.package_folder, "lib"))
+            copy(self, "*.a", src=os.path.join(self.build_folder, "bin", "third-part", "hev-task-system"), dst=os.path.join(self.package_folder, "lib"))
+            copy(self, "*.so", src=os.path.join(self.build_folder, "bin", "third-part", "hev-task-system"), dst=os.path.join(self.package_folder, "lib"))
+
+    def package_info(self):
+        self.cpp_info.set_property("cmake_target_name", "heiher::hev-socks5-tunnel")
+        if self.options.get_safe("as_framework"):
+            self.cpp_info.type = PackageType.STATIC
+            self.cpp_info.package_framework = True
+            self.cpp_info.location = os.path.join(self.package_folder, "HevSocks5Tunnel.xcframework")
+        else:
+            self.cpp_info.libraries = collect_libs(self)

recipes/libssh/conanfile.py

@@ -10,9 +10,10 @@ import os
 required_conan_version = ">=2.21"
 
 
-class LibsshLocal(ConanFile):
-    name = "libssh-local"
+class LibSSHRecipe(ConanFile):
+    name = "libssh"
     version = "0.11.3"
+    user = "amnezia"
     license = "LGPL-2.1"
     homepage = "https://www.libssh.org/"
     description = "multiplatform C library implementing the SSHv2 protocol on client and server side"

recipes/openvpnadapter/conanfile.py

@@ -0,0 +1,70 @@
+from conan import ConanFile
+from conan.tools.layout import basic_layout
+from conan.tools.apple import is_apple_os
+from conan.errors import ConanInvalidConfiguration
+from conan.tools.scm import Git
+from conan.internal.model.pkg_type import PackageType
+from conan.tools.files import chdir
+
+import os
+import shutil
+
+class OpenVPNAdapter(ConanFile):
+    name = "openvpnadapter"
+    version = "1.0.0"
+    settings = "os", "build_type"
+
+    @property
+    def _platform(self):
+        sdk = self.settings.get_safe("os.sdk", "macosx")
+        return {
+            "macosx": "macOS",
+            "iphoneos": "iOS",
+            "iphonesimulator": "iOS Simulator"
+        }.get(sdk)
+    
+    @property
+    def _configuration(self):
+        return "Debug" if self.settings.get_safe("build_type") == "Debug" else "Release"
+
+    def layout(self):
+        basic_layout(self)
+
+    def validate(self):
+        if not is_apple_os(self):
+            raise ConanInvalidConfiguration(
+                f"There is absolutely no point building Apple framework for {self.settings.os}"
+            )
+
+    def source(self):
+        git = Git(self)
+        git.clone(
+            url="https://github.com/amnezia-vpn/OpenVPNAdapter.git",
+            target=".",
+            args=["--recurse-submodules", "--branch", "master-amnezia"]
+        )
+
+    def build(self):
+        sdk = self.settings.get_safe("os.sdk", "macosx")
+        with chdir(self, self.source_folder):
+            self.run("xcrun xcodebuild"
+                " -project OpenVPNAdapter.xcodeproj"
+                " -scheme OpenVPNAdapter"
+                " -configuration Release"
+                f" -destination 'generic/platform={self._platform}'"
+                f" -sdk {sdk}"
+                f' "CONFIGURATION_BUILD_DIR={self.build_folder}"'
+                f' "BUILT_PRODUCTS_DIR={self.build_folder}"'
+                " BUILD_LIBRARY_FOR_DISTRIBUTION=YES"
+                " CODE_SIGNING_ALLOWED=NO"
+            )
+
+    def package(self):
+        shutil.copytree(os.path.join(self.build_folder, "OpenVPNAdapter.framework"),
+                        os.path.join(self.package_folder, "OpenVPNAdapter.framework"))
+        
+    def package_info(self):
+        self.cpp_info.set_property("cmake_target_name", "amnezia::openvpnadapter")
+        self.cpp_info.type = PackageType.STATIC
+        self.cpp_info.package_framework = True
+        self.cpp_info.location = os.path.join(self.package_folder, "OpenVPNAdapter.framework")