From f2caa85f62701f0f5d4bd5693668acbaea56bbff Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 6 Jun 2012 10:17:07 -0500 Subject: [PATCH] Update /src/curl/release.sh to download & install 7.26.0 Previous cURL versions did not try to build .dll files; unfortunately, support for .dll files is not quite cooked yet: when enabling the shared library build, libcurl.a contains symbols marked as dllexport, which makes the link stage fail (as reported by Pat Thoyts). Signed-off-by: Johannes Schindelin --- .../patches/0001-Eat-own-dog-food-use-cURL-to-download-CAs.patch | 8 ++++---- src/curl/release.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/curl/patches/0001-Eat-own-dog-food-use-cURL-to-download-CAs.patch b/src/curl/patches/0001-Eat-own-dog-food-use-cURL-to-download-CAs.patch index 760a23c1..e93fc8df 100644 --- a/src/curl/patches/0001-Eat-own-dog-food-use-cURL-to-download-CAs.patch +++ b/src/curl/patches/0001-Eat-own-dog-food-use-cURL-to-download-CAs.patch @@ -1,4 +1,4 @@ -From 18183f6a3413f93c4133be3ba34a4bafcd5e7cf9 Mon Sep 17 00:00:00 2001 +From 8ec26d8de61884f7a7109b043adfbab69d1b015c Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 25 Jul 2009 17:36:51 +0200 Subject: [PATCH 1/3] Eat own dog food: use cURL to download CAs @@ -17,14 +17,14 @@ Signed-off-by: Pat Thoyts 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/lib/mk-ca-bundle.pl b/lib/mk-ca-bundle.pl -index 0f24ade..0d31228 100644 +index 189ed01..dc6fe12 100644 --- a/lib/mk-ca-bundle.pl +++ b/lib/mk-ca-bundle.pl @@ -32,7 +32,6 @@ # use Getopt::Std; use MIME::Base64; --use LWP::UserAgent 6; +-use LWP::UserAgent; use strict; use vars qw($opt_b $opt_h $opt_i $opt_l $opt_n $opt_q $opt_t $opt_u $opt_v); @@ -53,5 +53,5 @@ index 0f24ade..0d31228 100644 my $currentdate = scalar gmtime($resp ? $resp->last_modified : (stat($txt))[9]); -- -1.7.10.msysgit.1 +1.7.10-rc1 diff --git a/src/curl/release.sh b/src/curl/release.sh index 3f8faff7..bc2e4fc2 100644 --- a/src/curl/release.sh +++ b/src/curl/release.sh @@ -2,7 +2,7 @@ cd "$(dirname "$0")" -VERSION=7.25.0 +VERSION=7.26.0 DIR=curl-$VERSION URL=http://curl.haxx.se/download/$DIR.tar.bz2 FILE=${URL##*/} @@ -31,7 +31,7 @@ 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 && +./configure --prefix=/mingw --with-ssl=/mingw --enable-sspi --disable-shared && make && index=$(/share/msysGit/pre-install.sh) && make install && -- 2.11.4.GIT