switch to using upstream openssh repository

recipes/libressl/conanfile.py

@@ -74,6 +74,9 @@ def build(self):
         cmake.definitions['CMAKE_STATIC_LIBRARY_PREFIX'] = "lib"
         cmake.definitions['BUILD_SHARED_LIBS'] = 'ON' if self.options.shared else 'OFF'
 
+        if self.settings.os == 'Windows' and self.settings.arch == 'armv8':
+            cmake.definitions['CMAKE_SYSTEM_PROCESSOR'] = 'aarch64'
+
         if self.settings.os == 'iOS' or self.settings.os == 'Android':
             cmake.definitions['LIBRESSL_APPS'] = 'OFF'
         else:

recipes/openssh/conanfile.py

@@ -6,11 +6,10 @@ class OpenSSHConan(ConanFile):
     exports = 'VERSION'
     version = open(os.path.join('.', 'VERSION'), 'r').read().rstrip()
     license = 'BSD'
-    url = 'https://github.com/awakecoding/openssh-portable'
+    url = 'https://github.com/openssh/openssh-portable'
     description = 'OpenSSH'
     settings = 'os', 'arch', 'distro', 'build_type'
     no_copy_source = False
-    branch = 'v9.5.0-patches'
     python_requires = "shared/1.0.0@devolutions/stable"
     python_requires_extend = "shared.UtilsBase"
     use_prebuilt_msdeps = False
@@ -33,11 +32,22 @@ def build_requirements(self):
 
     def source(self):
         folder = self.name
+        version_parts = self.version.split('.')
+        self.branch = f"V_{version_parts[0]}_{version_parts[1]}_P1"
         self.output.info('Cloning repo: %s dest: %s branch: %s' % (self.url, folder, self.branch))
         git = tools.Git(folder=folder)
         git.clone(self.url)
         git.checkout(self.branch)
 
+        git = tools.Git(folder="openssh-distro")
+        git.clone("https://github.com/Devolutions/openssh-distro")
+        version_dir = 'v%s' % (self.version)
+        patches_dir = os.path.join("openssh-distro", "patches", version_dir)
+        if os.path.isdir(patches_dir):
+            for patch_file in sorted([f for f in os.listdir(patches_dir) if f.endswith('.patch')]):
+                patch_path = os.path.join(patches_dir, patch_file)
+                tools.patch(base_path=folder, patch_file=patch_path)
+
     def build(self):
         cmake = CMake(self)
         self.cmake_wrapper(cmake, self.settings, self.options)