diff options
| author | Peter Pentchev <roam@FreeBSD.org> | 2004-12-21 17:51:09 +0800 |
|---|---|---|
| committer | Peter Pentchev <roam@FreeBSD.org> | 2004-12-21 17:51:09 +0800 |
| commit | ae5a44d3de4af5e21b5512baea51876a6a5276b9 (patch) | |
| tree | 79b5cc2acd709027325aa86e7c5c6b0a20966eba /ftp/curl/files | |
| parent | 9e2e2bea6f3b0e6b645b1964d9ee76f808161d02 (diff) | |
| download | freebsd-ports-gnome-ae5a44d3de4af5e21b5512baea51876a6a5276b9.tar.gz freebsd-ports-gnome-ae5a44d3de4af5e21b5512baea51876a6a5276b9.tar.zst freebsd-ports-gnome-ae5a44d3de4af5e21b5512baea51876a6a5276b9.zip | |
Update to curl-7.12.3 (yes, we skipped 7.12.2 for various reasons).
Explicitly disable libidn support so that it is not even probed if libidn
is installed; I will look into enabling it after some more testing.
Testing paid off on: ref4 (lib/select.c), sledge (lib/sendf.c)
Diffstat (limited to 'ftp/curl/files')
| -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 |
4 files changed, 63 insertions, 6 deletions
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") { |