[lief/mbedtls] Update to 0.12.1 and 3.1.0

ports/ixwebsocket/portfile.cmake

@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO machinezone/IXWebSocket
-    REF 2149ac7ed60d7713a86446c4b93c6004f66415ac #v11.2.6
-    SHA512 737667f6e89156168db771fd2a6d3686cd51ddc753fa083ae399a84c689770a09fd86643bb2d838e9ae5a729067236f1d9b4ceece912145cfb83b29541a3d2c1
+    REF f7eb3688ddcb7d555df91e97ce8804421378e3b4 #v11.3.3
+    SHA512 78eddce7d3f817632b2f48b7f7c8e767fe1995d6a91d9156b0683fafd89c00e898b09fdcaa40559df333fc63c9160fe03b2770e5e9afcfcf489e89871e12fb1c
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

ports/ixwebsocket/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "ixwebsocket",
-  "version-semver": "11.2.6",
+  "version-semver": "11.3.3",
   "description": "Lightweight WebSocket Client and Server + HTTP Client and Server",
   "homepage": "https://github.com/machinezone/IXWebSocket",
   "dependencies": [

ports/lief/0001-Support-vcpkg.patch

@@ -0,0 +1,45 @@
+From 754328b44c63a5cb3f9c98fe357bad7d127c6ebc Mon Sep 17 00:00:00 2001
+From: Eric Kilmer <[email protected]>
+Date: Fri, 25 Feb 2022 17:43:34 -0500
+Subject: [PATCH] Support vcpkg
+
+Remove msvccrt choosing and fix install paths on Windows
+---
+ CMakeLists.txt | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 80877756..53e20fa3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,9 +11,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_CROSSCOMPILING)
+ endif()
+
+
+-if(WIN32 OR ${IS_WIN_CROSS_COMPILE})
+-  include(ChooseMSVCCRT)
+-endif()
+ include(CheckCXXCompilerFlag)
+ include(CheckCCompilerFlag)
+ include(ExternalProject)
+@@ -667,7 +664,7 @@ endif()
+ # Installation
+ # ======================
+
+-if(UNIX)
++if(1)
+   include(GNUInstallDirs)
+ else()
+   if(WIN32)
+@@ -687,7 +684,7 @@ install(
+   EXPORT LIEFExport
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
+   INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+ install(
+-- 
+2.35.1
+

ports/lief/portfile.cmake

@@ -0,0 +1,89 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lief-project/LIEF
+    REF 0.12.0-rc.1
+    SHA512 2193ef5047795c9cf6bcd6fecfc8808cf5eaaa9f30ea03a6ef55c161950f5cccfa1618b18162721bebbbc6189d5ee2941d4d9dee858cd69dc743810f2d042ed1
+    HEAD_REF master
+    PATCHES
+        0001-Support-vcpkg.patch
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+FEATURES
+    "tests"          LIEF_TESTS             # Enable tests
+    "doc"            LIEF_DOC               # Enable documentation
+    "c-api"          LIEF_C_API             # C API
+    "examples"       LIEF_EXAMPLES          # Build LIEF C++ examples
+    "force32"        LIEF_FORCE32           # Force build LIEF 32 bits version
+    "coverage"       LIEF_COVERAGE          # Perform code coverage
+    "use-ccache"     LIEF_USE_CCACHE        # Use ccache to speed up compilation
+    "extra-warnings" LIEF_EXTRA_WARNINGS    # Enable extra warning from the compiler
+    "logging"        LIEF_LOGGING           # Enable logging
+    "logging-debug"  LIEF_LOGGING_DEBUG     # Enable debug logging
+    "enable-json"    LIEF_ENABLE_JSON       # Enable JSON-related APIs
+
+    "elf"            LIEF_ELF               # Build LIEF with ELF module
+    "pe"             LIEF_PE                # Build LIEF with PE  module
+    "macho"          LIEF_MACHO             # Build LIEF with MachO module
+
+    "oat"            LIEF_OAT               # Build LIEF with OAT module
+    "dex"            LIEF_DEX               # Build LIEF with DEX module
+    "vdex"           LIEF_VDEX              # Build LIEF with VDEX module
+    "art"            LIEF_ART               # Build LIEF with ART module
+
+    # Sanitizer
+    "asan"          LIEF_ASAN               # Enable Address sanitizer
+    "lsan"          LIEF_LSAN               # Enable Leak sanitizer
+    "tsan"          LIEF_TSAN               # Enable Thread sanitizer
+    "usan"          LIEF_USAN               # Enable undefined sanitizer
+
+    # Fuzzer
+    "fuzzing"       LIEF_FUZZING            # Fuzz LIEF
+
+    # Profiling
+    "profiling"     LIEF_PROFILING          # Enable performance profiling
+
+    # INVERTED_FEATURES
+    # TODO: Not sure how to remove a dependency from list of defaults
+    # "disable-frozen" LIEF_DISABLE_FROZEN    # Disable Frozen even if it is supported
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+
+    OPTIONS
+        ${FEATURE_OPTIONS}
+
+        -DLIEF_PYTHON_API=OFF
+        -DLIEF_USE_CCACHE=OFF
+
+        # Build with external vcpkg dependencies
+        -DLIEF_OPT_MBEDTLS_EXTERNAL=ON
+        -DLIEF_OPT_UTFCPP_EXTERNAL=ON
+        -DLIEF_EXTERNAL_SPDLOG=ON
+        -DLIEF_OPT_NLOHMANN_JSON_EXTERNAL=ON
+        -DLIEF_OPT_FROZEN_EXTERNAL=ON
+        -DLIEF_OPT_EXTERNAL_LEAF=ON
+        "-DLIEF_EXTERNAL_LEAF_DIR=${CURRENT_INSTALLED_DIR}/include"
+        -DLIEF_OPT_EXTERNAL_SPAN=ON
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH share/LIEF/cmake)
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+# Check if all-caps directory is empty (it won't be on case-insensitive filesystems).
+# These files could have been moved during vcpkg_cmake_config_fixup
+file(GLOB dir_files "${CURRENT_PACKAGES_DIR}/share/LIEF/*")
+list(LENGTH dir_files dir_files_len)
+if(dir_files_len EQUAL 0)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/LIEF")
+endif()
+
+# Handle copyright
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

ports/lief/vcpkg.json

@@ -0,0 +1,116 @@
+{
+  "name": "lief",
+  "version-semver": "0.12.0-rc.1",
+  "description": "LIEF - Library to Instrument Executable Formats",
+  "homepage": "https://lief.quarkslab.com",
+  "license": "Apache-2.0",
+  "supports": "!uwp",
+  "dependencies": [
+    "boost-leaf",
+    "frozen",
+    "mbedtls",
+    "spdlog",
+    "tcb-span",
+    "utfcpp",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "default-features": [
+    "art",
+    "c-api",
+    "dex",
+    "elf",
+    "enable-json",
+    "logging",
+    "macho",
+    "oat",
+    "pe",
+    "vdex"
+  ],
+  "features": {
+    "art": {
+      "description": "Build LIEF with ART module"
+    },
+    "asan": {
+      "description": "Enable Address sanitizer"
+    },
+    "c-api": {
+      "description": "C API"
+    },
+    "coverage": {
+      "description": "Perform code coverage"
+    },
+    "dex": {
+      "description": "Build LIEF with DEX module"
+    },
+    "disable-frozen": {
+      "description": "Disable Frozen even if it is supported"
+    },
+    "doc": {
+      "description": "Enable documentation"
+    },
+    "elf": {
+      "description": "Build LIEF with ELF module"
+    },
+    "enable-json": {
+      "description": "Enable JSON-related APIs",
+      "dependencies": [
+        "nlohmann-json"
+      ]
+    },
+    "examples": {
+      "description": "Build LIEF C++ examples"
+    },
+    "extra-warnings": {
+      "description": "Enable extra warning from the compiler"
+    },
+    "force32": {
+      "description": "Force build LIEF 32 bits version"
+    },
+    "fuzzing": {
+      "description": "Fuzz LIEF"
+    },
+    "logging": {
+      "description": "Enable logging"
+    },
+    "logging-debug": {
+      "description": "Enable debug logging"
+    },
+    "lsan": {
+      "description": "Enable Leak sanitizer"
+    },
+    "macho": {
+      "description": "Build LIEF with MachO module"
+    },
+    "oat": {
+      "description": "Build LIEF with OAT module"
+    },
+    "pe": {
+      "description": "Build LIEF with PE  module"
+    },
+    "profiling": {
+      "description": "Enable performance profiling"
+    },
+    "tests": {
+      "description": "Enable tests"
+    },
+    "tsan": {
+      "description": "Enable Thread sanitizer"
+    },
+    "usan": {
+      "description": "Enable undefined sanitizer"
+    },
+    "use-ccache": {
+      "description": "Use ccache to speed up compilation"
+    },
+    "vdex": {
+      "description": "Build LIEF with VDEX module"
+    }
+  }
+}

ports/mbedtls/enable-pthread.patch

@@ -1,27 +1,26 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8833246..f68ab02 100644
+index 6debe35..64e0674 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -28,6 +28,7 @@ set(MBEDTLS_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-
- option(USE_PKCS11_HELPER_LIBRARY "Build mbed TLS with the pkcs11-helper library." OFF)
- option(ENABLE_ZLIB_SUPPORT "Build mbed TLS with zlib library." OFF)
+@@ -51,6 +51,7 @@ if(WIN32)
+ else()
+     option(GEN_FILES "Generate the auto-generated files as needed" ON)
+ endif()
 +option(ENABLE_PTHREAD "Build mbed TLS with pthread" OFF)
 
- option(ENABLE_PROGRAMS "Build mbed TLS programs." ON)
-
-@@ -231,6 +232,8 @@ else()
+ string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER_ID}")
+ string(REGEX MATCH "GNU" CMAKE_COMPILER_IS_GNU "${CMAKE_C_COMPILER_ID}")
+@@ -243,12 +244,26 @@ else()
      set(LIB_INSTALL_DIR lib)
  endif()
 
-+include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
++#include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
 +
- if(ENABLE_ZLIB_SUPPORT)
-     find_package(ZLIB)
+ add_subdirectory(include)
 
-@@ -239,6 +242,17 @@ if(ENABLE_ZLIB_SUPPORT)
-     endif(ZLIB_FOUND)
- endif(ENABLE_ZLIB_SUPPORT)
+ add_subdirectory(3rdparty)
+
+ add_subdirectory(library)
 
 +if(ENABLE_PTHREAD)
 +    if(WIN32)
@@ -34,61 +33,54 @@ index 8833246..f68ab02 100644
 +    set(LINK_WITH_PTHREAD ON)
 +endif()
 +
- add_subdirectory(include)
-
- add_subdirectory(3rdparty)
++
+ #
+ # The C files in tests/src directory contain test code shared among test suites
+ # and programs. This shared test code is compiled and linked to test suites and
 diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
-index 62c0f62..7923202 100644
+index e693bc1..7f5216a 100644
 --- a/include/CMakeLists.txt
 +++ b/include/CMakeLists.txt
-@@ -1,10 +1,14 @@
+@@ -1,9 +1,13 @@
  option(INSTALL_MBEDTLS_HEADERS "Install mbed TLS headers." ON)
 
-+configure_file(mbedtls/config_threading.h.in mbedtls/config_threading.h)
++#configure_file(mbedtls/config_threading.h.in mbedtls/config_threading.h)
 +
  if(INSTALL_MBEDTLS_HEADERS)
 
      file(GLOB headers "mbedtls/*.h")
      file(GLOB psa_headers "psa/*.h")
--
-+    
-+    set(headers ${headers} ${CMAKE_CURRENT_BINARY_DIR}/mbedtls/config_threading.h)
 +    
++    #set(headers ${headers} ${CMAKE_CURRENT_BINARY_DIR}/mbedtls/config_threading.h)
+
      install(FILES ${headers}
          DESTINATION include/mbedtls
-         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
-index 1e6e052..51c20da 100644
---- a/include/mbedtls/config.h
-+++ b/include/mbedtls/config.h
-@@ -24,6 +24,8 @@
+diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h
+index 0558ee0..d2fd425 100644
+--- a/include/mbedtls/mbedtls_config.h
++++ b/include/mbedtls/mbedtls_config.h
+@@ -24,6 +24,15 @@
   *  limitations under the License.
   */
 
-+#include "mbedtls/config_threading.h"
 +
- #ifndef MBEDTLS_CONFIG_H
- #define MBEDTLS_CONFIG_H
-
-diff --git a/include/mbedtls/config_threading.h.in b/include/mbedtls/config_threading.h.in
-new file mode 100644
-index 0000000..9d5d42e
---- /dev/null
-+++ b/include/mbedtls/config_threading.h.in
-@@ -0,0 +1,6 @@
-+#cmakedefine ENABLE_PTHREAD
++
++
 +
 +#ifdef ENABLE_PTHREAD
 +#define MBEDTLS_THREADING_C
 +#define MBEDTLS_THREADING_PTHREAD
 +#endif
-\ No newline at end of file
++
+ /**
+  * This is an optional version symbol that enables comatibility handling of
+  * config files.
 diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
-index 33e2cfc..4b99331 100644
+index 07599f5..27e426d 100644
 --- a/library/CMakeLists.txt
 +++ b/library/CMakeLists.txt
-@@ -137,7 +137,11 @@ if(ENABLE_ZLIB_SUPPORT)
- endif(ENABLE_ZLIB_SUPPORT)
+@@ -189,7 +189,11 @@ if(HAIKU)
+ endif(HAIKU)
 
  if(LINK_WITH_PTHREAD)
 -    set(libs ${libs} pthread)