diff options
| -rw-r--r-- | ftp/curl/Makefile | 10 | ||||
| -rw-r--r-- | ftp/curl/distinfo | 4 | ||||
| -rw-r--r-- | ftp/curl/files/patch-configure | 12 | ||||
| -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 | 11 |
6 files changed, 71 insertions, 12 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index b9de875a0cf4..b5d275f8cdeb 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= curl -PORTVERSION= 7.12.1 +PORTVERSION= 7.12.3 CATEGORIES= ftp ipv6 www MASTER_SITES= http://curl.haxx.se/download/ \ ${MASTER_SITE_SOURCEFORGE} \ @@ -66,10 +66,12 @@ PLIST_SUB+= SSL="@comment " CONFIGURE_ARGS += --with-krb4=/usr .endif -# Note: some of these tests seem to intermittently fail on my system. -# I don't know why they would do that, yet. +CONFIGURE_ARGS += --without-libidn + +# Setting LANG=C is a kludge; maybe curl/libcurl shouldn't actually use +# the user's locale when dates are sent to the server. test: build - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} test + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LANG=C ${MAKE} test .if !defined(NOPORTDOCS) post-install: diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo index 0e744e09a1c2..76fbd0afa0af 100644 --- a/ftp/curl/distinfo +++ b/ftp/curl/distinfo @@ -1,2 +1,2 @@ -MD5 (curl-7.12.1.tar.bz2) = ffa1386d7473fdc419441cb0156d0005 -SIZE (curl-7.12.1.tar.bz2) = 1355061 +MD5 (curl-7.12.3.tar.bz2) = a71b80538872245b984e176de932e99e +SIZE (curl-7.12.3.tar.bz2) = 1830712 diff --git a/ftp/curl/files/patch-configure b/ftp/curl/files/patch-configure index cdee47ca403f..fa5024b5f52c 100644 --- a/ftp/curl/files/patch-configure +++ b/ftp/curl/files/patch-configure @@ -1,10 +1,10 @@ ---- configure.orig Fri Apr 9 14:00:52 2004 -+++ configure Fri Apr 9 14:01:29 2004 -@@ -24123,8 +24123,10 @@ - EXTRA_SSL= ;; +--- configure.orig Mon Oct 18 01:22:10 2004 ++++ configure Mon Dec 13 14:59:23 2004 +@@ -24217,8 +24217,10 @@ *) - EXTRA_SSL=$OPT_SSL -+ if [ ! "$EXTRA_SSL" = "/usr" ]; then + PKGTEST="no" + EXTRA_SSL=$OPT_SSL ++ if ! [ "$EXTRA_SSL" = "/usr" ]; then LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib$libsuff" CPPFLAGS="$CPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include" + fi diff --git a/ftp/curl/files/patch-lib::select.c b/ftp/curl/files/patch-lib::select.c new file mode 100644 index 000000000000..de3e74ea85ce --- /dev/null +++ b/ftp/curl/files/patch-lib::select.c @@ -0,0 +1,17 @@ +--- 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 new file mode 100644 index 000000000000..158073d74dd5 --- /dev/null +++ b/ftp/curl/files/patch-lib::sendf.c @@ -0,0 +1,29 @@ +--- 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 new file mode 100644 index 000000000000..0d8ccf4a0187 --- /dev/null +++ b/ftp/curl/files/patch-tests::runtests.pl @@ -0,0 +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") { |