From 2656d8d355bc293dfdae8338b442036687bfb883 Mon Sep 17 00:00:00 2001
From: schmonz <schmonz@pkgsrc.org>
Date: Fri, 11 Aug 2017 01:30:23 +0000
Subject: [PATCH] Update to 5.42. From the changelog:

* New features
  - "redirect" also supports "exec" and not only "connect".
  - PKCS#11 engine DLL updated to version 0.4.7.
* Bugfixes
  - Fixed premature cron thread initialization causing hangs.
  - Fixed "verifyPeer = yes" on OpenSSL <= 1.0.1.
  - Fixed pthreads support on OpenSolaris.
---
 security/stunnel/Makefile                            |  4 ++--
 security/stunnel/distinfo                            | 12 ++++++------
 .../stunnel/patches/patch-stunnel.conf-sample.in     |  4 +++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index db69bb20bca0..20d02008cd97 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.107 2017/06/23 03:45:18 schmonz Exp $
+# $NetBSD: Makefile,v 1.108 2017/08/11 01:30:23 schmonz Exp $
 
-DISTNAME=		stunnel-5.41
+DISTNAME=		stunnel-5.42
 CATEGORIES=		security
 MASTER_SITES=		http://www.stunnel.org/downloads/
 
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index f304c0f6a3b3..f8cde3fac48d 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.54 2017/06/23 03:45:18 schmonz Exp $
+$NetBSD: distinfo,v 1.55 2017/08/11 01:30:23 schmonz Exp $
 
-SHA1 (stunnel-5.41.tar.gz) = 9aa8335e0f9571480b0d62b4b58d9d510447b732
-RMD160 (stunnel-5.41.tar.gz) = fdab09cd74f94a09c9b407e7cec58868a5e86cc2
-SHA512 (stunnel-5.41.tar.gz) = cfe414330905d133d4ec698b0d3e40e376a29b70376d88695fbf928c78c8ede36a9d80fca3644f9219a7d4f17fea17cb8bc42e80d788848756bd863bf5eb7ff9
-Size (stunnel-5.41.tar.gz) = 649807 bytes
+SHA1 (stunnel-5.42.tar.gz) = c9228cb94750bfa4a8f6594d544280002fd43345
+RMD160 (stunnel-5.42.tar.gz) = c40db532d1121681b9ddecfe56bff3e5b8152f54
+SHA512 (stunnel-5.42.tar.gz) = 875af19e8a4fa8e983e98d3e6bea198b789bea9b18933ed74aa1f9ce6922e4c4dd3a4ccae3b74c12de30c39b68c3210c9adb7cd228c7fefc28dff258dcdb4968
+Size (stunnel-5.42.tar.gz) = 649496 bytes
 SHA1 (patch-aa) = b247aca629197887fb720f7a02d9b73d60bb0d37
 SHA1 (patch-ac) = 4e5e0a3cfe95b3952741814a1f26bcb99d002fdc
-SHA1 (patch-stunnel.conf-sample.in) = 86d195963e5ad2db381ac89ae0fca13a7f641fa5
+SHA1 (patch-stunnel.conf-sample.in) = 9edaabd1bc15d3ff8524178f4a6aba4a7963b015
diff --git a/security/stunnel/patches/patch-stunnel.conf-sample.in b/security/stunnel/patches/patch-stunnel.conf-sample.in
index 37fb34808de0..460c30836ea3 100644
--- a/security/stunnel/patches/patch-stunnel.conf-sample.in
+++ b/security/stunnel/patches/patch-stunnel.conf-sample.in
@@ -1,4 +1,6 @@
-$NetBSD: patch-stunnel.conf-sample.in,v 1.1 2016/08/29 19:21:24 jym Exp $
+$NetBSD: patch-stunnel.conf-sample.in,v 1.2 2017/08/11 01:30:23 schmonz Exp $
+
+Set pkgsrc defaults: uid, gid, chroot, pidfile.
 
 --- tools/stunnel.conf-sample.in.orig	2016-07-05 21:27:57.000000000 +0000
 +++ tools/stunnel.conf-sample.in