diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-07-07 04:23:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 13:23:44 -0700 |
| commit | f12d986e6a06e0d761089d672df42511fa2dfe0d (patch) | |
| tree | 33e20162611e72703623b8b6806d45adbbbd096b /ports/curl/0002_fix_uwp.patch | |
| parent | ac4e90220adb99d7cea190c41d798ac113f20627 (diff) | |
| download | vcpkg-f12d986e6a06e0d761089d672df42511fa2dfe0d.tar.gz vcpkg-f12d986e6a06e0d761089d672df42511fa2dfe0d.zip | |
[curl] Update to 7.71.0 (#12141)
* [curl] Update to 7.71.0
* Update to 7.71.1
Diffstat (limited to 'ports/curl/0002_fix_uwp.patch')
| -rw-r--r-- | ports/curl/0002_fix_uwp.patch | 84 |
1 files changed, 10 insertions, 74 deletions
diff --git a/ports/curl/0002_fix_uwp.patch b/ports/curl/0002_fix_uwp.patch index b69dd4cb9..ae3615875 100644 --- a/ports/curl/0002_fix_uwp.patch +++ b/ports/curl/0002_fix_uwp.patch @@ -1,79 +1,15 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 38b7b7d..5b3d33e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -897,7 +897,9 @@ check_symbol_exists(setsockopt "${CURL_INCLUDES}" HAVE_SETSOCKOPT)
- check_function_exists(mach_absolute_time HAVE_MACH_ABSOLUTE_TIME)
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index 62b7b33..9b0e2e1 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -107,7 +107,9 @@ endif()
+
+ target_link_libraries(${LIB_NAME} ${CURL_LIBS})
- # symbol exists in win32, but function does not.
-if(WIN32)
+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-+ add_definitions(-D_WIN32_WINNT=0x0A00 -DHAVE_STRUCT_POLLFD -D_WINSOCK_DEPRECATED_NO_WARNINGS)
++ add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
+elseif(WIN32)
- if(ENABLE_INET_PTON)
- check_function_exists(inet_pton HAVE_INET_PTON)
- # _WIN32_WINNT_VISTA (0x0600)
-diff --git a/lib/curl_gethostname.c b/lib/curl_gethostname.c
-index 8337c72..41867b2 100644
---- a/lib/curl_gethostname.c
-+++ b/lib/curl_gethostname.c
-@@ -21,6 +21,7 @@
- ***************************************************************************/
-
- #include "curl_setup.h"
-+#include "curl/curl.h"
-
- #include "curl_gethostname.h"
-
-@@ -64,9 +65,10 @@ int Curl_gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen)
- #ifdef DEBUGBUILD
-
- /* Override host name when environment variable CURL_GETHOSTNAME is set */
-- const char *force_hostname = getenv("CURL_GETHOSTNAME");
-+ char *force_hostname = curl_getenv("CURL_GETHOSTNAME");
- if(force_hostname) {
- strncpy(name, force_hostname, namelen);
-+ free(force_hostname);
- err = 0;
- }
- else {
-diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
-index e7060eb..9cd76f7 100644
---- a/lib/curl_ntlm_core.c
-+++ b/lib/curl_ntlm_core.c
-@@ -726,10 +726,11 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash,
-
- /* Calculate the timestamp */
- #ifdef DEBUGBUILD
-- char *force_timestamp = getenv("CURL_FORCETIME");
-- if(force_timestamp)
-+ char *force_timestamp = curl_getenv("CURL_FORCETIME");
-+ if(force_timestamp) {
- tw = CURL_OFF_T_C(11644473600) * 10000000;
-- else
-+ free(force_timestamp);
-+ }
- #endif
- tw = ((curl_off_t)time(NULL) + CURL_OFF_T_C(11644473600)) * 10000000;
-
-diff --git a/lib/rand.c b/lib/rand.c
-index 6ee45fe..b2d712d 100644
---- a/lib/rand.c
-+++ b/lib/rand.c
-@@ -44,7 +44,7 @@ static CURLcode randit(struct Curl_easy *data, unsigned int *rnd)
- static bool seeded = FALSE;
+ add_definitions(-D_USRDLL)
+ endif()
- #ifdef CURLDEBUG
-- char *force_entropy = getenv("CURL_ENTROPY");
-+ char *force_entropy = curl_getenv("CURL_ENTROPY");
- if(force_entropy) {
- if(!seeded) {
- unsigned int seed = 0;
-@@ -58,6 +58,7 @@ static CURLcode randit(struct Curl_easy *data, unsigned int *rnd)
- else
- randseed++;
- *rnd = randseed;
-+ free(force_entropy);
- return CURLE_OK;
- }
- #endif
|