Pullup ticket #5784 - requested by bsiegert

www/curl: security update

Revisions pulled up:
- www/curl/Makefile                                             1.197
- www/curl/PLIST                                                1.70
- www/curl/distinfo                                             1.144

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   adam
   Date:           Wed Jul 11 18:13:26 UTC 2018

   Modified Files:
           pkgsrc/www/curl: Makefile PLIST distinfo

   Log Message:
   curl: updated to 7.61.0

   Curl and libcurl 7.61.0

   This release includes the following changes:
   * getinfo: add microsecond precise timers for seven intervals
   * curl: show headers in bold, switch off with --no-styled-output
   * httpauth: add support for Bearer tokens
   * Add CURLOPT_TLS13_CIPHERS and CURLOPT_PROXY_TLS13_CIPHERS
   * curl: --tls13-ciphers and --proxy-tls13-ciphers
   * Add CURLOPT_DISALLOW_USERNAME_IN_URL
   * curl: --disallow-username-in-url

   This release includes the following bugfixes:
   * CVE-2018-0500: smtp: fix SMTP send buffer overflow
   * schannel: disable client cert option if APIs not available
   * schannel: disable manual verify if APIs not available
   * tests/libtest/Makefile: Do not unconditionally add gcc-specific flags
   * openssl: acknowledge --tls-max for default version too
   * stub_gssapi: fix 'unused parameter' warnings
   * examples/progressfunc: make it build on both new and old libcurls
   * docs: mention it is HA Proxy protocol "version 1"
   * curl_fnmatch: only allow two asterisks for matching
   * docs: clarify CURLOPT_HTTPGET
   * configure: replace a AC_TRY_RUN with CURL_RUN_IFELSE
   * configure: do compile-time SIZEOF checks instead of run-time
   * checksrc: make sure sizeof() is used *with* parentheses
   * CURLOPT_ACCEPT_ENCODING.3: add brotli and clarify a bit
   * schannel: make CAinfo parsing resilient to CR/LF
   * tftp: make sure error is zero terminated before printfing it
   * http resume: skip body if http code 416 (range error) is ignored
   * configure: add basic test of --with-ssl prefix
   * cmake: set -d postfix for debug builds
   * multi: provide a socket to wait for in Curl_protocol_getsock
   * content_encoding: handle zlib versions too old for Z_BLOCK
   * winbuild: only delete OUTFILE if it exists
   * winbuild: In MakefileBuild.vc fix typo DISTDIR->DIRDIST
   * schannel: add failf calls for client certificate failures
   * cmake: Fix the test for fsetxattr and strerror_r
   * curl.1: Fix cmdline-opts reference errors
   * cmdline-opts/gen.pl: warn if mutexes: or see-also: list non-existing options
   * cmake: check for getpwuid_r
   * configure: fix ssh2 linking when built with a static mbedtls
   * psl: use latest psl and refresh it periodically
   * fnmatch: insist on escaped bracket to match
   * KNOWN_BUGS: restore text regarding 2101
   * INSTALL: LDFLAGS=-Wl,-R/usr/local/ssl/lib
   * configure: override AR_FLAGS to silence warning
   * os400: implement mime api EBCDIC wrappers
   * curl.rc: embed manifest for correct Windows version detection
   * strictness: correct {infof, failf} format specifiers
   * tests: update .gitignore for libtests
   * configure: check for declaration of getpwuid_r
   * fnmatch: use the system one if available
   * CURLOPT_RESOLVE: always purge old entry first
   * multi: remove a potentially bad DEBUGF()
   * curl_addrinfo: use same #ifdef conditions in source as header
   * build: remove the Borland specific makefiles
   * axTLS: not considered fit for use
   * cmdline-opts/cert-type.d: mention "p12" as a recognized type
   * system.h: add support for IBM xlc C compiler
   * tests/libtest: Add lib1521 to nodist_SOURCES
   * mk-ca-bundle.pl: leave certificate name untouched
   * boringssl + schannel: undef X509_NAME in lib/schannel.h
   * openssl: assume engine support in 1.0.1 or later
   * cppcheck: fix warnings
   * test 46: make test pass after year 2025
   * schannel: support selecting ciphers
   * Curl_debug: remove dead printhost code
   * test 1455: unflakified
   * Curl_init_do: handle NULL connection pointer passed in
   * progress: remove a set of unused defines
   * mk-ca-bundle.pl: make -u delete certdata.txt if found not changed
   * GOVERNANCE.md: explains how this project is run
   * configure: use pkg-config for c-ares detection
   * configure: enhance ability to build with static openssl
   * maketgz: fix sed issues on OSX
   * multi: fix memory leak when stopped during name resolve
   * CURLOPT_INTERFACE.3: interface names not supported on Windows
   * url: fix dangling conn->data pointer
   * cmake: allow multiple SSL backends
   * system.h: fix for gcc on 32 bit OpenServer
   * ConnectionExists: make sure conn->data is set when "taking" a connection
   * multi: fix crash due to dangling entry in connect-pending list
   * CURLOPT_SSL_VERIFYPEER.3: Add performance note
   * netrc: use a larger buffer to support longer passwords
   * url: check Curl_conncache_add_conn return code
   * configure: Add dependent libraries after crypto
   * easy_perform: faster local name resolves by using *multi_timeout()
   * getnameinfo: not used, removed all configure checks
   * travis: add a build using the synchronous name resolver
   * CURLINFO_TLS_SSL_PTR.3: improve the example
   * openssl: allow TLS 1.3 by default
   * openssl: make the requested TLS version the *minimum* wanted
   * openssl: Remove some dead code
   * telnet: fix clang warnings
   * DEPRECATE: new doc describing planned item removals
   * example/crawler.c: simple crawler based on libxml2
   * libssh: goto DISCONNECT state on error, not SESSION_FREE
   * CMake: Remove unused functions
   * darwinssl: allow High Sierra users to build the code using GCC
   * scripts: include _curl as part of CLEANFILES
   * examples: fix -Wformat warnings
   * curl_setup: include <winerror.h> before <windows.h>
   * schannel: make more cipher options conditional
   * CMake: remove redundant and old end-of-block syntax
   * post303.d: clarify that this is an RFC violation


   To generate a diff of this commit:
   cvs rdiff -u -r1.196 -r1.197 pkgsrc/www/curl/Makefile
   cvs rdiff -u -r1.69 -r1.70 pkgsrc/www/curl/PLIST
   cvs rdiff -u -r1.143 -r1.144 pkgsrc/www/curl/distinfo

3 files changed, 18 insertions, 8 deletions

diff --git a/www/curl/Makefile b/www/curl/Makefile
index a49331562c7..c1ccf63dad9 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.196 2018/05/17 09:59:39 leot Exp $
+# $NetBSD: Makefile,v 1.196.2.1 2018/07/14 16:53:15 spz Exp $
 
-DISTNAME=	curl-7.60.0
+DISTNAME=	curl-7.61.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 016cff1782b..6c2d9c57cce 100644
--- a/www/curl/PLIST
+++ b/www/curl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.69 2018/05/17 09:59:39 leot Exp $
+@comment $NetBSD: PLIST,v 1.69.2.1 2018/07/14 16:53:15 spz Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
@@ -15,9 +15,11 @@ man/man1/curl-config.1
 man/man1/curl.1
 man/man3/CURLINFO_ACTIVESOCKET.3
 man/man3/CURLINFO_APPCONNECT_TIME.3
+man/man3/CURLINFO_APPCONNECT_TIME_T.3
 man/man3/CURLINFO_CERTINFO.3
 man/man3/CURLINFO_CONDITION_UNMET.3
 man/man3/CURLINFO_CONNECT_TIME.3
+man/man3/CURLINFO_CONNECT_TIME_T.3
 man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3
 man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3
 man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3
@@ -36,9 +38,11 @@ man/man3/CURLINFO_LASTSOCKET.3
 man/man3/CURLINFO_LOCAL_IP.3
 man/man3/CURLINFO_LOCAL_PORT.3
 man/man3/CURLINFO_NAMELOOKUP_TIME.3
+man/man3/CURLINFO_NAMELOOKUP_TIME_T.3
 man/man3/CURLINFO_NUM_CONNECTS.3
 man/man3/CURLINFO_OS_ERRNO.3
 man/man3/CURLINFO_PRETRANSFER_TIME.3
+man/man3/CURLINFO_PRETRANSFER_TIME_T.3
 man/man3/CURLINFO_PRIMARY_IP.3
 man/man3/CURLINFO_PRIMARY_PORT.3
 man/man3/CURLINFO_PRIVATE.3
@@ -47,6 +51,7 @@ man/man3/CURLINFO_PROXYAUTH_AVAIL.3
 man/man3/CURLINFO_PROXY_SSL_VERIFYRESULT.3
 man/man3/CURLINFO_REDIRECT_COUNT.3
 man/man3/CURLINFO_REDIRECT_TIME.3
+man/man3/CURLINFO_REDIRECT_TIME_T.3
 man/man3/CURLINFO_REDIRECT_URL.3
 man/man3/CURLINFO_REQUEST_SIZE.3
 man/man3/CURLINFO_RESPONSE_CODE.3
@@ -66,9 +71,11 @@ man/man3/CURLINFO_SPEED_UPLOAD_T.3
 man/man3/CURLINFO_SSL_ENGINES.3
 man/man3/CURLINFO_SSL_VERIFYRESULT.3
 man/man3/CURLINFO_STARTTRANSFER_TIME.3
+man/man3/CURLINFO_STARTTRANSFER_TIME_T.3
 man/man3/CURLINFO_TLS_SESSION.3
 man/man3/CURLINFO_TLS_SSL_PTR.3
 man/man3/CURLINFO_TOTAL_TIME.3
+man/man3/CURLINFO_TOTAL_TIME_T.3
 man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3
 man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3
 man/man3/CURLMOPT_MAXCONNECTS.3
@@ -119,6 +126,7 @@ man/man3/CURLOPT_DEBUGDATA.3
 man/man3/CURLOPT_DEBUGFUNCTION.3
 man/man3/CURLOPT_DEFAULT_PROTOCOL.3
 man/man3/CURLOPT_DIRLISTONLY.3
+man/man3/CURLOPT_DISALLOW_USERNAME_IN_URL.3
 man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3
 man/man3/CURLOPT_DNS_INTERFACE.3
 man/man3/CURLOPT_DNS_LOCAL_IP4.3
@@ -242,6 +250,7 @@ man/man3/CURLOPT_PROXY_SSL_CIPHER_LIST.3
 man/man3/CURLOPT_PROXY_SSL_OPTIONS.3
 man/man3/CURLOPT_PROXY_SSL_VERIFYHOST.3
 man/man3/CURLOPT_PROXY_SSL_VERIFYPEER.3
+man/man3/CURLOPT_PROXY_TLS13_CIPHERS.3
 man/man3/CURLOPT_PROXY_TLSAUTH_PASSWORD.3
 man/man3/CURLOPT_PROXY_TLSAUTH_TYPE.3
 man/man3/CURLOPT_PROXY_TLSAUTH_USERNAME.3
@@ -320,6 +329,7 @@ man/man3/CURLOPT_TIMEOUT.3
 man/man3/CURLOPT_TIMEOUT_MS.3
 man/man3/CURLOPT_TIMEVALUE.3
 man/man3/CURLOPT_TIMEVALUE_LARGE.3
+man/man3/CURLOPT_TLS13_CIPHERS.3
 man/man3/CURLOPT_TLSAUTH_PASSWORD.3
 man/man3/CURLOPT_TLSAUTH_TYPE.3
 man/man3/CURLOPT_TLSAUTH_USERNAME.3
diff --git a/www/curl/distinfo b/www/curl/distinfo
index 876a7357b4d..92a81118c2d 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.143 2018/05/17 09:59:39 leot Exp $
+$NetBSD: distinfo,v 1.143.2.1 2018/07/14 16:53:15 spz Exp $
 
-SHA1 (curl-7.60.0.tar.bz2) = 2f0de4ededaa339dca2e45fa71ee9ddbaa9765b9
-RMD160 (curl-7.60.0.tar.bz2) = 3847f864ae57aa6ec8458dd05a6195be55b725ca
-SHA512 (curl-7.60.0.tar.bz2) = c7566bbe7289cd75d34a65b457905d54b5d07543b9fed5a762c889eb09114ad66de62c3edafd1973e87bc8e303a434e77b4e40eea1718801e79ae9256531abe9
-Size (curl-7.60.0.tar.bz2) = 2938400 bytes
+SHA1 (curl-7.61.0.tar.bz2) = ddebde47541b514f6ba6ea03a488f053ae95af1a
+RMD160 (curl-7.61.0.tar.bz2) = 6101f3a189c5a7cc7b0bdd56fc6e80dc37ccdaa8
+SHA512 (curl-7.61.0.tar.bz2) = 4907234c75a9e52a5b81cf895bcc811d7a69f1db84a9ae1adc3af360e8cc4371f58c00925ce6bc5170f2a8072848da47a52c41f4bfedcf14274ec75802afcddd
+Size (curl-7.61.0.tar.bz2) = 2949354 bytes
 SHA1 (patch-configure) = ba8abac55f11a53d07235e57d21ce5b32a421902
 SHA1 (patch-curl-config.in) = 363359665985cc14f36ddf47fc3480f1200e3533
 SHA1 (patch-lib_hostcheck.c) = 8e772d3f91cdafae17281cc19004269ece0cf308