microsoft · strega-nil-ms · Apr 6, 2022 · Jan 31, 2022 · Jan 31, 2022 · Jan 31, 2022
diff --git a/ports/aws-sdk-cpp/fix-openssl3.patch b/ports/aws-sdk-cpp/fix-openssl3.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake
+index cae5b92248..1aa728b01c 100644
+--- a/cmake/compiler_settings.cmake
++++ b/cmake/compiler_settings.cmake
+@@ -53,7 +53,7 @@ macro(set_gcc_flags)
+ endmacro()
+
+ macro(set_gcc_warnings)
+-    list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-Werror" "-pedantic" "-Wextra")
++    list(APPEND AWS_COMPILER_WARNINGS "-Wno-deprecated-declarations" "-Wall" "-Werror" "-pedantic" "-Wextra")
+     if(COMPILER_CLANG)
+         if(PLATFORM_ANDROID)
+             # when using clang with libc and API lower than 21 we need to include Android support headers and ignore the gnu-include-next warning.
diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
     PATCHES
         patch-relocatable-rpath.patch
         fix-aws-root.patch
+        fix-openssl3.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)

diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json
@@ -2,6 +2,7 @@
   "$note": "Automatically generated by generateFeatures.ps1",
   "name": "aws-sdk-cpp",
   "version": "1.9.220",
+  "port-version": 1,
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
   "supports": "!(windows & arm) & !uwp",

diff --git a/ports/azure-c-shared-utility/openssl.patch b/ports/azure-c-shared-utility/openssl.patch
@@ -0,0 +1,13 @@
+diff --git a/adapters/x509_openssl.c b/adapters/x509_openssl.c
+index 5a9e5ac2..bb946c2d 100644
+--- a/adapters/x509_openssl.c
++++ b/adapters/x509_openssl.c
+@@ -75,7 +75,7 @@ static int load_certificate_chain(SSL_CTX* ssl_ctx, const char* certificate)
+                 // certificates.
+
+                 /* Codes_SRS_X509_OPENSSL_07_006: [ If successful x509_openssl_add_ecc_credentials shall to import each certificate in the cert chain. ] */
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && (OPENSSL_VERSION_NUMBER < 0x20000000L)
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
+                 SSL_CTX_clear_extra_chain_certs(ssl_ctx);
+ #else
+                 if (ssl_ctx->extra_certs != NULL)
diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake
@@ -21,6 +21,7 @@ else()
         SHA512 c30cba73692691fe1310b6180e3aeaf4d86b6276981c680cac31d605634e5dedbce3f823142dfebba4ae2f76ccead965a527d95df0e52af638a30ddec9818fbd
         HEAD_REF master
         PATCHES
+            openssl.patch
             fix-install-location.patch
             fix-utilityFunctions-conditions.patch
             disable-error.patch

diff --git a/ports/azure-c-shared-utility/vcpkg.json b/ports/azure-c-shared-utility/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "azure-c-shared-utility",
   "version-date": "2022-01-21",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Azure C SDKs common code",
   "homepage": "https://github.com/Azure/azure-c-shared-utility",
   "license": "MIT",

diff --git a/ports/idevicerestore/libcurl_d.patch → ports/idevicerestore/fix-vcxproj.patch b/ports/idevicerestore/libcurl_d.patch → ports/idevicerestore/fix-vcxproj.patch
@@ -1,23 +1,44 @@
 diff --git a/idevicerestore.vcxproj b/idevicerestore.vcxproj
-index fa209fae..cf89306b 100644
+index fa209fa..6afa088 100644
 --- a/idevicerestore.vcxproj
-+++ b/idevicerestore.vcxproj	
-@@ -94,7 +94,7 @@
++++ b/idevicerestore.vcxproj
+@@ -92,9 +92,10 @@
+       <Optimization>Disabled</Optimization>
+       <SDLCheck>true</SDLCheck>
        <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions>
++      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
      </ClCompile>
      <Link>
 -      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-@@ -105,7 +105,7 @@
+@@ -103,9 +104,10 @@
+       <Optimization>Disabled</Optimization>
+       <SDLCheck>true</SDLCheck>
        <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions>
++      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
      </ClCompile>
      <Link>
 -      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-
+@@ -116,6 +118,7 @@
+       <IntrinsicFunctions>true</IntrinsicFunctions>
+       <SDLCheck>true</SDLCheck>
+       <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions>
++      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+     </ClCompile>
+     <Link>
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+@@ -131,6 +134,7 @@
+       <IntrinsicFunctions>true</IntrinsicFunctions>
+       <SDLCheck>true</SDLCheck>
+       <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions>
++      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+     </ClCompile>
+     <Link>
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/ports/idevicerestore/portfile.cmake b/ports/idevicerestore/portfile.cmake
@@ -5,7 +5,7 @@ vcpkg_from_github(
     SHA512 ba623be56c2f37853516d7d4c32e16f1ec72f33d512f18aa812ce6830af4b9e389f7af5321888dd0ddd168e282b652e379b60f90970680e213eabf489f406915
     HEAD_REF msvc-master
     PATCHES
-        libcurl_d.patch
+        fix-vcxproj.patch
         fix-libgen.h-cannot-be-found.patch
 )
 

diff --git a/ports/idevicerestore/vcpkg.json b/ports/idevicerestore/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "idevicerestore",
-  "version-string": "1.0.12",
-  "port-version": 6,
+  "version": "1.0.12",
+  "port-version": 7,
   "description": "Restore/upgrade firmware of iOS devices",
   "supports": "windows",
   "dependencies": [

diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake
@@ -1,11 +1,17 @@
+set(PATCHES 0001-fix-for-vcpkg.patch)
+
+if(VCPKG_TARGET_IS_UWP)
+    list(APPEND PATCHES uwp-warnings.patch)
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO paullouisageneau/libdatachannel
     REF 127f157fc00abeb6fe5a57ce56a7c4e092721203 #v0.16.4
     SHA512 ef7d1f652af031c13260a4c436c949eb566d40d15dcde5b56ab782e9e9d7b5e287f4a6a61bc4eb3fcdbb835c102637b0368f3c43af6f9fa9c87cd99d15bde454
     HEAD_REF master
     PATCHES
-        0001-fix-for-vcpkg.patch
+        ${PATCHES}
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -40,4 +46,4 @@ ${DATACHANNEL_CONFIG}")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/libdatachannel/uwp-warnings.patch b/ports/libdatachannel/uwp-warnings.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b79b458..790bf95 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -385,6 +385,9 @@ if(WARNINGS_AS_ERRORS)
+ 	endif()
+ endif()
+
++target_compile_options(datachannel PRIVATE /wd4996)
++target_compile_options(datachannel-static PRIVATE /wd4996)
++
+ install(TARGETS datachannel EXPORT LibDataChannelTargets
+ 	RUNTIME DESTINATION bin
+ 	LIBRARY DESTINATION lib
diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libdatachannel",
   "version-semver": "0.16.4",
+  "port-version": 1,
   "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.",
   "homepage": "https://github.com/paullouisageneau/libdatachannel",
   "dependencies": [

diff --git a/ports/libmysql/openssl.patch b/ports/libmysql/openssl.patch
@@ -0,0 +1,125 @@
+diff --git a/mysys/my_md5.cc b/mysys/my_md5.cc
+index dea997b252c..81484f0652b 100644
+--- a/mysys/my_md5.cc
++++ b/mysys/my_md5.cc
+@@ -35,6 +35,10 @@
+ #include <openssl/crypto.h>
+ #include <openssl/md5.h>
+
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++#include <openssl/evp.h>
++#endif
++
+ static void my_md5_hash(unsigned char *digest, unsigned const char *buf,
+                         int len) {
+   MD5_CTX ctx;
+@@ -56,7 +60,11 @@ static void my_md5_hash(unsigned char *digest, unsigned const char *buf,
+ int compute_md5_hash(char *digest, const char *buf, int len) {
+   int retval = 0;
+   int fips_mode = 0;
++  #if OPENSSL_VERSION_NUMBER < 0x30000000L
+   fips_mode = FIPS_mode();
++  #else
++  fips_mode = EVP_default_properties_is_fips_enabled(NULL);
++  #endif
+   /* If fips mode is ON/STRICT restricted method calls will result into abort,
+    * skipping call. */
+   if (fips_mode == 0) {
+diff --git a/plugin/x/client/xconnection_impl.cc b/plugin/x/client/xconnection_impl.cc
+index 13bc6794ea5..8752bcea9bf 100644
+--- a/plugin/x/client/xconnection_impl.cc
++++ b/plugin/x/client/xconnection_impl.cc
+@@ -51,6 +51,10 @@
+ #include "plugin/x/src/config/config.h"
+ #include "sql-common/net_ns.h"
+
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++#include <openssl/evp.h>
++#endif
++
+ #ifndef WIN32
+ #include <netdb.h>
+ #include <sys/socket.h>
+@@ -524,12 +528,20 @@ int set_fips_mode(const uint32_t fips_mode,
+   if (fips_mode > 2) {
+     goto EXIT;
+   }
++  #if OPENSSL_VERSION_NUMBER < 0x30000000L
+   fips_mode_old = FIPS_mode();
++  #else
++  fips_mode_old = EVP_default_properties_is_fips_enabled(NULL);
++  #endif
+   if (fips_mode_old == fips_mode) {
+     rc = 1;
+     goto EXIT;
+   }
++  #if OPENSSL_VERSION_NUMBER < 0x30000000L
+   if (!(rc = FIPS_mode_set(fips_mode))) {
++  #else
++  if (!(rc = EVP_default_properties_enable_fips(fips_mode))) {
++  #endif
+     err_library = ERR_get_error();
+     ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1);
+     err_string[OPENSSL_ERROR_LENGTH - 1] = '\0';
+diff --git a/vio/viosslfactories.cc b/vio/viosslfactories.cc
+index 6c04029ccb0..164b727e3dc 100644
+--- a/vio/viosslfactories.cc
++++ b/vio/viosslfactories.cc
+@@ -40,6 +40,10 @@
+
+ #include <openssl/dh.h>
+
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++#include <openssl/evp.h>
++#endif
++
+ #if OPENSSL_VERSION_NUMBER < 0x10002000L
+ #include <openssl/ec.h>
+ #endif /* OPENSSL_VERSION_NUMBER < 0x10002000L */
+@@ -498,12 +502,20 @@ int set_fips_mode(const uint fips_mode, char err_string[OPENSSL_ERROR_LENGTH]) {
+   if (fips_mode > 2) {
+     goto EXIT;
+   }
++  #if OPENSSL_VERSION_NUMBER < 0x30000000L
+   fips_mode_old = FIPS_mode();
++  #else
++  fips_mode_old = EVP_default_properties_is_fips_enabled(NULL);
++  #endif
+   if (fips_mode_old == fips_mode) {
+     rc = 1;
+     goto EXIT;
+   }
++  #if OPENSSL_VERSION_NUMBER < 0x30000000L
+   if (!(rc = FIPS_mode_set(fips_mode))) {
++  #else
++  if (!(rc = EVP_default_properties_enable_fips(NULL, fips_mode))) {
++  #endif
+     /*
+       If OS doesn't have FIPS enabled openssl library and user sets FIPS mode
+       ON, It fails with proper error. But in the same time it doesn't allow to
+@@ -511,7 +523,11 @@ int set_fips_mode(const uint fips_mode, char err_string[OPENSSL_ERROR_LENGTH]) {
+       error, setting old working FIPS mode value in the OpenSSL library. It will
+       allow successful cryptographic operation and will not abort the server.
+     */
++    #if OPENSSL_VERSION_NUMBER < 0x30000000L
+     FIPS_mode_set(fips_mode_old);
++    #else
++    EVP_default_properties_enable_fips(NULL, fips_mode_old);
++    #endif
+     err_library = ERR_get_error();
+     ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1);
+     err_string[OPENSSL_ERROR_LENGTH - 1] = '\0';
+@@ -525,7 +541,13 @@ EXIT:
+
+   @returns openssl current fips mode
+ */
++#if OPENSSL_VERSION_NUMBER < 0x30000000L
+ uint get_fips_mode() { return FIPS_mode(); }
++#else
++uint get_fips_mode() {
++  return EVP_default_properties_is_fips_enabled(NULL);
++}
++#endif
+
+ long process_tls_version(const char *tls_version) {
+   const char *separator = ",";
diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake
@@ -18,6 +18,7 @@ vcpkg_from_github(
         rename-version.patch
         export-cmake-targets.patch
         004-added-limits-include.patch
+        openssl.patch
 )
 
 file(REMOVE_RECURSE "${SOURCE_PATH}/include/boost_1_70_0")

diff --git a/ports/libmysql/vcpkg.json b/ports/libmysql/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libmysql",
   "version": "8.0.20",
-  "port-version": 5,
+  "port-version": 6,
   "description": "A MySQL client library for C development",
   "homepage": "https://github.com/mysql/mysql-server",
   "supports": "!(windows & x86) & !uwp",

diff --git a/ports/librabbitmq/fix-uwpwarning.patch b/ports/librabbitmq/fix-uwpwarning.patch
@@ -1,8 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b353be6..419e983 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -150,6 +150,10 @@ else()
+   endif()
+ endif()
+
++if(MSVC)
++  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996")
++endif()
++
+ option(REGENERATE_AMQP_FRAMING "Regenerate amqp_framing.h/amqp_framing.c sources (for developer use)" OFF)
+ mark_as_advanced(REGENERATE_AMQP_FRAMING)
+
 diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt
-index bd5369a..f6d703f 100644
+index d8dcd26..671840b 100644
 --- a/librabbitmq/CMakeLists.txt
 +++ b/librabbitmq/CMakeLists.txt
-@@ -113,7 +113,7 @@ set(RABBITMQ_SOURCES
+@@ -108,7 +108,7 @@ set(RABBITMQ_SOURCES
      ${AMQP_SSL_SRCS}
  )
 

diff --git a/ports/librabbitmq/vcpkg.json b/ports/librabbitmq/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "librabbitmq",
   "version": "0.11.0",
+  "port-version": 1,
   "description": "A C-language AMQP client library for use with v2.0+ of the RabbitMQ broker.",
   "homepage": "https://github.com/alanxz/rabbitmq-c",
   "dependencies": [

diff --git a/ports/librtmp/CMakeLists.txt b/ports/librtmp/CMakeLists.txt
@@ -40,6 +40,7 @@ set(SRCS librtmp/amf.c
 
 if(MSVC)
     set(SRCS_MSVC "librtmp/librtmp.def")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996")
 endif()
 
 add_library(librtmp ${SRCS} ${HEADERS} ${SRCS_MSVC})

diff --git a/ports/librtmp/vcpkg.json b/ports/librtmp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "librtmp",
   "version-date": "2019-11-11",
-  "port-version": 2,
+  "port-version": 3,
   "description": "RTMPDump Real-Time Messaging Protocol API",
   "homepage": "https://rtmpdump.mplayerhq.hu",
   "dependencies": [

diff --git a/ports/libssh2/0003-fix-openssl3.patch b/ports/libssh2/0003-fix-openssl3.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/max_warnings.cmake b/cmake/max_warnings.cmake
+index b176d30..e986461 100644
+--- a/cmake/max_warnings.cmake
++++ b/cmake/max_warnings.cmake
+@@ -13,6 +13,8 @@ if(MSVC)
+
+   # Disable broken warnings
+   add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996")
++  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996")
+ elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+   if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
diff --git a/ports/libssh2/portfile.cmake b/ports/libssh2/portfile.cmake
@@ -7,6 +7,7 @@ vcpkg_from_github(
     PATCHES
         0001-Fix-UWP.patch
         0002-fix-macros.patch
+        0003-fix-openssl3.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS