Update to 5.20

Changelog:
Version 5.20, 2015.07.09, urgency: HIGH
* Security bugfixes
  - OpenSSL DLLs updated to version 1.0.2d.
    https://www.openssl.org/news/secadv_20150709.txt
* New features
  - poll(2) re-enabled on MacOS X 10.5 and later.
  - Xcode SDK is automatically used on MacOS X if no other
    locally installed OpenSSL directory is found.
  - The SSL library detection algorithm was made a bit smarter.
  - Warnings about insecure authentication were modified to
    include the name of the affected service section.
  - A warning was added to stunnel.init if no pid file was
    specified in the configuration file (thx to Peter Pentchev).
  - Optional debugging symbols are included in the Win32 installer.
  - Documentation updates (closes Debian bug #781669).
* Bugfixes
  - Signal pipe reinitialization added to prevent turning the
    main accepting thread into a busy wait loop when an external
    condition breaks the signal pipe.  This bug was found to
    surface on Win32, but other platforms may also be affected.
  - Fixed removing the disabled taskbar icon.
  - Generated temporary DH parameters are used for configuration
    reload instead of the static defaults.
  - LSB compatibility fixes added to the stunnel.init script (thx
    to Peter Pentchev).
  - Fixed the manual page headers (thx to Gleydson Soares).

Version 5.19, 2015.06.16, urgency: MEDIUM:
* New features
  - OpenSSL DLLs updated to version 1.0.2c.
  - Added a runtime check whether COMP_zlib() method is implemented
    in order to improve compatibility with the Debian OpenSSL build.
* Bugfixes
  - Improved socket error handling.
  - Cron thread priority on Win32 platform changed to
    THREAD_PRIORITY_LOWEST to improve portability.
  - Makefile bugfixes for stunnel 5.18 regressions.
  - Fixed some typos in docs and scripts (thx to Peter Pentchev).
  - Fixed a log level check condition (thx to Peter Pentchev).

Version 5.18, 2015.06.12, urgency: MEDIUM:
* New features
  - OpenSSL DLLs updated to version 1.0.2b.
    https://www.openssl.org/news/secadv_20150611.txt
  - Added "include" configuration file option to include all
    configuration file parts located in a specified directory.
  - Log file is reopened every 24 hours.  With "log = overwrite"
    this feature can be used to prevent filling up disk space.
  - Temporary DH parameters are refreshed every 24 hours, unless
    static DH parameters were provided in the certificate file.
  - Unique initial DH parameters are distributed with each release.
  - Warnings are logged on potentially insecure authentication.
  - Improved compatibility with the current OpenSSL 1.1.0-dev tree:
    removed RLE compression support, etc.
  - Updated stunnel.spec (thx to Bill Quayle).
* Bugfixes
  - Fixed handling of dynamic connect targets.
  - Fixed handling of trailing whitespaces in the Content-Length
    header of the NTLM authentication.
  - Fixed --sysconfdir and --localstatedir handling (thx to
    Dagobert Michelsen).

4 files changed, 18 insertions, 19 deletions

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 44eda4e9444..1252c09280b 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.95 2015/06/12 10:51:10 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2015/07/25 03:11:18 ryoon Exp $
 
-DISTNAME=		stunnel-5.17
-PKGREVISION=		1
+DISTNAME=		stunnel-5.20
 CATEGORIES=		security
 MASTER_SITES=		http://www.stunnel.org/downloads/
 
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index 8fb1b5d5b70..25597d59684 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.43 2015/06/05 20:41:03 youri Exp $
+$NetBSD: distinfo,v 1.44 2015/07/25 03:11:18 ryoon Exp $
 
-SHA1 (stunnel-5.17.tar.gz) = 62c1be914934a09e9ac0b9ef34f7aacc8f34838f
-RMD160 (stunnel-5.17.tar.gz) = 91da4b9d56806b273757216d1ec52842f64e4e15
-Size (stunnel-5.17.tar.gz) = 613840 bytes
-SHA1 (patch-aa) = 6e64233183a9ca19a5f86c7152a21f3d8e146268
-SHA1 (patch-ac) = 52d2d1ee392ceecb31b1cafa6fd3c42d4e9e0694
+SHA1 (stunnel-5.20.tar.gz) = 7506fd03cd04d7bc93b6253e63f0619b7b336053
+RMD160 (stunnel-5.20.tar.gz) = c38ba51fd06d23257c8edf1686cab5954a0cd5e8
+Size (stunnel-5.20.tar.gz) = 625091 bytes
+SHA1 (patch-aa) = cd0f449f0672599472076794370f284b94152726
+SHA1 (patch-ac) = 91b09d39fb968ad76952acdff250150d3e372c36
diff --git a/security/stunnel/patches/patch-aa b/security/stunnel/patches/patch-aa
index d29990ba3dc..1c9343d4e90 100644
--- a/security/stunnel/patches/patch-aa
+++ b/security/stunnel/patches/patch-aa
@@ -1,19 +1,19 @@
-$NetBSD: patch-aa,v 1.26 2014/11/07 11:30:47 schmonz Exp $
+$NetBSD: patch-aa,v 1.27 2015/07/25 03:11:18 ryoon Exp $
 
 Install configuration files into examples directory.
 
---- tools/Makefile.in.orig	2014-10-23 15:09:25.000000000 +0000
+--- tools/Makefile.in.orig	2015-07-03 12:08:23.000000000 +0000
 +++ tools/Makefile.in
-@@ -226,7 +226,7 @@ top_srcdir = @top_srcdir@
- EXTRA_DIST = ca.html ca.pl importCA.html importCA.sh script.sh \
- 	stunnel.spec stunnel.cnf stunnel.nsi stunnel.license stunnel.conf
+@@ -273,7 +273,7 @@ EXTRA_DIST = ca.html ca.pl importCA.html
+ 	stunnel.spec stunnel.cnf stunnel.nsi stunnel.license stunnel.conf \
+ 	stunnel.conf-sample.in stunnel.init.in stunnel.service.in
  
 -confdir = $(sysconfdir)/stunnel
 +confdir = $(datadir)/examples/stunnel
  conf_DATA = stunnel.conf-sample
  examplesdir = $(docdir)/examples
- examples_DATA = ca.html ca.pl importCA.html importCA.sh script.sh \
-@@ -414,7 +414,7 @@ info: info-am
+ examples_DATA = stunnel.spec stunnel.init stunnel.service ca.html \
+@@ -463,7 +463,7 @@ info: info-am
  
  info-am:
  
diff --git a/security/stunnel/patches/patch-ac b/security/stunnel/patches/patch-ac
index 35df537ffa0..2aeab724ad1 100644
--- a/security/stunnel/patches/patch-ac
+++ b/security/stunnel/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.18 2015/06/05 20:41:04 youri Exp $
+$NetBSD: patch-ac,v 1.19 2015/07/25 03:11:18 ryoon Exp $
 
 We'll take care of PKG_SYSCONFSUBDIR ourselves, thanks.
 
---- src/Makefile.in.orig	2015-04-29 18:17:24.000000000 +0000
+--- src/Makefile.in.orig	2015-07-09 13:41:47.000000000 +0000
 +++ src/Makefile.in
-@@ -388,7 +388,7 @@ libstunnel_la_LDFLAGS = -avoid-version
+@@ -396,7 +396,7 @@ libstunnel_la_LDFLAGS = -avoid-version
  
  # Additional preprocesor definitions
  stunnel_CPPFLAGS = -I/usr/kerberos/include -I$(SSLDIR)/include \