curl: update to release 7.21.1

patthoyts · patthoyts · commit 5361bdf59927 · 2010-09-10T14:08:20.000+01:00
curl 7.21.1 includes support for NTLM which should be of interest.

Fixed the dog food patch which failed to apply and added a patch to
read the netrc file with explicit text mode.
Create the curl git as autocrlf false to make it silent on commit.

Signed-off-by: Pat Thoyts &lt;patthoyts@users.sourceforge.net&gt;
diff --git a/src/curl/.gitignore b/src/curl/.gitignore
@@ -1,2 +1,3 @@
-curl-7.20.0/
-curl-7.20.0.tar.bz2
+curl-*/
+curl-*.tar.bz2
+curl-*.tar.bz2.asc
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
@@ -9,18 +9,18 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  1 files changed, 1 insertions(+), 13 deletions(-)
 
 diff --git a/lib/mk-ca-bundle.pl b/lib/mk-ca-bundle.pl
-index c964efe..83fc5ef 100644
+index 3586dc4..55debff 100644
 --- a/lib/mk-ca-bundle.pl
 +++ b/lib/mk-ca-bundle.pl
-@@ -33,7 +33,6 @@
+@@ -32,7 +32,6 @@
  #
  use Getopt::Std;
  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_h $opt_i $opt_l $opt_n $opt_q $opt_t $opt_u $opt_v);
  
-@@ -52,8 +51,6 @@ if ($opt_i) {
+@@ -51,8 +50,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";
@@ -29,7 +29,7 @@ index c964efe..83fc5ef 100644
    print ("=" x 78 . "\n");
  }
  
-@@ -78,16 +75,7 @@ $txt =~ s/\?.*//;
+@@ -77,16 +74,7 @@ $txt =~ s/\?.*//;
  
  if (!$opt_n || !-e $txt) {
    print "Downloading '$txt' ...\n" if (!$opt_q);
@@ -48,5 +48,5 @@ index c964efe..83fc5ef 100644
  
  if ($opt_b && -e $crt) {
 -- 
-1.6.3.2.1299.gee46c
+1.7.3.rc0.2611.g5f0f0
 
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
@@ -0,0 +1,29 @@
+From f854f1bb65bb66af0764a98e3a71f73a97decd25 Mon Sep 17 00:00:00 2001
+From: Pat Thoyts <patthoyts@users.sourceforge.net>
+Date: Fri, 10 Sep 2010 10:40:03 +0100
+Subject: [PATCH] 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 <patthoyts@users.sourceforge.net>
+---
+ lib/netrc.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/netrc.c b/lib/netrc.c
+index 1c425fe..27d21bd 100644
+--- a/lib/netrc.c
++++ b/lib/netrc.c
+@@ -138,7 +138,7 @@ int Curl_parsenetrc(const char *host,
+     netrc_alloc = TRUE;
+   }
+ 
+-  file = fopen(netrcfile, "r");
++  file = fopen(netrcfile, "rt");
+   if(file) {
+     char *tok;
+     char *tok_buf;
+-- 
+1.7.2.1.msysgit.0
+
diff --git a/src/curl/release.sh b/src/curl/release.sh
@@ -2,7 +2,7 @@
 
 cd "$(dirname "$0")"
 
-VERSION=7.20.0
+VERSION=7.21.1
 DIR=curl-$VERSION
 URL=http://curl.haxx.se/download/$DIR.tar.bz2
 FILE=${URL##*/}
@@ -20,6 +20,7 @@ test -d $DIR || {
 	tar xjvf $FILE && (
 		cd $DIR &&
 		git init &&
+                git config core.autocrlf false &&
 		git add . &&
 		git commit -m "Import of $FILE"
 	)
