Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dependencies: upgrade libcurl to 7.74.0. #14444

Merged
merged 1 commit into from
Dec 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions bazel/foreign_cc/curl.patch
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,3 @@ index ec1cfa782..0c5a72f00 100644
+ string(REGEX REPLACE "/MD" "/MT" ${flags_var} "${${flags_var}}")
+ endif()
+ endforeach()
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 911c9096d..ba6af1bf1 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -91,4 +91,0 @@ add_library(
-if(MSVC AND NOT BUILD_SHARED_LIBS)
- set_target_properties(${LIB_NAME} PROPERTIES STATIC_LIBRARY_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
-endif()
-
6 changes: 3 additions & 3 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -649,8 +649,8 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "curl",
project_desc = "Library for transferring data with URLs",
project_url = "https://curl.haxx.se",
version = "7.72.0",
sha256 = "d4d5899a3868fbb6ae1856c3e55a32ce35913de3956d1973caccd37bd0174fa2",
version = "7.74.0",
sha256 = "e56b3921eeb7a2951959c02db0912b5fcd5fdba5aca071da819e1accf338bbd7",
strip_prefix = "curl-{version}",
urls = ["https://github.com/curl/curl/releases/download/curl-{underscore_version}/curl-{version}.tar.gz"],
use_category = ["dataplane_ext", "observability_ext"],
Expand All @@ -660,7 +660,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
"envoy.grpc_credentials.aws_iam",
"envoy.tracers.opencensus",
],
release_date = "2020-08-19",
release_date = "2020-12-09",
cpe = "cpe:2.3:a:haxx:curl:*",
),
com_googlesource_chromium_v8 = dict(
Expand Down
2 changes: 1 addition & 1 deletion test/dependencies/curl_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ TEST(CurlTest, BuiltWithExpectedFeatures) {
EXPECT_EQ(0, info->features & CURL_VERSION_HTTPS_PROXY);
EXPECT_EQ(0, info->features & CURL_VERSION_MULTI_SSL);
EXPECT_EQ(0, info->features & CURL_VERSION_BROTLI);
EXPECT_EQ(0, info->features & CURL_VERSION_ALTSVC);
EXPECT_NE(0, info->features & CURL_VERSION_ALTSVC);
EXPECT_EQ(0, info->features & CURL_VERSION_HTTP3);
EXPECT_NE(0, info->ares_num);
}
Expand Down