From 9f9778ccff48981a691bf34f30ecc4bf2efd5ac1 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Sun, 11 Mar 2018 23:41:51 -0700 Subject: [many ports] Improve behavior on Linux and general cleanup --- ports/curl/CONTROL | 2 +- ports/curl/portfile.cmake | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'ports/curl') diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index e7f13888d..0f6acea43 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,5 @@ Source: curl -Version: 7.58.0-4 +Version: 7.58.0-5 Build-Depends: zlib Description: A library for transferring data with URLs Default-Features: ssl diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 94587649d..299dc4fa4 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -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) -- cgit v1.2.3 From f0dc8c109eaf264fbdbc6fb726fe23a9ef2bd97a Mon Sep 17 00:00:00 2001 From: pravic Date: Wed, 14 Mar 2018 17:51:20 +0300 Subject: [curl] update to 7.59.0 --- ports/curl/CONTROL | 2 +- ports/curl/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ports/curl') diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 0f6acea43..c273ec181 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,5 @@ Source: curl -Version: 7.58.0-5 +Version: 7.59.0 Build-Depends: zlib Description: A library for transferring data with URLs Default-Features: ssl diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 299dc4fa4..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 ) -- cgit v1.2.3 From 33a8ee0a88b277dab4be336169f4b975f8c41cbb Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 14 Mar 2018 01:42:30 -0700 Subject: [abseil][curl][chakracore][thrift] Upgrades --- ports/curl/0002_fix_uwp.patch | 4 ++-- ports/curl/CONTROL | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ports/curl') 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 c273ec181..1f410c06a 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,5 @@ Source: curl -Version: 7.59.0 +Version: 7_59_0-1 Build-Depends: zlib Description: A library for transferring data with URLs Default-Features: ssl -- cgit v1.2.3 From d20fccad10b017e413c71dfd785a14470816ea2b Mon Sep 17 00:00:00 2001 From: Ivy Snow Date: Mon, 19 Mar 2018 11:17:08 +0800 Subject: [curl] fix a dependency error: "Error: Unable to satisfy dependency ssl:x86-windows of curl[http2]:x86-windows" --- ports/curl/CONTROL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ports/curl') diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 1f410c06a..18518e1ea 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,5 @@ Source: curl -Version: 7_59_0-1 +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 -- cgit v1.2.3