diff options
| -rw-r--r-- | ports/curl/0001_cmake.patch | 15 | ||||
| -rw-r--r-- | ports/curl/0002_fix_uwp.patch | 16 | ||||
| -rw-r--r-- | ports/curl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/curl/portfile.cmake | 6 |
4 files changed, 28 insertions, 11 deletions
diff --git a/ports/curl/0001_cmake.patch b/ports/curl/0001_cmake.patch index db281e122..4298321b3 100644 --- a/ports/curl/0001_cmake.patch +++ b/ports/curl/0001_cmake.patch @@ -11,3 +11,18 @@ index 12a7c61..9839c67 100644 ) if(LIBSSH2_INCLUDE_DIR) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7b73b98..6c7c559 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1132,7 +1132,9 @@ function(TRANSFORM_MAKEFILE_INC INPUT_FILE OUTPUT_FILE) + + endfunction() + +-if(WIN32 AND NOT CYGWIN) ++if(MSVC) ++ set(CURL_INSTALL_CMAKE_DIR share/curl) ++elseif(WIN32 AND NOT CYGWIN) + set(CURL_INSTALL_CMAKE_DIR CMake) + else() + set(CURL_INSTALL_CMAKE_DIR lib/cmake/curl) diff --git a/ports/curl/0002_fix_uwp.patch b/ports/curl/0002_fix_uwp.patch index a3f227fb1..8408177e8 100644 --- a/ports/curl/0002_fix_uwp.patch +++ b/ports/curl/0002_fix_uwp.patch @@ -1,9 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0caf3dc..de9fcdb 100644 +index 7b73b98..72f6171 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -941,7 +941,9 @@ check_symbol_exists(ioctl "${CURL_INCLUDES}" HAVE_IOCTL) - check_symbol_exists(setsockopt "${CURL_INCLUDES}" HAVE_SETSOCKOPT) +@@ -882,7 +882,9 @@ check_symbol_exists(setsockopt "${CURL_INCLUDES}" HAVE_SETSOCKOPT) + check_function_exists(mach_absolute_time HAVE_MACH_ABSOLUTE_TIME) # symbol exists in win32, but function does not. -if(WIN32) @@ -38,10 +38,10 @@ index 8337c72..41867b2 100644 } else { diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c -index aea5452..c1f59f2 100644 +index e896276..268f0ea 100644 --- a/lib/curl_ntlm_core.c +++ b/lib/curl_ntlm_core.c -@@ -700,9 +700,12 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash, +@@ -743,9 +743,12 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash, /* Calculate the timestamp */ #ifdef DEBUGBUILD @@ -57,10 +57,10 @@ index aea5452..c1f59f2 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 6e86e53..a96fe1a 100644 +index 8042edf..3442df7 100644 --- a/lib/ftp.c +++ b/lib/ftp.c -@@ -4292,7 +4292,7 @@ CURLcode ftp_parse_url_path(struct connectdata *conn) +@@ -4297,7 +4297,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; @@ -70,7 +70,7 @@ index 6e86e53..a96fe1a 100644 Curl_urldecode(conn->data, data->state.path, 0, &path, &dlen, FALSE); if(result) { diff --git a/lib/rand.c b/lib/rand.c -index 2713a0a..7da6e00 100644 +index 2670af9..0d18d37 100644 --- a/lib/rand.c +++ b/lib/rand.c @@ -44,7 +44,7 @@ static CURLcode randit(struct Curl_easy *data, unsigned int *rnd) diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 1193e114f..cdc514006 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,4 +1,4 @@ Source: curl -Version: 7.55.1-1 +Version: 7.57.0-1 Build-Depends: zlib, openssl, libssh2 Description: A library for transferring data with URLs diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index eaeba787d..8a5d17ed6 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO curl/curl - REF curl-7_55_1 - SHA512 b5c6dd6cca8d07c08d1760feff9822f1264359adde068afd1584fc3fdcfa50c68e0e1b5ecaa277298ad0923b61019943c181ee1f0870c312399038c4c4e0e327 + REF curl-7_57_0 + SHA512 19f963d86682153d2d73731c784adf6457bc3fd48b628d6d701649f64718b10df268797ce21ad5f5339efc5df81b8547772edcc36c046665309e32997d5d1afc HEAD_REF master ) @@ -64,6 +64,8 @@ else() endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + file(READ ${CURRENT_PACKAGES_DIR}/include/curl/curl.h CURL_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) string(REPLACE "#ifdef CURL_STATICLIB" "#if 1" CURL_H "${CURL_H}") |