Updated curl to 7.49.0.

 Fixed in 7.49.0 - May 18 2016

Changes:

    schannel: Add ALPN support
    SSH: support CURLINFO_FILETIME
    SSH: new CURLOPT_QUOTE command "statvfs"
    wolfssl: Add ALPN support
    http2: added --http2-prior-knowledge
    http2: added CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE
    libcurl: added CURLOPT_CONNECT_TO
    curl: added --connect-to
    libcurl: added CURLOPT_TCP_FASTOPEN
    curl: added --tcp-fastopen
    curl: remove support for --ftpport, -http-request and --socks

Bugfixes:

    CVE-2016-3739: TLS certificate check bypass with mbedTLS/PolarSSL
    checksrc.bat: Updated the help to be consistent with generate.bat
    checksrc.bat: Added support for scanning the tests and examples
    openssl: fix ERR_remove_thread_state() for boringssl/libressl
    openssl: boringssl provides the same numbering as openssl
    multi: fix "Operation timed out after" timer
    url: don't use bad offset in tld_check_name to show error
    sshserver.pl: use quotes for given options
    Makefile.am: skip the scripts dir
    curl: warn for --capath use if not supported by libcurl
    http2: fix connection reuse
    GSS: make Curl_gss_log_error more verbose
    build-wolfssl: Allow a broader range of ciphers (Visual Studio)
    wolfssl: Use ECC supported curves extension
    openssl: Fix compilation warnings
    Curl_add_buffer_send: avoid possible NULL dereference
    SOCKS5_gssapi_negotiate: don't assume little-endian ints
    strerror: don't bit shift a signed integer
    url: Corrected get protocol family for FTP and LDAP
    curl/mprintf.h: remove support for _MPRINTF_REPLACE
    upload: missing rewind call could make libcurl hang
    IMAP: check pointer before dereferencing it
    build: Changed the Visual Studio projects warning level from 3 to 4
    checksrc: now stricter, wider checks, code cleaned up
    checksrc: added docs/CHECKSRC.md
    curl_sasl: Fixed potential null pointer utilisation
    krb5: Fixed missing client response when mutual authentication enabled
    krb5: Only process challenge when present
    krb5: Only generate a SPN when its not known
    formdata: use appropriate fopen() macros
    curl.1: -w filename_effective was introduced in 7.26.0
    http2: make use of the nghttp2 error callback
    http2: fix connection reuse when PING comes after last DATA
    curl.1: change example for -F
    HTTP2: Add a space character after the status code
    curl.1: use example.com more
    mbedtls.c: changed private prefix to mbed_
    mbedtls: implement and provide *_data_pending() to avoid hang
    mbedtls: fix MBEDTLS_DEBUG builds
    ftp/imap/pop3/smtp: Allow the service name to be overridden
    CURLOPT_SOCKS5_GSSAPI_SERVICE: Merged with CURLOPT_PROXY_SERVICE_NAME
    build: include scripts/ in the dist
    http2: Add handling stream level error
    http2: Improve header parsing
    makefile.vc6: use d suffix on debug object
    configure: remove check for libresolve
    scripts/make: use $(EXEEXT) for executables
    checksrc: got rid of the whitelist files
    sendf: added ability to call recv() before send() as workaround
    NTLM: check for NULL pointer before dereferencing
    openssl: builds with OpenSSL 1.1.0-pre5
    configure: ac_cv_ -> curl_cv_ for all cached vars
    winbuild: add mbedtls support
    curl: make --ftp-create-dirs retry on failure
    PolarSSL: implement public key pinning
    multi: accidentally used resolved host name instead of proxy
    CURLINFO_TLS_SESSION.3: clarify TLS library support before 7.48.0
    CONNECT_ONLY: don't close connection on GSS 401/407 reponses
    opts: Fix some syntax errors in example code fragments
    mbedtls: Fix session resume
    test1139: verifies libcurl option man page presence
    CURLINFO_TLS_SSL_PTR.3: Clarify SSL pointer availability
    curl: make --disable work as long form of -q
    curl: use --telnet-option as documented
    curl.1: document --ftp-ssl-reqd, --krb4 and --ntlm-wb
    curl: -h output lacked --proxy-header and --ntlm-wb
    curl -J: make it work even without http:// scheme on URL
    lib: include curl_printf.h as one of the last headers
    tests: handle path properly on Msys/Cygwin
    curl.1: --mail-rcpt can be used multiple times
    CURLOPT_ACCEPT_ENCODING.3: clarified
    docs: fixed lots of broken man page references
    tls: make setting pinnedkey option fail if not supported
    test1140: run nroff-scan to verify man pages
    http: make sure a blank header overrides accept_decoding
    connections: do not reuse non-HTTP proxies on different ports
    connect: fix invalid "Network is unreachable" errors
    TLS: move the ALPN/NPN enable bits to the connection
    TLS: SSL_peek is not a const operation
    http2: Add space between colon and header value
    darwinssl: fix certificate verification disable on OS X 10.8
    mprintf: Fix processing of width and prec args
    ftp wildcard: segfault due to init only in multi_perform

4 files changed, 10 insertions, 28 deletions

diff --git a/www/curl/Makefile b/www/curl/Makefile
index f4d528b7b80..5bc9e6d7d30 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.164 2016/04/24 10:34:44 wiz Exp $
+# $NetBSD: Makefile,v 1.165 2016/05/29 20:37:34 wiz Exp $
 
-DISTNAME=	curl-7.48.0
+DISTNAME=	curl-7.49.0
 CATEGORIES=	www
 MASTER_SITES=	https://curl.haxx.se/download/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/curl/PLIST b/www/curl/PLIST
index 993b18f6e44..3b21e74c2b6 100644
--- a/www/curl/PLIST
+++ b/www/curl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.56 2016/04/07 11:03:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.57 2016/05/29 20:37:34 wiz Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
@@ -91,6 +91,7 @@ man/man3/CURLOPT_CLOSESOCKETFUNCTION.3
 man/man3/CURLOPT_CONNECTTIMEOUT.3
 man/man3/CURLOPT_CONNECTTIMEOUT_MS.3
 man/man3/CURLOPT_CONNECT_ONLY.3
+man/man3/CURLOPT_CONNECT_TO.3
 man/man3/CURLOPT_CONV_FROM_NETWORK_FUNCTION.3
 man/man3/CURLOPT_CONV_FROM_UTF8_FUNCTION.3
 man/man3/CURLOPT_CONV_TO_NETWORK_FUNCTION.3
@@ -266,6 +267,7 @@ man/man3/CURLOPT_STDERR.3
 man/man3/CURLOPT_STREAM_DEPENDS.3
 man/man3/CURLOPT_STREAM_DEPENDS_E.3
 man/man3/CURLOPT_STREAM_WEIGHT.3
+man/man3/CURLOPT_TCP_FASTOPEN.3
 man/man3/CURLOPT_TCP_KEEPALIVE.3
 man/man3/CURLOPT_TCP_KEEPIDLE.3
 man/man3/CURLOPT_TCP_KEEPINTVL.3
@@ -357,4 +359,3 @@ share/aclocal/libcurl.m4
 share/doc/curl/FAQ
 share/doc/curl/MANUAL
 share/doc/curl/TheArtOfHttpScripting
-share/zsh/site-functions/_curl
diff --git a/www/curl/distinfo b/www/curl/distinfo
index 42b3b897ecf..5941edb0bd4 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.117 2016/05/14 18:36:02 sevan Exp $
+$NetBSD: distinfo,v 1.118 2016/05/29 20:37:34 wiz Exp $
 
-SHA1 (curl-7.48.0.tar.bz2) = 8b5ccc16bdae5241fe40c66e8b20fa91540cdf92
-RMD160 (curl-7.48.0.tar.bz2) = 3dc03df4ba48eb71e257db1f5dda7f88c59df88e
-SHA512 (curl-7.48.0.tar.bz2) = 9bb554eaf4ccaced0fa9b38de4f381eab84b96c1aa07a45d83ddfd38a925044d0fe9fac517263f67f009d2294a31c33dedb2267defbab0cb14f96091bbed5f92
-Size (curl-7.48.0.tar.bz2) = 7408757 bytes
+SHA1 (curl-7.49.0.tar.bz2) = c21df0a7494d116e6286f20724070e8380c5d198
+RMD160 (curl-7.49.0.tar.bz2) = 212924e92c479847ac47b3c4f0deff549f4598b6
+SHA512 (curl-7.49.0.tar.bz2) = 57a82185c082ea872a54c6f5a11ca24fe6131108c16255278671504afca848b9298681de9c9bb5905b9655295edf25c104d1301c4bbdb1f261d952a020d77111
+Size (curl-7.49.0.tar.bz2) = 7458465 bytes
 SHA1 (patch-aa) = 793701d5ecc3343170fb437906c9adb74763cd13
 SHA1 (patch-curl-config.in) = d0cc7bb6a5bf0b9257f40dcffce7093cc0098eb7
 SHA1 (patch-lib_hostcheck.c) = 8e772d3f91cdafae17281cc19004269ece0cf308
-SHA1 (patch-lib_vtls_openssl.c) = 45bb5de6fd10c1593f2583d49b27d3c00ae92780
diff --git a/www/curl/patches/patch-lib_vtls_openssl.c b/www/curl/patches/patch-lib_vtls_openssl.c
deleted file mode 100644
index 3e943869caa..00000000000
--- a/www/curl/patches/patch-lib_vtls_openssl.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-lib_vtls_openssl.c,v 1.1 2016/05/14 18:36:02 sevan Exp $
-
-Add support for building with LibreSSL/BoringSSL
-https://github.com/curl/curl/commit/240cd84b494e0ffee8ad261c43b927d246cf6be1
-
---- lib/vtls/openssl.c.orig	Sat May 14 15:53:20 2016
-+++ lib/vtls/openssl.c
-@@ -95,7 +95,9 @@
- 
- #if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
- #define HAVE_ERR_REMOVE_THREAD_STATE 1
--#if (OPENSSL_VERSION_NUMBER >= 0x10100004L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100004L) && \
-+  !defined(LIBRESSL_VERSION_NUMBER) && \
-+  !defined(OPENSSL_IS_BORINGSSL)
- /* OpenSSL 1.1.0-pre4 removed the argument! */
- #define HAVE_ERR_REMOVE_THREAD_STATE_NOARG 1
- #endif