Update to version 3.16.

Changes:
* Some transfer() bugfixes/improvements.
* STDIN/STDOUT are no logner assumed to be non-socket decriptors.
* Problem with --with-tcp-wrappers patch fixed.
* pop3 and nntp support bug fixed by Martin Germann.
* -o option to append log messages to a file added.
* Changed error message for SSL error 0.

Provided by Martti Kuparinen in PR 13537.

3 files changed, 26 insertions, 31 deletions

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index cbe1bb484ee..c25e61b6326 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2001/07/20 09:58:29 tron Exp $
+# $NetBSD: Makefile,v 1.20 2001/07/23 10:03:09 martin Exp $
 #
 
-DISTNAME=		stunnel-3.15
+DISTNAME=		stunnel-3.16
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.fu-berlin.de/pub/unix/security/stunnel/ \
 			ftp://stunnel.mirt.net/stunnel/ \
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index 23be796b2de..0f662fc2aac 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2001/07/19 12:22:17 martin Exp $
+$NetBSD: distinfo,v 1.5 2001/07/23 10:03:09 martin Exp $
 
-SHA1 (stunnel-3.15.tar.gz) = a8edd56287efe917b622582a607f2f0acf06ec42
-Size (stunnel-3.15.tar.gz) = 120633 bytes
+SHA1 (stunnel-3.16.tar.gz) = 918a5ddf3555c33c67d9c3bbea6fe4ab1ab7859a
+Size (stunnel-3.16.tar.gz) = 121666 bytes
 SHA1 (patch-aa) = 9ef36b68a7689e9130da6b11f21a9ff9e6fcda90
-SHA1 (patch-ab) = 4fa1cccd3aeed03b2bb544a0fde04b3c2c72b6eb
+SHA1 (patch-ab) = 30e7b84b35511ff29f482e01e57a6c8e9634b057
 SHA1 (patch-ac) = 9246c0855f0fa12f79d00f7729c54c9b1703bdb9
diff --git a/security/stunnel/patches/patch-ab b/security/stunnel/patches/patch-ab
index 38a24c9120c..ce313e981da 100644
--- a/security/stunnel/patches/patch-ab
+++ b/security/stunnel/patches/patch-ab
@@ -1,15 +1,24 @@
-$NetBSD: patch-ab,v 1.5 2001/07/19 12:22:17 martin Exp $
+$NetBSD: patch-ab,v 1.6 2001/07/23 10:03:10 martin Exp $
 
---- configure.in.orig	Sun Jul 15 14:43:33 2001
-+++ configure.in	Thu Jul 19 14:02:22 2001
-@@ -108,21 +108,24 @@
- fi
+--- configure.in.orig	Wed Jul 18 08:55:23 2001
++++ configure.in	Mon Jul 23 11:54:52 2001
+@@ -124,12 +124,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 Check for libwrap library.
-+wrap_LIB=
- AC_MSG_CHECKING(whether to use the libwrap library)
+@@ -138,17 +133,19 @@
  AC_ARG_WITH(tcp-wrappers,
- [  --with-tcp-wrappers     Use the libwrap library],
+ [  --with-tcp-wrappers     Use the libwrap (TCP wrappers) library],
    [
 +    saved_LIBS="$LIBS"
      if test "$withval" = "yes"; then
@@ -28,21 +37,7 @@ $NetBSD: patch-ab,v 1.5 2001/07/19 12:22:17 martin Exp $
    ],
    [
      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
-@@ -182,7 +180,7 @@
+@@ -184,7 +181,7 @@
  # AC_HEADER_DIRENT
  # AC_HEADER_STDC
  # AC_HEADER_SYS_WAIT
@@ -51,7 +46,7 @@ $NetBSD: patch-ab,v 1.5 2001/07/19 12:22:17 martin Exp $
  
  # dnl Checks for typedefs, structures, and compiler characteristics.
  # AC_C_CONST
-@@ -200,6 +198,8 @@
+@@ -202,6 +199,8 @@
  AC_CHECK_SIZEOF(unsigned int)
  AC_CHECK_SIZEOF(unsigned long)
  AC_CHECK_SIZEOF(unsigned long long)