Changes 7.28.0:

SSH: added agent based authentication
ftp: active conn, allow application to set sockopt after accept() call with CURLSOCKTYPE_ACCEPT
multi: add curl_multi_wait()
metalink: Added support for Microsoft Windows CryptoAPI
md5: Added support for Microsoft Windows CryptoAPI
parse_proxy: treat "socks://x" as a socks4 proxy
socks: Added support for IPv6 connections through SOCKSv5 proxy
Bugfixes:

WSAPoll disabled on Windows builds due to its bugs
segfault on request retries
curl-config: parentheses fix
VC build: add define for openssl
globbing: fix segfault when >9 globs were used
fixed a few clang-analyzer warnings
metalink: change code order to build with gnutls-nettle
gtls: fix build failure by including nettle-specific headers
change preferred HTTP auth on a handle previously used for another auth
file: use fdopen() to avoid race condition
Added DWANT_IDN_PROTOTYPES define for MSVC too
verbose: fixed (nil) output of hostnames in re-used connections
metalink: Un-broke the build when building --with-darwinssl
curl man page cleanup
Avoid leak of local device string when reusing connection
Curl_socket_check: fix return code for timeout
nss: do not print misleading NSS error codes
configure: remove the --enable/disable-nonblocking options
darwinssl: add TLS 1.1 and 1.2 support, replace deprecated functions
NTLM: re-use existing connection better
schannel crash on multi and easy handle cleanup
SOCKS: truly disable it if CURL_DISABLE_PROXY is defined
mk-ca-bundle: detect start of trust section better
gnutls: do not fail on non-fatal handshake errors
SMTP: only send SIZE if supported
ftpserver: respond with a 250 to SMTP EHLO
ssh: do not crash if MD5 fingerprint is not provided by libssh2
winbuild: Added support for building with SPNEGO enabled
metalink: Fixed validation of binary files containing EOF
setup.h: fixed for MS VC10 build
cmake: use standard findxxx modules for cmake v2.8+
HTTP_ONLY: disable more protocols
Curl_reconnect_request: clear pointer on failure
https.c example: remember to call curl_global_init()
metalink: Filter resource URLs by type
multi interface: CURLOPT_LOW_SPEED_* fix during rate limitation
curl_schannel: Removed buffer limit and optimized buffer strategy

5 files changed, 26 insertions, 24 deletions

diff --git a/www/curl/Makefile b/www/curl/Makefile
index 021544bb619..dc1712d6f31 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.116 2012/10/03 21:58:28 wiz Exp $
+# $NetBSD: Makefile,v 1.117 2012/10/12 07:36:11 adam Exp $
 
-DISTNAME=	curl-7.27.0
-PKGREVISION=	1
+DISTNAME=	curl-7.28.0
 CATEGORIES=	www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		ftp://ftp.sunet.se/pub/www/utilities/curl/
diff --git a/www/curl/PLIST b/www/curl/PLIST
index 0dbf992a6c1..93a3893d156 100644
--- a/www/curl/PLIST
+++ b/www/curl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2012/05/29 14:58:05 wiz Exp $
+@comment $NetBSD: PLIST,v 1.37 2012/10/12 07:36:11 adam Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
@@ -52,6 +52,7 @@ man/man3/curl_multi_socket.3
 man/man3/curl_multi_socket_action.3
 man/man3/curl_multi_strerror.3
 man/man3/curl_multi_timeout.3
+man/man3/curl_multi_wait.3
 man/man3/curl_share_cleanup.3
 man/man3/curl_share_init.3
 man/man3/curl_share_setopt.3
@@ -91,6 +92,7 @@ share/examples/curl/ftp-wildcard.c
 share/examples/curl/ftpget.c
 share/examples/curl/ftpgetinfo.c
 share/examples/curl/ftpgetresp.c
+share/examples/curl/ftpsget.c
 share/examples/curl/ftpupload.c
 share/examples/curl/ftpuploadresume.c
 share/examples/curl/getinfo.c
@@ -121,6 +123,7 @@ share/examples/curl/rtsp.c
 share/examples/curl/sampleconv.c
 share/examples/curl/sendrecv.c
 share/examples/curl/sepheaders.c
+share/examples/curl/sftpget.c
 share/examples/curl/simple.c
 share/examples/curl/simplepost.c
 share/examples/curl/simplesmtp.c
diff --git a/www/curl/buildlink3.mk b/www/curl/buildlink3.mk
index 7dd39d9d091..814f174c713 100644
--- a/www/curl/buildlink3.mk
+++ b/www/curl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2011/10/05 02:14:19 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2012/10/12 07:36:11 adam Exp $
 
 BUILDLINK_TREE+=	curl
 
@@ -10,19 +10,19 @@ BUILDLINK_ABI_DEPENDS.curl+=	curl>=7.21.4nb1
 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
-.  if !empty(PKG_BUILD_OPTIONS.curl:Mgssapi)
-.    include "../../mk/krb5.buildlink3.mk"
-.  endif
-.  if !empty(PKG_BUILD_OPTIONS.curl:Mldap)
-.    include "../../databases/openldap-client/buildlink3.mk"
-.  endif
-.  if !empty(PKG_BUILD_OPTIONS.curl:Mrtmp)
-.    include "../../net/rtmpdump/buildlink3.mk"
-.  endif
+.include "../../mk/pkg-build-options.mk"
+.if !empty(PKG_BUILD_OPTIONS.curl:Mlibssh2)
+.  include "../../security/libssh2/buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.curl:Mgssapi)
+.  include "../../mk/krb5.buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.curl:Mldap)
+.  include "../../databases/openldap-client/buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.curl:Mrtmp)
+.  include "../../net/rtmpdump/buildlink3.mk"
+.endif
 
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/www/curl/distinfo b/www/curl/distinfo
index 31800f8815b..07d80227913 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.78 2012/08/01 12:27:12 drochner Exp $
+$NetBSD: distinfo,v 1.79 2012/10/12 07:36:11 adam Exp $
 
-SHA1 (curl-7.27.0.tar.bz2) = 51f563587720b71047b6e307412d49ce24ad7bfb
-RMD160 (curl-7.27.0.tar.bz2) = b9ce785cae06911577b5654bb32f55fd2e6b712a
-Size (curl-7.27.0.tar.bz2) = 2476068 bytes
+SHA1 (curl-7.28.0.tar.bz2) = dbb69e510438495aa22dfc438d69477c4b2a49b6
+RMD160 (curl-7.28.0.tar.bz2) = 99ddd50b8d0b1f94833752b58b505ce3159f5dde
+Size (curl-7.28.0.tar.bz2) = 2507197 bytes
 SHA1 (patch-aa) = 66dc62384fa8dcd5a68f0f9af8b3c449a46fd250
diff --git a/www/curl/options.mk b/www/curl/options.mk
index 2b01643152c..a44ed279c65 100644
--- a/www/curl/options.mk
+++ b/www/curl/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2012/06/12 15:46:03 wiz Exp $
+# $NetBSD: options.mk,v 1.9 2012/10/12 07:36:11 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.curl
 PKG_SUPPORTED_OPTIONS=	inet6 libssh2 gssapi ldap rtmp
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibssh2)
-CONFIGURE_ARGS+= 	--with-libssh2=${BUILDLINK_PREFIX.libssh2:Q}
+CONFIGURE_ARGS+=	--with-libssh2=${BUILDLINK_PREFIX.libssh2}
 .  include "../../security/libssh2/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-libssh2