Update of stunnel to version 3.20, from Martti Kuparinen in PR pkg/13728.

Changelog for version 3.20, 2001.08.15, urgency: LOW:

* setsockopt() optlen set according to the optval for Solaris.
* Minor NetBSD compatibility fixes by Martti Kuparinen.
* Minor MSVC6 compatibility fixes by Patrick Mayweg.
* SSL close_notify timeout reduced to 10 seconds of inactivity.
* Socket close instead of reset on close_notify timeout.
* Some source arrangement and minor bugfixes.

5 files changed, 15 insertions, 40 deletions

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index c736eac2e95..af21e4dce61 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2001/08/10 14:41:18 martin Exp $
+# $NetBSD: Makefile,v 1.22 2001/08/19 16:26:07 martin Exp $
 #
 
-DISTNAME=		stunnel-3.19
+DISTNAME=		stunnel-3.20
 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 4085a850a8f..3fdb03c8c21 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2001/08/10 14:41:18 martin Exp $
+$NetBSD: distinfo,v 1.7 2001/08/19 16:26:07 martin Exp $
 
-SHA1 (stunnel-3.19.tar.gz) = f08c9c469a4b7978570c0bd9dbb33aabc25602f8
-Size (stunnel-3.19.tar.gz) = 126011 bytes
-SHA1 (patch-aa) = dbdc9c7d9934e9b95e902cd1eb67b8983249655e
-SHA1 (patch-ab) = 41422967d362469b9d1a62341e68bba863ed04d9
-SHA1 (patch-ac) = 36a04efd0641b571db6b413642bfd6cfb00003cd
+SHA1 (stunnel-3.20.tar.gz) = 5548dcb434837e490818c300a3ff90a0a91a389a
+Size (stunnel-3.20.tar.gz) = 126539 bytes
+SHA1 (patch-aa) = c7e26158d70ada1024f5c09b9fbba4bd5280c0dd
+SHA1 (patch-ab) = fb989cc7f46ac07f5c904e8561163c4b597c3160
diff --git a/security/stunnel/patches/patch-aa b/security/stunnel/patches/patch-aa
index 56280b83d77..f69021e2782 100644
--- a/security/stunnel/patches/patch-aa
+++ b/security/stunnel/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.8 2001/08/10 14:41:19 martin Exp $
+$NetBSD: patch-aa,v 1.9 2001/08/19 16:26:08 martin Exp $
 
---- Makefile.in.orig	Mon Aug  6 18:41:24 2001
-+++ Makefile.in	Fri Aug 10 16:26:56 2001
+--- Makefile.in.orig	Sun Aug 12 21:52:10 2001
++++ Makefile.in	Thu Aug 16 09:02:37 2001
 @@ -9,7 +9,7 @@
  sbindir=@sbindir@
  libdir=@libdir@
@@ -14,12 +14,12 @@ $NetBSD: patch-aa,v 1.8 2001/08/10 14:41:19 martin Exp $
 @@ -20,7 +20,7 @@
  CFLAGS=@CFLAGS@ @DEFS@ -Dlibdir=\"$(libdir)\" -DPIDDIR=\"$(piddir)\"
  LIBS=@LIBS@
- OBJS=stunnel.o ssl.o protocol.o sthreads.o pty.o log.o options.o
+ OBJS=stunnel.o ssl.o client.o protocol.o sthreads.o pty.o log.o options.o
 -DESTFILES=$(sbindir)/stunnel $(libdir)/stunnel.so $(man8dir)/stunnel.8  $(PEM_DIR)/stunnel.pem
 +DESTFILES=$(sbindir)/stunnel $(libdir)/stunnel.so $(man8dir)/stunnel.8
  
  WINGCC=i386-mingw32msvc-gcc 
- WINCFLAGS=-O2 -Wall -DUSE_WIN32 -DHAVE_OPENSSL -I../openssl-0.9.6/outinc
+ WINCFLAGS=-O2 -Wall -DUSE_WIN32 -DHAVE_OPENSSL -DVERSION=\"@VERSION@\" -I../openssl-0.9.6/outinc
 @@ -29,7 +29,7 @@
  
  # standard external rules
diff --git a/security/stunnel/patches/patch-ab b/security/stunnel/patches/patch-ab
index 4c4ccdd7903..c2a5a087b2a 100644
--- a/security/stunnel/patches/patch-ab
+++ b/security/stunnel/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.7 2001/08/10 14:41:19 martin Exp $
+$NetBSD: patch-ab,v 1.8 2001/08/19 16:26:08 martin Exp $
 
---- configure.in.orig	Fri Aug 10 11:30:46 2001
-+++ configure.in	Fri Aug 10 16:33:18 2001
+--- configure.in.orig	Wed Aug 15 20:25:28 2001
++++ configure.in	Thu Aug 16 09:03:22 2001
 @@ -125,20 +125,7 @@
  AC_CHECK_LIB(nsl, gethostbyname)
  AC_CHECK_LIB(socket, socket)
@@ -24,12 +24,3 @@ $NetBSD: patch-ab,v 1.7 2001/08/10 14:41:19 martin Exp $
  
  AC_CHECK_LIB(util, openpty)
  
-@@ -195,7 +182,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 pty.h stropts.h)
- 
- # dnl Checks for typedefs, structures, and compiler characteristics.
- # AC_C_CONST
diff --git a/security/stunnel/patches/patch-ac b/security/stunnel/patches/patch-ac
deleted file mode 100644
index 76ef902dfea..00000000000
--- a/security/stunnel/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/08/10 14:41:19 martin Exp $
-
---- pty.c.orig	Fri Aug 10 10:48:25 2001
-+++ pty.c	Fri Aug 10 16:32:18 2001
-@@ -26,6 +26,10 @@
- #include <util.h>
- #endif /* HAVE_UTIL_H */
- 
-+#ifdef HAVE_SYS_IOCTL_H
-+#include <sys/ioctl.h>
-+#endif
-+
- /* Pty allocated with _getpty gets broken if we do I_PUSH:es to it. */
- #if defined(HAVE__GETPTY) || defined(HAVE_OPENPTY)
- #undef HAVE_DEV_PTMX