From 3a9151cddd239aab12436ec42b042720c1340f33 Mon Sep 17 00:00:00 2001 From: Pat Thoyts Date: Fri, 15 Mar 2013 17:30:50 +0000 Subject: [PATCH] curl: switch back to openssl and avoid dynamic link to zlib Erik noted that the new compilation options cause libcurl to be linked to zlib1.dll which we do not include. Removing the ZLIB_PATH parameter keeps it statically linked. The winssl code can fail to operate behind a proxy. It tries to check for certificate revocation, fails and then aborts the ssl negotiations. Therefore reverting back to openssl for ssl support. Signed-off-by: Pat Thoyts --- src/curl/release.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/curl/release.sh b/src/curl/release.sh index 8ac131ab..6df9f1e4 100644 --- a/src/curl/release.sh +++ b/src/curl/release.sh @@ -42,8 +42,10 @@ test $(cd $DIR && git rev-list HEAD | wc -l) -gt 1 || die "Could not apply patches" (cd $DIR && -CFG='-ipv6 -zlib -sspi -spnego -winssl -ldaps' \ -ZLIB_PATH=/src/zlib/zlib-1.2.7 \ +CFG='-ssl-ipv6-zlib-sspi-spnego-ldaps' \ +OPENSSL_PATH=/mingw \ +OPENSSL_LIBPATH=/mingw/lib \ +OPENSSL_LIBS='-lcrypto.dll -lssl.dll' \ make mingw32 && index=$(/share/msysGit/pre-install.sh) && cleanup_old_curl && -- 2.11.4.GIT