Log Message:
Pullup ticket #5757 - requested by bsiegert
www/curl: security update

Revisions pulled up:
- www/curl/Makefile                                             1.196
- www/curl/PLIST                                                1.69
- www/curl/distinfo                                             1.143

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   leot
   Date:           Thu May 17 09:59:40 UTC 2018

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

   Log Message:
   curl: Update www/curl to 7.60.0

   Changes:
   7.60.0
   ------
   This release includes the following changes:

     o Add CURLOPT_HAPROXYPROTOCOL, support for the HAProxy PROXY protocol
     o Add --haproxy-protocol for the command line tool
     o Add CURLOPT_DNS_SHUFFLE_ADDRESSES, shuffle returned IP addresses

   This release includes the following bugfixes:

     o FTP: shutdown response buffer overflow CVE-2018-1000300
     o RTSP: bad headers buffer over-read CVE-2018-1000301
     o FTP: fix typo in recursive callback detection for seeking
     o test1208: marked flaky
     o HTTP: make header-less responses still count correct body size
     o user-agent.d:: mention --proxy-header as well
     o http2: fixes typo
     o cleanup: misc typos in strings and comments
     o rate-limit: use three second window to better handle high speeds
     o examples/hiperfifo.c: improved
     o pause: when changing pause state, update socket state
     o multi: improved pending transfers handling => improved performance
     o curl_version_info.3: fix ssl_version description
     o add_handle/easy_perform: clear errorbuffer on start if set
     o darwinssl: fix iOS build
     o cmake: add support for brotli
     o parsedate: support UT timezone
     o vauth/ntlm.h: fix the #ifdef header guard
     o lib/curl_path.h: added #ifdef header guard
     o vauth/cleartext: fix integer overflow check
     o CURLINFO_COOKIELIST.3: made the example not leak memory
     o cookie.d: mention that "-" as filename means stdin
     o CURLINFO_SSL_VERIFYRESULT.3: fixed the example
     o http2: read pending frames (including GOAWAY) in connection-check
     o timeval: remove compilation warning by casting
     o cmake: avoid warn-as-error during config checks
     o travis-ci: enable -Werror for CMake builds
     o openldap: fix for NULL return from ldap_get_attribute_ber()
     o threaded resolver: track resolver time and set suitable timeout values
     o cmake: Add advapi32 as explicit link library for win32
     o docs: fix CURLINFO_*_T examples use of CURL_FORMAT_CURL_OFF_T
     o test1148: set a fixed locale for the test
     o cookies: when reading from a file, only remove_expired once
     o cookie: store cookies per top-level-domain-specific hash table
     o openssl: fix build with LibreSSL 2.7
     o tls: fix mbedTLS 2.7.0 build + handle sha256 failures
     o openssl: RESTORED verify locations when verifypeer==0
     o file: restore old behavior for file:////foo/bar URLs
     o FTP: allow PASV on IPv6 connections when a proxy is being used
     o build-openssl.bat: allow custom paths for VS and perl
     o winbuild: make the clean target work without build-type
     o build-openssl.bat: Refer to VS2017 as VC14.1 instead of VC15
     o curl: retry on FTP 4xx, ignore other protocols
     o configure: detect (and use) sa_family_t
     o examples/sftpuploadresume: Fix Windows large file seek
     o build: cleanup to fix clang warnings/errors
     o winbuild: updated the documentation
     o lib: silence null-dereference warnings
     o travis: bump to clang 6 and gcc 7
     o travis: build libpsl and make builds use it
     o proxy: show getenv proxy use in verbose output
     o duphandle: make sure CURLOPT_RESOLVE is duplicated
     o all: Refactor malloc+memset to use calloc
     o checksrc: Fix typo
     o system.h: Add sparcv8plus to oracle/sunpro 32-bit detection
     o vauth: Fix typo
     o ssh: show libSSH2 error code when closing fails
     o test1148: tolerate progress updates better
     o urldata: make service names unconditional
     o configure: keep LD_LIBRARY_PATH changes local
     o ntlm_sspi: fix authentication using Credential Manager
     o schannel: add client certificate authentication
     o winbuild: Support custom devel paths for each dependency
     o schannel: add support for CURLOPT_CAINFO
     o http2: handle on_begin_headers() called more than once
     o openssl: support OpenSSL 1.1.1 verbose-mode trace messages
     o openssl: fix subjectAltName check on non-ASCII platforms
     o http2: avoid strstr() on data not zero terminated
     o http2: clear the "drain counter" when a stream is closed
     o http2: handle GOAWAY properly
     o tool_help: clarify --max-time unit of time is seconds
     o curl.1: clarify that options and URLs can be mixed
     o http2: convert an assert to run-time check
     o curl_global_sslset: always provide available backends
     o ftplistparser: keep state between invokes
     o Curl_memchr: zero length input can't match
     o examples/sftpuploadresume: typecast fseek argument to long
     o examples/http2-upload: expand buffer to avoid silly warning
     o ctype: restore character classification for non-ASCII platforms
     o mime: avoid NULL pointer dereference risk
     o cookies: ensure that we have cookies before writing jar
     o os400.c: fix checksrc warnings
     o configure: provide --with-wolfssl as an alias for --with-cyassl
     o cyassl: adapt to libraries without TLS 1.0 support built-in
     o http2: get rid of another strstr
     o checksrc: force indentation of lines after an else
     o cookies: remove unused macro
     o CURLINFO_PROTOCOL.3: mention the existing defined names
     o tests: provide 'manual' as a feature to optionally require
     o travis: enable libssh2 on both macos and Linux
     o CURLOPT_URL.3: added ENCODING section
     o wolfssl: Fix non-blocking connect
     o vtls: don't define MD5_DIGEST_LENGTH for wolfssl
     o docs: remove extraneous commas in man pages
     o URL: fix ASCII dependency in strcpy_url and strlen_url
     o ssh-libssh.c: fix left shift compiler warning
     o configure: only check for CA bundle for file-using SSL backends
     o travis: add an mbedtls build
     o http: don't set the "rewind" flag when not uploading anything
     o configure: put CURLDEBUG and DEBUGBUILD in lib/curl_config.h
     o transfer: don't unset writesockfd on setup of multiplexed conns
     o vtls: use unified "supports" bitfield member in backends
     o URLs: fix one more http url
     o travis: add a build using WolfSSL
     o openssl: change FILE ops to BIO ops
     o travis: add build using NSS
     o smb: reject negative file sizes
     o cookies: accept parameter names as cookie name
     o http2: getsock fix for uploads
     o all over: fixed format specifiers
     o http2: use the correct function pointer typedef

   This release would not have looked like this without help, code, reports and
   advice from friends like these:

      Adam Brown, Alex Baines, Anders Bakken, Anders Roxell, anshnd on github,
      Bas van Schaik, Bernard Spil, Chris Araman, Christian Schmitz, Cyril B,
      Dagobert Michelsen, Dan Fandrich, Daniel Gustafsson, Daniel Stenberg,
      Dan McNulty, Dario Weisser, dasimx on github, David Garske, David L.,
      Denis Ollier, Dmitry Mikhirev, Dongliang Mu, Don J Olmstead, Eric
   Gallager,
      Ernst Sjöstrand, Frank Gevaerts, Gaurav Malhotra, Geeknik Labs, Howard
   Chu,
      iz8mbw on github, Jakub Wilk, Jon DeVree, Kees Dekker, Kobi Gurkan,
      Laurie Clark-Michalek, Lauri Kasanen, Lawrence Matthews, Luz Paz,
      Marcel Raad, Max Dymond, Michael Kaufmann, Michael Kilburn,
      Michał Janiszewski, Michal Trybus, Muz Dima, Nikos Tsipinakis, Ori
   Avtalion,
      Oumph on github, patelvivekv1993 on github, Patrick Monnerat,
      Philip Prindeville, Ray Satiro, Rick Deist, Rikard Falkeborn, Sergei
   Nikulov,
      Stefan Agner, steini2000 on github, Stephan Mühlstrasser, Sunny Purushe,
      Terry Wu, Vincas Razma, wncboy on github, Wyatt O'Day, 刘佩东,
      (64 contributors)

            Thanks! (and sorry if I forgot to mention someone)

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