From 11d9c9173f89991b0b773a7de8f0475de68b6fef Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 12 Oct 2023 20:29:02 +0300
Subject: Upgrade to 8.4.0

That in particular fixes CVE-2023-38545 CVE-2023-38546.
---
 curl/README-DEV | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'curl/README-DEV')

diff --git a/curl/README-DEV b/curl/README-DEV
index 760e273..fa202e4 100644
--- a/curl/README-DEV
+++ b/curl/README-DEV
@@ -5,11 +5,16 @@ understanding will be useful when upgrading to a new upstream version. See
 Symlink the required upstream directories into curl/:
 
 $ ln -s ../../upstream/{src,lib} curl
-$ ln -s lib/{strtoofft,nonblock,warnless,dynbuf,version_win32,curl_multibyte}.c curl
+$ ln -s lib/{strtoofft,nonblock,warnless,dynbuf,version_win32,curl_multibyte,base64}.c curl
 $ ln -s ../../libcurl/libcurl/curl_config.h curl
 
 Patch curl to use CA certificate bundle provided by the
 libca-certificates-curl package by default:
 
+$ cp curl/src/tool_main.c curl/tool_main.c.orig
 $ cp curl/src/tool_main.c curl
-$ patch -p0 <curl/tool_main.c.patch
+$ git apply curl/tool_main.c.patch
+
+Note that the above patch is produced by the following command:
+
+$ git diff >curl/tool_main.c.patch
-- 
cgit v1.1