Pullup ticket #4922 - requested by he

www/curl: security update

Revisions pulled up:
- www/curl/Makefile                                             1.157-1.160
- www/curl/distinfo                                             1.112,1.115

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   mef
   Date:           Thu Jan 28 11:46:02 UTC 2016

   Modified Files:
           pkgsrc/www/curl: Makefile distinfo

   Log Message:
   Update 7.46.0 to 7.47.0
   -----------------------
   Curl and libcurl 7.47.0

    Public curl releases:         151
    Command line options:         179
    curl_easy_setopt() options:   221
    Public functions in libcurl:  61
    Contributors:                 1340

   This release includes the following changes:

    o version: Add flag CURL_VERSION_PSL for libpsl
    o http: added CURL_HTTP_VERSION_2TLS to do HTTP/2 for HTTPS only [8]
    o curl: use 2TLS by default
    o curl --expect100-timeout: added [10]
    o Add .dir-locals and set c-basic-offset to 2 (for emacs) [16]

   This release includes the following bugfixes:

    o curl: avoid local drive traversal when saving file on Windows [33]
    o NTLM: do not resuse proxy connections without diff proxy credentials [34]
    o tests: Disable the OAUTHBEARER tests when using a non-default port number [1]
    o curl: remove keepalive #ifdef checks done on libcurl's behalf
    o formdata: Check if length is too large for memory [2]
    o lwip: Fix compatibility issues with later versions [3]
    o openssl: BoringSSL doesn't have CONF_modules_free
    o config-win32: Fix warning HAVE_WINSOCK2_H undefined
    o build: fix compilation error with CURL_DISABLE_VERBOSE_STRINGS [4]
    o http2: Fix hanging paused stream [5]
    o scripts/Makefile: fix GNUism and survive no perl [6]
    o openssl: adapt to 1.1.0+ name changes
    o openssl: adapt to openssl >= 1.1.0 X509 opaque structs [7]
    o HTTP2.md: spell fix and remove TODO now implemented
    o setstropt: const-correctness [9]
    o cyassl: fix compiler warning on type conversion
    o gskit: Fix host subject altname verification [11]
    o http2: Support trailer fields [12]
    o wolfssl: handle builds without SSLv3 support
    o cyassl: deal with lack of *get_peer_certificate [13]
    o sockfilt: do not wait on unreliable file or pipe handle
    o make: build zsh script even in an out-of-tree build
    o test 1326: fix getting stuck on Windows
    o test 87: fix file check on Windows
    o configure: allow static builds on mingw [14]
    o configure: detect IPv6 support on Windows [15]
    o ConnectionExists: with *PIPEWAIT, wait for connections [17]
    o Makefile.inc: s/curl_SOURCES/CURL_FILES [18]
    o test 16: fixed for Windows
    o test 252-255: use datacheck mode text for ASCII-mode LISTings
    o tftpd server: add Windows support by writing files in binary mode
    o ftplistparser: fix handling of file LISTings using Windows EOL
    o tests first.c: fix calculation of sleep timeout on Windows
    o tests (several): use datacheck mode text for ASCII-mode LISTings
    o CURLOPT_RANGE.3: for HTTP servers, range support is optional
    o test 1515: add MSYS support by passing a relative path
    o curl_global_init.3: Add Windows-specific info for init via DLL [19]
    o http2: Fix client write for trailers on stream close [20]
    o mbedtls: Fix ALPN support
    o connection reuse: IDN host names fixed [21]
    o http2: Fix PUSH_PROMISE headers being treated as trailers [22]
    o http2: handle the received SETTINGS frame [23]
    o http2: Ensure that http2_handle_stream_close is called [24]
    o mbedtls: implement CURLOPT_PINNEDPUBLICKEY
    o runtests: Add mbedTLS to the SSL backends
    o IDN host names: Remove the port number before converting to ACE [25]
    o zsh.pl: fail if no curl is found
    o scripts: fix zsh completion generation
    o scripts: don't generate and install zsh completion when cross-compiling [26]
    o lib: Prefix URLs with lower-case protocol names/schemes [27]
    o ConnectionExists: only do pipelining/multiplexing when asked [28]
    o configure: assume IPv6 works when cross-compiled [29]
    o openssl: for 1.1.0+ they now provide a SSLeay() macro of their own
    o openssl: improved error detection/reporting
    o ssh: CURLOPT_SSH_PUBLIC_KEYFILE now treats "" as NULL again [30]
    o mbedtls: Fix pinned key return value on fail [31]
    o maketgz: generate date stamp with LC_TIME=C [32]

   This release includes the following known bugs:

    o see docs/KNOWN_BUGS (http://curl.haxx.se/docs/knownbugs.html)

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

     Alessandro Ghedini, Anders Bakken, Christian Stewart, Dan Fandrich,
     Daniel Schauenberg, Daniel Stenberg, Francisco Moraes, Gisle Vanem,
     Isaac Boukris, Johannes Schindelin, John Kohl, Kamil Dudka, Marc Hoersken,
     Michael Kaufmann, Mohammad AlSaleh, Patrick Monnerat, Ray Satiro, Steve Holme,
     Tatsuhiro Tsujikawa, Thomas Glanzmann, Thomas Klausner,
     (21 contributors)

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


   To generate a diff of this commit:
   cvs rdiff -u -r1.156 -r1.157 pkgsrc/www/curl/Makefile
   cvs rdiff -u -r1.111 -r1.112 pkgsrc/www/curl/distinfo

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   wiz
   Date:           Thu Jan 28 12:04:45 UTC 2016

   Modified Files:
           pkgsrc/www/curl: Makefile

   Log Message:
   Remove gmake dependency, bug was fixed upstream before 7.47.0.


   To generate a diff of this commit:
   cvs rdiff -u -r1.157 -r1.158 pkgsrc/www/curl/Makefile

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   adam
   Date:           Mon Feb  8 17:35:32 UTC 2016

   Modified Files:
           pkgsrc/www/curl: Makefile distinfo
   Removed Files:
           pkgsrc/www/curl/patches: patch-doc_examples_getredirect_c

   Log Message:
   Changes 7.47.1:
   Bugfixes:
   * getredirect.c: fix variable name
   * tool_doswin: silence unused function warning
   * cmake: fixed when OpenSSL enabled on Windows and schannel detected
   * curl.1: Explain remote-name behavior if file already exists
   * tool_operate: Don't sanitize --output path (Windows)
   * URLs: change all http:// URLs to https:// in documentation & comments
   * sasl_sspi: Fix memory leak in domain populate
   * COPYING: clarify that Daniel is not the sole author
   * examples/htmltitle: Use _stricmp on Windows
   * examples/asiohiper: Avoid function name collision on Windows
   * idn_win32: Better error checking
   * openssl: Fix signed/unsigned mismatch warning in X509V3_ext
   * curl save files: check for backslashes on cygwin


   To generate a diff of this commit:
   cvs rdiff -u -r1.158 -r1.159 pkgsrc/www/curl/Makefile
   cvs rdiff -u -r1.114 -r1.115 pkgsrc/www/curl/distinfo
   cvs rdiff -u -r1.2 -r0 \
       pkgsrc/www/curl/patches/patch-doc_examples_getredirect_c

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Wed Feb 10 07:38:47 UTC 2016

   Modified Files:
           pkgsrc/www/curl: Makefile

   Log Message:
   The Curl website now enforces the use of HTTPS. Update the home page and
   master site URL accordingly.


   To generate a diff of this commit:
   cvs rdiff -u -r1.159 -r1.160 pkgsrc/www/curl/Makefile

2 files changed, 10 insertions, 12 deletions

diff --git a/www/curl/Makefile b/www/curl/Makefile
index ce133720e3d..94c654911cf 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.156 2015/12/06 11:31:13 wiz Exp $
+# $NetBSD: Makefile,v 1.156.2.1 2016/02/14 17:55:41 spz Exp $
 
-DISTNAME=	curl-7.46.0
+DISTNAME=	curl-7.47.1
 CATEGORIES=	www
-MASTER_SITES=	http://curl.haxx.se/download/ \
+MASTER_SITES=	https://curl.haxx.se/download/ \
 		ftp://ftp.sunet.se/pub/www/utilities/curl/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://curl.haxx.se/
+HOMEPAGE=	https://curl.haxx.se/
 COMMENT=	Client that groks URLs
 # not completely, but near enough
 LICENSE=	mit
@@ -15,9 +15,7 @@ LICENSE=	mit
 # list it into IPv6-ready packages
 BUILD_DEFS+=	IPV6_READY
 
-USE_TOOLS+=		nroff
-# https://github.com/bagder/curl/issues/555
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		nroff perl
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
diff --git a/www/curl/distinfo b/www/curl/distinfo
index 54371295786..684d358a144 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.111 2015/12/06 11:31:13 wiz Exp $
+$NetBSD: distinfo,v 1.111.2.1 2016/02/14 17:55:41 spz Exp $
 
-SHA1 (curl-7.46.0.tar.bz2) = 96fbe5abe8ecfb923e4ab0a579b3d6be43ef0e96
-RMD160 (curl-7.46.0.tar.bz2) = 59a70f558853483a2b63ddb59e9d02b7d95bb2e8
-SHA512 (curl-7.46.0.tar.bz2) = ff47216a2b4a2d14a2e98e0e87867897a9bf059c58d2d73aa47a69ccd94977367e2de15bea641abfb00e236a8b016ee869675c2cc702f7919da5fe612bd8b5e1
-Size (curl-7.46.0.tar.bz2) = 3494481 bytes
+SHA1 (curl-7.47.1.tar.bz2) = db57162affecaa320b462e35d2adbb37bf30bbe7
+RMD160 (curl-7.47.1.tar.bz2) = cfcdd8632aab2a8ef40435ae1ed7f499741cb1f3
+SHA512 (curl-7.47.1.tar.bz2) = e99d94dfdd349df0603de21687039c69765d40ae6bd73bd8ccdb6d046903a94e590a9cc903f378f8d030997a29bf0394ac5e342c9989a815679f9ea4fa79913f
+Size (curl-7.47.1.tar.bz2) = 3506256 bytes
 SHA1 (patch-aa) = 793701d5ecc3343170fb437906c9adb74763cd13
 SHA1 (patch-curl-config.in) = d0cc7bb6a5bf0b9257f40dcffce7093cc0098eb7
 SHA1 (patch-lib_hostcheck.c) = 8e772d3f91cdafae17281cc19004269ece0cf308