Update to 5.28

Changelog:
Version 5.28, 2015.12.11, urgency: HIGH
* New features
  - Build matrix (.travis.yml) extended with ./configure options.
  - mingw.mak updated to build tstunnel.exe (thx to Jose Alf.).
* Bugfixes
  - Fixed incomplete initialization.
  - Fixed UCONTEXT threading on OSX.
  - Fixed exit codes for information requests (as
    in "stunnel -version" or "stunnel -help").

Version 5.27, 2015.12.03, urgency: MEDIUM
* Security bugfixes
  - OpenSSL DLLs updated to version 1.0.2e.
    https://www.openssl.org/news/secadv_20151203.txt
* New features
  - Automated build testing configured with .travis.yml.
  - Added reading server certificates from hardware engines.
    For example: cert = id_45
  - Only attempt to use potentially harmful compiler or linker
    options if gcc was detected.
  - /opt/csw added to the OpenSSL directory lookup list.
  - mingw.mak updates (thx to Jose Alf.).
  - TODO list updated.

Version 5.26, 2015.11.06, urgency: MEDIUM
* Bugfixes
  - Compilation fixes for OSX, *BSD and Solaris.

Version 5.25, 2015.11.02, urgency: MEDIUM
* New features
  - SMTP client protocol negotiation support for
    "protocolUsername", "protocolPassword", and
    "protocolAuthentication" (thx to Douglas Harris).
  - New service-level option "config" to specify configuration
    commands introduced in OpenSSL 1.0.2 (thx to Stephen Wall).
  - The global option "foreground" now also accepts "quiet"
    parameter, which does not enable logging to stderr.
  - Manual page updated.
  - Obsolete OpenSSL engines removed from the Windows build:
    4758cca, aep, atalla, cswift, nuron, sureware.
  - Improved compatibility with the current OpenSSL 1.1.0-dev tree:
    gracefully handle symbols renamed from SSLeay* to OpenSSL*.
* Bugfixes
  - Fixed the "s_poll_wait returned 1, but no descriptor
    is ready" internal error.
  - Fixed "exec" hangs due to incorrect thread-local
    storage handling (thx to Philip Craig).
  - Fixed PRNG initialization (thx to Philip Craig).
  - Setting socket options no longer performed on PTYs.
  - Fixed 64-bit Windows build.

Version 5.24, 2015.10.08, urgency: MEDIUM
* New features
  - Custom CRL verification was replaced with the internal
    OpenSSL functionality.
  - *BSD support for "transparent = destination" and
    client-side "protocol = socks". This feature should
    work at least on FreeBSD, OpenBSD and OS X.
  - Added a new "protocolDomain" option for the NTLM
    authentication (thx to Andreas Botsikas).
  - Improved compatibility of the NTLM phase 1 message (thx
    to Andreas Botsikas).
  - "setuid" and "setgid" options are now also available
    in service sections.  They can be used to set owner
    and group of the Unix socket specified with "accept".
  - Added support for the new OpenSSL 1.0.2 SSL options.
  - Added OPENSSL_NO_EGD support (thx to Bernard Spil).
  - VC autodetection added to makew32.bat (thx to Andreas
    Botsikas).
* Bugfixes
  - Fixed the RESOLVE [F0] TOR extension support in SOCKS5.
  - Fixed the error code reported on the failed bind()
    requests.
  - Fixed the sequential log id with the FORK threading.
  - Restored the missing Microsoft.VC90.CRT.manifest file.

Version 5.23, 2015.09.02, urgency: LOW
* New features
  - Client-side support for the SOCKS protocol.
    See https://www.stunnel.org/socksvpn.html for details.
  - Reject SOCKS requests to connect loopback addresses.
  - New service-level option "OCSPnonce".
    The default value is "OCSPnonce = no".
  - Win32 directory structure rearranged.  The installer
    script provides automatic migration for common setups.
  - Added Win32 installer option to install stunnel for the
    current user only.  This feature does not deploy the NT
    service, but it also does not require aministrative
    privileges to install and configure stunnel.
  - stunnel.cnf was renamed to openssl.cnf in order to
    to prevent users from mixing it up with stunnel.conf.
  - Win32 desktop is automatically refreshed when the icon
    is created or removed.
  - The ca-certs.pem file is now updated on stunnel upgrade.
  - Inactive ports were removed from the PORTS file.
  - Added IPv6 support to the transparent proxy code.
* Bugfixes
  - Compilation fix for OpenSSL version older than 1.0.0.
  - Compilation fix for mingw.

Version 5.22, 2015.07.30, urgency: HIGH
* New features
  - "OCSPaia = yes" added to the configuration file templates.
  - Improved double free detection.
* Bugfixes
  - Fixed a number of OCSP bugs.  The most severe of those
    bugs caused stunnel to treat OCSP responses that failed
    OCSP_basic_verify() checks as if they were successful.
  - Fixed the passive IPv6 resolver (broken in stunnel 5.21).

Version 5.21, 2015.07.27, urgency: MEDIUM
* New features
  - Signal names are displayed instead of numbers.
  - First resolve IPv4 addresses on passive resolver requests.
    This speeds up stunnel startup on Win32 with a slow/defunct
    DNS service.
  - The "make check" target was modified to only build Win32
    executables when stunnel is built from a git repository (thx
    to Peter Pentchev).
  - More elaborate descriptions were added to the warning about
    using "verify = 2" without "checkHost" or "checkIP".
  - Performance optimization was performed on the debug code.
* Bugfixes
  - Fixed the FORK and UCONTEXT threading support.
  - Fixed "failover=prio" (broken since stunnel 5.15).
  - Added a retry when sleep(3) was interrupted by a signal
    in the cron thread scheduler.

4 files changed, 31 insertions, 13 deletions

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 1252c09280b..3b4463b5fc1 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.96 2015/07/25 03:11:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.97 2015/12/27 18:36:05 ryoon Exp $
 
-DISTNAME=		stunnel-5.20
+DISTNAME=		stunnel-5.28
 CATEGORIES=		security
 MASTER_SITES=		http://www.stunnel.org/downloads/
 
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index 1a6702e5d37..5bfc25d26c3 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.45 2015/11/04 01:18:11 agc Exp $
+$NetBSD: distinfo,v 1.46 2015/12/27 18:36:06 ryoon Exp $
 
-SHA1 (stunnel-5.20.tar.gz) = 7506fd03cd04d7bc93b6253e63f0619b7b336053
-RMD160 (stunnel-5.20.tar.gz) = c38ba51fd06d23257c8edf1686cab5954a0cd5e8
-SHA512 (stunnel-5.20.tar.gz) = 59262aacf866cac25bac707b94c5a6185aa868b5fdfab38a9ef03a00b80f106d92e2872c0b0fecbc5d13adb7bdea7f922768fb78f38355dbf67eb34a148441e4
-Size (stunnel-5.20.tar.gz) = 625091 bytes
-SHA1 (patch-aa) = cd0f449f0672599472076794370f284b94152726
+SHA1 (stunnel-5.28.tar.gz) = 9162f0162638046ed559efe06337bf070ab96f1e
+RMD160 (stunnel-5.28.tar.gz) = 4edceb3a2587822fdb13aff9892c89d4c9e5b975
+SHA512 (stunnel-5.28.tar.gz) = a01b02afbc05aa7256f245b9142fb17990cd2026274da9358a52778dd0272379aec39e5794c0992e11e3f7584b69fee903742bba9e072bb32928d65bd3abe40a
+Size (stunnel-5.28.tar.gz) = 637471 bytes
+SHA1 (patch-aa) = c79d26b07a7e9d11f54bf2f61d17206b0c2951b0
 SHA1 (patch-ac) = 91b09d39fb968ad76952acdff250150d3e372c36
+SHA1 (patch-configure) = a17310f9b1e6697320cb5316b9db360f1658142c
diff --git a/security/stunnel/patches/patch-aa b/security/stunnel/patches/patch-aa
index 1c9343d4e90..ef6094b224a 100644
--- a/security/stunnel/patches/patch-aa
+++ b/security/stunnel/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.27 2015/07/25 03:11:18 ryoon Exp $
+$NetBSD: patch-aa,v 1.28 2015/12/27 18:36:06 ryoon Exp $
 
 Install configuration files into examples directory.
 
---- tools/Makefile.in.orig	2015-07-03 12:08:23.000000000 +0000
+--- tools/Makefile.in.orig	2015-12-08 15:59:03.000000000 +0000
 +++ tools/Makefile.in
-@@ -273,7 +273,7 @@ EXTRA_DIST = ca.html ca.pl importCA.html
- 	stunnel.spec stunnel.cnf stunnel.nsi stunnel.license stunnel.conf \
+@@ -275,7 +275,7 @@ EXTRA_DIST = ca.html ca.pl importCA.html
+ 	stunnel.spec openssl.cnf stunnel.nsi stunnel.license stunnel.conf \
  	stunnel.conf-sample.in stunnel.init.in stunnel.service.in
  
 -confdir = $(sysconfdir)/stunnel
@@ -13,7 +13,7 @@ Install configuration files into examples directory.
  conf_DATA = stunnel.conf-sample
  examplesdir = $(docdir)/examples
  examples_DATA = stunnel.spec stunnel.init stunnel.service ca.html \
-@@ -463,7 +463,7 @@ info: info-am
+@@ -464,7 +464,7 @@ info: info-am
  
  info-am:
  
diff --git a/security/stunnel/patches/patch-configure b/security/stunnel/patches/patch-configure
new file mode 100644
index 00000000000..383597433a4
--- /dev/null
+++ b/security/stunnel/patches/patch-configure
@@ -0,0 +1,17 @@
+$NetBSD: patch-configure,v 1.1 2015/12/27 18:36:06 ryoon Exp $
+
+Fix NetBSD build, undefined u_short etc.
+
+--- configure.orig	2015-12-08 15:59:04.000000000 +0000
++++ configure
+@@ -3082,10 +3082,6 @@ $as_echo "#define _GNU_SOURCE 1" >>confd
+ 
+ $as_echo "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+ 
+-# OSX does not declare chroot() with newer _XOPEN_SOURCE versions
+-
+-$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
+-
+ # Solaris does not declare IPv6 structures without __EXTENSIONS__
+ 
+ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h