From 5440c40f028d174fe719286ea7c9a21b4c400dcd Mon Sep 17 00:00:00 2001 From: Kevin Lu <6320810+kevinlul@users.noreply.github.com> Date: Fri, 10 Jan 2020 13:26:10 -0500 Subject: [PATCH] [curl] Update to 7.68.0 (#9589) * Bump version * fix UWP patch --- ports/curl/0002_fix_uwp.patch | 13 ------------- ports/curl/CONTROL | 2 +- ports/curl/portfile.cmake | 4 ++-- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/ports/curl/0002_fix_uwp.patch b/ports/curl/0002_fix_uwp.patch index 565903ad2..b69dd4cb9 100644 --- a/ports/curl/0002_fix_uwp.patch +++ b/ports/curl/0002_fix_uwp.patch @@ -56,19 +56,6 @@ index e7060eb..9cd76f7 100644 #endif tw = ((curl_off_t)time(NULL) + CURL_OFF_T_C(11644473600)) * 10000000; -diff --git a/lib/ftp.c b/lib/ftp.c -index 825aaaa..3b96670 100644 ---- a/lib/ftp.c -+++ b/lib/ftp.c -@@ -4262,7 +4262,7 @@ CURLcode ftp_parse_url_path(struct connectdata *conn) - /* prevpath is "raw" so we convert the input path before we compare the - strings */ - size_t dlen; -- char *path; -+ char *path = NULL; - CURLcode result = - Curl_urldecode(conn->data, ftp->path, 0, &path, &dlen, TRUE); - if(result) { diff --git a/lib/rand.c b/lib/rand.c index 6ee45fe..b2d712d 100644 --- a/lib/rand.c diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index fd9f428f9..90e91c95a 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,5 @@ Source: curl -Version: 7.66.0-2 +Version: 7.68.0 Build-Depends: zlib Homepage: https://github.com/curl/curl Description: A library for transferring data with URLs diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 36837f93d..17e6817b1 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO curl/curl - REF curl-7_66_0 - SHA512 0b02b6117ab69e848219fa59b25e4254934d841fbc3e2a70ccfdcb417ab7fc46a10dd703a25fbe8a2a98a59cbc73ad6b9298f5668a7345f7910010b958de4d21 + REF curl-7_68_0 + SHA512 d75ed39b121a5a04d5a4ba89779967a49e196a93325747b51399adf1afb5f5c13355d6dbe798b259d19245c83bb55f0b621b24b25d8f3ddb1914df30067b8737 HEAD_REF master PATCHES 0001_cmake.patch