diff options
| author | Wimok Nupphiboon <wimok.mok@gmail.com> | 2018-03-24 11:53:55 +0700 |
|---|---|---|
| committer | Wimok Nupphiboon <wimok.mok@gmail.com> | 2018-03-24 11:53:55 +0700 |
| commit | 663be4bbffd435cf5e5fc62a0774c784c10ddc68 (patch) | |
| tree | d214f24405fa75d4dad9dfb938a04846d2ca6102 /ports/curl | |
| parent | 1e380dde21317e73d1859dad1c64c06eb88cc502 (diff) | |
| parent | aa57df6d6ed6d17000522492b66fc93d3f32ab86 (diff) | |
| download | vcpkg-663be4bbffd435cf5e5fc62a0774c784c10ddc68.tar.gz vcpkg-663be4bbffd435cf5e5fc62a0774c784c10ddc68.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'ports/curl')
| -rw-r--r-- | ports/curl/0002_fix_uwp.patch | 4 | ||||
| -rw-r--r-- | ports/curl/CONTROL | 4 | ||||
| -rw-r--r-- | ports/curl/portfile.cmake | 10 |
3 files changed, 12 insertions, 6 deletions
diff --git a/ports/curl/0002_fix_uwp.patch b/ports/curl/0002_fix_uwp.patch index 8408177e8..111ca98e8 100644 --- a/ports/curl/0002_fix_uwp.patch +++ b/ports/curl/0002_fix_uwp.patch @@ -60,14 +60,14 @@ diff --git a/lib/ftp.c b/lib/ftp.c index 8042edf..3442df7 100644 --- a/lib/ftp.c +++ b/lib/ftp.c -@@ -4297,7 +4297,7 @@ CURLcode ftp_parse_url_path(struct connectdata *conn) +@@ -4260,7 +4260,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, data->state.path, 0, &path, &dlen, FALSE); + Curl_urldecode(conn->data, data->state.path, 0, &path, &dlen, TRUE); if(result) { diff --git a/lib/rand.c b/lib/rand.c index 2670af9..0d18d37 100644 diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index e7f13888d..18518e1ea 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,5 @@ Source: curl -Version: 7.58.0-4 +Version: 7_59_0-2 Build-Depends: zlib Description: A library for transferring data with URLs Default-Features: ssl @@ -12,7 +12,7 @@ Feature: non-http Description: Enables protocols beyond HTTP/HTTPS/HTTP2 Feature: http2 -Build-Depends: nghttp2, ssl +Build-Depends: nghttp2, curl[ssl] Description: HTTP2 support Feature: ssl diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 94587649d..852fcf9d0 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_58_0 - SHA512 148c25152732dd5ad2626bc70c7725577e25033a73eecefa4dd820927ec552f9c2d0235cc3f597404d3893eced7d5d2bd9522f6302b7f930e9f65912ac2c91f6 + REF curl-7_59_0 + SHA512 eac51b986db7eafb836bc4fa00def88054304110990bf99a4387a5ff85a8375616c2ee5bee91bf608737faffe9f228dfd62be69a4b0622a4afe3deb1098b6bd3 HEAD_REF master ) @@ -95,6 +95,12 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/curl) + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/curl) +elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/curl) + vcpkg_fixup_cmake_targets(CONFIG_PATH share/curl) +endif() + file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/curl RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) |