>Number:         13728
>Category:       pkg
>Synopsis:       stunnel 3.20
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Aug 16 00:10:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Martti Kuparinen
>Release:        1.5X
>Organization:
>Environment:
	
System: NetBSD nevada 1.5X NetBSD 1.5X (AXIL) #0: Mon Aug 13 13:18:48 CEST 2001 root@nevada:/usr/src/sys/arch/sparc64/compile/AXIL sparc64
Architecture: sparc64
Machine: sparc64

>Description:

Update the stunnel package to the latest version.
Remember to remove patches/patch-ac as it's no longer needed!

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.

>How-To-Repeat:
	
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/stunnel/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	2001/08/10 14:41:18	1.21
+++ Makefile	2001/08/16 07:10:41
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.21 2001/08/10 14:41:18 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/ \
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/security/stunnel/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo	2001/08/10 14:41:18	1.6
+++ distinfo	2001/08/16 07:10:41
@@ -1,7 +1,6 @@
 $NetBSD: distinfo,v 1.6 2001/08/10 14:41:18 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
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/security/stunnel/patches/patch-aa,v
retrieving revision 1.8
diff -u -r1.8 patch-aa
--- patch-aa	2001/08/10 14:41:19	1.8
+++ patch-aa	2001/08/16 07:10:41
@@ -1,7 +1,7 @@
 $NetBSD: patch-aa,v 1.8 2001/08/10 14:41:19 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 @@
 @@ -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
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/security/stunnel/patches/patch-ab,v
retrieving revision 1.7
diff -u -r1.7 patch-ab
--- patch-ab	2001/08/10 14:41:19	1.7
+++ patch-ab	2001/08/16 07:10:41
@@ -1,7 +1,7 @@
 $NetBSD: patch-ab,v 1.7 2001/08/10 14:41:19 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 @@
  
  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
>Release-Note:
>Audit-Trail:
>Unformatted: