From e8817a5849975f9f43dcd29998d0fbe5e8e633f4 Mon Sep 17 00:00:00 2001
From: Lily Wang <v-lilywang@microsoft.com>
Date: Sat, 7 May 2022 02:38:59 -0700
Subject: [PATCH 01/11] [openssl] Add no-module configure option

---
 ports/openssl/unix/CMakeLists.txt | 2 +-
 ports/openssl/vcpkg.json          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt
index d47193512f2a25..9cb6a5325dece5 100644
--- a/ports/openssl/unix/CMakeLists.txt
+++ b/ports/openssl/unix/CMakeLists.txt
@@ -127,7 +127,7 @@ if(BUILD_SHARED_LIBS)
     list(APPEND BIN_EXTS ${BIN_EXT})
     list(APPEND LIB_EXTS ${LIB_EXT})
 else()
-    set(SHARED no-shared)
+    set(SHARED no-shared no-module)
     set(LIB_EXTS a)
 endif()
 set(INSTALL_PKG_CONFIGS "${BUILDDIR}/openssl.pc")
diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
index ff3927f0f22bb8..ade7e1f7b8dd23 100644
--- a/ports/openssl/vcpkg.json
+++ b/ports/openssl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openssl",
   "version": "3.0.2",
-  "port-version": 3,
+  "port-version": 4,
   "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",
   "license": "Apache-2.0",

From f985663b076c0ee55e6061b946e008643bd05860 Mon Sep 17 00:00:00 2001
From: Lily Wang <v-lilywang@microsoft.com>
Date: Sat, 7 May 2022 02:42:15 -0700
Subject: [PATCH 02/11] update version

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

diff --git a/versions/baseline.json b/versions/baseline.json
index cd021b02c48e3b..965ddafe754d8a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5170,7 +5170,7 @@
     },
     "openssl": {
       "baseline": "3.0.2",
-      "port-version": 3
+      "port-version": 4
     },
     "openssl-unix": {
       "baseline": "1.1.1h",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 10a28745a12690..137b984ea7f64a 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d84c8ad094d26ab5a2cfafaceedc51fac35dff05",
+      "version": "3.0.2",
+      "port-version": 4
+    },
     {
       "git-tree": "f521f59b704e7bebbddd28929f61f3911b8c7cb4",
       "version": "3.0.2",

From 0c25178a35c357ba53b6ce53beb741fd639bde98 Mon Sep 17 00:00:00 2001
From: Lily Wang <v-lilywang@microsoft.com>
Date: Sat, 7 May 2022 02:50:56 -0700
Subject: [PATCH 03/11] add no-module

---
 ports/openssl/windows/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake
index 5cd487300253ee..473b54c985e092 100644
--- a/ports/openssl/windows/portfile.cmake
+++ b/ports/openssl/windows/portfile.cmake
@@ -9,7 +9,7 @@ vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}")
 
 vcpkg_find_acquire_program(JOM)
 
-set(OPENSSL_SHARED no-shared)
+set(OPENSSL_SHARED no-shared no-module)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     set(OPENSSL_SHARED shared)
 endif()

From b6e0a252096fdcad8cef1b9652a1159dfdb95566 Mon Sep 17 00:00:00 2001
From: Lily Wang <v-lilywang@microsoft.com>
Date: Sat, 7 May 2022 02:51:24 -0700
Subject: [PATCH 04/11] version

---
 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 137b984ea7f64a..4de7c874a675a7 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "d84c8ad094d26ab5a2cfafaceedc51fac35dff05",
+      "git-tree": "b6fdc659402bda440d17fd0ad741d85d416bdb64",
       "version": "3.0.2",
       "port-version": 4
     },

From 4e5ca98e0c4cb353b023a6bdcc8ba8402c8b7ee0 Mon Sep 17 00:00:00 2001
From: Lily Wang <v-lilywang@microsoft.com>
Date: Sun, 8 May 2022 23:04:31 -0700
Subject: [PATCH 05/11] remove change on windows

---
 ports/openssl/windows/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake
index 473b54c985e092..5cd487300253ee 100644
--- a/ports/openssl/windows/portfile.cmake
+++ b/ports/openssl/windows/portfile.cmake
@@ -9,7 +9,7 @@ vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}")
 
 vcpkg_find_acquire_program(JOM)
 
-set(OPENSSL_SHARED no-shared no-module)
+set(OPENSSL_SHARED no-shared)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     set(OPENSSL_SHARED shared)
 endif()

From f2f8fe08cc7c1932646dfa2f4f95b4d0203537dd Mon Sep 17 00:00:00 2001
From: Lily Wang <v-lilywang@microsoft.com>
Date: Sun, 8 May 2022 23:05:06 -0700
Subject: [PATCH 06/11] x-add-version

---
 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 4de7c874a675a7..137b984ea7f64a 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "b6fdc659402bda440d17fd0ad741d85d416bdb64",
+      "git-tree": "d84c8ad094d26ab5a2cfafaceedc51fac35dff05",
       "version": "3.0.2",
       "port-version": 4
     },

From 05f195e374a21e606cf67bf8f2f2ef04e58a7d97 Mon Sep 17 00:00:00 2001
From: Lily Wang <v-lilywang@microsoft.com>
Date: Wed, 11 May 2022 23:49:02 -0700
Subject: [PATCH 07/11] update version

---
 ports/openssl/vcpkg.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
index 504092910c8671..f6a5cbac07adc5 100644
--- a/ports/openssl/vcpkg.json
+++ b/ports/openssl/vcpkg.json
@@ -1,11 +1,7 @@
 {
   "name": "openssl",
-<<<<<<< HEAD
-  "version": "3.0.2",
-  "port-version": 4,
-=======
   "version": "3.0.3",
->>>>>>> bae8f8c7d837c631ca72daec4b14e243824135a5
+  "port-version": 1,
   "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",
   "license": "Apache-2.0",

From 5c7080ee25d235859ea9246e75e24e9f15ca7d5c Mon Sep 17 00:00:00 2001
From: Lily Wang <v-lilywang@microsoft.com>
Date: Wed, 11 May 2022 23:49:38 -0700
Subject: [PATCH 08/11] x-add-version

---
 versions/baseline.json   |  7 +------
 versions/o-/openssl.json | 11 +++++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 542f2269d9fe30..b697bdf502c573 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5177,13 +5177,8 @@
       "port-version": 1
     },
     "openssl": {
-<<<<<<< HEAD
-      "baseline": "3.0.2",
-      "port-version": 4
-=======
       "baseline": "3.0.3",
-      "port-version": 0
->>>>>>> bae8f8c7d837c631ca72daec4b14e243824135a5
+      "port-version": 1
     },
     "openssl-unix": {
       "baseline": "1.1.1h",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 24deed9b792582..e7122725c1b870 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,15 +1,14 @@
 {
   "versions": [
     {
-<<<<<<< HEAD
-      "git-tree": "d84c8ad094d26ab5a2cfafaceedc51fac35dff05",
-      "version": "3.0.2",
-      "port-version": 4
-=======
+      "git-tree": "c98c31b2f3f530d5b8f5eb2b954ea1762461535f",
+      "version": "3.0.3",
+      "port-version": 1
+    },
+    {
       "git-tree": "973408910bc03c5a350f502080548a0d1ac68352",
       "version": "3.0.3",
       "port-version": 0
->>>>>>> bae8f8c7d837c631ca72daec4b14e243824135a5
     },
     {
       "git-tree": "f521f59b704e7bebbddd28929f61f3911b8c7cb4",

From 9fefb25c3ccc7df542b65d386a9cd2e77b7f39e2 Mon Sep 17 00:00:00 2001
From: Lily Wang <v-lilywang@microsoft.com>
Date: Tue, 17 May 2022 00:27:31 -0700
Subject: [PATCH 09/11] fix windows static

---
 ports/openssl/windows/portfile.cmake | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake
index 5cd487300253ee..01199c0357715e 100644
--- a/ports/openssl/windows/portfile.cmake
+++ b/ports/openssl/windows/portfile.cmake
@@ -9,9 +9,10 @@ vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}")
 
 vcpkg_find_acquire_program(JOM)
 
-set(OPENSSL_SHARED no-shared)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     set(OPENSSL_SHARED shared)
+else()
+    set(OPENSSL_SHARED no-shared no-module)
 endif()
 
 set(CONFIGURE_OPTIONS
@@ -125,8 +126,10 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
 
         message(STATUS "Build ${TARGET_TRIPLET}-dbg done")
 
-        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.pdb")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/bin/legacy.pdb")
+        if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+            file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.pdb")
+            file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/bin/legacy.pdb")
+        endif()
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/certs")
@@ -139,10 +142,12 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/engines-3")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/private")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-if(NOT VCPKG_BUILD_TYPE)
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.dll")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    if(NOT VCPKG_BUILD_TYPE)
+        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.dll")
+    endif()
+    file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/bin/legacy.dll")
 endif()
-file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/bin/legacy.dll")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/ossl-modules")

From c619c3070959590228d25e43be80b05eebdd333e Mon Sep 17 00:00:00 2001
From: Lily Wang <v-lilywang@microsoft.com>
Date: Tue, 17 May 2022 00:28:13 -0700
Subject: [PATCH 10/11] x-add-version

---
 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 e7122725c1b870..e2eeb5aaaada0c 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "c98c31b2f3f530d5b8f5eb2b954ea1762461535f",
+      "git-tree": "3f4bc1ce6401ba2c2ad2109dc8e82042566064b1",
       "version": "3.0.3",
       "port-version": 1
     },

From f2e8a0c4f6b5fd24497491957caefa4ad8d8b8ee Mon Sep 17 00:00:00 2001
From: Lily Wang <v-lilywang@microsoft.com>
Date: Tue, 17 May 2022 20:10:00 -0700
Subject: [PATCH 11/11] x-add-version

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

diff --git a/versions/baseline.json b/versions/baseline.json
index cce2918afe93b2..fc0aa4f61e38a9 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5178,7 +5178,7 @@
     },
     "openssl": {
       "baseline": "3.0.3",
-      "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 93f7b62b5cdc6e..c312ffc0815879 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cdd8b7c5c9ebba05598bc90a58f224f13cf0b611",
+      "version": "3.0.3",
+      "port-version": 2
+    },
     {
       "git-tree": "1ac5c972c2c6c9af050334b2f7a41de1253c6a5e",
       "version": "3.0.3",