From 1a84e2f611ff53501b7a29e8ea8497cd0ca83beb Mon Sep 17 00:00:00 2001 From: Pat Thoyts Date: Tue, 21 May 2013 15:22:41 +0100 Subject: [PATCH] curl: update to use the curl-7.30.0 release. Signed-off-by: Pat Thoyts --- ...Eat-own-dog-food-use-cURL-to-download-CAs.patch | 32 ++++++++++++++-------- src/curl/patches/0002-Add-a-.gitignore-file.patch | 12 ++++---- ....netrc-files-as-text-when-opening-to-hand.patch | 15 +++++----- src/curl/release.sh | 4 +-- 4 files changed, 36 insertions(+), 27 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 e93fc8df..2fec1f25 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 8ec26d8de61884f7a7109b043adfbab69d1b015c Mon Sep 17 00:00:00 2001 +From a3eb8813c6ab6df4ead1533d956db16ff1df229a 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 @@ -13,11 +13,11 @@ doesn't work if we try checking the certificate chain. Signed-off-by: Johannes Schindelin Signed-off-by: Pat Thoyts --- - lib/mk-ca-bundle.pl | 11 +---------- - 1 file changed, 1 insertion(+), 10 deletions(-) + lib/mk-ca-bundle.pl | 19 +------------------ + 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/lib/mk-ca-bundle.pl b/lib/mk-ca-bundle.pl -index 189ed01..dc6fe12 100644 +index edede42..da441cd 100644 --- a/lib/mk-ca-bundle.pl +++ b/lib/mk-ca-bundle.pl @@ -32,7 +32,6 @@ @@ -26,9 +26,9 @@ index 189ed01..dc6fe12 100644 use MIME::Base64; -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); + use vars qw($opt_b $opt_f $opt_h $opt_i $opt_l $opt_n $opt_q $opt_t $opt_u $opt_v $opt_w); -@@ -51,8 +50,6 @@ if ($opt_i) { +@@ -55,8 +54,6 @@ if ($opt_i) { print "Operating System Name : $^O\n"; print "Getopt::Std.pm Version : ${Getopt::Std::VERSION}\n"; print "MIME::Base64.pm Version : ${MIME::Base64::VERSION}\n"; @@ -37,21 +37,29 @@ index 189ed01..dc6fe12 100644 print ("=" x 78 . "\n"); } -@@ -77,13 +74,7 @@ my $resp; +@@ -90,21 +87,7 @@ my $fetched; unless ($opt_n and -e $txt) { - print "Downloading '$txt' ...\n" if (!$opt_q); + print STDERR "Downloading '$txt' ...\n" if (!$opt_q); - my $ua = new LWP::UserAgent(agent => "$0/$version"); - $ua->env_proxy(); - $resp = $ua->mirror($url, $txt); - if ($resp && $resp->code eq '304') { -- print "Not modified\n" unless $opt_q; -- exit 0; +- print STDERR "Not modified\n" unless $opt_q; +- exit 0 if -e $crt && !$opt_f; +- } else { +- $fetched = 1; +- } +- if( !$resp || $resp->code !~ /^(?:200|304)$/ ) { +- print STDERR "Unable to download latest data: " +- . ($resp? $resp->code . ' - ' . $resp->message : "LWP failed") . "\n" +- unless $opt_q; +- exit 1 if -e $crt || ! -r $txt; - } + `curl --insecure $url > $txt`; } - my $currentdate = scalar gmtime($resp ? $resp->last_modified : (stat($txt))[9]); + my $currentdate = scalar gmtime($fetched ? $resp->last_modified : (stat($txt))[9]); -- -1.7.10-rc1 +1.8.1.msysgit.1 diff --git a/src/curl/patches/0002-Add-a-.gitignore-file.patch b/src/curl/patches/0002-Add-a-.gitignore-file.patch index 2d1d5c51..dbc7156b 100644 --- a/src/curl/patches/0002-Add-a-.gitignore-file.patch +++ b/src/curl/patches/0002-Add-a-.gitignore-file.patch @@ -1,17 +1,17 @@ -From 95898bfa20d9e10bcdf789d869652770714d2351 Mon Sep 17 00:00:00 2001 +From ea37b5f56c7f34fe21c9e5cf93253e0392bf91d3 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 25 Jul 2009 17:44:54 +0200 -Subject: [PATCH] Add a .gitignore file +Subject: [PATCH 2/3] Add a .gitignore file Signed-off-by: Johannes Schindelin --- - .gitignore | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) + .gitignore | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 -index 0000000..42de541 +index 0000000..67aaa4d --- /dev/null +++ b/.gitignore @@ -0,0 +1,18 @@ @@ -34,5 +34,5 @@ index 0000000..42de541 +/config.status +/curl-config -- -1.6.3.2.1299.gee46c +1.8.1.msysgit.1 diff --git a/src/curl/patches/0003-curl-treat-.netrc-files-as-text-when-opening-to-hand.patch b/src/curl/patches/0003-curl-treat-.netrc-files-as-text-when-opening-to-hand.patch index 640300f4..1eeb026f 100644 --- a/src/curl/patches/0003-curl-treat-.netrc-files-as-text-when-opening-to-hand.patch +++ b/src/curl/patches/0003-curl-treat-.netrc-files-as-text-when-opening-to-hand.patch @@ -1,21 +1,22 @@ -From f854f1bb65bb66af0764a98e3a71f73a97decd25 Mon Sep 17 00:00:00 2001 +From bf33f627cf7d02d2a52ff35467ed03b4df65dd1b Mon Sep 17 00:00:00 2001 From: Pat Thoyts Date: Fri, 10 Sep 2010 10:40:03 +0100 -Subject: [PATCH] curl: treat .netrc files as text when opening to handle line endings +Subject: [PATCH 3/3] curl: treat .netrc files as text when opening to handle + line endings The .netrc file may well use CRLF on Windows and should be opened using text mode to avoid reading in the CR as part of the authentication data. Signed-off-by: Pat Thoyts --- - lib/netrc.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + lib/netrc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/netrc.c b/lib/netrc.c -index 1c425fe..27d21bd 100644 +index 2c5942a..9228134 100644 --- a/lib/netrc.c +++ b/lib/netrc.c -@@ -138,7 +138,7 @@ int Curl_parsenetrc(const char *host, +@@ -97,7 +97,7 @@ int Curl_parsenetrc(const char *host, netrc_alloc = TRUE; } @@ -25,5 +26,5 @@ index 1c425fe..27d21bd 100644 char *tok; char *tok_buf; -- -1.7.2.1.msysgit.0 +1.8.1.msysgit.1 diff --git a/src/curl/release.sh b/src/curl/release.sh index 6df9f1e4..da4388d4 100644 --- a/src/curl/release.sh +++ b/src/curl/release.sh @@ -2,7 +2,7 @@ cd "$(dirname "$0")" -VERSION=7.28.1 +VERSION=7.30.0 DIR=curl-$VERSION URL=http://curl.haxx.se/download/$DIR.tar.bz2 FILE=${URL##*/} @@ -31,7 +31,7 @@ test -d $DIR || { tar xjvf $FILE && ( cd $DIR && git init && - git config core.autocrlf false && + git config core.autocrlf false && git add . && git commit -m "Import of $FILE" ) -- 2.11.4.GIT