Update to version 7.18.0 and add SSHv2 support via the newly imported

security/libssh2 package.

Changes:

 o --data-urlencode
 o CURLOPT_PROXY_TRANSFER_MODE
 o --no-keepalive - now curl does connections with keep-alive enabled by
   default
 o --socks4a added (proxy type CURLPROXY_SOCKS4A for libcurl)
 o --socks5-hostname added (CURLPROXY_SOCKS5_HOSTNAME for libcurl)
 o curl_easy_pause()
 o CURLOPT_SEEKFUNCTION and CURLOPT_SEEKDATA
 o --keepalive-time
 o curl --help output was re-ordered

This release includes the following bugfixes:

 o curl-config --features and --protocols show the correct output when built
   with NSS, and also when SCP, SFTP and libz are not available
 o free problem in the curl tool for users with empty home dir
 o curl.h version 7.17.1 problem when building C++ apps with MSVC
 o SFTP and SCP use persistent connections
 o segfault on bad URL
 o variable wrapping when using absolutely huge send buffer sizes
 o variable wrapping when using debug callback and the HTTP request wasn't sent
   in one go
 o SSL connections with NSS done with the multi-interface
 o setting a share no longer activates cookies
 o Negotiate now works on auth and proxy simultanouesly
 o support HTTP Digest nonces up to 1023 letters
 o resumed ftp upload no longer requires the read callback to return full
   buffers
 o no longer default-appends ;type= on FTP URLs thru proxies
 o SSL session id caching
 o POST with callback over proxy requiring NTLM or Digest
 o Expect: 100-continue flaw on re-used connection with POSTs
 o build fix for MSVC 9.0 (VS2008)
 o Windows curl builds failed file truncation when retry downloading
 o SSL session ID cache memory leak
 o bad connection re-use check with environment variable-activated proxy use
 o --libcurl now generates a return statement as well
 o socklen_t is no longer used in the public includes
 o time zone offsets from -1400 to +1400 are now accepted by the date parser
 o allows more spaces in WWW/Proxy-Authenticate: headers
 o curl-config --libs skips /usr/lib64
 o range support for file:// transfers
 o libcurl hang with huge POST request and request-body read from callback
 o removed extra newlines from many error messages
 o improved pipelining
 o improved OOM handling for data url encoded HTTP POSTs when read from a file
 o test suite could pick wrong tool(s) if more than one existed in the PATH
 o curl_multi_fdset() failed to return socket while doing CONNECT over proxy
 o curl_multi_remove_handle() on a handle that is in used for a pipeline now
   break that pipeline
 o CURLOPT_COOKIELIST memory leaks
 o progress meter/callback during http proxy CONNECT requests
 o auth for http proxy when the proxy closes connection after first response

5 files changed, 41 insertions, 25 deletions

diff --git a/www/curl/Makefile b/www/curl/Makefile
index e22468cb095..5dee1ab3caf 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.78 2008/01/18 05:09:48 tnn Exp $
+# $NetBSD: Makefile,v 1.79 2008/03/02 14:40:26 bjs Exp $
 
-DISTNAME=	curl-7.17.1
-PKGREVISION=	1
+DISTNAME=	curl-7.18.0
 CATEGORIES=	www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		ftp://ftp.sunet.se/pub/www/utilities/curl/
@@ -32,20 +31,23 @@ USE_TOOLS+=		perl
 .endif
 
 .include "options.mk"
-
-post-configure:
-	if ${GREP} '#define HAVE_SYS_SELECT_H 1' ${WRKSRC}/src/config.h \
-		>/dev/null; \
-	then \
-	    line='#include <sys/select.h>'; \
-	else \
-	    line='/* sys/select.h not included because it does not exist */'; \
-	fi; \
-	${SED} -e "s|__INCLUDE_SYS_SELECT_H__|$${line}|" \
-	       <${WRKSRC}/include/curl/multi.h \
-	       >${WRKSRC}/include/curl/multi.h.new; \
-	${MV} ${WRKSRC}/include/curl/multi.h.new \
-	      ${WRKSRC}/include/curl/multi.h
+#
+# XXXbjs CHANGES claims this is fixed.  I have left it here commented out
+#        in case this is not so.
+#
+#post-configure:
+#	if ${GREP} '#define HAVE_SYS_SELECT_H 1' ${WRKSRC}/src/config.h \
+#		>/dev/null; \
+#	then \
+#	    line='#include <sys/select.h>'; \
+#	else \
+#	    line='/* sys/select.h not included because it does not exist */'; \
+#	fi; \
+#	${SED} -e "s|__INCLUDE_SYS_SELECT_H__|$${line}|" \
+#	       <${WRKSRC}/include/curl/multi.h \
+#	       >${WRKSRC}/include/curl/multi.h.new; \
+#	${MV} ${WRKSRC}/include/curl/multi.h.new \
+#	      ${WRKSRC}/include/curl/multi.h
 
 post-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/curl
diff --git a/www/curl/PLIST b/www/curl/PLIST
index 0ea50076937..04a79fe9fa9 100644
--- a/www/curl/PLIST
+++ b/www/curl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2007/09/15 09:29:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.24 2008/03/02 14:40:26 bjs Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
@@ -17,6 +17,7 @@ man/man3/curl_easy_duphandle.3
 man/man3/curl_easy_escape.3
 man/man3/curl_easy_getinfo.3
 man/man3/curl_easy_init.3
+man/man3/curl_easy_pause.3
 man/man3/curl_easy_perform.3
 man/man3/curl_easy_reset.3
 man/man3/curl_easy_setopt.3
diff --git a/www/curl/buildlink3.mk b/www/curl/buildlink3.mk
index 3a7e3d3c68f..80ae9f32f09 100644
--- a/www/curl/buildlink3.mk
+++ b/www/curl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2008/01/18 05:09:48 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2008/03/02 14:40:26 bjs Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CURL_BUILDLINK3_MK:=	${CURL_BUILDLINK3_MK}+
@@ -15,6 +15,12 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}curl
 BUILDLINK_API_DEPENDS.curl+=	curl>=7.12.3
 BUILDLINK_ABI_DEPENDS.curl+=	curl>=7.17.1nb1
 BUILDLINK_PKGSRCDIR.curl?=	../../www/curl
+
+pkgbase:= curl
+.  include "../../mk/pkg-build-options.mk"
+.  if !empty(PKG_BUILD_OPTIONS.curl:Mlibssh2)
+.    include "../../security/libssh2/buildlink3.mk"
+.  endif
 .endif	# CURL_BUILDLINK3_MK
 
 .include "../../devel/libidn/buildlink3.mk"
diff --git a/www/curl/distinfo b/www/curl/distinfo
index 9df6d325618..4b226d80c11 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.53 2007/11/01 08:37:10 wiz Exp $
+$NetBSD: distinfo,v 1.54 2008/03/02 14:40:26 bjs Exp $
 
-SHA1 (curl-7.17.1.tar.bz2) = ad34b9386e7fd1c8f2a8025e2716a8047b194970
-RMD160 (curl-7.17.1.tar.bz2) = 8ab8dc7a33a5265dfe25eb0725248c3cd6519510
-Size (curl-7.17.1.tar.bz2) = 1721551 bytes
+SHA1 (curl-7.18.0.tar.bz2) = f561a6a1f285c22d1f6a54b4dfa19b6cb9362c2a
+RMD160 (curl-7.18.0.tar.bz2) = f25ec844e7ef6221719439b3214fd3c3a42f5604
+Size (curl-7.18.0.tar.bz2) = 1779421 bytes
diff --git a/www/curl/options.mk b/www/curl/options.mk
index 60bee6d8405..7403135232f 100644
--- a/www/curl/options.mk
+++ b/www/curl/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.1 2006/08/10 14:18:16 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2008/03/02 14:40:26 bjs Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.curl
-PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUPPORTED_OPTIONS=	inet6 libssh2
 
 .include "../../mk/bsd.options.mk"
 
@@ -10,3 +10,10 @@ CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
+
+.if !empty(PKG_OPTIONS:Mlibssh2)
+CONFIGURE_ARGS+= 	--with-libssh2=${BUILDLINK_PREFIX.libssh2:Q}
+.  include "../../security/libssh2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-libssh2
+.endif