Update "stunnel" package to version 4.42. Changes since version 4.39:

- New features
  - New verify level 0 to request and ignore peer certificate.  This
    feature is useful with the new Windows GUI menu to save cached peer
    certificate chains, as SSL client certificates are not sent by default.
  - Manual page has been updated.
  - Removed support for changing Windows Service name with "service" option.
  - Hardcoded 2048-bit DH parameters are used as a fallback if DH parameters
    are not provided in stunnel.pem.
  - Default "ciphers" value updated to prefer ECDH:
    "ALL:!SSLv2:!aNULL:!EXP:!LOW:-MEDIUM:RC4:+HIGH".
  - Default ECDH curve updated to "prime256v1".
  - Removed support for temporary RSA keys (used in obsolete export ciphers).
- Bugfixes
  - The -quiet commandline option was applied to *all* message boxes.
  - Silent install (/S option) no longer attempts to create stunnel.pem.

4 files changed, 24 insertions, 20 deletions

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 3c56ff13012..7955addedb2 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.71 2011/07/11 14:20:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.72 2011/08/24 17:56:50 tron Exp $
 
-DISTNAME=		stunnel-4.39
+DISTNAME=		stunnel-4.42
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.stunnel.org/stunnel/
 
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index 7fb42509f70..dbbe5aa087d 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.30 2011/07/11 14:20:24 ryoon Exp $
+$NetBSD: distinfo,v 1.31 2011/08/24 17:56:50 tron Exp $
 
-SHA1 (stunnel-4.39.tar.gz) = 381e35a7af354b93aee6d2914485de369bdad76f
-RMD160 (stunnel-4.39.tar.gz) = 55df4c93a6a57ea797d4ab57f9e32a6c80fbcf75
-Size (stunnel-4.39.tar.gz) = 552000 bytes
-SHA1 (patch-aa) = e633cd25316d6885cdc4ee62ddcc3119a91a22b3
-SHA1 (patch-ac) = 3cafb2854549bb8aeb27fc27872f1267051d8796
+SHA1 (stunnel-4.42.tar.gz) = 2bfe693f95d79e964c51fd5e9bf0762663338c9d
+RMD160 (stunnel-4.42.tar.gz) = beecf4e8b4bfa538473e983910fa3ee7acedeafa
+Size (stunnel-4.42.tar.gz) = 558391 bytes
+SHA1 (patch-aa) = 1337b81c8b9a77dc18c052e3f7301d62c68a8b8f
+SHA1 (patch-ac) = fda78cc9794c39357091a55e74fc44e3143b0fab
diff --git a/security/stunnel/patches/patch-aa b/security/stunnel/patches/patch-aa
index 6f9a3cf68ed..eb81ecaba53 100644
--- a/security/stunnel/patches/patch-aa
+++ b/security/stunnel/patches/patch-aa
@@ -1,17 +1,19 @@
-$NetBSD: patch-aa,v 1.23 2011/07/11 14:20:24 ryoon Exp $
+$NetBSD: patch-aa,v 1.24 2011/08/24 17:56:50 tron Exp $
 
---- tools/Makefile.in.orig	2011-05-02 22:14:27.000000000 +0000
-+++ tools/Makefile.in
-@@ -192,7 +192,7 @@ top_srcdir = @top_srcdir@
+Install configuration files into examples directory.
+
+--- tools/Makefile.in.orig	2011-08-17 12:15:27.000000000 +0100
++++ tools/Makefile.in	2011-08-24 18:46:44.000000000 +0100
+@@ -192,7 +192,7 @@
  EXTRA_DIST = ca.html ca.pl importCA.html importCA.sh script.sh \
- 	stunnel.spec stunnel.cnf stunnel.nsi stunnel.conf
+ 	stunnel.spec stunnel.cnf stunnel.nsi stunnel.license stunnel.conf
  
 -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 \
-@@ -373,7 +373,7 @@ info: info-am
+@@ -373,7 +373,7 @@
  
  info-am:
  
diff --git a/security/stunnel/patches/patch-ac b/security/stunnel/patches/patch-ac
index 0dc47086f01..3f74215cc05 100644
--- a/security/stunnel/patches/patch-ac
+++ b/security/stunnel/patches/patch-ac
@@ -1,13 +1,15 @@
-$NetBSD: patch-ac,v 1.12 2011/07/11 14:20:24 ryoon Exp $
+$NetBSD: patch-ac,v 1.13 2011/08/24 17:56:50 tron Exp $
 
---- src/Makefile.in.orig	2011-05-02 22:14:27.000000000 +0000
-+++ src/Makefile.in
-@@ -254,7 +254,7 @@ libstunnel_la_LDFLAGS = -avoid-version
+Change pid file location.
+
+--- src/Makefile.in.orig	2011-08-17 12:15:27.000000000 +0100
++++ src/Makefile.in	2011-08-24 18:49:46.000000000 +0100
+@@ -254,7 +254,7 @@
  INCLUDES = -I/usr/kerberos/include
  
  # Additional compiler flags
 -AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
-+AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"' -DPIDFILE='"$(localstatedir)/run/stunnel.pid"'
++AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' -DPIDFILE='"$(localstatedir)/run/stunnel.pid"'
  
  # Win32 executable
- EXTRA_DIST = stunnel.exe make.bat mingw.mak makece.bat evc.mak vc.mak makew32.bat version.rc nogui.c os2.mak
+ EXTRA_DIST = stunnel.exe make.bat mingw.mak makece.bat evc.mak vc.mak makew32.bat nogui.c os2.mak