Update stunnel to 3.15.

Based on a pkg provided by Martti Kuparinen in PR 13484.

Changes include:

* Serious bug resulting in random transfer() hangs fixed.
* Separate file descriptors are used for inetd mode.
* -f (foreground) logs are now stamped with time.
* New ./configure option: --with-tcp-wrappers by Brian Hatch.
* pop3 protocol client support (-n pop3) by Martin Germann.
* nntp protocol client support (-n nntp) by Martin Germann.
* RFC 2487 (smtp STARTTLS) client mode support.
* Transparency support for Tru64 added.
* Some #includes for AIX added.

3 files changed, 54 insertions, 27 deletions

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 7311a7f0dc0..d8a555d1d15 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,24 +1,28 @@
-# $NetBSD: Makefile,v 1.16 2001/06/20 13:44:12 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2001/07/19 12:22:17 martin Exp $
 #
 
-DISTNAME=		stunnel-3.14
+DISTNAME=		stunnel-3.15
 CATEGORIES=		security
-MASTER_SITES=		http://www.stunnel.org/download/stunnel/src/
+MASTER_SITES=		ftp://stunnel.mirt.net/stunnel/ \
+			http://www.stunnel.org/download/stunnel/src/
 
 MAINTAINER=		martin@NetBSD.ORG
 HOMEPAGE=		http://www.stunnel.org/
 COMMENT=		Universal SSL tunnel
 
 BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
-DEPENDS+=		pth>=1.3.5:../../devel/pth
 
+USE_BUILDLINK_ONLY=	# defined
 USE_SSL=		# defined
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE} \
 			--with-cert-dir="${SSLCERTS}" \
-			--with-pem-dir="${SSLCERTS}"
+			--with-pem-dir="${SSLCERTS}" \
+			--with-tcp-wrappers
 
 pre-configure:
 	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
 
+.include "../../security/openssl/buildlink.mk"
+.include "../../devel/pth/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index 95dc0f5721b..23be796b2de 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/06/20 13:44:12 wiz Exp $
+$NetBSD: distinfo,v 1.4 2001/07/19 12:22:17 martin Exp $
 
-SHA1 (stunnel-3.14.tar.gz) = f1e713fa9a8c595da9f597c4b920fea63b0973bc
-Size (stunnel-3.14.tar.gz) = 115584 bytes
+SHA1 (stunnel-3.15.tar.gz) = a8edd56287efe917b622582a607f2f0acf06ec42
+Size (stunnel-3.15.tar.gz) = 120633 bytes
 SHA1 (patch-aa) = 9ef36b68a7689e9130da6b11f21a9ff9e6fcda90
-SHA1 (patch-ab) = 149634d07a6eb3245645d77ceb38d70b6fd1a504
+SHA1 (patch-ab) = 4fa1cccd3aeed03b2bb544a0fde04b3c2c72b6eb
 SHA1 (patch-ac) = 9246c0855f0fa12f79d00f7729c54c9b1703bdb9
diff --git a/security/stunnel/patches/patch-ab b/security/stunnel/patches/patch-ab
index 0a37bf45c1f..38a24c9120c 100644
--- a/security/stunnel/patches/patch-ab
+++ b/security/stunnel/patches/patch-ab
@@ -1,34 +1,57 @@
-$NetBSD: patch-ab,v 1.4 2001/01/22 13:30:36 martin Exp $
+$NetBSD: patch-ab,v 1.5 2001/07/19 12:22:17 martin Exp $
 
---- configure.in.orig	Thu Dec 21 19:12:46 2000
-+++ configure.in	Mon Jan 22 14:14:10 2001
-@@ -134,12 +134,14 @@
+--- configure.in.orig	Sun Jul 15 14:43:33 2001
++++ configure.in	Thu Jul 19 14:02:22 2001
+@@ -108,21 +108,24 @@
+ fi
  
  dnl Check for libwrap library.
- AC_MSG_CHECKING([for hosts_access in -lwrap])
 +wrap_LIB=
- saved_LIBS="$LIBS"
- LIBS="-lwrap $saved_LIBS"
- AC_TRY_LINK([int hosts_access(); int allow_severity, deny_severity;],
- [hosts_access()],
--[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LIBWRAP)],
--[AC_MSG_RESULT(no)]; LIBS="$saved_LIBS")
-+[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LIBWRAP) wrap_LIB="-lwrap"],
-+[AC_MSG_RESULT(no)])
-+LIBS="$saved_LIBS"
+ AC_MSG_CHECKING(whether to use the libwrap library)
+ AC_ARG_WITH(tcp-wrappers,
+ [  --with-tcp-wrappers     Use the libwrap library],
+   [
++    saved_LIBS="$LIBS"
+     if test "$withval" = "yes"; then
+       AC_MSG_RESULT(yes)
+       AC_MSG_CHECKING([for hosts_access in -lwrap])
+       LIBS="-lwrap $LIBS"
+       AC_TRY_LINK([int hosts_access(); int allow_severity, deny_severity;],
+         [hosts_access()],
+-        [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LIBWRAP)],
++        [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LIBWRAP) wrap_LIB="-lwrap"],
+ 	[AC_MSG_RESULT(not found); exit 1])
+     else
+       AC_MSG_RESULT(no)
+     fi
++    LIBS="$saved_LIBS"
+   ],
+   [
+     AC_MSG_RESULT((default))
+@@ -154,12 +157,7 @@
+ AC_CHECK_LIB(dl, dlopen)
+ AC_CHECK_LIB(nsl, gethostbyname)
+ AC_CHECK_LIB(socket, socket)
+-AC_CHECK_LIB(pthread, pthread_create)
+-# BSD hack
+-AC_CHECK_LIB(c_r, pthread_create,
+-        [ LIBS="$LIBS -pthread"
+-	AC_DEFINE(HAVE_LIBPTHREAD) ]
+-)
++# XXX pthread does not work with stunnel on NetBSD 
+ AC_CHECK_LIB(util, openpty)
  
  dnl Add SSL includes and libraries
- CFLAGS="$CFLAGS -I$ssldir/include"
-@@ -161,7 +163,7 @@
+@@ -182,7 +180,7 @@
  # AC_HEADER_DIRENT
  # AC_HEADER_STDC
  # AC_HEADER_SYS_WAIT
 -AC_CHECK_HEADERS(getopt.h unistd.h sys/select.h tcpd.h pthread.h pty.h stropts.h)
-+AC_CHECK_HEADERS(getopt.h unistd.h sys/select.h tcpd.h pthread.h util.h sys/ioctl.h pty.h stropts.h)
++AC_CHECK_HEADERS(getopt.h unistd.h sys/select.h tcpd.h pthread.h util.h pty.h stropts.h)
  
  # dnl Checks for typedefs, structures, and compiler characteristics.
  # AC_C_CONST
-@@ -179,6 +181,8 @@
+@@ -200,6 +198,8 @@
  AC_CHECK_SIZEOF(unsigned int)
  AC_CHECK_SIZEOF(unsigned long)
  AC_CHECK_SIZEOF(unsigned long long)