summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-11-19 00:06:50 +0100
committerMichael Stahl <mstahl@redhat.com>2013-11-19 00:07:22 +0100
commit460d6ce526b79f4d98600d60a63f894e197b66fe (patch)
tree7e28c8312d89c5cc576f74ebad0ea360b142e7e2
parentef089191076493d89e033cbbebd7f0dda92f6abe (diff)
curl: use WNT native Schannel SSL/TLS implementation
This should give better OS integration for things like adding CAs. Change-Id: I53fbfad402618e98d4116a0fecf0bf59e905e292
-rw-r--r--external/curl/UnpackedTarball_curl.mk1
-rw-r--r--external/curl/curl-msvc-schannel.patch.122
2 files changed, 23 insertions, 0 deletions
diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk
index 05e9aa5024a4..2e4d4cc1283c 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
$(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 \
))
diff --git a/external/curl/curl-msvc-schannel.patch.1 b/external/curl/curl-msvc-schannel.patch.1
new file mode 100644
index 000000000000..68af66d6dd2f
--- /dev/null
+++ b/external/curl/curl-msvc-schannel.patch.1
@@ -0,0 +1,22 @@
+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
+@@ -260,7 +260,7 @@
+ TARGET = $(LIBCURL_DYN_LIB_REL)
+ DIROBJ = $(CFG)
+ LNK = $(LNKDLL) $(WINLIBS) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_REL)
+-CC = $(CCNODBG) $(RTLIB)
++CC = $(CCNODBG) $(RTLIB) $(CFLAGSWINSSL)
+ CFGSET = TRUE
+ RESOURCE = $(DIROBJ)\libcurl.res
+ !ENDIF
+@@ -411,7 +411,7 @@
+ TARGET = $(LIBCURL_DYN_LIB_DBG)
+ DIROBJ = $(CFG)
+ LNK = $(LNKDLL) $(WINLIBS) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_DBG) /PDB:$(DIROBJ)\$(LIBCURL_DYN_LIB_PDB)
+-CC = $(CCDEBUG) $(RTLIBD)
++CC = $(CCDEBUG) $(RTLIBD) $(CFLAGSWINSSL)
+ CFGSET = TRUE
+ RESOURCE = $(DIROBJ)\libcurl.res
+ !ENDIF