This is an automated email from the ASF dual-hosted git repository.
laiyingchun pushed a commit to branch branch-1.17.x
in repository https://gitbox.apache.org/repos/asf/kudu.git
The following commit(s) were added to refs/heads/branch-1.17.x by this push:
new 7cf1710c7 [thirdparty] Fix the curl missing patch
7cf1710c7 is described below
commit 7cf1710c799a7da54ecde6e55101a4958eb34c5b
Author: Yingchun Lai <[email protected]>
AuthorDate: Wed Oct 25 11:40:44 2023 +0800
[thirdparty] Fix the curl missing patch
This is a follow-up patch for commit:
28c9218172d366832b1f9881cfbc7f159afd3029, the previous
commit missed to patch both of the two patches of curl.
Change-Id: Ib997c7c304e9d55e1fe16d28f1dca53500d69ba7
Reviewed-on: http://gerrit.cloudera.org:8080/20620
Reviewed-by: Alexey Serbin <[email protected]>
Tested-by: Kudu Jenkins
(cherry picked from commit 0dbd63ad942835593b6fb028ad4fdfaaee289526)
Reviewed-on: http://gerrit.cloudera.org:8080/20621
Tested-by: Yingchun Lai <[email protected]>
---
thirdparty/download-thirdparty.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/thirdparty/download-thirdparty.sh
b/thirdparty/download-thirdparty.sh
index eb258367f..331a3fef8 100755
--- a/thirdparty/download-thirdparty.sh
+++ b/thirdparty/download-thirdparty.sh
@@ -303,11 +303,12 @@ fetch_and_patch \
$GCOVR_SOURCE \
$GCOVR_PATCHLEVEL
-CURL_PATCHLEVEL=1
+CURL_PATCHLEVEL=2
fetch_and_patch \
curl-${CURL_VERSION}.tar.gz \
$CURL_SOURCE \
$CURL_PATCHLEVEL \
+ "patch -p1 < $TP_DIR/patches/curl-custom-openssl-library.patch" \
"patch -p1 < $TP_DIR/patches/curl-handle-openssl-errors.patch" \
"autoreconf -fvi"
