Update to 4.20. From the changelog:

Version 4.20, 2006.11.30, urgency: MEDIUM:
* Release notes
  - The new transfer() function has been well tested.
    I recommend upgrading any previous version with this one.
* Bugfixes
  - Fixed support for encrypted passphases (broken in 4.19).
  - Reduced amount of debug logs.
  - A minor man page update.

Version 4.19, 2006.11.11, urgency: LOW/EXPERIMENTAL:
* Release notes
  - There are a lot of new features in this version.  I recommend
    to test it well before upgrading your mission-critical systems.
* New features
  - New service-level option to specify OCSP server flag:
    OCSPflag = <flag>
  - "protocolCredentials" option changed to "protocolUsername"
    and "protocolPassword"
  - NTLM support to be enabled with the new service-level option:
    protocolAuthentication = NTLM
  - imap protocol negotiation support added.
  - Passphrase cache was added so the user does not need to reenter
    the same passphrase for each defined service any more.
  - New service-level option to retry connect+exec section:
    retry = yes|no
  - Local IP and port is logged for each established connection.
  - Win32 DLLs for OpenSSL 0.9.8d.
* Bugfixes
  - Serious problem with SSL_WANT_* retries fixed.
    The new code requires extensive testing!

Version 4.18, 2006.09.26, urgency: MEDIUM:
* Bugfixes
  - GPF on entering private key pass phrase on Win32 fixed.
  - Updated OpenSSL Win32 DLLs.
  - Minor configure script update.

Version 4.17, 2006.09.10, urgency: MEDIUM:
* New features
  - Win32 DLLs for OpenSSL 0.9.8c.
* Bugfixes
  - Problem with detecting getaddrinfo() in ./configure fixed.
  - Compilation problem due to misplaced #endif in ssl.c fixed.
  - Duplicate 220 in smtp_server() function in protocol.c fixed.
  - Minor os2.mak update.
  - Minor update of safestring()/safename() macros.

Version 4.16, 2006.08.31, urgency: MEDIUM:
* New features sponsored by Hewlett-Packard
  - A new global option to control engine:
    engineCtrl = <command>[:<parameter>]
  - A new service-level option to select engine to read private key:
    engineNum = <engine number>
  - OCSP support:
    ocsp = <URL>
* New features
  - A new option to select version of SSL protocol:
    sslVersion = all|SSLv2|SSLv3|TLSv1
  - Visual Studio vc.mak by David Gillingham <dgillingham@gmail.com>.
  - OS2 support by Paul Smedley (http://smedley.info)
* Bugfixes
  - An ordinary user can install stunnel again.
  - Compilation problem with --enable-dh fixed.
  - Some minor compilation warnings fixed.
  - Service-level CRL cert store implemented.
  - GPF on protocol negotiations fixed.
  - Problem detecting addrinfo() on Tru64 fixed.
  - Default group is now detected by configure script.
  - Check for maximum number of defined services added.
  - OpenSSL_add_all_algorithms() added to SSL initialization.
  - configure script sections reordered to detect pthread library funcions.
  - RFC 2487 autdoetection improved.  High resolution s_poll_wait()
    not currently supported by UCONTEXT threading.
  - More precise description of cert directory file names (thx to Muhammad
    Muquit).
* Other changes
  - Maximum number of services increased from 64 to 256 when poll() is used.

6 files changed, 19 insertions, 36 deletions

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 9360bef2a08..ff346d95046 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2006/10/16 20:14:26 tv Exp $
+# $NetBSD: Makefile,v 1.58 2007/01/14 00:07:15 schmonz Exp $
 
-DISTNAME=		stunnel-4.15
-PKGREVISION=		1
+DISTNAME=		stunnel-4.20
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.fu-berlin.de/unix/security/stunnel/ \
 			ftp://stunnel.mirt.net/stunnel/ \
diff --git a/security/stunnel/PLIST b/security/stunnel/PLIST
index 217814aaf0f..82cbee21221 100644
--- a/security/stunnel/PLIST
+++ b/security/stunnel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/10/14 11:12:19 obache Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/01/14 00:07:15 schmonz Exp $
 lib/libstunnel.la
 man/man8/stunnel.8
 man/man8/stunnel.fr.8
@@ -12,6 +12,8 @@ share/doc/stunnel/COPYRIGHT.GPL
 share/doc/stunnel/CREDITS
 share/doc/stunnel/ChangeLog
 share/doc/stunnel/INSTALL
+share/doc/stunnel/INSTALL.W32
+share/doc/stunnel/INSTALL.WCE
 share/doc/stunnel/NEWS
 share/doc/stunnel/PORTS
 share/doc/stunnel/README
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index 3c81befb34d..93940ee17b9 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.21 2006/10/16 20:14:26 tv Exp $
+$NetBSD: distinfo,v 1.22 2007/01/14 00:07:15 schmonz Exp $
 
-SHA1 (stunnel-4.15.tar.gz) = 735406c1ca94904581158a434214e1f6568539d0
-RMD160 (stunnel-4.15.tar.gz) = a8d5c9d3fb24d0518975cbb347729f5eba3d3f12
-Size (stunnel-4.15.tar.gz) = 497103 bytes
-SHA1 (patch-aa) = e54eed598bb069b9131ed42721df8f49069b15b8
-SHA1 (patch-ab) = 947f8ee20b28fa782786976ac19d0f7ef895f254
-SHA1 (patch-ac) = 64a24088f3a6e55bd59324a17bbcf74786ed2cb2
+SHA1 (stunnel-4.20.tar.gz) = a9a449b28a4f34ab22f6b4bfaa81c1904a5883c4
+RMD160 (stunnel-4.20.tar.gz) = 6a5dfbabe17804e87ed8c7c75898dba4b4257827
+Size (stunnel-4.20.tar.gz) = 513394 bytes
+SHA1 (patch-aa) = 08f7c534152ced42373212a3ade8d7a4a750cd5d
+SHA1 (patch-ac) = dec916e00497f1df6844475cc8972513a6ced0ba
diff --git a/security/stunnel/patches/patch-aa b/security/stunnel/patches/patch-aa
index 3bcc039cb3f..f74855abad3 100644
--- a/security/stunnel/patches/patch-aa
+++ b/security/stunnel/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.18 2006/10/14 11:12:19 obache Exp $
+$NetBSD: patch-aa,v 1.19 2007/01/14 00:07:15 schmonz Exp $
 
---- tools/Makefile.in.orig	2006-03-06 21:02:39.000000000 +0000
+--- tools/Makefile.in.orig	2006-11-11 09:58:22.000000000 -0500
 +++ tools/Makefile.in
-@@ -160,7 +160,7 @@ target_alias = @target_alias@
+@@ -161,7 +161,7 @@ target_alias = @target_alias@
  EXTRA_DIST = ca.html ca.pl importCA.html importCA.sh script.sh \
  	stunnel.spec stunnel.mak stunnel.cnf stunnel.nsi stunnel.conf
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.18 2006/10/14 11:12:19 obache Exp $
  conf_DATA = stunnel.conf-sample
  docdir = $(datadir)/doc/stunnel
  examplesdir = $(docdir)/examples
-@@ -331,7 +331,7 @@ info: info-am
+@@ -332,7 +332,7 @@ info: info-am
  
  info-am:
  
diff --git a/security/stunnel/patches/patch-ab b/security/stunnel/patches/patch-ab
deleted file mode 100644
index 2c904828c89..00000000000
--- a/security/stunnel/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.17 2006/10/14 11:12:19 obache Exp $
-
---- Makefile.in.orig	2006-03-06 20:52:41.000000000 +0000
-+++ Makefile.in
-@@ -180,10 +180,10 @@ ssldir = @ssldir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = src doc tools
--EXTRA_DIST = PORTS BUGS COPYRIGHT.GPL CREDITS INSTALL.W32 INSTALL.WCE
-+EXTRA_DIST = PORTS BUGS COPYRIGHT.GPL CREDITS
- docdir = $(datadir)/doc/stunnel
- doc_DATA = AUTHORS BUGS ChangeLog COPYING COPYRIGHT.GPL CREDITS \
--	INSTALL INSTALL.W32 INSTALL.WCE NEWS PORTS README TODO
-+	INSTALL NEWS PORTS README TODO
- 
- distcleancheck_listfiles = \
- 	find -type f -exec sh -c 'test -f $(srcdir)/{} || echo {}' ';'
diff --git a/security/stunnel/patches/patch-ac b/security/stunnel/patches/patch-ac
index 115c30ddc79..b237c9778a2 100644
--- a/security/stunnel/patches/patch-ac
+++ b/security/stunnel/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2006/10/16 20:14:26 tv Exp $
+$NetBSD: patch-ac,v 1.8 2007/01/14 00:07:15 schmonz Exp $
 
---- src/Makefile.in.orig	2006-03-06 15:52:41.000000000 -0500
+--- src/Makefile.in.orig	2006-11-11 09:58:22.000000000 -0500
 +++ src/Makefile.in
-@@ -222,7 +222,7 @@ libstunnel_la_LDFLAGS = -avoid-version
+@@ -221,7 +221,7 @@ libstunnel_la_LDFLAGS = -avoid-version
  INCLUDES = -I/usr/kerberos/include
  
  # Additional compiler flags
@@ -10,4 +10,4 @@ $NetBSD: patch-ac,v 1.7 2006/10/16 20:14:26 tv Exp $
 +AM_CPPFLAGS = -DLIBDIR='"$(libdir)"' -DCONFDIR='"$(sysconfdir)"' -DPIDFILE='"/var/run/stunnel/stunnel.pid"'
  
  # Win32 executable
- EXTRA_DIST = stunnel.exe make.bat mingw.mak makece.bat evc.mak vc.mak nogui.c
+ EXTRA_DIST = stunnel.exe make.bat mingw.mak makece.bat evc.mak vc.mak nogui.c os2.mak