summaryrefslogtreecommitdiff
path: root/ftp/curl
diff options
context:
space:
mode:
authorPeter Pentchev <roam@FreeBSD.org>2006-12-13 12:41:35 +0000
committerPeter Pentchev <roam@FreeBSD.org>2006-12-13 12:41:35 +0000
commit64e068d25c1370f67d2f0d779ac1719f9bc5d137 (patch)
treee8e79d2b112a29862848aa733e4b3f9387c78d2e /ftp/curl
parent- wv2 -- Integer Overflow Vulnerability (diff)
Update the ftp/curl port to 7.16.0.
Bump PORTREVISION of all dependent ports. Fix the build errors in the few ports that still use the long deprecated, and now obsoleted, cURL options. Thanks to everyone who took the time to look over the patch! Discussed on: -ports
Notes
Notes: svn path=/head/; revision=179653
Diffstat (limited to 'ftp/curl')
-rw-r--r--ftp/curl/Makefile5
-rw-r--r--ftp/curl/distinfo6
-rw-r--r--ftp/curl/files/patch-lib::url.c12
-rw-r--r--ftp/curl/pkg-plist3
4 files changed, 14 insertions, 12 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 755b5f772c9c..732bea073e60 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= curl
-PORTVERSION= 7.15.5
-PORTREVISION= 1
+PORTVERSION= 7.16.0
CATEGORIES= ftp ipv6 www
MASTER_SITES= http://curl.haxx.se/download/ \
${MASTER_SITE_SOURCEFORGE} \
@@ -40,7 +39,7 @@ MAN3= curl_easy_cleanup.3 curl_easy_duphandle.3 \
libcurl-multi.3 libcurl-share.3 libcurl-tutorial.3
USE_LDCONFIG= yes
-SHLIB_VER= 3
+SHLIB_VER= 4
MAKE_ENV= SHLIB_VER="${SHLIB_VER}"
PLIST_SUB= SHLIB_VER="${SHLIB_VER}"
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index 56de83f19740..b21da0362fc7 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1,3 +1,3 @@
-MD5 (curl-7.15.5.tar.bz2) = 594142c7d53bbdd988e8cef6354eeeff
-SHA256 (curl-7.15.5.tar.bz2) = 2980815e53f4caeafc5e35d183d9379bcaaec49f759be1a4ac628cfb6c392fe0
-SIZE (curl-7.15.5.tar.bz2) = 1543007
+MD5 (curl-7.16.0.tar.bz2) = 5819f56e93d04cde2992fe88b54cbfad
+SHA256 (curl-7.16.0.tar.bz2) = fc8dcda5a933c370c15c832bf1e7316a0690f473fdd6000454d233edaa33bc23
+SIZE (curl-7.16.0.tar.bz2) = 1566391
diff --git a/ftp/curl/files/patch-lib::url.c b/ftp/curl/files/patch-lib::url.c
index bc19abd1e208..6adc665de34d 100644
--- a/ftp/curl/files/patch-lib::url.c
+++ b/ftp/curl/files/patch-lib::url.c
@@ -1,6 +1,6 @@
---- lib/url.c.orig Wed Jun 2 14:45:18 2004
-+++ lib/url.c Wed Jun 2 14:45:40 2004
-@@ -329,6 +329,10 @@
+--- lib/url.c.orig Mon Oct 30 00:46:27 2006
++++ lib/url.c Fri Dec 1 14:04:02 2006
+@@ -542,6 +542,10 @@
data->set.httpauth = CURLAUTH_BASIC; /* defaults to basic */
data->set.proxyauth = CURLAUTH_BASIC; /* defaults to basic */
@@ -8,6 +8,6 @@
+ data->set.no_signal = TRUE; /* different handling of signals and threads */
+#endif /* __FreeBSD_version */
+
- /* create an array with connection data struct pointers */
- data->state.numconnects = 5; /* hard-coded right now */
- data->state.connects = (struct connectdata **)
+ /* This no longer creates a connection cache here. It is instead made on
+ the first call to curl_easy_perform() or when the handle is added to a
+ multi stack. */
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index f95009ea9ffb..50e773f665ba 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -45,6 +45,7 @@ libdata/pkgconfig/libcurl.pc
%%PORTDOCS%%%%DOCSDIR%%/curl.1
%%PORTDOCS%%%%DOCSDIR%%/curl.html
%%PORTDOCS%%%%DOCSDIR%%/curl.pdf
+%%PORTDOCS%%%%DOCSDIR%%/examples/10-at-a-time.c
%%PORTDOCS%%%%DOCSDIR%%/examples/Makefile
%%PORTDOCS%%%%DOCSDIR%%/examples/Makefile.am
%%PORTDOCS%%%%DOCSDIR%%/examples/Makefile.example
@@ -65,6 +66,8 @@ libdata/pkgconfig/libcurl.pc
%%PORTDOCS%%%%DOCSDIR%%/examples/ftpuploadresume.c
%%PORTDOCS%%%%DOCSDIR%%/examples/getinfo.c
%%PORTDOCS%%%%DOCSDIR%%/examples/getinmemory.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/ghiper.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/hiperfifo.c
%%PORTDOCS%%%%DOCSDIR%%/examples/htmltidy.c
%%PORTDOCS%%%%DOCSDIR%%/examples/htmltitle.cc
%%PORTDOCS%%%%DOCSDIR%%/examples/http-post.c