diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake index a6f1e152b5..1f65fff5ba 100644 --- a/ports/mbedtls/portfile.cmake +++ b/ports/mbedtls/portfile.cmake @@ -3,9 +3,9 @@ set(VCPKG_LIBRARY_LINKAGE static) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ARMmbed/mbedtls - REF 523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8 # mbedtls-2.24.0 - SHA512 1ce78f34e8d87c2ce0454e0a08f4c6e5b3129d4b24cfa44162af21c2e8b5dc7feabf849e4fa547ce3781b5ce11aaf675cfed47412bae40091fbdd87bbcdbee07 - HEAD_REF master + REF 8b3f26a5ac38d4fdccbc5c5366229f3e01dafcc0 # mbedtls-2.28.0 + SHA512 a5d2694ae87347be7ebf5c32b86d7bb809cc696b549947efb3d12d41d5f726d4f7caed3cc6ee3f3c9b9e46b3c42c4ce8a5f9741b1b0a3c644b6ae615d2f4c55a + HEAD_REF mbedtls-2.28 PATCHES enable-pthread.patch ) @@ -13,12 +13,11 @@ vcpkg_from_github( vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - pthreads ENABLE_PTHREAD + pthreads ENABLE_PTHREAD ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DENABLE_TESTING=OFF @@ -26,7 +25,7 @@ vcpkg_configure_cmake( -DMBEDTLS_FATAL_WARNINGS=FALSE ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/mbedtls/vcpkg.json b/ports/mbedtls/vcpkg.json index d3079e1259..93c0e9b222 100644 --- a/ports/mbedtls/vcpkg.json +++ b/ports/mbedtls/vcpkg.json @@ -1,10 +1,20 @@ { "name": "mbedtls", - "version": "2.24.0", - "port-version": 4, + "version": "2.28.0", "description": "An open source, portable, easy to use, readable and flexible SSL library", "homepage": "https://github.com/ARMmbed/mbedtls", + "license": "Apache-2.0", "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "pthreads": { "description": "Multi-threading support", diff --git a/versions/baseline.json b/versions/baseline.json index ec0cf6e0a7..9f1a353be9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4397,8 +4397,8 @@ "port-version": 0 }, "mbedtls": { - "baseline": "2.24.0", - "port-version": 4 + "baseline": "2.28.0", + "port-version": 0 }, "mcpp": { "baseline": "2.7.2.14", diff --git a/versions/m-/mbedtls.json b/versions/m-/mbedtls.json index f1e254f7f5..440fc362ea 100644 --- a/versions/m-/mbedtls.json +++ b/versions/m-/mbedtls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50e6870207f6a1f0b1e2197978b4403de775eac2", + "version": "2.28.0", + "port-version": 0 + }, { "git-tree": "676b36c2f6fc72a2fbbbe521ae46fdefe5db67ca", "version": "2.24.0",