From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Fri, 1 Feb 2013 20:57:30 +0000 (+0000)
Subject: curl: update to 7.28.1 and enable ipv6
X-Git-Url: https://repo.or.cz/w/msysgit.git/commitdiff_plain/37e42ab860ae555d2ba4b0e3e014a0bc6860f0d5

curl: update to 7.28.1 and enable ipv6

To get this to build we switch from using configure to a premade
makefile. This affects the resulting dll name and will require
relinking any other binaries using the curl dll.

This patch also makes curl use the Windows built-in SSL support
rather than using OpenSSL.

Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---

diff --git a/src/curl/release.sh b/src/curl/release.sh
index bc2e4fc2..8ac131ab 100644
--- a/src/curl/release.sh
+++ b/src/curl/release.sh
@@ -2,7 +2,7 @@
 
 cd "$(dirname "$0")"
 
-VERSION=7.26.0
+VERSION=7.28.1
 DIR=curl-$VERSION
 URL=http://curl.haxx.se/download/$DIR.tar.bz2
 FILE=${URL##*/}
@@ -12,6 +12,17 @@ die () {
 	exit 1
 }
 
+cleanup_old_curl () {
+    for f in \
+        /mingw/bin/libcurl-4.dll \
+        /mingw/bin/curl-config \
+        /mingw/bin/libcurl.la
+    do
+        [ -f $f ] && rm -f $f
+    done
+    return 0
+}
+
 test -d $DIR || {
 	test -f $FILE ||
 	curl -O $URL ||
@@ -31,10 +42,16 @@ test $(cd $DIR && git rev-list HEAD | wc -l) -gt 1 ||
 die "Could not apply patches"
 
 (cd $DIR &&
-./configure --prefix=/mingw --with-ssl=/mingw --enable-sspi --disable-shared &&
-make &&
+CFG='-ipv6 -zlib -sspi -spnego -winssl -ldaps' \
+ZLIB_PATH=/src/zlib/zlib-1.2.7 \
+make mingw32 &&
 index=$(/share/msysGit/pre-install.sh) &&
-make install &&
+cleanup_old_curl &&
+/bin/install -m 0755 src/curl.exe /mingw/bin/curl.exe &&
+/bin/install -m 0755 lib/libcurl.dll /mingw/bin/libcurl.dll &&
+/bin/install -m 0755 lib/libcurl.a /mingw/lib/libcurl.a &&
+/bin/install -m 0755 lib/libcurldll.a /mingw/lib/libcurl.dll.a &&
+/bin/install -m 0644 include/curl/*.h /mingw/include/curl/ &&
 make ca-bundle &&
 ls ../certs/*.pem 2>/dev/null |
 while read pem