diff options
Diffstat (limited to 'ftp')
| -rw-r--r-- | ftp/curl/Makefile | 4 | ||||
| -rw-r--r-- | ftp/curl/distinfo | 4 | ||||
| -rw-r--r-- | ftp/curl/files/patch-configure | 15 | ||||
| -rw-r--r-- | ftp/curl/files/patch-lib::select.c | 17 | ||||
| -rw-r--r-- | ftp/curl/files/patch-lib::sendf.c | 29 | ||||
| -rw-r--r-- | ftp/curl/files/patch-tests::runtests.pl | 22 |
6 files changed, 27 insertions, 64 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index 456088be8dbc..0b309745bbc7 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -6,8 +6,8 @@ # PORTNAME= curl -PORTVERSION= 7.12.3 -PORTREVISION= 2 +PORTVERSION= 7.13.1 +#PORTREVISION= 0 CATEGORIES= ftp ipv6 www MASTER_SITES= http://curl.haxx.se/download/ \ ${MASTER_SITE_SOURCEFORGE} \ diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo index 76fbd0afa0af..4113a05fe6cc 100644 --- a/ftp/curl/distinfo +++ b/ftp/curl/distinfo @@ -1,2 +1,2 @@ -MD5 (curl-7.12.3.tar.bz2) = a71b80538872245b984e176de932e99e -SIZE (curl-7.12.3.tar.bz2) = 1830712 +MD5 (curl-7.13.1.tar.bz2) = d673f68dbab2553acdbfb5435bd1cd48 +SIZE (curl-7.13.1.tar.bz2) = 1860688 diff --git a/ftp/curl/files/patch-configure b/ftp/curl/files/patch-configure index fa5024b5f52c..1aff9ed58908 100644 --- a/ftp/curl/files/patch-configure +++ b/ftp/curl/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Oct 18 01:22:10 2004 -+++ configure Mon Dec 13 14:59:23 2004 -@@ -24217,8 +24217,10 @@ +--- configure.orig Mon Dec 20 11:39:59 2004 ++++ configure Thu Feb 17 19:07:53 2005 +@@ -24438,8 +24438,10 @@ *) PKGTEST="no" EXTRA_SSL=$OPT_SSL @@ -11,3 +11,12 @@ ;; esac +@@ -31950,7 +31952,7 @@ + main () + { + #ifndef basename +- char *p = (char *) basename; ++ char *(*p)(const char *) = basename; + #endif + + ; diff --git a/ftp/curl/files/patch-lib::select.c b/ftp/curl/files/patch-lib::select.c deleted file mode 100644 index de3e74ea85ce..000000000000 --- a/ftp/curl/files/patch-lib::select.c +++ /dev/null @@ -1,17 +0,0 @@ ---- lib/select.c.orig Tue Dec 21 09:06:14 2004 -+++ lib/select.c Tue Dec 21 09:06:27 2004 -@@ -23,11 +23,11 @@ - - #include "setup.h" - --#ifdef HAVE_SYS_SELECT_H --#include <sys/select.h> --#endif - #ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> -+#endif -+#ifdef HAVE_SYS_SELECT_H -+#include <sys/select.h> - #endif - - #ifdef HAVE_SYS_TIME_H diff --git a/ftp/curl/files/patch-lib::sendf.c b/ftp/curl/files/patch-lib::sendf.c deleted file mode 100644 index 158073d74dd5..000000000000 --- a/ftp/curl/files/patch-lib::sendf.c +++ /dev/null @@ -1,29 +0,0 @@ ---- lib/sendf.c.orig Tue Dec 21 10:13:04 2004 -+++ lib/sendf.c Tue Dec 21 10:16:45 2004 -@@ -155,10 +155,6 @@ - { - va_list ap; - va_start(ap, fmt); -- if(data->set.errorbuffer && !data->state.errorbuf) { -- vsnprintf(data->set.errorbuffer, CURL_ERROR_SIZE, fmt, ap); -- data->state.errorbuf = TRUE; /* wrote error string */ -- } - if(data->set.verbose) { - size_t len; - -@@ -170,6 +166,15 @@ - data->state.buffer[++len] = '\0'; - } - Curl_debug(data, CURLINFO_TEXT, data->state.buffer, len, NULL); -+ data->state.buffer[len] = '\0'; -+ } -+ if(data->set.errorbuffer && !data->state.errorbuf) { -+ if (data->set.verbose) -+ snprintf(data->set.errorbuffer, CURL_ERROR_SIZE, "%s", -+ data->state.buffer); -+ else -+ vsnprintf(data->set.errorbuffer, CURL_ERROR_SIZE, fmt, ap); -+ data->state.errorbuf = TRUE; /* wrote error string */ - } - - va_end(ap); diff --git a/ftp/curl/files/patch-tests::runtests.pl b/ftp/curl/files/patch-tests::runtests.pl index 0d8ccf4a0187..a27a3eae8e77 100644 --- a/ftp/curl/files/patch-tests::runtests.pl +++ b/ftp/curl/files/patch-tests::runtests.pl @@ -1,11 +1,11 @@ ---- tests/runtests.pl.orig Tue Dec 21 09:55:34 2004 -+++ tests/runtests.pl Tue Dec 21 09:55:07 2004 -@@ -1599,7 +1599,7 @@ - } - elsif ($ARGV[0] eq "-c") { - # use this path to curl instead of default -- $CURL=$ARGV[1]; -+ $CURL=$DBGCURL=$ARGV[1]; - shift @ARGV; - } - elsif ($ARGV[0] eq "-d") { +--- tests/runtests.pl.orig Sat Mar 12 03:40:30 2005 ++++ tests/runtests.pl Sat Mar 12 03:40:39 2005 +@@ -29,7 +29,7 @@ + @INC=(@INC, $ENV{'srcdir'}, "."); + + require "getpart.pm"; # array functions +-require "valgrind.pm"; # valgrind report parser ++#require "valgrind.pm"; # valgrind report parser + + my $srcdir = $ENV{'srcdir'} || '.'; + my $HOSTIP="127.0.0.1"; |