upgrade to stunnel v4.03. summary of new features:

- new user interface (config file)
- single daemon can listen on multiple ports
- delayed DNS lookup added
- configurable timeouts
- chroot support
- private key file for a certificate can be kept in a separate file

security/stunnel/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.23 2002/10/28 17:30:52 naddy Exp $
+# $OpenBSD: Makefile,v 1.24 2002/10/30 11:10:35 jakob Exp $
 
 COMMENT=	SSL encryption wrapper for standard network daemons
 
-DISTNAME=	stunnel-3.22
+DISTNAME=	stunnel-4.03
 CATEGORIES=	security
 
 MAINTAINER=     Jakob Schlyter <jakob@openbsd.org>
@@ -22,21 +22,20 @@ MASTER_SITES=	ftp://stunnel.mirt.net/stunnel/ \
 		ftp://ftp.uni-freiburg.de/pub/net/stunnel/ \
 		ftp://ftp.all.de/pub2/unix/security/stunnel/
 
-BUILD_DEPENDS=  ::textproc/p5-sdf
-
+SEPARATE_BUILD=		concurrent
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-tcp-wrappers \
 			--with-pem-dir=${SYSCONFDIR}/ssl \
-			--with-random=/dev/arandom
-ALL_TARGET=		stunnel stunnel.8
-REGRESS_TARGET=		test
-REGRESS_IS_INTERACTIVE=	Yes
-
-post-configure:
-	rm ${WRKSRC}/stunnel.8
+			--with-random=/dev/arandom \
+			--with-ssl=/usr \
+			--localstatedir=/var
+NO_REGRESS=		Yes
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/stunnel ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/stunnel.8 ${PREFIX}/man/man8
+	${INSTALL_PROGRAM} ${WRKBUILD}/src/stunnel ${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKBUILD}/doc/stunnel.8 ${PREFIX}/man/man8
+	${INSTALL_DATA_DIR} ${PREFIX}/examples/stunnel
+	${INSTALL_DATA} ${WRKBUILD}/tools/stunnel.conf-sample \
+		${PREFIX}/examples/stunnel
 
 .include <bsd.port.mk>

security/stunnel/distinfo

@@ -1,3 +1,3 @@
-MD5 (stunnel-3.22.tar.gz) = 69000d8365b006b3c080a1e2dc9ccba9
-RMD160 (stunnel-3.22.tar.gz) = 9672d3b78c7e7bcc7b796e491985477b7797375f
-SHA1 (stunnel-3.22.tar.gz) = c565ef001602faee544d7736bb53b1d4c1a3d162
+MD5 (stunnel-4.03.tar.gz) = 79dddf4174f3c2f7a83202bd8c9c6794
+RMD160 (stunnel-4.03.tar.gz) = 19582a3837df6e1daa66f5b1e1eebab543282b2f
+SHA1 (stunnel-4.03.tar.gz) = 9e704eac608b3407813b3f684e62c66b5487730d

security/stunnel/patches/patch-Makefile.in

@@ -1,15 +1,12 @@
 $OpenBSD$
---- Makefile.in.orig	Sun Dec 23 20:03:25 2001
-+++ Makefile.in	Mon Oct 28 18:25:50 2002
-@@ -9,9 +9,9 @@ exec_prefix=@exec_prefix@
- sbindir=@sbindir@
- libdir=@libdir@
- man8dir=@mandir@/man8
--piddir=@localstatedir@/stunnel/
-+piddir=/var/run/
- ssldir=@ssldir@
--openssl=$(ssldir)/bin/openssl
-+openssl=openssl
- PEM_DIR=@PEM_DIR@
- @SET_MAKE@
- VERSION=stunnel-@VERSION@
+--- Makefile.in.orig	Mon Sep  2 11:21:17 2002
++++ Makefile.in	Mon Sep  2 11:21:21 2002
+@@ -78,7 +78,7 @@ VERSION = @VERSION@
+ host = @host@
+ ssldir = @ssldir@
+ 
+-SUBDIRS = src doc tools
++SUBDIRS = src doc
+ 
+ # extra_src = src/gui.c src/resources.rc src/stunnel.ico src/stunnel.exe
+ # extra_doc = doc/stunnel.pod doc/stunnel.8 doc/stunnel.html doc/en doc/pl

security/stunnel/patches/patch-tools_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-tools_Makefile_in,v 1.1 2002/10/30 11:10:35 jakob Exp $
+--- tools/Makefile.in.orig	Mon Sep  2 11:18:34 2002
++++ tools/Makefile.in	Mon Sep  2 11:18:43 2002
+@@ -90,7 +90,7 @@ examplesdir = $(docdir)/examples
+ examples_DATA = ca.html ca.pl importCA.html importCA.sh 	stunnel.spec stunnel.init
+ 
+ 
+-openssl = $(ssldir)/bin/openssl
++openssl = $(ssldir)/sbin/openssl
+ mkinstalldirs = $(SHELL) $(top_srcdir)/auto/mkinstalldirs
+ CONFIG_CLEAN_FILES =  stunnel.conf-sample stunnel.init
+ DATA =  $(conf_DATA) $(examples_DATA)

security/stunnel/pkg/PLIST

@@ -1,3 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2000/06/20 19:36:25 jakob Exp $
-sbin/stunnel
+@comment $OpenBSD: PLIST,v 1.3 2002/10/30 11:10:35 jakob Exp $
+examples/stunnel/stunnel.conf-sample
 man/man8/stunnel.8
+sbin/stunnel
+@dirrm examples/stunnel