mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[nghttp2] update to 1.61.0 (#38023)
Fix CVE-2024-28182 https://github.com/nghttp2/nghttp2/security/advisories/GHSA-x6x3-gv8h-m57q Remove no longer needed no-tests.path, there is now an build option for disable TESTING
This commit is contained in:
parent
f6e7ffb2d6
commit
4920c80ea9
@ -1,32 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 58ae48c7..fc3b38a5 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -432,7 +432,6 @@ add_subdirectory(lib)
|
||||
add_subdirectory(third-party)
|
||||
add_subdirectory(src)
|
||||
add_subdirectory(examples)
|
||||
-add_subdirectory(tests)
|
||||
#add_subdirectory(tests/testdata)
|
||||
add_subdirectory(integration-tests)
|
||||
if(ENABLE_DOC)
|
||||
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
|
||||
index 211c8e43..94e688d4 100644
|
||||
--- a/lib/CMakeLists.txt
|
||||
+++ b/lib/CMakeLists.txt
|
||||
@@ -66,6 +66,7 @@ if(BUILD_SHARED_LIBS)
|
||||
endif()
|
||||
|
||||
# Static library (for unittests because of symbol visibility)
|
||||
+if(BUILD_STATIC_LIBS)
|
||||
add_library(${STATIC_LIB} STATIC ${NGHTTP2_SOURCES})
|
||||
|
||||
set_target_properties(${STATIC_LIB} PROPERTIES
|
||||
@@ -82,7 +83,6 @@ target_include_directories(${STATIC_LIB} INTERFACE
|
||||
|
||||
target_compile_definitions(${STATIC_LIB} PUBLIC "-DNGHTTP2_STATICLIB")
|
||||
|
||||
-if(BUILD_STATIC_LIBS)
|
||||
install(TARGETS ${STATIC_LIB} EXPORT ${EXPORT_SET})
|
||||
list(APPEND nghttp2_exports ${STATIC_LIB})
|
||||
endif()
|
@ -2,10 +2,8 @@ vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO nghttp2/nghttp2
|
||||
REF "v${VERSION}"
|
||||
SHA512 1526418b0cf8e065f00589c5abd0b4ebd32a3128fbedd7c1f8fc9a76b8b2ad9713a8f4b056d29fce454559fe9227392c59dcdffaa665249df94a1fcf85fcfc53
|
||||
SHA512 20578805dd981ee488706680afbc81f374beece76a21e859a5550ae2a2ffe6bfd55e24161a8f28eeb5b5132cb5eddaa1b2f12f5aecf71d11b9d506cc451ed2bf
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
no-tests.patch
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" ENABLE_STATIC_CRT)
|
||||
@ -16,6 +14,7 @@ vcpkg_cmake_configure(
|
||||
OPTIONS
|
||||
-DENABLE_LIB_ONLY=ON
|
||||
-DENABLE_DOC=OFF
|
||||
-DBUILD_TESTING=OFF
|
||||
"-DENABLE_STATIC_CRT=${ENABLE_STATIC_CRT}"
|
||||
"-DBUILD_STATIC_LIBS=${ENABLE_STATIC_LIB}"
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "nghttp2",
|
||||
"version": "1.60.0",
|
||||
"version": "1.61.0",
|
||||
"description": "Implementation of the Hypertext Transfer Protocol version 2 in C",
|
||||
"homepage": "https://github.com/nghttp2/nghttp2",
|
||||
"license": "MIT",
|
||||
|
@ -6101,7 +6101,7 @@
|
||||
"port-version": 4
|
||||
},
|
||||
"nghttp2": {
|
||||
"baseline": "1.60.0",
|
||||
"baseline": "1.61.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"nghttp2-asio": {
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "c729d32482e08364174b704deb8a5f91af6bb4f4",
|
||||
"version": "1.61.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "31de6aa7aa2d2e068717f30e8949570bdfd53bf6",
|
||||
"version": "1.60.0",
|
||||
|
Loading…
x
Reference in New Issue
Block a user