From 1d237e5a985f7d783bf3246b8e1458ea9b434c75 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 11 Oct 2024 22:40:02 +0800 Subject: [PATCH] [libvault] update to 0.61.0 (#41466) --- ports/libvault/0001-fix-dependencies.patch | 24 ---------------------- ports/libvault/portfile.cmake | 4 ++-- ports/libvault/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libvault.json | 5 +++++ 5 files changed, 9 insertions(+), 28 deletions(-) diff --git a/ports/libvault/0001-fix-dependencies.patch b/ports/libvault/0001-fix-dependencies.patch index 1ff1696e6b..50ec48cbe6 100644 --- a/ports/libvault/0001-fix-dependencies.patch +++ b/ports/libvault/0001-fix-dependencies.patch @@ -1,27 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cd4482b..ac50fb5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,9 +17,8 @@ option(LINK_CURL "Link curl library for vault" OFF) - option(BUILD_SHARED_LIBS "Build vault as a shared library" ON) - option(INSTALL "Run install targets" ON) - --find_package(CURL) -+find_package(CURL CONFIG REQUIRED) - if(CURL_FOUND) -- include_directories(${CURL_INCLUDE_DIR}) - else(CURL_FOUND) - message(FATAL_ERROR "CURL not found") - endif(CURL_FOUND) -@@ -126,7 +125,7 @@ set_target_properties( - target_include_directories(vault PRIVATE src) - - if(LINK_CURL) -- target_link_libraries(vault curl) -+ target_link_libraries(vault CURL::libcurl) - endif(LINK_CURL) - - if(ENABLE_COVERAGE) diff --git a/VaultConfig.cmake.in b/VaultConfig.cmake.in index 67a40ab..82db52d 100644 --- a/VaultConfig.cmake.in diff --git a/ports/libvault/portfile.cmake b/ports/libvault/portfile.cmake index 34b2b0ed11..2755698056 100644 --- a/ports/libvault/portfile.cmake +++ b/ports/libvault/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO abedra/libvault - REF 0.56.0 - SHA512 6a8d14a755ea3d39c2912ee6d33cec9c6f30a498c57efc40603cecbbd90d400dba52be7b42287c87cd425694c89edbae86218021b2beaa5edca748c3d5dd7c77 + REF "${VERSION}" + SHA512 20a7e8ae5bac5278ff2c9588d24f853b0c80169e008e930c390a78e15d18f36c68c2666a4c6c4aa263689d5b89a8c9945eead4d88087035fafb9865fcc3466ca PATCHES 0001-fix-dependencies.patch ) diff --git a/ports/libvault/vcpkg.json b/ports/libvault/vcpkg.json index e39477c98f..95ab36854e 100644 --- a/ports/libvault/vcpkg.json +++ b/ports/libvault/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libvault", - "version": "0.56.0", + "version": "0.61.0", "description": "A C++ library for Hashicorp Vault", "homepage": "https://github.com/abedra/libvault", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index d5377325d1..c3b3ad1675 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5261,7 +5261,7 @@ "port-version": 1 }, "libvault": { - "baseline": "0.56.0", + "baseline": "0.61.0", "port-version": 0 }, "libvhdi": { diff --git a/versions/l-/libvault.json b/versions/l-/libvault.json index 441d33f1c4..50fb2705bc 100644 --- a/versions/l-/libvault.json +++ b/versions/l-/libvault.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcdc4c8aa3972fd6419a4203105ac1d57444b30f", + "version": "0.61.0", + "port-version": 0 + }, { "git-tree": "3ab55180dfc75f58d833bae81f6e303416c992e6", "version": "0.56.0",