kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to curl 7.13.1, which also takes care of the recent security

Browse source 
issue.
This commit is contained in:
Peter Pentchev 2005-03-12 02:36:52 +00:00
parent 151cc5e3af
commit db0b512f74
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=130953
6 changed files with 27 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ftp/curl/Makefile
View file

@ -6,8 +6,8 @@
# #
PORTNAME= curl PORTNAME= curl
PORTVERSION= 7.12.3 PORTVERSION= 7.13.1
PORTREVISION= 2 #PORTREVISION= 0
CATEGORIES= ftp ipv6 www CATEGORIES= ftp ipv6 www
MASTER_SITES= http://curl.haxx.se/download/ \ MASTER_SITES= http://curl.haxx.se/download/ \
${MASTER_SITE_SOURCEFORGE} \ ${MASTER_SITE_SOURCEFORGE} \

4
ftp/curl/distinfo
View file

@ -1,2 +1,2 @@
MD5 (curl-7.12.3.tar.bz2) = a71b80538872245b984e176de932e99e MD5 (curl-7.13.1.tar.bz2) = d673f68dbab2553acdbfb5435bd1cd48
SIZE (curl-7.12.3.tar.bz2) = 1830712 SIZE (curl-7.13.1.tar.bz2) = 1860688

15
ftp/curl/files/patch-configure
View file

@ -1,6 +1,6 @@
--- configure.orig Mon Oct 18 01:22:10 2004 --- configure.orig Mon Dec 20 11:39:59 2004
+++ configure Mon Dec 13 14:59:23 2004 +++ configure Thu Feb 17 19:07:53 2005
@@ -24217,8 +24217,10 @@ @@ -24438,8 +24438,10 @@
*) *)
PKGTEST="no" PKGTEST="no"
EXTRA_SSL=$OPT_SSL EXTRA_SSL=$OPT_SSL
@ -11,3 +11,12 @@
;; ;;
esac esac
@@ -31950,7 +31952,7 @@
main ()
{
#ifndef basename
- char *p = (char *) basename;
+ char *(*p)(const char *) = basename;
#endif
;

17
ftp/curl/files/patch-lib::select.c
View file

@ -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

29
ftp/curl/files/patch-lib::sendf.c
View file

@ -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);

22
ftp/curl/files/patch-tests::runtests.pl
View file

@ -1,11 +1,11 @@
--- tests/runtests.pl.orig Tue Dec 21 09:55:34 2004 --- tests/runtests.pl.orig Sat Mar 12 03:40:30 2005
+++ tests/runtests.pl Tue Dec 21 09:55:07 2004 +++ tests/runtests.pl Sat Mar 12 03:40:39 2005
@@ -1599,7 +1599,7 @@ @@ -29,7 +29,7 @@
} @INC=(@INC, $ENV{'srcdir'}, ".");
elsif ($ARGV[0] eq "-c") {
# use this path to curl instead of default require "getpart.pm"; # array functions
- $CURL=$ARGV[1]; -require "valgrind.pm"; # valgrind report parser
+ $CURL=$DBGCURL=$ARGV[1]; +#require "valgrind.pm"; # valgrind report parser
shift @ARGV;
} my $srcdir = $ENV{'srcdir'} || '.';
elsif ($ARGV[0] eq "-d") { my $HOSTIP="127.0.0.1";