diff --git a/ports/wolftpm/portfile.cmake b/ports/wolftpm/portfile.cmake index 8eb9977d81..709144c9b7 100644 --- a/ports/wolftpm/portfile.cmake +++ b/ports/wolftpm/portfile.cmake @@ -2,8 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfssl/wolftpm REF v${VERSION} - SHA512 fc1d26e4144a496fef7ae7db27f11026132da1dc98f6f61de495b0b7c03ac59c65daccd307cc1449eeb55bc22e2ca552abd7ed607be448688127b2ed6d56867a + SHA512 e6b73ec95f6c0cd37a71063c13db2a95175c54d2c63f69959ed68b4992277f1304136e1ecc5419ce4ff070d9162dbb30a9c6f78c7238383d72c686f1cdc1ab7c HEAD_REF master + PATCHES + "wolftpm_pr430.diff" ) vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/wolftpm/vcpkg.json b/ports/wolftpm/vcpkg.json index ae9fc42a05..f09907c0e7 100644 --- a/ports/wolftpm/vcpkg.json +++ b/ports/wolftpm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wolftpm", - "version": "3.9.1", + "version": "3.9.2", "description": "TPM library used with wolfSSL library for many platforms", "homepage": "https://wolfssl.com", "license": "GPL-2.0-or-later", diff --git a/ports/wolftpm/wolftpm_pr430.diff b/ports/wolftpm/wolftpm_pr430.diff new file mode 100644 index 0000000000..70ead12bcb --- /dev/null +++ b/ports/wolftpm/wolftpm_pr430.diff @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e3977e1f..0eb658af 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -91,11 +91,16 @@ if(WOLFTPM_SINGLE_THREADED) + endif() + + # Mutex locking +-set(WOLFTPM_NO_LOCK "no" CACHE STRING +- "Enable thread mutex locking (default: enabled)") ++if(WOLFTPM_SINGLE_THREADED) ++ set(_WOLFTPM_NO_LOCK_DEFAULT "yes") ++else() ++ set(_WOLFTPM_NO_LOCK_DEFAULT "no") ++endif() ++set(WOLFTPM_NO_LOCK "${_WOLFTPM_NO_LOCK_DEFAULT}" CACHE STRING ++ "Disable thread mutex locking (default: ${_WOLFTPM_NO_LOCK_DEFAULT})") + set_property(CACHE WOLFTPM_NO_LOCK + PROPERTY STRINGS "yes;no") +-if(NOT WOLFTPM_NO_LOCK) ++if(WOLFTPM_NO_LOCK) + list(APPEND WOLFTPM_DEFINITIONS + "-DWOLFTPM_NO_LOCK") + endif() diff --git a/versions/baseline.json b/versions/baseline.json index 167d35fd3d..5495e928db 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10329,7 +10329,7 @@ "port-version": 0 }, "wolftpm": { - "baseline": "3.9.1", + "baseline": "3.9.2", "port-version": 0 }, "wordnet": { diff --git a/versions/w-/wolftpm.json b/versions/w-/wolftpm.json index 6d18bcb883..981510b1f3 100644 --- a/versions/w-/wolftpm.json +++ b/versions/w-/wolftpm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "87c0c4dd4c15000202df33f380b84370c968f4f8", + "version": "3.9.2", + "port-version": 0 + }, { "git-tree": "a992f959b43632e9ad2a7478aa54b330e4669e0f", "version": "3.9.1",