From 09f4eca1ef796830463e9e41b1590ea2ed0a7026 Mon Sep 17 00:00:00 2001
From: Sergey Bronnikov <sergeyb@tarantool.org>
Date: Thu, 12 Jan 2023 21:43:34 +0300
Subject: [PATCH] third_party: update libcurl from 7.84.0 to 7.87.0

Changelog: https://curl.se/changes.html#7_87_0

New release contains fixes for 7 security problems [1]:

https://curl.se/docs/CVE-2022-35252.html
https://curl.se/docs/CVE-2022-32221.html
https://curl.se/docs/CVE-2022-35260.html
https://curl.se/docs/CVE-2022-42915.html
https://curl.se/docs/CVE-2022-42916.html
https://curl.se/docs/CVE-2022-43551.html
https://curl.se/docs/CVE-2022-43552.html

Patch adds a new option ENABLE_WEBSOCKETS defined in curl build
infrastructure with it's default value used in 7.87.0.

1. https://curl.se/docs/releases.html

NO_DOC=libcurl submodule bump
NO_TEST=libcurl submodule bump

Closes #8150
---
 changelogs/unreleased/bump-libcurl-to-7.87.0.md | 3 +++
 cmake/BuildLibCURL.cmake                        | 1 +
 third_party/curl                                | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/bump-libcurl-to-7.87.0.md

diff --git a/changelogs/unreleased/bump-libcurl-to-7.87.0.md b/changelogs/unreleased/bump-libcurl-to-7.87.0.md
new file mode 100644
index 0000000000..4af8134337
--- /dev/null
+++ b/changelogs/unreleased/bump-libcurl-to-7.87.0.md
@@ -0,0 +1,3 @@
+## feature/build
+
+* Updated libcurl to version 7.87.0 (gh-8150).
diff --git a/cmake/BuildLibCURL.cmake b/cmake/BuildLibCURL.cmake
index 32c4aec088..39f4e318e2 100644
--- a/cmake/BuildLibCURL.cmake
+++ b/cmake/BuildLibCURL.cmake
@@ -187,6 +187,7 @@ macro(curl_build)
     list(APPEND LIBCURL_CMAKE_FLAGS "-DENABLE_CURLDEBUG=OFF")
     list(APPEND LIBCURL_CMAKE_FLAGS "-DENABLE_DEBUG=OFF")
     list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_MSH3=OFF")
+    list(APPEND LIBCURL_CMAKE_FLAGS "-DENABLE_WEBSOCKETS=OFF")
 
     # We need PIC at least to enable build for Fedora on
     # ARM64 CPU. Without it configuration with Fedora
diff --git a/third_party/curl b/third_party/curl
index 45ac4d0194..c12fb3ddaf 160000
--- a/third_party/curl
+++ b/third_party/curl
@@ -1 +1 @@
-Subproject commit 45ac4d019475df03562fe0ac54eb67e1d1de0ca7
+Subproject commit c12fb3ddaf48e709a7a4deaa55ec485e4df163ee
-- 
GitLab