[mbedtls] update to 2.28.8 (#39978)

This commit is contained in:
talregev 2024-07-20 21:32:00 +03:00 committed by GitHub
parent 3ecd2b1101
commit b6ae534b3a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 17 additions and 11 deletions

View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b001bb7..b9fb566 100644
index 844491778..aa81d01f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,7 @@ set(MBEDTLS_DIR ${CMAKE_CURRENT_SOURCE_DIR})
@@ -46,6 +46,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)
@ -10,8 +10,8 @@ index b001bb7..b9fb566 100644
option(ENABLE_PROGRAMS "Build Mbed TLS programs." ON)
@@ -263,6 +264,8 @@ else()
set(LIB_INSTALL_DIR lib)
@@ -264,6 +265,8 @@ if(LIB_INSTALL_DIR)
set(CMAKE_INSTALL_LIBDIR "${LIB_INSTALL_DIR}")
endif()
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
@ -19,7 +19,7 @@ index b001bb7..b9fb566 100644
if(ENABLE_ZLIB_SUPPORT)
find_package(ZLIB)
@@ -271,6 +274,17 @@ if(ENABLE_ZLIB_SUPPORT)
@@ -272,6 +275,17 @@ if(ENABLE_ZLIB_SUPPORT)
endif(ZLIB_FOUND)
endif(ENABLE_ZLIB_SUPPORT)
@ -38,7 +38,7 @@ index b001bb7..b9fb566 100644
add_subdirectory(3rdparty)
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 11b417b..5ca44c3 100644
index 11b417bd3..5ca44c341 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -1,10 +1,14 @@
@ -58,7 +58,7 @@ index 11b417b..5ca44c3 100644
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 ac2146e..4cd831a 100644
index 4842fd494..fbce34128 100644
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -12,6 +12,8 @@
@ -84,7 +84,7 @@ index 0000000..9d5d42e
+#endif
\ No newline at end of file
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 1b2980d..8c495fe 100644
index 48e51a158..4e752f777 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -149,7 +149,11 @@ if(ENABLE_ZLIB_SUPPORT)

View File

@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ARMmbed/mbedtls
REF "v${VERSION}"
SHA512 b61dd319606c88c834b3a8e8f9f85e68a22b6b21ca177b340a972dfabe9efee984b8a9f6ed5d3b1829f229c689394e9f393b94efb38d82bda3a1e53d1e7a2861
SHA512 72a25a6b2a132545d32c7a6819bde569a315f2e83049467653af6347c918e4781462dceca21c64c76a4af7d19cedaf968f48b3f0309a6b0289466c087e49dd38
HEAD_REF mbedtls-2.28
PATCHES
enable-pthread.patch
@ -36,3 +36,4 @@ if (VCPKG_TARGET_IS_WINDOWS AND pthreads IN_LIST FEATURES)
endif ()
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()

View File

@ -1,6 +1,6 @@
{
"name": "mbedtls",
"version": "2.28.7",
"version": "2.28.8",
"description": "An open source, portable, easy to use, readable and flexible SSL library",
"homepage": "https://github.com/ARMmbed/mbedtls",
"license": "Apache-2.0",

View File

@ -5709,7 +5709,7 @@
"port-version": 2
},
"mbedtls": {
"baseline": "2.28.7",
"baseline": "2.28.8",
"port-version": 0
},
"mchehab-zbar": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1e5355b5449b7ca3e1de902bd6c264e27e8eae6d",
"version": "2.28.8",
"port-version": 0
},
{
"git-tree": "b8ca11fc0285875347dc1203913af7f84f9c7cad",
"version": "2.28.7",