Update stunnel to 3.9. For NetBSD, if in-tree OpenSSL exists, then the

default certificate directory is now /etc/openssl/certs (matches OpenSSL's
default), but if stunnel uses the pkgsrc OpenSSL, then the default is
${PREFIX}/certs.

Changes from version 3.8 include:

* Updated temporary key generation:
   - stunnel is now honoring requested key-lengths correctly,
   - temporary key is changed every hour.
* transfer() no longer hangs on some platforms.
  Special thanks to Peter Wagemans for the patch.
* Potential security problem with syslog() call fixed.
* use daemon() function instead of daemonize, if available
* added -S flag, allowing you to choose which default verify
  sources to use
* relocated service name output logging until after log_open.
  (no longer outputs log info to inetd socket, causing bad SSL)
* -V flag now outputs the default values used by stunnel
* Added rigerous PRNG seeding
* PID changes (and related security-fix)
* Man page fixes
* Client SSL Session-IDs now used
* -N flag to specify tcpwrapper service name

* UPGRADE NOTE: this version seriously changes several previous stunnel
  default behaviours.  There are no longer any default cert file/dirs
  compilied into stunnel, you must use the --with-cert-dir and
  --with-cert-file configure arguments to set these manually, if desired.
  Stunnel does not use the underlying ssl library defaults by default
  unless configured with --enable-ssllib-cs.  Note that these can always
  be enabled at run time with the -A,-a, and -S flags.
  Additionally, unless --with-pem-dir is specified at compile time,
  stunnel will default to looking for stunnel.pem in the current directory.

1 files changed, 16 insertions, 14 deletions

diff --git a/security/stunnel/patches/patch-aa b/security/stunnel/patches/patch-aa
index 47e2547f3fe..658790178cf 100644
--- a/security/stunnel/patches/patch-aa
+++ b/security/stunnel/patches/patch-aa
@@ -1,32 +1,34 @@
-$NetBSD: patch-aa,v 1.5 2000/06/17 21:52:18 tron Exp $
+$NetBSD: patch-aa,v 1.6 2000/12/19 07:03:22 jlam Exp $
 
---- Makefile.in.orig	Tue Feb 22 13:08:16 2000
-+++ Makefile.in	Sat Jun 17 23:46:38 2000
-@@ -7,9 +7,9 @@
+--- Makefile.in.orig	Sat Oct 21 10:02:03 2000
++++ Makefile.in
+@@ -9,7 +9,7 @@
  sbindir=@sbindir@
  libdir=@libdir@
  man8dir=@mandir@/man8
--piddir=@localstatedir@/stunnel
+-piddir=@localstatedir@/stunnel/
 +piddir=/var/run
  ssldir=@ssldir@
--certdir=$(ssldir)/certs
-+certdir=@prefix@/certs
+ PEM_DIR=@PEM_DIR@
  @SET_MAKE@
- VERSION=stunnel-@VERSION@
- RANDOM_OPT=@RANDOM_OPT@
-@@ -18,7 +18,7 @@
- CFLAGS=@CFLAGS@ @DEFS@ -Dcertdir=\"$(certdir)\" -Dlibdir=\"$(libdir)\" -Dpiddir=\"$(piddir)\"
+@@ -20,11 +20,11 @@
+ CFLAGS=@CFLAGS@ @DEFS@ -Dlibdir=\"$(libdir)\" -DPIDDIR=\"$(piddir)\"
  LIBS=@LIBS@
  OBJS=stunnel.o ssl.o protocol.o sthreads.o pty.o log.o
--DESTFILES=$(sbindir)/stunnel $(libdir)/stunnel.so $(man8dir)/stunnel.8 $(certdir)/stunnel.pem
+-DESTFILES=$(sbindir)/stunnel $(libdir)/stunnel.so $(man8dir)/stunnel.8  $(PEM_DIR)/stunnel.pem
 +DESTFILES=$(sbindir)/stunnel $(libdir)/stunnel.so $(man8dir)/stunnel.8
  
  # standard external rules
  
-@@ -50,7 +50,6 @@
+-all: stunnel stunnel.so stunnel.pem
++all: stunnel stunnel.so
+ 
+ install: all installdirs $(DESTFILES)
+ 
+@@ -52,7 +52,6 @@
  
  installdirs: mkinstalldirs
- 	./mkinstalldirs $(sbindir) $(libdir) $(man8dir) $(certdir) $(piddir)
+ 	./mkinstalldirs $(sbindir) $(libdir) $(man8dir) $(PEM_DIR) $(piddir)
 -	chmod a=rwx,+t $(piddir)
  
  # non-standard external rules