From a41eaa92db235264ee19535d269a856c9d7966fb Mon Sep 17 00:00:00 2001
From: Ahmed Yarub Hani Al Nuaimi <ahmedyarub@yahoo.com>
Date: Sat, 17 Apr 2021 22:09:21 -0300
Subject: [PATCH 01/26] Add curl try_compile parameters Don't set compiler when
 compiling for iOS

---
 ports/aws-sdk-cpp/portfile.cmake  |  7 +++
 ports/openssl/unix/CMakeLists.txt | 80 ++++++++++++++++++-------------
 2 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
index f9d66a54f64a0c..731393f9c36d81 100644
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@@ -19,6 +19,12 @@ include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake)
 
 if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
     set(rpath "@loader_path")
+    set(EXTRA_ARGS
+            "-DCURL_HAS_H2_EXITCODE=0"
+            "-DCURL_HAS_H2_EXITCODE__TRYRUN_OUTPUT=\"\""
+            "-DCURL_HAS_TLS_PROXY_EXITCODE=0"
+            "-DCURL_HAS_TLS_PROXY_EXITCODE__TRYRUN_OUTPUT=\"\""
+            )
 else()
     set(rpath "\$ORIGIN")
 endif()
@@ -27,6 +33,7 @@ vcpkg_configure_cmake(
     DISABLE_PARALLEL_CONFIGURE
     PREFER_NINJA
     OPTIONS
+        ${EXTRA_ARGS}
         -DENABLE_UNITY_BUILD=ON
         -DENABLE_TESTING=OFF
         -DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}
diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt
index 14633c9415c956..f0e9acb8fc1585 100644
--- a/ports/openssl/unix/CMakeLists.txt
+++ b/ports/openssl/unix/CMakeLists.txt
@@ -84,7 +84,10 @@ else()
     file(TO_NATIVE_PATH ENV_PATH "${COMPILER_ROOT}:$ENV{PATH}")
 endif()
 set(ENV{ANDROID_DEV} "${CMAKE_SYSROOT}/usr")
-set(ENV{CC} "${CMAKE_C_COMPILER}")
+
+if(NOT IOS)
+    set(ENV{CC} "${CMAKE_C_COMPILER}")
+endif()
 
 message("ENV{ANDROID_DEV}=$ENV{ANDROID_DEV}")
 
@@ -143,37 +146,50 @@ else()
     set(PATH_VAR ":$ENV{PATH}")
 endif()
 
-
-
-add_custom_command(
-    OUTPUT "${BUILDDIR}/Makefile"
-    COMMAND ${ENV_COMMAND} CC=${CMAKE_C_COMPILER}
-    COMMAND ${ENV_COMMAND} AR=${CMAKE_AR}
-    COMMAND ${ENV_COMMAND} LD=${CMAKE_LINKER}
-    COMMAND ${ENV_COMMAND} RANLIB=${CMAKE_RANLIB}
-    COMMAND ${ENV_COMMAND} MAKE=${MAKE}
-    COMMAND ${ENV_COMMAND} MAKEDEPPROG=${CMAKE_C_COMPILER}
-    COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
-    COMMAND "${PERL}" Configure
-        ${SHARED}
-        enable-static-engine
-        no-zlib
-        no-ssl2
-        no-idea
-        no-bf
-        no-cast
-        no-seed
-        no-md2
-        no-tests
-        ${DISABLES}
-        ${PLATFORM}
-        "--prefix=${CMAKE_INSTALL_PREFIX}"
-        "--openssldir=/etc/ssl"
-        ${CFLAGS}
-    COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake"
-    VERBATIM
-    WORKING_DIRECTORY "${BUILDDIR}"
-)
+if(IOS)
+    add_custom_command(
+            OUTPUT "${BUILDDIR}/Makefile"
+            COMMAND "${PERL}" Configure
+            ${SHARED}
+            ${DISABLES}
+            ${PLATFORM}
+            "--prefix=${CMAKE_INSTALL_PREFIX}"
+            "--openssldir=/etc/ssl"
+            COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake"
+            VERBATIM
+            WORKING_DIRECTORY "${BUILDDIR}"
+    )
+else()
+    add_custom_command(
+        OUTPUT "${BUILDDIR}/Makefile"
+        COMMAND ${ENV_COMMAND} CC=${CMAKE_C_COMPILER}
+        COMMAND ${ENV_COMMAND} AR=${CMAKE_AR}
+        COMMAND ${ENV_COMMAND} LD=${CMAKE_LINKER}
+        COMMAND ${ENV_COMMAND} RANLIB=${CMAKE_RANLIB}
+        COMMAND ${ENV_COMMAND} MAKE=${MAKE}
+        COMMAND ${ENV_COMMAND} MAKEDEPPROG=${CMAKE_C_COMPILER}
+        COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
+        COMMAND "${PERL}" Configure
+            ${SHARED}
+            enable-static-engine
+            no-zlib
+            no-ssl2
+            no-idea
+            no-bf
+            no-cast
+            no-seed
+            no-md2
+            no-tests
+            ${DISABLES}
+            ${PLATFORM}
+            "--prefix=${CMAKE_INSTALL_PREFIX}"
+            "--openssldir=/etc/ssl"
+            ${CFLAGS}
+        COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake"
+        VERBATIM
+        WORKING_DIRECTORY "${BUILDDIR}"
+    )
+endif()
 
 add_custom_target(build_libs ALL
     COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"

From 1fddc96516acb213eab588cdb8fa24027b10ae5d Mon Sep 17 00:00:00 2001
From: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Date: Sat, 17 Apr 2021 22:19:19 -0300
Subject: [PATCH 02/26] Update OpenSSL and AWS SDK for C++ port versions

---
 ports/aws-sdk-cpp/vcpkg.json | 2 +-
 ports/openssl/CONTROL        | 1 +
 versions/a-/aws-sdk-cpp.json | 5 +++++
 versions/baseline.json       | 4 ++--
 versions/o-/openssl.json     | 5 +++++
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json
index 5aac8ad5749c2d..02bb0315aa911b 100644
--- a/ports/aws-sdk-cpp/vcpkg.json
+++ b/ports/aws-sdk-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "aws-sdk-cpp",
   "version": "1.8.126",
-  "port-version": 7,
+  "port-version": 8,
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
   "dependencies": [
diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL
index df1c9ced410529..8a26fb7946cdb4 100644
--- a/ports/openssl/CONTROL
+++ b/ports/openssl/CONTROL
@@ -1,4 +1,5 @@
 Source: openssl
 Version: 1.1.1j
+Port-Version: 1
 Homepage: https://www.openssl.org
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json
index ada8fad313ca53..0a6ad8109767ad 100644
--- a/versions/a-/aws-sdk-cpp.json
+++ b/versions/a-/aws-sdk-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2795f006adfb732d610a140ef9eb036f053a5997",
+      "version": "1.8.126",
+      "port-version": 8
+    },
     {
       "git-tree": "f1baa5b35e752a0576d9d81d70d15b2c44a467db",
       "version": "1.8.126",
diff --git a/versions/baseline.json b/versions/baseline.json
index e3441409c03ee4..22c159852e30e0 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -234,7 +234,7 @@
     },
     "aws-sdk-cpp": {
       "baseline": "1.8.126",
-      "port-version": 7
+      "port-version": 8
     },
     "azmq": {
       "baseline": "2020-03-03",
@@ -4514,7 +4514,7 @@
     },
     "openssl": {
       "baseline": "1.1.1j",
-      "port-version": 0
+      "port-version": 1
     },
     "openssl-unix": {
       "baseline": "1.1.1h",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 56c4f2c66b378f..5968727330396a 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2797d49ed1aa47fd6f37965c3db7dc48ca64d1f5",
+      "version-string": "1.1.1j",
+      "port-version": 1
+    },
     {
       "git-tree": "009a7ee95741b939859c77b8e1ddd6c146ffe54e",
       "version-string": "1.1.1j",

From d9ee2ea70619f780b9515c171ab7e2d89e82ef5b Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Sat, 17 Apr 2021 20:25:52 -0700
Subject: [PATCH 03/26] [vcpkg baseline][marble] Disable find I18n

---
 ports/marble/CONTROL        |  6 ------
 ports/marble/portfile.cmake |  4 +++-
 ports/marble/vcpkg.json     | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 7 deletions(-)
 delete mode 100644 ports/marble/CONTROL
 create mode 100644 ports/marble/vcpkg.json

diff --git a/ports/marble/CONTROL b/ports/marble/CONTROL
deleted file mode 100644
index 20dd30c0c313fd..00000000000000
--- a/ports/marble/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: marble
-Version: 19.08.2
-Homepage: https://marble.kde.org
-Description: Marble KDE library
-Supports: windows & x64 & !static
-Build-Depends: qt5-base, qt5-svg, qt5-quickcontrols, qt5-webchannel
diff --git a/ports/marble/portfile.cmake b/ports/marble/portfile.cmake
index 665eb31d10e9b9..a78e854b13ad9d 100644
--- a/ports/marble/portfile.cmake
+++ b/ports/marble/portfile.cmake
@@ -11,7 +11,9 @@ vcpkg_from_github(
  
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+    PREFER_NINJA
+    OPTIONS
+        -DCMAKE_DISABLE_FIND_PACKAGE_I18n=ON
 )
 
 vcpkg_install_cmake()
diff --git a/ports/marble/vcpkg.json b/ports/marble/vcpkg.json
new file mode 100644
index 00000000000000..1c72e0e7082f5c
--- /dev/null
+++ b/ports/marble/vcpkg.json
@@ -0,0 +1,14 @@
+{
+  "name": "marble",
+  "version-string": "19.08.2",
+  "port-version": 1,
+  "description": "Marble KDE library",
+  "homepage": "https://marble.kde.org",
+  "supports": "windows & x64 & !static",
+  "dependencies": [
+    "qt5-base",
+    "qt5-quickcontrols",
+    "qt5-svg",
+    "qt5-webchannel"
+  ]
+}

From 8cca02bcc25fd10d0278830cc8348de7d9b984c8 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Sat, 17 Apr 2021 20:26:20 -0700
Subject: [PATCH 04/26] update version record

---
 versions/baseline.json  | 2 +-
 versions/m-/marble.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index e3441409c03ee4..c3b5a330e8221e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3822,7 +3822,7 @@
     },
     "marble": {
       "baseline": "19.08.2",
-      "port-version": 0
+      "port-version": 1
     },
     "marl": {
       "baseline": "2020-10-10",
diff --git a/versions/m-/marble.json b/versions/m-/marble.json
index ea004fb06dbb3c..d1d1cb0c66d2e5 100644
--- a/versions/m-/marble.json
+++ b/versions/m-/marble.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "753693b3e64d7baedd61a8f57b62e467267bc741",
+      "version-string": "19.08.2",
+      "port-version": 1
+    },
     {
       "git-tree": "6da05bd09e0eb41ee05e3269fab2283c5dab2d4c",
       "version-string": "19.08.2",

From 3d432d01fff03d2278d01b7afdf72771cd37acd1 Mon Sep 17 00:00:00 2001
From: Ahmed Yarub Hani Al Nuaimi <ahmedyarub@yahoo.com>
Date: Sun, 18 Apr 2021 13:03:39 -0300
Subject: [PATCH 05/26] Fix AWS C Common build for WASM32

---
 ports/aws-c-common/CONTROL                     |  5 +++--
 .../disable_outline_atomics_emscripten.patch   | 18 ++++++++++++++++++
 ports/aws-c-common/portfile.cmake              |  3 ++-
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 ports/aws-c-common/disable_outline_atomics_emscripten.patch

diff --git a/ports/aws-c-common/CONTROL b/ports/aws-c-common/CONTROL
index 2439c0c655e399..030d99ee5f1c72 100644
--- a/ports/aws-c-common/CONTROL
+++ b/ports/aws-c-common/CONTROL
@@ -1,5 +1,6 @@
-Source: aws-c-common
+Source: aws-c-common
 Version: 0.4.56
+Port-Version: 1
 Homepage: https://github.com/awslabs/aws-c-common
-Description: AWS common library for C
+Description: AWS common library for C
 Supports: !(arm|uwp)
\ No newline at end of file
diff --git a/ports/aws-c-common/disable_outline_atomics_emscripten.patch b/ports/aws-c-common/disable_outline_atomics_emscripten.patch
new file mode 100644
index 00000000000000..cf1daa81f5bd76
--- /dev/null
+++ b/ports/aws-c-common/disable_outline_atomics_emscripten.patch
@@ -0,0 +1,18 @@
+diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
+--- a/cmake/AwsCFlags.cmake	(revision 4a21a1c0757083a16497fea27886f5f20ccdf334)
++++ b/cmake/AwsCFlags.cmake	(date 1618758078727)
+@@ -70,9 +70,11 @@
+ 
+        # -moutline-atomics generates code for both older load/store exclusive atomics and also
+        # Arm's Large System Extensions (LSE) which scale substantially better on large core count systems
+-        check_c_compiler_flag(-moutline-atomics HAS_MOUTLINE_ATOMICS)
+-        if (HAS_MOUTLINE_ATOMICS)
+-            list(APPEND AWS_C_FLAGS -moutline-atomics)
++        if(NOT EMSCRIPTEN)
++            check_c_compiler_flag(-moutline-atomics HAS_MOUTLINE_ATOMICS)
++            if (HAS_MOUTLINE_ATOMICS)
++                list(APPEND AWS_C_FLAGS -moutline-atomics)
++            endif()
+         endif()
+     endif()
+ 
diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake
index f3704ef05b8a0d..9a883d17e00972 100644
--- a/ports/aws-c-common/portfile.cmake
+++ b/ports/aws-c-common/portfile.cmake
@@ -1,13 +1,14 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-common
-    REF 4a21a1c0757083a16497fea27886f5f20ccdf334 # v0.4.56
+    REF 4a21a1c0757083a16497fea27886f5f20ccdf334 # v0.4.56
     SHA512 68898a8ac15d5490f45676eabfbe0df9e45370a74c543a28909fd0d85fed48dfcf4bcd6ea2d01d1a036dd352e2e4e0b08c48c63ab2a2b477fe150b46a827136e
     HEAD_REF master
     PATCHES
         disable-error-4068.patch # This patch fixes dependency port compilation failure
         disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow
         fix-cmake-target-path.patch # Shared libraries and static libraries are not built at the same time
+		disable_outline_atomics_emscripten.patch # Disables -moutline-atomics flag which is not supported for wasm32
 )
 
 vcpkg_configure_cmake(

From a6feb5e2a628db139916a78ebcb9d844fd3381ec Mon Sep 17 00:00:00 2001
From: Ahmed Yarub Hani Al Nuaimi <ahmedyarub@yahoo.com>
Date: Sun, 18 Apr 2021 15:40:59 -0300
Subject: [PATCH 06/26] Fix OpenSSL build for WASM32

---
 ports/openssl/CONTROL             |   1 +
 ports/openssl/unix/CMakeLists.txt | 118 ++++++++++++++++++++----------
 2 files changed, 80 insertions(+), 39 deletions(-)

diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL
index df1c9ced410529..8a26fb7946cdb4 100644
--- a/ports/openssl/CONTROL
+++ b/ports/openssl/CONTROL
@@ -1,4 +1,5 @@
 Source: openssl
 Version: 1.1.1j
+Port-Version: 1
 Homepage: https://www.openssl.org
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt
index 14633c9415c956..8ee146046859bc 100644
--- a/ports/openssl/unix/CMakeLists.txt
+++ b/ports/openssl/unix/CMakeLists.txt
@@ -40,6 +40,9 @@ elseif(MINGW)
     else()
         set(PLATFORM mingw)
     endif()
+elseif(EMSCRIPTEN)
+    set(MAKE $ENV{EMSDK}/upstream/emscripten/emmake)
+    set(ENV{MAKE} $ENV{EMSDK}/upstream/emscripten/emmake)
 else()
     message(FATAL_ERROR "Unknown platform")
 endif()
@@ -143,47 +146,84 @@ else()
     set(PATH_VAR ":$ENV{PATH}")
 endif()
 
+if(EMSCRIPTEN)
+    add_custom_command(
+            OUTPUT "${BUILDDIR}/Makefile"
+            COMMAND ${ENV_COMMAND} CC=${CMAKE_C_COMPILER}
+            COMMAND ${ENV_COMMAND} AR=${CMAKE_AR}
+            COMMAND ${ENV_COMMAND} LD=${CMAKE_LINKER}
+            COMMAND ${ENV_COMMAND} RANLIB=${CMAKE_RANLIB}
+            COMMAND ${ENV_COMMAND} MAKE=${MAKE}
+            COMMAND ${ENV_COMMAND} MAKEDEPPROG=${CMAKE_C_COMPILER}
+            COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
+            COMMAND "$ENV{EMSDK}/upstream/emscripten/emconfigure" ./config
+            ${SHARED}
+            threads
+            no-engine
+            no-dso
+            no-asm
+            no-shared
+            no-sse2
+            no-srtp
+            ${DISABLES}
+            "--prefix=${CMAKE_INSTALL_PREFIX}"
+            "--openssldir=/etc/ssl"
+            "--cross-compile-prefix=\"/\""
+            COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake"
+            VERBATIM
+            WORKING_DIRECTORY "${BUILDDIR}"
+    )
 
+    add_custom_target(build_libs ALL
+            COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
+            COMMAND "${CMAKE_COMMAND}" -E touch "${BUILDDIR}/krb5.h"
+            COMMAND "${MAKE}" make build_libs
+            VERBATIM
+            WORKING_DIRECTORY "${BUILDDIR}"
+            DEPENDS "${BUILDDIR}/Makefile"
+            BYPRODUCTS ${INSTALL_LIBS}
+            )
+else()
+    add_custom_command(
+        OUTPUT "${BUILDDIR}/Makefile"
+        COMMAND ${ENV_COMMAND} CC=${CMAKE_C_COMPILER}
+        COMMAND ${ENV_COMMAND} AR=${CMAKE_AR}
+        COMMAND ${ENV_COMMAND} LD=${CMAKE_LINKER}
+        COMMAND ${ENV_COMMAND} RANLIB=${CMAKE_RANLIB}
+        COMMAND ${ENV_COMMAND} MAKE=${MAKE}
+        COMMAND ${ENV_COMMAND} MAKEDEPPROG=${CMAKE_C_COMPILER}
+        COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
+        COMMAND "${PERL}" Configure
+            ${SHARED}
+            enable-static-engine
+            no-zlib
+            no-ssl2
+            no-idea
+            no-bf
+            no-cast
+            no-seed
+            no-md2
+            no-tests
+            ${DISABLES}
+            ${PLATFORM}
+            "--prefix=${CMAKE_INSTALL_PREFIX}"
+            "--openssldir=/etc/ssl"
+            ${CFLAGS}
+        COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake"
+        VERBATIM
+        WORKING_DIRECTORY "${BUILDDIR}"
+    )
 
-add_custom_command(
-    OUTPUT "${BUILDDIR}/Makefile"
-    COMMAND ${ENV_COMMAND} CC=${CMAKE_C_COMPILER}
-    COMMAND ${ENV_COMMAND} AR=${CMAKE_AR}
-    COMMAND ${ENV_COMMAND} LD=${CMAKE_LINKER}
-    COMMAND ${ENV_COMMAND} RANLIB=${CMAKE_RANLIB}
-    COMMAND ${ENV_COMMAND} MAKE=${MAKE}
-    COMMAND ${ENV_COMMAND} MAKEDEPPROG=${CMAKE_C_COMPILER}
-    COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
-    COMMAND "${PERL}" Configure
-        ${SHARED}
-        enable-static-engine
-        no-zlib
-        no-ssl2
-        no-idea
-        no-bf
-        no-cast
-        no-seed
-        no-md2
-        no-tests
-        ${DISABLES}
-        ${PLATFORM}
-        "--prefix=${CMAKE_INSTALL_PREFIX}"
-        "--openssldir=/etc/ssl"
-        ${CFLAGS}
-    COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake"
-    VERBATIM
-    WORKING_DIRECTORY "${BUILDDIR}"
-)
-
-add_custom_target(build_libs ALL
-    COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
-    COMMAND "${CMAKE_COMMAND}" -E touch "${BUILDDIR}/krb5.h"
-    COMMAND "${MAKE}" build_libs
-    VERBATIM
-    WORKING_DIRECTORY "${BUILDDIR}"
-    DEPENDS "${BUILDDIR}/Makefile"
-    BYPRODUCTS ${INSTALL_LIBS}
-)
+    add_custom_target(build_libs ALL
+            COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
+            COMMAND "${CMAKE_COMMAND}" -E touch "${BUILDDIR}/krb5.h"
+            COMMAND "${MAKE}" build_libs
+            VERBATIM
+            WORKING_DIRECTORY "${BUILDDIR}"
+            DEPENDS "${BUILDDIR}/Makefile"
+            BYPRODUCTS ${INSTALL_LIBS}
+            )
+endif()
 
 if((CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS") AND BUILD_SHARED_LIBS)
     if(DEFINED CMAKE_INSTALL_NAME_DIR)

From 9658a7eb1ea7a6c5763f845dd1c04a5460cfcd8f Mon Sep 17 00:00:00 2001
From: Ahmed Yarub Hani Al Nuaimi <ahmedyarub@yahoo.com>
Date: Sun, 18 Apr 2021 15:58:40 -0300
Subject: [PATCH 07/26] Update AWS C Common and OpenSSL versions

---
 versions/a-/aws-c-common.json | 5 +++++
 versions/baseline.json        | 4 ++--
 versions/o-/openssl.json      | 5 +++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/versions/a-/aws-c-common.json b/versions/a-/aws-c-common.json
index 84a58aa974077a..c8bc10fbdd9f86 100644
--- a/versions/a-/aws-c-common.json
+++ b/versions/a-/aws-c-common.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "71cdac53355da4c5b623d5471272036498e36599",
+      "version-string": "0.4.56",
+      "port-version": 1
+    },
     {
       "git-tree": "3b58ff9b212a0910118c979470d7e53925d1b705",
       "version-string": "0.4.56",
diff --git a/versions/baseline.json b/versions/baseline.json
index e3441409c03ee4..7cbdc58c90e744 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -218,7 +218,7 @@
     },
     "aws-c-common": {
       "baseline": "0.4.56",
-      "port-version": 0
+      "port-version": 1
     },
     "aws-c-event-stream": {
       "baseline": "0.1.6",
@@ -4514,7 +4514,7 @@
     },
     "openssl": {
       "baseline": "1.1.1j",
-      "port-version": 0
+      "port-version": 1
     },
     "openssl-unix": {
       "baseline": "1.1.1h",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 56c4f2c66b378f..56f369b26ef07f 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2e4d360ee9ef0a7a7a9871892838265045e25e07",
+      "version-string": "1.1.1j",
+      "port-version": 1
+    },
     {
       "git-tree": "009a7ee95741b939859c77b8e1ddd6c146ffe54e",
       "version-string": "1.1.1j",

From a0c4c2680fe4527a5cce8b48fe097ce8c5699240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Mon, 19 Apr 2021 11:04:30 +0800
Subject: [PATCH 08/26] Update versions/a-/aws-sdk-cpp.json

---
 versions/a-/aws-sdk-cpp.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json
index 0a6ad8109767ad..130acd0b8bb736 100644
--- a/versions/a-/aws-sdk-cpp.json
+++ b/versions/a-/aws-sdk-cpp.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "2795f006adfb732d610a140ef9eb036f053a5997",
+      "git-tree": "9c60baa2cff0bbfc024a8241b96f6685f4e083d3",
       "version": "1.8.126",
       "port-version": 8
     },

From 49f07bd3a8d2e79f156f6bc911732e4c8845daae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Mon, 19 Apr 2021 11:04:34 +0800
Subject: [PATCH 09/26] Update versions/o-/openssl.json

---
 versions/o-/openssl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 5968727330396a..414b2f11e13cde 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "2797d49ed1aa47fd6f37965c3db7dc48ca64d1f5",
+      "git-tree": "3388a88872808e9926c9d94a702bca7e9f2736f9",
       "version-string": "1.1.1j",
       "port-version": 1
     },

From e3a99fc3650ea97223a4126d3b5fb07dff3fc264 Mon Sep 17 00:00:00 2001
From: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Date: Mon, 19 Apr 2021 21:21:55 -0300
Subject: [PATCH 10/26] Fix port-versions after merging master branch

---
 ports/aws-sdk-cpp/vcpkg.json | 2 +-
 ports/openssl/CONTROL        | 2 +-
 versions/a-/aws-sdk-cpp.json | 5 +++++
 versions/baseline.json       | 4 ++--
 versions/o-/openssl.json     | 5 +++++
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json
index 02bb0315aa911b..2ebe3c89fa5385 100644
--- a/ports/aws-sdk-cpp/vcpkg.json
+++ b/ports/aws-sdk-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "aws-sdk-cpp",
   "version": "1.8.126",
-  "port-version": 8,
+  "port-version": 9,
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
   "dependencies": [
diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL
index 8a26fb7946cdb4..4fb53bb677ef3e 100644
--- a/ports/openssl/CONTROL
+++ b/ports/openssl/CONTROL
@@ -1,5 +1,5 @@
 Source: openssl
 Version: 1.1.1j
-Port-Version: 1
+Port-Version: 2
 Homepage: https://www.openssl.org
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json
index 87305608de2111..27065802cff66d 100644
--- a/versions/a-/aws-sdk-cpp.json
+++ b/versions/a-/aws-sdk-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "422c3181effad9596e2a70905d357e39ec33d5cc",
+      "version": "1.8.126",
+      "port-version": 9
+    },
     {
       "git-tree": "e1cf5cdb2c16125d532b8281d6901839f11a25f5",
       "version": "1.8.126",
diff --git a/versions/baseline.json b/versions/baseline.json
index d2f8977d2594e8..287ce70d39f135 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -234,7 +234,7 @@
     },
     "aws-sdk-cpp": {
       "baseline": "1.8.126",
-      "port-version": 8
+      "port-version": 9
     },
     "azmq": {
       "baseline": "2020-03-03",
@@ -4514,7 +4514,7 @@
     },
     "openssl": {
       "baseline": "1.1.1j",
-      "port-version": 1
+      "port-version": 2
     },
     "openssl-unix": {
       "baseline": "1.1.1h",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 9891f69cd97b59..34c381de3476a6 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f64c492c931c3cb248575a39ae92645392564ad3",
+      "version-string": "1.1.1j",
+      "port-version": 2
+    },
     {
       "git-tree": "2695b5d292f012836d962b22293d4dc081f75bff",
       "version-string": "1.1.1j",

From 5d48274d30ee5b5e562f3b836c2a3ef4341ba1ad Mon Sep 17 00:00:00 2001
From: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Date: Mon, 19 Apr 2021 21:54:50 -0300
Subject: [PATCH 11/26] Fix port-versions after merging master branch

---
 ports/openssl/CONTROL    | 2 +-
 versions/baseline.json   | 2 +-
 versions/o-/openssl.json | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL
index 8a26fb7946cdb4..4fb53bb677ef3e 100644
--- a/ports/openssl/CONTROL
+++ b/ports/openssl/CONTROL
@@ -1,5 +1,5 @@
 Source: openssl
 Version: 1.1.1j
-Port-Version: 1
+Port-Version: 2
 Homepage: https://www.openssl.org
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
diff --git a/versions/baseline.json b/versions/baseline.json
index 5d0a70e3f81d07..dcd6c26ecfec3d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4522,7 +4522,7 @@
     },
     "openssl": {
       "baseline": "1.1.1j",
-      "port-version": 1
+      "port-version": 2
     },
     "openssl-unix": {
       "baseline": "1.1.1h",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 9891f69cd97b59..0924793f793ca1 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "40ac9b02c44593b77db40930060eb6b1ed606ad8",
+      "version-string": "1.1.1j",
+      "port-version": 2
+    },
     {
       "git-tree": "2695b5d292f012836d962b22293d4dc081f75bff",
       "version-string": "1.1.1j",

From 0df627c4703a2727ab9d3de7b04954acdb424f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Wed, 21 Apr 2021 11:50:07 +0800
Subject: [PATCH 12/26] Update versions/o-/openssl.json

---
 versions/o-/openssl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 0924793f793ca1..eaabb47054ec8d 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "40ac9b02c44593b77db40930060eb6b1ed606ad8",
+      "git-tree": "98d1f78df875b28a9ae7e5e1cfc679fc0c0637d3",
       "version-string": "1.1.1j",
       "port-version": 2
     },

From 93d03ba91681a5b49a3eeec1cbcf9fddf20028fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Wed, 21 Apr 2021 15:51:49 +0800
Subject: [PATCH 13/26] Update versions/a-/aws-sdk-cpp.json

---
 versions/a-/aws-sdk-cpp.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json
index 27065802cff66d..0f18d4fe1048af 100644
--- a/versions/a-/aws-sdk-cpp.json
+++ b/versions/a-/aws-sdk-cpp.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "422c3181effad9596e2a70905d357e39ec33d5cc",
+      "git-tree": "c23d66191b235f6f388187395b62f38b8e6e35f5",
       "version": "1.8.126",
       "port-version": 9
     },

From dc310c3e451397e4a2b673dbbb04b008520e198a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Wed, 21 Apr 2021 15:51:54 +0800
Subject: [PATCH 14/26] Update versions/o-/openssl.json

---
 versions/o-/openssl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 34c381de3476a6..0a79d3c6d3fc8b 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "f64c492c931c3cb248575a39ae92645392564ad3",
+      "git-tree": "01fede48f331d05f2feb591061d9e5c1bc076fb0",
       "version-string": "1.1.1j",
       "port-version": 2
     },

From 7125a75be99409f989f719a760949cac47da4528 Mon Sep 17 00:00:00 2001
From: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Date: Sat, 24 Apr 2021 12:04:12 -0300
Subject: [PATCH 15/26] Fix merge conflicts

---
 ports/openssl/CONTROL    | 2 +-
 versions/baseline.json   | 2 +-
 versions/o-/openssl.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL
index 4fb53bb677ef3e..164d2ab608fea6 100644
--- a/ports/openssl/CONTROL
+++ b/ports/openssl/CONTROL
@@ -1,5 +1,5 @@
 Source: openssl
 Version: 1.1.1j
-Port-Version: 2
+Port-Version: 3
 Homepage: https://www.openssl.org
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
diff --git a/versions/baseline.json b/versions/baseline.json
index 956eaaea2edd3c..4eae46a8cfb3be 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4522,7 +4522,7 @@
     },
     "openssl": {
       "baseline": "1.1.1j",
-      "port-version": 2
+      "port-version": 3
     },
     "openssl-unix": {
       "baseline": "1.1.1h",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index effea05048cd14..6272a373840cfe 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "01fede48f331d05f2feb591061d9e5c1bc076fb0",
+      "git-tree": "c36a602902678620f0fdb8f08e67e78d7dd98ae5",
       "version-string": "1.1.1j",
       "port-version": 3
     },

From 284eba06f7fce256ca0855c2188402dea81a79c2 Mon Sep 17 00:00:00 2001
From: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Date: Sat, 24 Apr 2021 12:10:43 -0300
Subject: [PATCH 16/26] Fix merge conflicts

---
 versions/o-/openssl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 9d9593db7f1bca..c5d882b90c7f30 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "98d1f78df875b28a9ae7e5e1cfc679fc0c0637d3",
+      "git-tree": "673c6ee53c41fde3bb83b55045b789cfe7064133",
       "version-string": "1.1.1j",
       "port-version": 4
     },

From 1e77b84eeb9db0ce58f53d86f1edcea2005822e8 Mon Sep 17 00:00:00 2001
From: Ahmed Yarub Hani Al Nuaimi <ahmedyarub@yahoo.com>
Date: Sat, 24 Apr 2021 12:26:44 -0300
Subject: [PATCH 17/26] Update ports/aws-c-common/portfile.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
---
 ports/aws-c-common/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake
index 9a883d17e00972..de57b1e5ac66fb 100644
--- a/ports/aws-c-common/portfile.cmake
+++ b/ports/aws-c-common/portfile.cmake
@@ -8,7 +8,7 @@ vcpkg_from_github(
         disable-error-4068.patch # This patch fixes dependency port compilation failure
         disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow
         fix-cmake-target-path.patch # Shared libraries and static libraries are not built at the same time
-		disable_outline_atomics_emscripten.patch # Disables -moutline-atomics flag which is not supported for wasm32
+        disable_outline_atomics_emscripten.patch # Disables -moutline-atomics flag which is not supported for wasm32
 )
 
 vcpkg_configure_cmake(

From dafef4bee382bec421aff96d2ef3d8ec063a9a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Sun, 25 Apr 2021 15:49:33 +0800
Subject: [PATCH 18/26] Update versions/a-/aws-c-common.json

---
 versions/a-/aws-c-common.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/a-/aws-c-common.json b/versions/a-/aws-c-common.json
index c8bc10fbdd9f86..50d03fea9498ad 100644
--- a/versions/a-/aws-c-common.json
+++ b/versions/a-/aws-c-common.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "71cdac53355da4c5b623d5471272036498e36599",
+      "git-tree": "d3456e2003b64b54185fa10132fac127c55c7fbb",
       "version-string": "0.4.56",
       "port-version": 1
     },

From d0fdd8b051e65227f78d7d5b3fcf20768d89efe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Sun, 25 Apr 2021 15:49:39 +0800
Subject: [PATCH 19/26] Update versions/o-/openssl.json

---
 versions/o-/openssl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index c5d882b90c7f30..5529d81ce00f33 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "673c6ee53c41fde3bb83b55045b789cfe7064133",
+      "git-tree": "2a4116c50cba23eed86dcb1ac3c7a778d62f1f80",
       "version-string": "1.1.1j",
       "port-version": 4
     },

From 8ec2e26ab2051b94871850612d055c356bf96fdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Sun, 25 Apr 2021 15:49:44 +0800
Subject: [PATCH 20/26] Update versions/o-/openssl.json

---
 versions/o-/openssl.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 5529d81ce00f33..1265c3ad3bd9ca 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -5,11 +5,6 @@
       "version-string": "1.1.1j",
       "port-version": 4
     },
-    {
-      "git-tree": "c36a602902678620f0fdb8f08e67e78d7dd98ae5",
-      "version-string": "1.1.1j",
-      "port-version": 3
-    },
     {
       "git-tree": "47f6dd2398634984759b609529bf35482957da54",
       "version-string": "1.1.1j",

From 24fb7a061cfd9e40d90eedc0ab28b3b7a8a7082b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Sun, 25 Apr 2021 15:49:50 +0800
Subject: [PATCH 21/26] Update versions/o-/openssl.json

---
 versions/o-/openssl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 1265c3ad3bd9ca..2274b664f17eac 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -3,7 +3,7 @@
     {
       "git-tree": "2a4116c50cba23eed86dcb1ac3c7a778d62f1f80",
       "version-string": "1.1.1j",
-      "port-version": 4
+      "port-version": 3
     },
     {
       "git-tree": "47f6dd2398634984759b609529bf35482957da54",

From 6fd226b874f5f9fe00682929190d39412bcd2a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Sun, 25 Apr 2021 15:49:54 +0800
Subject: [PATCH 22/26] Update ports/openssl/CONTROL

---
 ports/openssl/CONTROL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL
index b7d67bd45cc64e..164d2ab608fea6 100644
--- a/ports/openssl/CONTROL
+++ b/ports/openssl/CONTROL
@@ -1,5 +1,5 @@
 Source: openssl
 Version: 1.1.1j
-Port-Version: 4
+Port-Version: 3
 Homepage: https://www.openssl.org
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.

From f8644b8ba6c90a91acc38d7b19e9bec9caea715b Mon Sep 17 00:00:00 2001
From: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Date: Sun, 9 May 2021 17:10:14 +0044
Subject: [PATCH 23/26] Merge master branch and resolve merge conflicts

---
 ports/openssl/vcpkg.json | 2 +-
 versions/o-/openssl.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
index 612b38a057c668..462e3b6cbaa518 100644
--- a/ports/openssl/vcpkg.json
+++ b/ports/openssl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openssl",
   "version-string": "1.1.1k",
-  "port-version": 1,
+  "port-version": 2,
   "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
   "homepage": "https://www.openssl.org"
 }
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index c0771f1a52d437..3c73e4f53c096d 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d055940fd7d90edf8db6de47dc1d7856fac3e08f",
+      "version-string": "1.1.1k",
+      "port-version": 2
+    },
     {
       "git-tree": "24a9f866c10144f3dcce1b8972d43170cfad3201",
       "version-string": "1.1.1k",

From 5c3ae62793d2e7476399add1d53550d3b7afc485 Mon Sep 17 00:00:00 2001
From: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Date: Sun, 9 May 2021 17:12:00 +0044
Subject: [PATCH 24/26] Disable -moutline-atomics in Android also

---
 ...e_atomics_emscripten.patch => disable_outline_atomics.patch} | 2 +-
 ports/aws-c-common/portfile.cmake                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename ports/aws-c-common/{disable_outline_atomics_emscripten.patch => disable_outline_atomics.patch} (94%)

diff --git a/ports/aws-c-common/disable_outline_atomics_emscripten.patch b/ports/aws-c-common/disable_outline_atomics.patch
similarity index 94%
rename from ports/aws-c-common/disable_outline_atomics_emscripten.patch
rename to ports/aws-c-common/disable_outline_atomics.patch
index cf1daa81f5bd76..b3c9e109f2154c 100644
--- a/ports/aws-c-common/disable_outline_atomics_emscripten.patch
+++ b/ports/aws-c-common/disable_outline_atomics.patch
@@ -8,7 +8,7 @@ diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
 -        check_c_compiler_flag(-moutline-atomics HAS_MOUTLINE_ATOMICS)
 -        if (HAS_MOUTLINE_ATOMICS)
 -            list(APPEND AWS_C_FLAGS -moutline-atomics)
-+        if(NOT EMSCRIPTEN)
++        if(NOT EMSCRIPTEN AND NOT ANDROID)
 +            check_c_compiler_flag(-moutline-atomics HAS_MOUTLINE_ATOMICS)
 +            if (HAS_MOUTLINE_ATOMICS)
 +                list(APPEND AWS_C_FLAGS -moutline-atomics)
diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake
index de57b1e5ac66fb..12efebc8790626 100644
--- a/ports/aws-c-common/portfile.cmake
+++ b/ports/aws-c-common/portfile.cmake
@@ -8,7 +8,7 @@ vcpkg_from_github(
         disable-error-4068.patch # This patch fixes dependency port compilation failure
         disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow
         fix-cmake-target-path.patch # Shared libraries and static libraries are not built at the same time
-        disable_outline_atomics_emscripten.patch # Disables -moutline-atomics flag which is not supported for wasm32
+        disable_outline_atomics.patch # Disables -moutline-atomics flag which is not supported for wasm32 and Android
 )
 
 vcpkg_configure_cmake(

From 6f0e4b9cdb8386c8bc66c4fce34b592e52cbb94c Mon Sep 17 00:00:00 2001
From: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Date: Sun, 9 May 2021 17:15:28 +0044
Subject: [PATCH 25/26] Revert line ending change

---
 ports/openssl/unix/CMakeLists.txt | 556 +++++++++++++++---------------
 1 file changed, 278 insertions(+), 278 deletions(-)

diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt
index dbd161ecf449b9..2c0fdcee644106 100644
--- a/ports/openssl/unix/CMakeLists.txt
+++ b/ports/openssl/unix/CMakeLists.txt
@@ -1,278 +1,278 @@
-cmake_minimum_required(VERSION 3.9)
-project(openssl C)
-
-if(NOT SOURCE_PATH)
-    message(FATAL_ERROR "Requires SOURCE_PATH")
-endif()
-
-if(CMAKE_SYSTEM_NAME STREQUAL "Android" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-        set(PLATFORM linux-x86_64)
-    else()
-        set(PLATFORM linux-generic32)
-    endif()
-elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS")
-    if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm64")
-        set(PLATFORM ios64-xcrun)
-    elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "arm")
-        set(PLATFORM ios-xcrun)
-    elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" OR
-           VCPKG_TARGET_ARCHITECTURE MATCHES "x64")
-        set(PLATFORM iossimulator-xcrun)
-    else()
-        message(FATAL_ERROR "Unknown iOS target architecture: ${VCPKG_TARGET_ARCHITECTURE}")
-    endif()
-    # disable that makes linkage error (e.g. require stderr usage)
-    list(APPEND DISABLES no-stdio no-ui no-asm)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm64")
-        set(PLATFORM darwin64-arm64-cc)
-    else()
-        set(PLATFORM darwin64-x86_64-cc)
-    endif()
-elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-    set(PLATFORM BSD-generic64)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
-    set(PLATFORM BSD-generic64)
-elseif(MINGW)
-    if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-        set(PLATFORM mingw64)
-    else()
-        set(PLATFORM mingw)
-    endif()
-elseif(EMSCRIPTEN)
-    set(MAKE $ENV{EMSDK}/upstream/emscripten/emmake)
-    set(ENV{MAKE} $ENV{EMSDK}/upstream/emscripten/emmake)
-else()
-    message(FATAL_ERROR "Unknown platform")
-endif()
-
-get_filename_component(COMPILER_ROOT "${CMAKE_C_COMPILER}" DIRECTORY)
-
-message("CMAKE_C_COMPILER=${CMAKE_C_COMPILER}")
-message("COMPILER_ROOT=${COMPILER_ROOT}")
-message("CMAKE_SYSROOT=${CMAKE_SYSROOT}")
-message("CMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}")
-message("CMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
-message("CMAKE_C_FLAGS=${CMAKE_C_FLAGS}")
-message("CMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}")
-message("CMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}")
-message("CMAKE_INCLUDE_SYSTEM_FLAG_C=${CMAKE_INCLUDE_SYSTEM_FLAG_C}")
-message("CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG=${CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG}")
-
-set(CFLAGS "${CMAKE_C_FLAGS}")
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CFLAGS "-Wno-error=unused-command-line-argument ${CMAKE_C_FLAGS}")
-endif()
-if(CMAKE_C_COMPILER_TARGET AND CMAKE_C_COMPILE_OPTIONS_TARGET)
-    set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_TARGET}${CMAKE_C_COMPILER_TARGET}")
-endif()
-if(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN AND CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN)
-    set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN}")
-endif()
-if(CMAKE_SYSROOT AND CMAKE_C_COMPILE_OPTIONS_SYSROOT)
-    set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}")
-elseif(CMAKE_OSX_SYSROOT AND CMAKE_C_COMPILE_OPTIONS_SYSROOT)
-    set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_OSX_SYSROOT}")
-endif()
-if (CMAKE_OSX_DEPLOYMENT_TARGET AND CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG)
-    set(CFLAGS "${CFLAGS} ${CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}")
-endif()
-
-string(REGEX REPLACE "^ " "" CFLAGS "${CFLAGS}")
-
-if(CMAKE_HOST_WIN32)
-    file(TO_NATIVE_PATH ENV_PATH "${COMPILER_ROOT};$ENV{PATH}")
-else()
-    file(TO_NATIVE_PATH ENV_PATH "${COMPILER_ROOT}:$ENV{PATH}")
-endif()
-set(ENV{ANDROID_DEV} "${CMAKE_SYSROOT}/usr")
-
-if(NOT IOS)
-    set(ENV{CC} "${CMAKE_C_COMPILER}")
-endif()
-
-message("ENV{ANDROID_DEV}=$ENV{ANDROID_DEV}")
-
-get_filename_component(SOURCE_PATH_NAME "${SOURCE_PATH}" NAME)
-set(BUILDDIR "${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_PATH_NAME}")
-
-if(NOT EXISTS "${BUILDDIR}")
-    file(COPY ${SOURCE_PATH} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-endif()
-
-get_filename_component(MSYS_BIN_DIR "${MAKE}" DIRECTORY)
-
-if(BUILD_SHARED_LIBS)
-    set(SHARED shared)
-    file(STRINGS "${BUILDDIR}/include/openssl/opensslv.h" SHLIB_VERSION
-        REGEX "^#[\t ]*define[\t ]+SHLIB_VERSION_NUMBER[\t ]+\".*\".*")
-    string(REGEX REPLACE "^.*SHLIB_VERSION_NUMBER[\t ]+\"([^\"]*)\".*$" "\\1"
-        SHLIB_VERSION "${SHLIB_VERSION}")
-    if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS")
-        set(LIB_EXT dylib)
-        set(LIB_EXTS ${SHLIB_VERSION}.${LIB_EXT})
-    elseif(MINGW)
-        string(REPLACE "." "_" SHLIB_VERSION "${SHLIB_VERSION}")
-        set(BIN_EXT dll)
-        set(LIB_EXT dll.a)
-    else()
-        set(LIB_EXT so)
-        set(LIB_EXTS ${LIB_EXT}.${SHLIB_VERSION})
-    endif()
-    list(APPEND BIN_EXTS ${BIN_EXT})
-    list(APPEND LIB_EXTS ${LIB_EXT})
-else()
-    set(SHARED no-shared)
-    set(LIB_EXTS a)
-endif()
-foreach(lib ssl crypto)
-    foreach(ext ${LIB_EXTS})
-        list(APPEND INSTALL_LIBS "${BUILDDIR}/lib${lib}.${ext}")
-        list(APPEND INSTALL_PKG_CONFIGS "${BUILDDIR}/lib${lib}.pc")
-    endforeach()
-    foreach(ext ${BIN_EXTS})
-    # This might be wrong for targets which don't follow this naming scheme, but I'm not aware of any
-        if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-            list(APPEND INSTALL_BINS "${BUILDDIR}/lib${lib}-${SHLIB_VERSION}-x64.${ext}")
-        else()
-            list(APPEND INSTALL_BINS "${BUILDDIR}/lib${lib}-${SHLIB_VERSION}.${ext}")
-        endif()
-    endforeach()
-endforeach()
-
-if(CMAKE_HOST_WIN32)
-    set(ENV_COMMAND set)
-    set(PATH_VAR ";%PATH%")
-else()
-    set(ENV_COMMAND export)
-    set(PATH_VAR ":$ENV{PATH}")
-endif()
-
-if(IOS)
-    add_custom_command(
-            OUTPUT "${BUILDDIR}/Makefile"
-            COMMAND "${PERL}" Configure
-            ${SHARED}
-            ${DISABLES}
-            ${PLATFORM}
-            "--prefix=${CMAKE_INSTALL_PREFIX}"
-            "--openssldir=/etc/ssl"
-            COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake"
-            VERBATIM
-            WORKING_DIRECTORY "${BUILDDIR}"
-    )
-elseif(EMSCRIPTEN)
-    add_custom_command(
-            OUTPUT "${BUILDDIR}/Makefile"
-            COMMAND ${ENV_COMMAND} CC=${CMAKE_C_COMPILER}
-            COMMAND ${ENV_COMMAND} AR=${CMAKE_AR}
-            COMMAND ${ENV_COMMAND} LD=${CMAKE_LINKER}
-            COMMAND ${ENV_COMMAND} RANLIB=${CMAKE_RANLIB}
-            COMMAND ${ENV_COMMAND} MAKE=${MAKE}
-            COMMAND ${ENV_COMMAND} MAKEDEPPROG=${CMAKE_C_COMPILER}
-            COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
-            COMMAND "$ENV{EMSDK}/upstream/emscripten/emconfigure" ./config
-            ${SHARED}
-            threads
-            no-engine
-            no-dso
-            no-asm
-            no-shared
-            no-sse2
-            no-srtp
-            ${DISABLES}
-            "--prefix=${CMAKE_INSTALL_PREFIX}"
-            "--openssldir=/etc/ssl"
-            "--cross-compile-prefix=\"/\""
-            COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake"
-            VERBATIM
-            WORKING_DIRECTORY "${BUILDDIR}"
-    )
-else()
-    add_custom_command(
-        OUTPUT "${BUILDDIR}/Makefile"
-        COMMAND ${ENV_COMMAND} CC=${CMAKE_C_COMPILER}
-        COMMAND ${ENV_COMMAND} AR=${CMAKE_AR}
-        COMMAND ${ENV_COMMAND} LD=${CMAKE_LINKER}
-        COMMAND ${ENV_COMMAND} RANLIB=${CMAKE_RANLIB}
-        COMMAND ${ENV_COMMAND} MAKE=${MAKE}
-        COMMAND ${ENV_COMMAND} MAKEDEPPROG=${CMAKE_C_COMPILER}
-        COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
-        COMMAND "${PERL}" Configure
-            ${SHARED}
-            enable-static-engine
-            no-zlib
-            no-ssl2
-            no-idea
-            no-bf
-            no-cast
-            no-seed
-            no-md2
-            no-tests
-            ${DISABLES}
-            ${PLATFORM}
-            "--prefix=${CMAKE_INSTALL_PREFIX}"
-            "--openssldir=/etc/ssl"
-            ${CFLAGS}
-        COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake"
-        VERBATIM
-        WORKING_DIRECTORY "${BUILDDIR}"
-    )
-endif()
-
-if(EMSCRIPTEN)
-    add_custom_target(build_libs ALL
-            COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
-            COMMAND "${CMAKE_COMMAND}" -E touch "${BUILDDIR}/krb5.h"
-            COMMAND "${MAKE}" make build_libs
-            COMMAND "${MAKE}" make -j ${VCPKG_CONCURRENCY} build_libs
-            VERBATIM
-            WORKING_DIRECTORY "${BUILDDIR}"
-            DEPENDS "${BUILDDIR}/Makefile"
-            BYPRODUCTS ${INSTALL_LIBS}
-            )
-else()
-    add_custom_target(build_libs ALL
-        COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
-        COMMAND "${CMAKE_COMMAND}" -E touch "${BUILDDIR}/krb5.h"
-        COMMAND "${MAKE}" -j ${VCPKG_CONCURRENCY} build_libs
-        VERBATIM
-        WORKING_DIRECTORY "${BUILDDIR}"
-        DEPENDS "${BUILDDIR}/Makefile"
-        BYPRODUCTS ${INSTALL_LIBS}
-    )
-endif()
-
-if((CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS") AND BUILD_SHARED_LIBS)
-    if(DEFINED CMAKE_INSTALL_NAME_DIR)
-        set(ID_PREFIX "${CMAKE_INSTALL_NAME_DIR}")
-    else()
-        set(ID_PREFIX "@rpath")
-    endif()
-
-    add_custom_command(
-        TARGET build_libs
-        COMMAND /usr/bin/install_name_tool -id "${ID_PREFIX}/libssl.${SHLIB_VERSION}.dylib"
-                                               "${BUILDDIR}/libssl.${SHLIB_VERSION}.dylib"
-        COMMAND /usr/bin/install_name_tool -id "${ID_PREFIX}/libcrypto.${SHLIB_VERSION}.dylib"
-                                               "${BUILDDIR}/libcrypto.1.1.dylib"
-        COMMAND /usr/bin/install_name_tool -change "${CMAKE_INSTALL_PREFIX}/lib/libcrypto.${SHLIB_VERSION}.dylib"
-                                                   "${ID_PREFIX}/libcrypto.${SHLIB_VERSION}.dylib"
-                                                   "${BUILDDIR}/libssl.${SHLIB_VERSION}.dylib"
-        VERBATIM
-    )
-endif()
-
-install(
-    FILES ${INSTALL_LIBS}
-    DESTINATION lib
-)
-install(
-    FILES ${INSTALL_BINS}
-    DESTINATION bin
-)
-install(
-    FILES ${INSTALL_PKG_CONFIGS}
-    DESTINATION lib/pkgconfig
-)
+cmake_minimum_required(VERSION 3.9)
+project(openssl C)
+
+if(NOT SOURCE_PATH)
+    message(FATAL_ERROR "Requires SOURCE_PATH")
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Android" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+        set(PLATFORM linux-x86_64)
+    else()
+        set(PLATFORM linux-generic32)
+    endif()
+elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS")
+    if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm64")
+        set(PLATFORM ios64-xcrun)
+    elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "arm")
+        set(PLATFORM ios-xcrun)
+    elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" OR
+           VCPKG_TARGET_ARCHITECTURE MATCHES "x64")
+        set(PLATFORM iossimulator-xcrun)
+    else()
+        message(FATAL_ERROR "Unknown iOS target architecture: ${VCPKG_TARGET_ARCHITECTURE}")
+    endif()
+    # disable that makes linkage error (e.g. require stderr usage)
+    list(APPEND DISABLES no-stdio no-ui no-asm)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm64")
+        set(PLATFORM darwin64-arm64-cc)
+    else()
+        set(PLATFORM darwin64-x86_64-cc)
+    endif()
+elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+    set(PLATFORM BSD-generic64)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+    set(PLATFORM BSD-generic64)
+elseif(MINGW)
+    if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+        set(PLATFORM mingw64)
+    else()
+        set(PLATFORM mingw)
+    endif()
+elseif(EMSCRIPTEN)
+    set(MAKE $ENV{EMSDK}/upstream/emscripten/emmake)
+    set(ENV{MAKE} $ENV{EMSDK}/upstream/emscripten/emmake)
+else()
+    message(FATAL_ERROR "Unknown platform")
+endif()
+
+get_filename_component(COMPILER_ROOT "${CMAKE_C_COMPILER}" DIRECTORY)
+
+message("CMAKE_C_COMPILER=${CMAKE_C_COMPILER}")
+message("COMPILER_ROOT=${COMPILER_ROOT}")
+message("CMAKE_SYSROOT=${CMAKE_SYSROOT}")
+message("CMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}")
+message("CMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+message("CMAKE_C_FLAGS=${CMAKE_C_FLAGS}")
+message("CMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}")
+message("CMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}")
+message("CMAKE_INCLUDE_SYSTEM_FLAG_C=${CMAKE_INCLUDE_SYSTEM_FLAG_C}")
+message("CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG=${CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG}")
+
+set(CFLAGS "${CMAKE_C_FLAGS}")
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    set(CFLAGS "-Wno-error=unused-command-line-argument ${CMAKE_C_FLAGS}")
+endif()
+if(CMAKE_C_COMPILER_TARGET AND CMAKE_C_COMPILE_OPTIONS_TARGET)
+    set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_TARGET}${CMAKE_C_COMPILER_TARGET}")
+endif()
+if(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN AND CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN)
+    set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN}")
+endif()
+if(CMAKE_SYSROOT AND CMAKE_C_COMPILE_OPTIONS_SYSROOT)
+    set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}")
+elseif(CMAKE_OSX_SYSROOT AND CMAKE_C_COMPILE_OPTIONS_SYSROOT)
+    set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_OSX_SYSROOT}")
+endif()
+if (CMAKE_OSX_DEPLOYMENT_TARGET AND CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG)
+    set(CFLAGS "${CFLAGS} ${CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}")
+endif()
+
+string(REGEX REPLACE "^ " "" CFLAGS "${CFLAGS}")
+
+if(CMAKE_HOST_WIN32)
+    file(TO_NATIVE_PATH ENV_PATH "${COMPILER_ROOT};$ENV{PATH}")
+else()
+    file(TO_NATIVE_PATH ENV_PATH "${COMPILER_ROOT}:$ENV{PATH}")
+endif()
+set(ENV{ANDROID_DEV} "${CMAKE_SYSROOT}/usr")
+
+if(NOT IOS)
+    set(ENV{CC} "${CMAKE_C_COMPILER}")
+endif()
+
+message("ENV{ANDROID_DEV}=$ENV{ANDROID_DEV}")
+
+get_filename_component(SOURCE_PATH_NAME "${SOURCE_PATH}" NAME)
+set(BUILDDIR "${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_PATH_NAME}")
+
+if(NOT EXISTS "${BUILDDIR}")
+    file(COPY ${SOURCE_PATH} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+endif()
+
+get_filename_component(MSYS_BIN_DIR "${MAKE}" DIRECTORY)
+
+if(BUILD_SHARED_LIBS)
+    set(SHARED shared)
+    file(STRINGS "${BUILDDIR}/include/openssl/opensslv.h" SHLIB_VERSION
+        REGEX "^#[\t ]*define[\t ]+SHLIB_VERSION_NUMBER[\t ]+\".*\".*")
+    string(REGEX REPLACE "^.*SHLIB_VERSION_NUMBER[\t ]+\"([^\"]*)\".*$" "\\1"
+        SHLIB_VERSION "${SHLIB_VERSION}")
+    if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS")
+        set(LIB_EXT dylib)
+        set(LIB_EXTS ${SHLIB_VERSION}.${LIB_EXT})
+    elseif(MINGW)
+        string(REPLACE "." "_" SHLIB_VERSION "${SHLIB_VERSION}")
+        set(BIN_EXT dll)
+        set(LIB_EXT dll.a)
+    else()
+        set(LIB_EXT so)
+        set(LIB_EXTS ${LIB_EXT}.${SHLIB_VERSION})
+    endif()
+    list(APPEND BIN_EXTS ${BIN_EXT})
+    list(APPEND LIB_EXTS ${LIB_EXT})
+else()
+    set(SHARED no-shared)
+    set(LIB_EXTS a)
+endif()
+foreach(lib ssl crypto)
+    foreach(ext ${LIB_EXTS})
+        list(APPEND INSTALL_LIBS "${BUILDDIR}/lib${lib}.${ext}")
+        list(APPEND INSTALL_PKG_CONFIGS "${BUILDDIR}/lib${lib}.pc")
+    endforeach()
+    foreach(ext ${BIN_EXTS})
+    # This might be wrong for targets which don't follow this naming scheme, but I'm not aware of any
+        if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+            list(APPEND INSTALL_BINS "${BUILDDIR}/lib${lib}-${SHLIB_VERSION}-x64.${ext}")
+        else()
+            list(APPEND INSTALL_BINS "${BUILDDIR}/lib${lib}-${SHLIB_VERSION}.${ext}")
+        endif()
+    endforeach()
+endforeach()
+
+if(CMAKE_HOST_WIN32)
+    set(ENV_COMMAND set)
+    set(PATH_VAR ";%PATH%")
+else()
+    set(ENV_COMMAND export)
+    set(PATH_VAR ":$ENV{PATH}")
+endif()
+
+if(IOS)
+    add_custom_command(
+            OUTPUT "${BUILDDIR}/Makefile"
+            COMMAND "${PERL}" Configure
+            ${SHARED}
+            ${DISABLES}
+            ${PLATFORM}
+            "--prefix=${CMAKE_INSTALL_PREFIX}"
+            "--openssldir=/etc/ssl"
+            COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake"
+            VERBATIM
+            WORKING_DIRECTORY "${BUILDDIR}"
+    )
+elseif(EMSCRIPTEN)
+    add_custom_command(
+            OUTPUT "${BUILDDIR}/Makefile"
+            COMMAND ${ENV_COMMAND} CC=${CMAKE_C_COMPILER}
+            COMMAND ${ENV_COMMAND} AR=${CMAKE_AR}
+            COMMAND ${ENV_COMMAND} LD=${CMAKE_LINKER}
+            COMMAND ${ENV_COMMAND} RANLIB=${CMAKE_RANLIB}
+            COMMAND ${ENV_COMMAND} MAKE=${MAKE}
+            COMMAND ${ENV_COMMAND} MAKEDEPPROG=${CMAKE_C_COMPILER}
+            COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
+            COMMAND "$ENV{EMSDK}/upstream/emscripten/emconfigure" ./config
+            ${SHARED}
+            threads
+            no-engine
+            no-dso
+            no-asm
+            no-shared
+            no-sse2
+            no-srtp
+            ${DISABLES}
+            "--prefix=${CMAKE_INSTALL_PREFIX}"
+            "--openssldir=/etc/ssl"
+            "--cross-compile-prefix=\"/\""
+            COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake"
+            VERBATIM
+            WORKING_DIRECTORY "${BUILDDIR}"
+    )
+else()
+    add_custom_command(
+        OUTPUT "${BUILDDIR}/Makefile"
+        COMMAND ${ENV_COMMAND} CC=${CMAKE_C_COMPILER}
+        COMMAND ${ENV_COMMAND} AR=${CMAKE_AR}
+        COMMAND ${ENV_COMMAND} LD=${CMAKE_LINKER}
+        COMMAND ${ENV_COMMAND} RANLIB=${CMAKE_RANLIB}
+        COMMAND ${ENV_COMMAND} MAKE=${MAKE}
+        COMMAND ${ENV_COMMAND} MAKEDEPPROG=${CMAKE_C_COMPILER}
+        COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
+        COMMAND "${PERL}" Configure
+            ${SHARED}
+            enable-static-engine
+            no-zlib
+            no-ssl2
+            no-idea
+            no-bf
+            no-cast
+            no-seed
+            no-md2
+            no-tests
+            ${DISABLES}
+            ${PLATFORM}
+            "--prefix=${CMAKE_INSTALL_PREFIX}"
+            "--openssldir=/etc/ssl"
+            ${CFLAGS}
+        COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake"
+        VERBATIM
+        WORKING_DIRECTORY "${BUILDDIR}"
+    )
+endif()
+
+if(EMSCRIPTEN)
+    add_custom_target(build_libs ALL
+            COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
+            COMMAND "${CMAKE_COMMAND}" -E touch "${BUILDDIR}/krb5.h"
+            COMMAND "${MAKE}" make build_libs
+            COMMAND "${MAKE}" make -j ${VCPKG_CONCURRENCY} build_libs
+            VERBATIM
+            WORKING_DIRECTORY "${BUILDDIR}"
+            DEPENDS "${BUILDDIR}/Makefile"
+            BYPRODUCTS ${INSTALL_LIBS}
+            )
+else()
+    add_custom_target(build_libs ALL
+        COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
+        COMMAND "${CMAKE_COMMAND}" -E touch "${BUILDDIR}/krb5.h"
+        COMMAND "${MAKE}" -j ${VCPKG_CONCURRENCY} build_libs
+        VERBATIM
+        WORKING_DIRECTORY "${BUILDDIR}"
+        DEPENDS "${BUILDDIR}/Makefile"
+        BYPRODUCTS ${INSTALL_LIBS}
+    )
+endif()
+
+if((CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS") AND BUILD_SHARED_LIBS)
+    if(DEFINED CMAKE_INSTALL_NAME_DIR)
+        set(ID_PREFIX "${CMAKE_INSTALL_NAME_DIR}")
+    else()
+        set(ID_PREFIX "@rpath")
+    endif()
+
+    add_custom_command(
+        TARGET build_libs
+        COMMAND /usr/bin/install_name_tool -id "${ID_PREFIX}/libssl.${SHLIB_VERSION}.dylib"
+                                               "${BUILDDIR}/libssl.${SHLIB_VERSION}.dylib"
+        COMMAND /usr/bin/install_name_tool -id "${ID_PREFIX}/libcrypto.${SHLIB_VERSION}.dylib"
+                                               "${BUILDDIR}/libcrypto.1.1.dylib"
+        COMMAND /usr/bin/install_name_tool -change "${CMAKE_INSTALL_PREFIX}/lib/libcrypto.${SHLIB_VERSION}.dylib"
+                                                   "${ID_PREFIX}/libcrypto.${SHLIB_VERSION}.dylib"
+                                                   "${BUILDDIR}/libssl.${SHLIB_VERSION}.dylib"
+        VERBATIM
+    )
+endif()
+
+install(
+    FILES ${INSTALL_LIBS}
+    DESTINATION lib
+)
+install(
+    FILES ${INSTALL_BINS}
+    DESTINATION bin
+)
+install(
+    FILES ${INSTALL_PKG_CONFIGS}
+    DESTINATION lib/pkgconfig
+)

From eabd63022674acb79d98744d234434f36a1a9f8a Mon Sep 17 00:00:00 2001
From: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Date: Mon, 17 May 2021 11:58:23 +0044
Subject: [PATCH 26/26] Fix version info

---
 versions/a-/aws-c-common.json | 2 +-
 versions/o-/openssl.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions/a-/aws-c-common.json b/versions/a-/aws-c-common.json
index 50d03fea9498ad..a7d7bf26b7efb1 100644
--- a/versions/a-/aws-c-common.json
+++ b/versions/a-/aws-c-common.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "d3456e2003b64b54185fa10132fac127c55c7fbb",
+      "git-tree": "afa3b695905711c9699c03d94a77f222396e3346",
       "version-string": "0.4.56",
       "port-version": 1
     },
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 3c73e4f53c096d..5e5641dac7a343 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "d055940fd7d90edf8db6de47dc1d7856fac3e08f",
+      "git-tree": "dcaa59e72471884bf333486e49be386dd4a3da4f",
       "version-string": "1.1.1k",
       "port-version": 2
     },