diff options
Diffstat (limited to 'external/curl')
-rw-r--r-- | external/curl/ExternalPackage_curl.mk | 2 | ||||
-rw-r--r-- | external/curl/ExternalProject_curl.mk | 11 | ||||
-rw-r--r-- | external/curl/UnpackedTarball_curl.mk | 10 | ||||
-rw-r--r-- | external/curl/curl-7.26.0_win-proxy.patch | 59 | ||||
-rw-r--r-- | external/curl/curl-android.patch | 16 | ||||
-rw-r--r-- | external/curl/curl-freebsd.patch.1 | 32 | ||||
-rw-r--r-- | external/curl/curl-msvc-schannel.patch.1 | 4 | ||||
-rw-r--r-- | external/curl/curl-msvc.patch.1 | 4 | ||||
-rw-r--r-- | external/curl/curl-xp.patch.1 | 12 |
9 files changed, 54 insertions, 96 deletions
diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk index ed5589212dad..2de52db1b741 100644 --- a/external/curl/ExternalPackage_curl.mk +++ b/external/curl/ExternalPackage_curl.mk @@ -22,7 +22,7 @@ $(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dyli else ifeq ($(OS),AIX) $(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so,lib/.libs/libcurl.so.4)) else -$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.3.0)) +$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.4.0)) endif endif # $(DISABLE_DYNLOADING) diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index dc12c4bb89e9..76b4a4556103 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -42,10 +42,9 @@ $(call gb_ExternalProject_get_state_target,curl,build): CPPFLAGS="$(curl_CPPFLAGS)" \ LDFLAGS=$(curl_LDFLAGS) \ ./configure \ - $(if $(filter IOS MACOSX,$(OS)),,--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \ - $(if $(filter IOS,$(OS)),--with-darwinssl) \ - $(if $(filter MACOSX,$(OS)),\ - --with-darwinssl) \ + $(if $(filter IOS MACOSX,$(OS)),\ + --with-darwinssl,\ + --with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \ --without-ssl --without-gnutls --without-polarssl --without-cyassl --without-axtls \ --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \ --disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \ @@ -80,9 +79,9 @@ else ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,curl,build): $(call gb_ExternalProject_run,build,\ - MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc10 \ + MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc12 \ cfg=$(if $(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll) \ - EXCFLAGS="/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE /DUSE_WINDOWS_SSPI $(SOLARINC)" $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \ + EXCFLAGS="/EHs /D_CRT_SECURE_NO_DEPRECATE /DUSE_WINDOWS_SSPI /D_USING_V110_SDK71_ $(SOLARINC)" $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \ ,lib) endif diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk index 8e236b4a9765..536474d4a30b 100644 --- a/external/curl/UnpackedTarball_curl.mk +++ b/external/curl/UnpackedTarball_curl.mk @@ -14,15 +14,15 @@ $(eval $(call gb_UnpackedTarball_set_tarball,curl,$(CURL_TARBALL),,curl)) $(eval $(call gb_UnpackedTarball_set_patchlevel,curl,1)) $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\ - lib/Makefile.vc10 \ + lib/Makefile.vc12 \ )) $(eval $(call gb_UnpackedTarball_add_patches,curl,\ - external/curl/curl-freebsd.patch.1 \ external/curl/curl-msvc.patch.1 \ external/curl/curl-msvc-schannel.patch.1 \ external/curl/curl-7.26.0_mingw.patch \ external/curl/curl-7.26.0_win-proxy.patch \ + external/curl/curl-xp.patch.1 \ )) ifeq ($(SYSTEM_NSS),) @@ -31,10 +31,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\ )) endif -ifeq ($(OS),ANDROID) -$(eval $(call gb_UnpackedTarball_add_patches,curl,\ - external/curl/curl-android.patch \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/external/curl/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch index 99402a437e5a..1c478868d7d2 100644 --- a/external/curl/curl-7.26.0_win-proxy.patch +++ b/external/curl/curl-7.26.0_win-proxy.patch @@ -1,41 +1,41 @@ ---- curl-7.26.0/lib/Makefile.vc10 -+++ misc/build/curl-7.26.0/lib/Makefile.vc10 -@@ -116,7 +116,7 @@ LFLAGS = /nologo /machine:$(MACHINE) - SSLLIBS = libeay32.lib ssleay32.lib +--- curl-7.26.0/lib/Makefile.vc12 ++++ misc/build/curl-7.26.0/lib/Makefile.vc12 +@@ -118,7 +118,7 @@ + WINSSLLIBS = crypt32.lib ZLIBLIBSDLL = zdll.lib ZLIBLIBS = zlib.lib -WINLIBS = ws2_32.lib wldap32.lib advapi32.lib -+WINLIBS = ws2_32.lib wldap32.lib advapi32.lib winhttp.lib ++WINLIBS = ws2_32.lib wldap32.lib advapi32.lib winhttp.lib crypt32.lib CFLAGS = $(CFLAGS) $(EXCFLAGS) CFGSET = FALSE --- curl-7.26.0/lib/url.c +++ misc/build/curl-7.26.0/lib/url.c -@@ -80,6 +80,10 @@ void idn_free (void *ptr); - int curl_win32_idn_to_ascii(const char *in, char **out); - #endif /* USE_LIBIDN */ +@@ -78,6 +78,10 @@ + bool curl_win32_idn_to_ascii(const char *in, char **out); + #endif /* USE_LIBIDN2 */ -+#ifdef WIN32 ++#ifdef _WIN32 +#include <WinHttp.h> +#endif + #include "urldata.h" #include "netrc.h" -@@ -4111,6 +4115,21 @@ static bool check_noproxy(const char* name, const char* no_proxy) +@@ -4586,6 +4590,21 @@ return FALSE; } -+#ifdef WIN32 -+static char* wstrToCstr( LPWSTR wStr ) ++#ifdef _WIN32 ++static char *wstrToCstr(LPWSTR wStr) +{ + int bufSize; -+ char* out = NULL; ++ char *out = NULL; + if(wStr != NULL) { + bufSize = WideCharToMultiByte( -+ CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL ); -+ out = ( char* )malloc( bufSize * sizeof(char)); -+ WideCharToMultiByte( CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL ); ++ CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL); ++ out = (char *)malloc(bufSize * sizeof(char)); ++ WideCharToMultiByte(CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL); + } + return out; +} @@ -44,7 +44,7 @@ /**************************************************************** * Detect what (if any) proxy to use. Remember that this selects a host * name and is not limited to HTTP proxies only. -@@ -4119,6 +4138,7 @@ static bool check_noproxy(const char* name, const char* no_proxy) +@@ -4594,6 +4613,7 @@ static char *detect_proxy(struct connectdata *conn) { char *proxy = NULL; @@ -52,20 +52,20 @@ #ifndef CURL_DISABLE_HTTP /* If proxy was not specified, we check for default proxy environment -@@ -4138,7 +4158,63 @@ static char *detect_proxy(struct connectdata *conn) +@@ -4613,7 +4633,64 @@ * For compatibility, the all-uppercase versions of these variables are * checked if the lowercase versions don't exist. */ - char *no_proxy=NULL; -+#ifdef WIN32 ++#ifdef _WIN32 + WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *ieProxyConfig; -+ ieProxyConfig = (WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*) ++ ieProxyConfig = (WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *) + malloc(sizeof(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG)); + if(WinHttpGetIEProxyConfigForCurrentUser(ieProxyConfig)) { + if(!ieProxyConfig->fAutoDetect) { + char *ieProxy; + char *ieNoProxy; -+ char* pos; ++ char *pos; + + ieProxy = wstrToCstr(ieProxyConfig->lpszProxy); + ieNoProxy = wstrToCstr(ieProxyConfig->lpszProxyBypass); @@ -82,10 +82,11 @@ + + if(!check_noproxy(conn->host.name, no_proxy)) { + /* Look for the http proxy setting */ -+ char* tok; ++ char *tok; ++ char *saveptr; + + if(NULL != ieProxy) { -+ tok = strtok(ieProxy, ";"); ++ tok = strtok_s(ieProxy, ";", &saveptr); + if(strchr(tok, '=') == NULL) { + proxy = strdup(ieProxy); + } @@ -93,9 +94,9 @@ + do { + if(strncmp(tok, "http=", 5) == 0) { + /* We found HTTP proxy value, then use it */ -+ proxy = strdup( tok + 5 ); ++ proxy = strdup(tok + 5); + } -+ tok = strtok(NULL, ";"); ++ tok = strtok_s(NULL, ";", &saveptr); + } + while(NULL != tok); + } @@ -109,15 +110,15 @@ + /* TODO Handle the Proxy config Auto Detection case */ + } + -+ GlobalFree( ieProxyConfig->lpszAutoConfigUrl ); -+ GlobalFree( ieProxyConfig->lpszProxy ); -+ GlobalFree( ieProxyConfig->lpszProxyBypass ); ++ GlobalFree(ieProxyConfig->lpszAutoConfigUrl); ++ GlobalFree(ieProxyConfig->lpszProxy); ++ GlobalFree(ieProxyConfig->lpszProxyBypass); + } +#else /* !WIN32 */ char proxy_env[128]; no_proxy=curl_getenv("no_proxy"); -@@ -4189,6 +4265,7 @@ static char *detect_proxy(struct connectdata *conn) +@@ -4663,6 +4739,7 @@ } } /* if(!check_noproxy(conn->host.name, no_proxy)) - it wasn't specified non-proxy */ diff --git a/external/curl/curl-android.patch b/external/curl/curl-android.patch deleted file mode 100644 index 40cf12447dbb..000000000000 --- a/external/curl/curl-android.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ur curl-7.26.0/ltmain.sh misc/build/curl-7.26.0/ltmain.sh ---- curl-7.26.0/ltmain.sh 2012-07-02 14:05:04.256112279 +0200 -+++ misc/build/curl-7.26.0/ltmain.sh 2012-07-02 14:07:23.775119842 +0200 -@@ -7307,6 +7307,12 @@ - func_warning "\`-release' is ignored for convenience libraries" - else - -+ # Force no versioning suffix for Android thanks to silly -+ # apkbuilder which doesn't add extra native libs unless their -+ # name ends with .so -+ -+ version_type=none -+ - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 diff --git a/external/curl/curl-freebsd.patch.1 b/external/curl/curl-freebsd.patch.1 deleted file mode 100644 index b1d7cb845845..000000000000 --- a/external/curl/curl-freebsd.patch.1 +++ /dev/null @@ -1,32 +0,0 @@ -Usual patch to produce Linux-like .so files on FreeBSD - -diff -ur curl-7.26.0/ltmain.sh misc/build/curl-7.26.0/ltmain.sh ---- a/ltmain.sh 2012-07-02 13:28:51.298994493 +0200 -+++ b/ltmain.sh 2012-07-02 13:42:46.511039769 +0200 -@@ -7334,13 +7334,13 @@ - # - case $version_type in - # correct linux to gnu/linux during the next big refactor -- darwin|linux|osf|windows|none) -+ darwin|linux|osf|windows|freebsd-aout|freebsd-elf|none) - func_arith $number_major + $number_minor - current=$func_arith_result - age="$number_minor" - revision="$number_revision" - ;; -- freebsd-aout|freebsd-elf|qnx|sunos) -+ qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" -@@ -7420,8 +7420,8 @@ - ;; - - freebsd-elf) -- major=".$current" -- versuffix=".$current" -+ major=.`expr $current - $age` -+ versuffix="$major" - ;; - - irix | nonstopux) diff --git a/external/curl/curl-msvc-schannel.patch.1 b/external/curl/curl-msvc-schannel.patch.1 index 1091a762a5e8..96768aa3f92c 100644 --- a/external/curl/curl-msvc-schannel.patch.1 +++ b/external/curl/curl-msvc-schannel.patch.1 @@ -1,7 +1,7 @@ MSVC: use WNT native Schannel SSL/TLS implementation ---- curl/lib/Makefile.vc10.old 2013-11-19 00:00:29.044499752 +0100 -+++ curl/lib/Makefile.vc10 2013-11-19 00:01:29.135499684 +0100 +--- curl/lib/Makefile.vc12.old 2013-11-19 00:00:29.044499752 +0100 ++++ curl/lib/Makefile.vc12 2013-11-19 00:01:29.135499684 +0100 @@ -260,7 +260,7 @@ TARGET = $(LIBCURL_DYN_LIB_REL) DIROBJ = $(CFG) diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1 index 927b3f184a78..57a292bb69a3 100644 --- a/external/curl/curl-msvc.patch.1 +++ b/external/curl/curl-msvc.patch.1 @@ -1,7 +1,7 @@ MSVC: using SOLARINC and EXCFLAGS ---- curl/lib/Makefile.vc10 2012-05-24 12:07:02.000000000 -0400 -+++ curl/lib/Makefile.vc10 2012-10-29 11:53:44.658809300 -0400 +--- curl/lib/Makefile.vc12 2012-05-24 12:07:02.000000000 -0400 ++++ curl/lib/Makefile.vc12 2012-10-29 11:53:44.658809300 -0400 @@ -117,7 +117,7 @@ ZLIBLIBSDLL = zdll.lib ZLIBLIBS = zlib.lib diff --git a/external/curl/curl-xp.patch.1 b/external/curl/curl-xp.patch.1 new file mode 100644 index 000000000000..9e4163e3eab1 --- /dev/null +++ b/external/curl/curl-xp.patch.1 @@ -0,0 +1,12 @@ +diff -ur curl.org/src/Makefile.vc10 curl/src/Makefile.vc10 +--- curl.org/src/Makefile.vc10 2016-07-04 03:45:24.102995951 +0200 ++++ curl/src/Makefile.vc10 2016-07-04 03:48:00.547835559 +0200 +@@ -127,7 +127,7 @@ + LINKD = link.exe /incremental:yes /debug /libpath:"../lib"
+ RCD = rc.exe /dDEBUGBUILD=1
+
+-CFLAGS = /I../lib /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /D_BIND_TO_CURRENT_VCLIBS_VERSION=1
++CFLAGS = /I../lib /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /D_BIND_TO_CURRENT_VCLIBS_VERSION=1 /D_WIN32_WINNT=0x0502
+ LFLAGS = /nologo /out:$(PROGRAM_NAME) /subsystem:console /machine:$(MACHINE)
+ RESFLAGS = /i../include
+
|