Pullup ticket #4812 - requested by he

www/curl: security update

Revisions pulled up:
- www/curl/Makefile                                             1.153-1.154
- www/curl/PLIST                                                1.52-1.53
- www/curl/distinfo                                             1.108-1.109
- www/curl/patches/patch-aa                                     1.33-1.34
- www/curl/patches/patch-curl-config.in                         1.7
- www/curl/patches/patch-lib_hostcheck.c                        1.4
- www/curl/patches/patch-lib_http2.c                            deleted

---
   Module Name:	pkgsrc
   Committed By:	spz
   Date:		Sat Aug  8 02:44:16 UTC 2015

   Modified Files:
   	pkgsrc/www/curl: Makefile PLIST distinfo
   	pkgsrc/www/curl/patches: patch-aa patch-curl-config.in
   	    patch-lib_hostcheck.c
   Added Files:
   	pkgsrc/www/curl/patches: patch-lib_multi.c patch-lib_transfer.c
   Removed Files:
   	pkgsrc/www/curl/patches: patch-lib_http2.c

   Log Message:
   reanimate curl-7.43.0 and add the upstream fix for
   http://curl.haxx.se/mail/lib-2015-06/0122.html found in
   https://github.com/bagder/curl/commit/903b6e05565bf826b4194447864288642214b094

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Mon Aug 17 15:43:27 UTC 2015

   Modified Files:
   	pkgsrc/www/curl: Makefile PLIST distinfo
   	pkgsrc/www/curl/patches: patch-aa
   Removed Files:
   	pkgsrc/www/curl/patches: patch-lib_multi.c patch-lib_transfer.c

   Log Message:
   Update to 7.44.0:

   Curl and libcurl 7.44.0

    Public curl releases:         148
    Command line options:         176
    curl_easy_setopt() options:   219
    Public functions in libcurl:  58
    Contributors:                 1291

   This release includes the following changes:

    o http2: added CURLMOPT_PUSHFUNCTION and CURLMOPT_PUSHDATA [6]
    o examples: added http2-serverpush.c [7]
    o http2: added curl_pushheader_byname() and curl_pushheader_bynum()
    o docs: added CODE_OF_CONDUCT.md [8]
    o curl: Add --ssl-no-revoke to disable certificate revocation checks [5]
    o libcurl: New value CURLSSLOPT_NO_REVOKE for CURLOPT_SSL_OPTIONS [9]
    o makefile: Added support for VC14
    o build: Added Visual Studio 2015 (VC14) project files
    o build: Added wolfSSL configurations to VC10+ project files [18]

   This release includes the following bugfixes:

    o FTP: fix HTTP CONNECT logic regression [1]
    o openssl: Fix build with openssl < ~ 0.9.8f
    o openssl: fix build with BoringSSL
    o curl_easy_setopt.3: option order doesn't matter
    o openssl: fix use of uninitialized buffer [2]
    o RTSP: removed dead code
    o Makefile.m32: add support for CURL_LDFLAG_EXTRAS
    o curl: always provide negotiate/kerberos options
    o cookie: Fix bug in export if any-domain cookie is present
    o curl_easy_setopt.3: mention CURLOPT_PIPEWAIT
    o INSTALL: Advise use of non-native SSL for Windows <= XP
    o tool_help: fix --tlsv1 help text to use >= for TLSv1
    o HTTP: POSTFIELDSIZE set after added to multi handle [3]
    o SSL-PROBLEMS: mention WinSSL problems in WinXP
    o setup-vms.h: Symbol case fixups
    o SSL: Pinned public key hash support
    o libtest: call PR_Cleanup() on exit if NSPR is used
    o ntlm_wb: Fix theoretical memory leak
    o runtests: Allow for spaces in curl custom path
    o http2: add stream != NULL checks for reliability
    o schannel: Replace deprecated GetVersion with VerifyVersionInfo
    o http2: verify success of strchr() in http2_send()
    o configure: add --disable-rt option
    o openssl: work around MSVC warning
    o HTTP: ignore "Content-Encoding: compress"
    o configure: check if OpenSSL linking wants -ldl
    o build-openssl.bat: Show syntax if required args are missing
    o test1902: attempt to make the test more reliable
    o libcurl-thread.3: Consolidate thread safety info
    o maketgz: Fixed some VC makefiles missing from the release tarball
    o libcurl-multi.3: mention curl_multi_wait [10]
    o ABI doc: use secure URL
    o http: move HTTP/2 cleanup code off http_disconnect() [11]
    o libcurl-thread.3: Warn memory functions must be thread safe [12]
    o curl_global_init_mem.3: Warn threaded resolver needs thread safe funcs [13]
    o docs: formpost needs the full size at start of upload [14]
    o curl_gssapi: remove 'const' to fix compiler warnings
    o SSH: three state machine fixups [15]
    o libcurl.3: fix a single typo [16]
    o generate.bat: Only clean prerequisite files when in ALL mode
    o curl_slist_append.3: add error checking to the example
    o buildconf.bat: Added support for file clean-up via -clean
    o generate.bat: Use buildconf.bat for prerequisite file clean-up
    o NTLM: handle auth for only a single request [17]
    o curl_multi_remove_handle.3: fix formatting [19]
    o checksrc.bat: Fixed error when [directory] isn't a curl source directory
    o checksrc.bat: Fixed error when missing *.c and *.h files
    o CURLOPT_RESOLVE.3: Note removal support was added in 7.42 [20]
    o test46: update cookie expire time
    o SFTP: fix range request off-by-one in size check [21]
    o CMake: fix GSSAPI builds [22]
    o build: refer to fixed libidn versions [4]
    o http2: discard frames with no SessionHandle [23]
    o curl_easy_recv.3: fix formatting
    o libcurl-tutorial.3: fix formatting [24]
    o curl_formget.3: correct return code [25]

1 files changed, 2 insertions, 2 deletions

diff --git a/www/curl/patches/patch-curl-config.in b/www/curl/patches/patch-curl-config.in
index ccf58619a08..82b20c2a539 100644
--- a/www/curl/patches/patch-curl-config.in
+++ b/www/curl/patches/patch-curl-config.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-curl-config.in,v 1.4 2014/03/30 12:57:54 spz Exp $
+$NetBSD: patch-curl-config.in,v 1.4.12.1 2015/09/09 20:28:44 tron Exp $
 
 - make "curl-config --libs" return proper ldflags for shared libraries
 
---- curl-config.in.orig	2014-01-05 22:07:54.000000000 +0000
+--- curl-config.in.orig	2015-06-03 07:38:20.000000000 +0000
 +++ curl-config.in
 @@ -148,9 +148,9 @@ while test $# -gt 0; do
             CURLLIBDIR=""