From 5226027e7630689f541c2b0e52ef4d52b8e526f7 Mon Sep 17 00:00:00 2001
From: Sergey Bronnikov <sergeyb@tarantool.org>
Date: Wed, 6 Jul 2022 15:10:25 +0300
Subject: [PATCH] third_party: update libcurl from 7.83.0 to 7.84.0

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

New release contains fixes for 4 security problems [1].

Patch adds a new option defined in curl build infrastructure with it's
default value used in 7.84.0. NOTE: PSL is a Public Suffix List (PSL),
it is a list of suffixes used for cookies.

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

NO_DOC=libcurl submodule bump
NO_TEST=libcurl submodule bump
---
 changelogs/unreleased/bump-libcurl-to-7.84.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.84.0.md

diff --git a/changelogs/unreleased/bump-libcurl-to-7.84.0.md b/changelogs/unreleased/bump-libcurl-to-7.84.0.md
new file mode 100644
index 0000000000..e02b93d4b1
--- /dev/null
+++ b/changelogs/unreleased/bump-libcurl-to-7.84.0.md
@@ -0,0 +1,3 @@
+## feature/build
+
+* Updated libcurl to version 7.84.0.
diff --git a/cmake/BuildLibCURL.cmake b/cmake/BuildLibCURL.cmake
index 2e1a0ab3c2..48ee2383b1 100644
--- a/cmake/BuildLibCURL.cmake
+++ b/cmake/BuildLibCURL.cmake
@@ -174,6 +174,7 @@ macro(curl_build)
     list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_BEARSSL=OFF")
     list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_GSSAPI=OFF")
     list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_LIBSSH=OFF")
+    list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_LIBPSL=OFF")
     list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_OPENLDAP=OFF")
     list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_WERROR=OFF")
     # CURL_ZSTD adds zstd encoding/decoding support. Tuning libcurl's build to
diff --git a/third_party/curl b/third_party/curl
index 1669b17d3a..45ac4d0194 160000
--- a/third_party/curl
+++ b/third_party/curl
@@ -1 +1 @@
-Subproject commit 1669b17d3a1a1fd824308544ca0ec02a2a4f50ea
+Subproject commit 45ac4d019475df03562fe0ac54eb67e1d1de0ca7
-- 
GitLab