- Update to 7.24.0

Changes:	http://curl.haxx.se/changes.html

5 files changed, 32 insertions, 93 deletions

diff --git a/ftp/curl/files/patch-Makefile.in b/ftp/curl/files/patch-Makefile.in
deleted file mode 100644
index 33176dcc9180..000000000000
--- a/ftp/curl/files/patch-Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Build and install the documentation as usual, no special handling.
-Forwarded: https://sourceforge.net/tracker/?func=detail&aid=2897155&group_id=976&atid=100976
-Author: Peter Pentchev <roam@FreeBSD.org>
-Last-Update: 2010-12-18
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -311,9 +311,9 @@
-  libcurl.pc.in vc6curl.dsw MacOSX-Framework Android.mk $(CMAKE_DIST)
- 
- bin_SCRIPTS = curl-config
--SUBDIRS = lib src
--DIST_SUBDIRS = $(SUBDIRS) tests include packages docs
--pkgconfigdir = $(libdir)/pkgconfig
-+SUBDIRS = lib src docs
-+DIST_SUBDIRS = $(SUBDIRS) tests include packages
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libcurl.pc
- all: all-recursive
- 
-@@ -874,12 +874,10 @@
- # We extend the standard install with a custom hook:
- install-data-hook:
- 	cd include && $(MAKE) install
--	cd docs && $(MAKE) install
- 
- # We extend the standard uninstall with a custom hook:
- uninstall-hook:
- 	cd include && $(MAKE) uninstall
--	cd docs && $(MAKE) uninstall
- 
- ca-bundle: lib/mk-ca-bundle.pl
- 	@echo "generate a fresh ca-bundle.crt"
diff --git a/ftp/curl/files/patch-configure b/ftp/curl/files/patch-configure
index 27d26e2e1c8c..3510088a3f55 100644
--- a/ftp/curl/files/patch-configure
+++ b/ftp/curl/files/patch-configure
@@ -6,9 +6,9 @@ Forwarded: not-needed
 Author: Peter Pentchev <roam@FreeBSD.org>
 Last-Update: 2010-12-19
 
---- a/configure
-+++ b/configure
-@@ -14201,10 +14201,10 @@
+--- configure.orig	2012-02-26 17:52:21.904908587 +0800
++++ configure	2012-02-26 17:52:21.929909948 +0800
+@@ -15049,10 +15049,10 @@
      flags_dbg_all="$flags_dbg_all -gdwarf-2"
      flags_dbg_all="$flags_dbg_all -gvms"
      flags_dbg_yes="-g"
@@ -21,7 +21,7 @@ Last-Update: 2010-12-19
    else
      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-@@ -15041,6 +15041,9 @@
+@@ -15892,6 +15892,9 @@
      tmp_CFLAGS="$CFLAGS"
      tmp_CPPFLAGS="$CPPFLAGS"
  
@@ -31,7 +31,7 @@ Last-Update: 2010-12-19
      ac_var_stripped=""
    for word1 in $tmp_CFLAGS; do
      ac_var_strip_word="no"
-@@ -15071,6 +15074,7 @@
+@@ -15922,6 +15925,7 @@
    done
      tmp_CPPFLAGS="$ac_var_stripped"
    squeeze tmp_CPPFLAGS
@@ -39,7 +39,7 @@ Last-Update: 2010-12-19
  
      #
      if test "$want_debug" = "yes"; then
-@@ -15283,6 +15287,9 @@
+@@ -16139,6 +16143,9 @@
      #
      if test "$honor_optimize_option" = "yes"; then
  
@@ -49,7 +49,7 @@ Last-Update: 2010-12-19
      ac_var_stripped=""
    for word1 in $tmp_CFLAGS; do
      ac_var_strip_word="no"
-@@ -15313,6 +15320,7 @@
+@@ -16169,6 +16176,7 @@
    done
      tmp_CPPFLAGS="$ac_var_stripped"
    squeeze tmp_CPPFLAGS
@@ -57,7 +57,7 @@ Last-Update: 2010-12-19
  
        if test "$want_optimize" = "yes"; then
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
-@@ -19224,7 +19232,8 @@
+@@ -20137,7 +20145,8 @@
          PKGTEST="no"
      PREFIX_OPENSSL=$OPT_SSL
  
@@ -66,8 +66,8 @@ Last-Update: 2010-12-19
 +                OPENSSL_PCDIR="$LOCALBASE/libdata/pkgconfig"
      { $as_echo "$as_me:${as_lineno-$LINENO}: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&5
  $as_echo "$as_me: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&6;}
-     if test -e "$OPENSSL_PCDIR/openssl.pc"; then
-@@ -21264,29 +21273,30 @@
+     if test -f "$OPENSSL_PCDIR/openssl.pc"; then
+@@ -23231,29 +23240,30 @@
      ;;
    off)
          LIB_RTMP="-lrtmp"
diff --git a/ftp/curl/files/patch-lib::url.c b/ftp/curl/files/patch-lib::url.c
index 7239f50ccdc8..02d05e16997b 100644
--- a/ftp/curl/files/patch-lib::url.c
+++ b/ftp/curl/files/patch-lib::url.c
@@ -3,9 +3,9 @@ Forwarded: not-needed
 Author: Peter Pentchev <roam@FreeBSD.org>
 Last-Update: 2010-12-18
 
---- a/lib/url.c
-+++ b/lib/url.c
-@@ -857,6 +857,10 @@
+--- lib/url.c.orig	2012-01-23 23:31:30.000000000 +0800
++++ lib/url.c	2012-02-26 17:52:21.937920303 +0800
+@@ -797,6 +797,10 @@
      data->progress.flags |= PGRS_HIDE;
      data->state.current_speed = -1; /* init to negative == impossible */
  
diff --git a/ftp/curl/files/patch-src::main.c b/ftp/curl/files/patch-src-tool_operate.c
index 02f52d2be1ea..a168b8bcec40 100644
--- a/ftp/curl/files/patch-src::main.c
+++ b/ftp/curl/files/patch-src-tool_operate.c
@@ -1,20 +1,13 @@
-Description: Use fstat() instead of stat() to avoid a race condition.
-Forwarded: not-needed
-Author: Peter Pentchev <roam@FreeBSD.org>
-Last-Update: 2010-12-18
-
---- a/src/main.c
-+++ b/src/main.c
-@@ -4887,33 +4887,34 @@
-             break;
+--- src/tool_operate.c.orig	2012-01-23 23:31:30.000000000 +0800
++++ src/tool_operate.c	2012-02-26 17:40:00.117907281 +0800
+@@ -580,22 +580,10 @@
+             DEBUGASSERT(!outs.filename);
            }
  
 -          if(config->resume_from_current) {
--            /* We're told to continue from where we are now. Get the
--               size of the file as it is now and open it for append instead */
--
+-            /* We're told to continue from where we are now. Get the size
+-               of the file as it is now and open it for append instead */
 -            struct_stat fileinfo;
--
 -            /* VMS -- Danger, the filesize is only valid for stream files */
 -            if(0 == stat(outfile, &fileinfo))
 -              /* set offset to current file size: */
@@ -24,37 +17,32 @@ Last-Update: 2010-12-18
 -              config->resume_from = 0;
 -          }
 -
-           outs.filename = outfile;
- 
 -          if(config->resume_from) {
--            outs.init = config->resume_from;
 +          if(config->resume_from || config->resume_from_current) {
              /* open file for output: */
--            outs.stream=(FILE *) fopen(outfile, config->resume_from?"ab":"wb");
-+	    /* (always open for appending, it has no effect on new files) */
-+            outs.stream=(FILE *) fopen(outfile, "ab");
-             if(!outs.stream) {
+-            FILE *file = fopen(outfile, config->resume_from?"ab":"wb");
++            /* (always open for appending, it has no effect on new files) */
++            FILE *file = fopen(outfile, "ab");
+             if(!file) {
                helpf(config->errors, "Can't open '%s'!\n", outfile);
-               free(url);
                res = CURLE_WRITE_ERROR;
-               break;
+@@ -603,6 +591,19 @@
              }
+             outs.fopened = TRUE;
+             outs.stream = file;
 +
-+	    if(config->resume_from_current) {
-+	      /* We're told to continue from where we are now. Get the
-+                 size of the file as it is now */
-+
-+	      struct_stat fileinfo;
-+
++            if(config->resume_from_current) {
++              /* We're told to continue from where we are now. Get the size
++                 of the file as it is now */
++              struct_stat fileinfo;
 +              if(0 == fstat(fileno(outs.stream), &fileinfo))
 +                /* set offset to current file size: */
 +                config->resume_from = fileinfo.st_size;
 +              else
 +                /* let offset be 0 */
 +                config->resume_from = 0;
-+	    }
++            }
 +
-+            outs.init = config->resume_from;
+             outs.init = config->resume_from;
            }
            else {
-             outs.stream = NULL; /* open when needed */
diff --git a/ftp/curl/files/patch-tests::runtests.pl b/ftp/curl/files/patch-tests::runtests.pl
deleted file mode 100644
index bedee759ea0f..000000000000
--- a/ftp/curl/files/patch-tests::runtests.pl
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Do not use valgrind.
-Forwarded: not-needed
-Author: Peter Pentchev <roam@FreeBSD.org>
-Last-Update: 2010-06-11
-
---- a/tests/runtests.pl
-+++ b/tests/runtests.pl
-@@ -104,7 +104,7 @@
-     );
- 
- require "getpart.pm"; # array functions
--require "valgrind.pm"; # valgrind report parser
-+#require "valgrind.pm"; # valgrind report parser
- require "ftp.pm";
- 
- my $HOSTIP="127.0.0.1";   # address on which the test server listens