From 995e31fac0d6d27b88d3249148e310963769bfcf Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sun, 3 May 2015 10:11:55 +0000
Subject: Update to 7.42.1:

Version 7.42.1 (28 Apr 2015)

Daniel Stenberg (28 Apr 2015)
- RELEASE-NOTES: 7.42.1 ready

- CURLOPT_HEADEROPT: default to separate

  Make the HTTP headers separated by default for improved security and
  reduced risk for information leakage.

  Bug: http://curl.haxx.se/docs/adv_20150429.html
  Reported-by: Yehezkel Horowitz, Oren Souroujon

- RELEASE-NOTES: synced with a6e0270e

- sws: init http2 state properly

  It would otherwise cause problems when running tests after 1801 etc.

- curl_easy_getinfo.3: document 'internals' in CURLINFO_TLS_SESSION

  ... as it was previouly undocumented what the pointer was.

- openssl: fix serial number output

  The code extracting the cert serial number was broken and didn't display
  it properly.

  Bug: https://github.com/bagder/curl/issues/235
  Reported-by: dkjjr89

- [Alessandro Ghedini brought this change]

  curl.1: fix typo

- RELEASE-NOTES: toward 7.42.1, synced with 097460a

- [Kamil Dudka brought this change]

  curl -z: do not write empty file on unmet condition

  This commit fixes a regression introduced in curl-7_41_0-186-g261a0fe.
  It also introduces a regression test 1424 based on tests 78 and 1423.

  Reported-by: Viktor Szakats
  Bug: https://github.com/bagder/curl/issues/237

- [Kamil Dudka brought this change]

  docs: distribute the CURLOPT_PINNEDPUBLICKEY(3) man page, too

- connectionexists: follow-up to fd9d3a1ef1f

  PROTOPT_CREDSPERREQUEST still needs to be checked even when NTLM is not
  enabled.

  Mistake-caught-by: Kamil Dudka

- connectionexists: fix build without NTLM

  Do not access NTLM-specific struct fields when built without NTLM
  enabled!

  bug: http://curl.haxx.se/?i=231
  Reported-by: Patrick Rapin

- dist: include {src,lib}/checksrc.whitelist
---
 www/curl/Makefile | 4 ++--
 www/curl/PLIST    | 3 ++-
 www/curl/distinfo | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/www/curl/Makefile b/www/curl/Makefile
index d77089d112c..8ab434747a0 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.147 2015/04/22 14:35:21 jperkin Exp $
+# $NetBSD: Makefile,v 1.148 2015/05/03 10:11:55 wiz Exp $
 
-DISTNAME=	curl-7.42.0
+DISTNAME=	curl-7.42.1
 CATEGORIES=	www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		ftp://ftp.sunet.se/pub/www/utilities/curl/
diff --git a/www/curl/PLIST b/www/curl/PLIST
index f1f05b2b92b..f4b389604b1 100644
--- a/www/curl/PLIST
+++ b/www/curl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.48 2015/04/22 14:35:21 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.49 2015/05/03 10:11:55 wiz Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
@@ -139,6 +139,7 @@ man/man3/CURLOPT_OPENSOCKETDATA.3
 man/man3/CURLOPT_OPENSOCKETFUNCTION.3
 man/man3/CURLOPT_PASSWORD.3
 man/man3/CURLOPT_PATH_AS_IS.3
+man/man3/CURLOPT_PINNEDPUBLICKEY.3
 man/man3/CURLOPT_PORT.3
 man/man3/CURLOPT_POST.3
 man/man3/CURLOPT_POSTFIELDS.3
diff --git a/www/curl/distinfo b/www/curl/distinfo
index 1d33eeddb81..39e1ef18f9f 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.103 2015/04/22 14:35:21 jperkin Exp $
+$NetBSD: distinfo,v 1.104 2015/05/03 10:11:55 wiz Exp $
 
-SHA1 (curl-7.42.0.tar.bz2) = 5cabee25dcefca7f071e660bd79847f69aeff6af
-RMD160 (curl-7.42.0.tar.bz2) = 876fc1de75dc5e342b3fb6b2ddeb9bbba481c9a4
-Size (curl-7.42.0.tar.bz2) = 3330103 bytes
+SHA1 (curl-7.42.1.tar.bz2) = f65708915875b8cb35edb51d8dd31440dc02fbd3
+RMD160 (curl-7.42.1.tar.bz2) = 76d5b23fae60356342e2bac2e4c706ed544d4adf
+Size (curl-7.42.1.tar.bz2) = 3327304 bytes
 SHA1 (patch-aa) = 59ec0be3ac90470fdc5935881da6a14dbab9d378
 SHA1 (patch-curl-config.in) = fd87c97b601a6b9269f67fbc066604ee7e22570e
 SHA1 (patch-lib_hostcheck.c) = 9faf94f44703c7d37377fd3af319ca5c27df34c2
-- 
cgit v1.2.3