Update to curl-7.10.7; the added patch is needed to actually get

the test suite going :)

6 files changed, 41 insertions, 26 deletions

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 8ec19b6b1f27..6dcc80015c52 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	curl
-PORTVERSION=	7.10.5
-PORTREVISION=	1
+PORTVERSION=	7.10.7
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		${MASTER_SITE_SOURCEFORGE} \
@@ -31,10 +30,12 @@ MAN3=		curl_easy_cleanup.3 curl_easy_duphandle.3 curl_easy_getinfo.3 \
 		curl_multi_add_handle.3 curl_multi_cleanup.3 \
 		curl_multi_fdset.3 curl_multi_info_read.3 curl_multi_init.3 \
 		curl_multi_perform.3 curl_multi_remove_handle.3 \
+		curl_share_cleanup.3 curl_share_init.3 curl_share_setopt.3 \
 		curl_slist_append.3 curl_slist_free_all.3 \
 		curl_strequal.3 curl_strnequal.3 \
 		curl_version.3 curl_version_info.3 \
-		libcurl.3 libcurl-multi.3 libcurl-errors.3
+		libcurl.3 libcurl-easy.3 libcurl-errors.3 libcurl-multi.3 \
+		libcurl-share.3
 
 INSTALLS_SHLIB=	yes
 SHLIB_VER=	2
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index 1f2a04523b46..63703d3bccc6 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1 +1 @@
-MD5 (curl-7.10.5.tar.bz2) = cef8a0c26ca7f4ff6b844d9f69b533f1
+MD5 (curl-7.10.7.tar.bz2) = 19f2f77279cd5d3026c71997463db791
diff --git a/ftp/curl/files/patch-lib::ftp.c b/ftp/curl/files/patch-lib::ftp.c
deleted file mode 100644
index dfe9eadf24a7..000000000000
--- a/ftp/curl/files/patch-lib::ftp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/ftp.c.orig	Tue May 13 23:31:00 2003
-+++ lib/ftp.c	Sun Jun 15 18:57:27 2003
-@@ -2055,7 +2055,7 @@
-       struct tm buffer;
-       tm = (struct tm *)localtime_r(&data->info.filetime, &buffer);
- #else
--      tm = localtime((unsigned long *)&data->info.filetime);
-+      tm = localtime((time_t *)&data->info.filetime);
- #endif
-       /* format: "Tue, 15 Nov 1994 12:45:26 GMT" */
-       strftime(buf, BUFSIZE-1, "Last-Modified: %a, %d %b %Y %H:%M:%S GMT\r\n",
diff --git a/ftp/curl/files/patch-lib::urldata.h b/ftp/curl/files/patch-lib::urldata.h
deleted file mode 100644
index 27d02fec0120..000000000000
--- a/ftp/curl/files/patch-lib::urldata.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/urldata.h.orig	Fri May  9 00:39:29 2003
-+++ lib/urldata.h	Sun Jun 15 18:57:46 2003
-@@ -501,7 +501,7 @@
- struct PureInfo {
-   int httpcode;
-   int httpversion;
--  long filetime; /* If requested, this is might get set. Set to -1 if
-+  time_t filetime; /* If requested, this is might get set. Set to -1 if
-                     the time was unretrievable */
-   long header_size;  /* size of read header(s) in bytes */
-   long request_size; /* the amount of bytes sent in the request(s) */
diff --git a/ftp/curl/files/patch-tests::server::getpart.c b/ftp/curl/files/patch-tests::server::getpart.c
new file mode 100644
index 000000000000..2b810fa3c04e
--- /dev/null
+++ b/ftp/curl/files/patch-tests::server::getpart.c
@@ -0,0 +1,19 @@
+--- tests/server/getpart.c.old	Tue Sep  2 14:05:23 2003
++++ tests/server/getpart.c	Tue Sep  2 14:07:16 2003
+@@ -20,7 +20,7 @@
+ {
+   int len = strlen(buffer);
+ 
+-  if((len + *stringlen) >= *stralloc) {
++  while((len + *stringlen) >= *stralloc) {
+     char *newptr= realloc(string, *stralloc*2);
+     if(newptr) {
+       string = newptr;
+@@ -56,6 +56,7 @@
+   } state = STATE_OUTSIDE;
+ 
+   string = (char *)malloc(stralloc);
++  string[0] = '\0';
+   
+   while(fgets(buffer, sizeof(buffer), stream)) {
+ 
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index 5be51b36d506..d3738f374b27 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -28,6 +28,7 @@ share/curl/curl-ca-bundle.crt
 %%PORTDOCS%%share/doc/curl/Makefile.in
 %%PORTDOCS%%share/doc/curl/README.win32
 %%PORTDOCS%%share/doc/curl/RESOURCES
+%%PORTDOCS%%share/doc/curl/SSLCERTS
 %%PORTDOCS%%share/doc/curl/THANKS
 %%PORTDOCS%%share/doc/curl/TODO
 %%PORTDOCS%%share/doc/curl/TheArtOfHttpScripting
@@ -51,6 +52,7 @@ share/curl/curl-ca-bundle.crt
 %%PORTDOCS%%share/doc/curl/examples/getinmemory.c
 %%PORTDOCS%%share/doc/curl/examples/http-post.c
 %%PORTDOCS%%share/doc/curl/examples/httpput.c
+%%PORTDOCS%%share/doc/curl/examples/makefile.dj
 %%PORTDOCS%%share/doc/curl/examples/multi-app.c
 %%PORTDOCS%%share/doc/curl/examples/multi-double.c
 %%PORTDOCS%%share/doc/curl/examples/multi-post.c
@@ -137,6 +139,15 @@ share/curl/curl-ca-bundle.crt
 %%PORTDOCS%%share/doc/curl/libcurl/curl_multi_remove_handle.3
 %%PORTDOCS%%share/doc/curl/libcurl/curl_multi_remove_handle.html
 %%PORTDOCS%%share/doc/curl/libcurl/curl_multi_remove_handle.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_share_cleanup.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_share_cleanup.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_share_cleanup.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_share_init.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_share_init.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_share_init.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_share_setopt.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_share_setopt.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_share_setopt.pdf
 %%PORTDOCS%%share/doc/curl/libcurl/curl_slist_append.3
 %%PORTDOCS%%share/doc/curl/libcurl/curl_slist_append.html
 %%PORTDOCS%%share/doc/curl/libcurl/curl_slist_append.pdf
@@ -159,12 +170,18 @@ share/curl/curl-ca-bundle.crt
 %%PORTDOCS%%share/doc/curl/libcurl/curl_version_info.html
 %%PORTDOCS%%share/doc/curl/libcurl/curl_version_info.pdf
 %%PORTDOCS%%share/doc/curl/libcurl/index.html
+%%PORTDOCS%%share/doc/curl/libcurl/libcurl-easy.3
+%%PORTDOCS%%share/doc/curl/libcurl/libcurl-easy.html
+%%PORTDOCS%%share/doc/curl/libcurl/libcurl-easy.pdf
 %%PORTDOCS%%share/doc/curl/libcurl/libcurl-errors.3
 %%PORTDOCS%%share/doc/curl/libcurl/libcurl-errors.html
 %%PORTDOCS%%share/doc/curl/libcurl/libcurl-errors.pdf
 %%PORTDOCS%%share/doc/curl/libcurl/libcurl-multi.3
 %%PORTDOCS%%share/doc/curl/libcurl/libcurl-multi.html
 %%PORTDOCS%%share/doc/curl/libcurl/libcurl-multi.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/libcurl-share.3
+%%PORTDOCS%%share/doc/curl/libcurl/libcurl-share.html
+%%PORTDOCS%%share/doc/curl/libcurl/libcurl-share.pdf
 %%PORTDOCS%%share/doc/curl/libcurl/libcurl.3
 %%PORTDOCS%%share/doc/curl/libcurl/libcurl.html
 %%PORTDOCS%%share/doc/curl/libcurl/libcurl.pdf