Update pkg to stunnel-3.11.

Fixes key-length and zombies problems.

6 files changed, 39 insertions, 38 deletions

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 9f259d11889..3a38adf7998 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2001/01/13 18:41:33 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/01/22 13:30:36 martin Exp $
 #
 
-DISTNAME=		stunnel-3.9
+DISTNAME=		stunnel-3.11
 CATEGORIES=		security
 MASTER_SITES=		http://www.stunnel.org/download/stunnel/src/
 
diff --git a/security/stunnel/files/md5 b/security/stunnel/files/md5
index 87ae7967710..500cb6a309c 100644
--- a/security/stunnel/files/md5
+++ b/security/stunnel/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/12/19 07:03:22 jlam Exp $
+$NetBSD: md5,v 1.3 2001/01/22 13:30:36 martin Exp $
 
-MD5 (stunnel-3.9.tar.gz) = 3c73fe4db1944af05afcca233ac4b700
+MD5 (stunnel-3.11.tar.gz) = 950b08220c12588e490dcb0609b7d668
diff --git a/security/stunnel/files/patch-sum b/security/stunnel/files/patch-sum
index 55e0aec3ee1..bb68a5b6036 100644
--- a/security/stunnel/files/patch-sum
+++ b/security/stunnel/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.6 2000/12/19 07:03:22 jlam Exp $
+$NetBSD: patch-sum,v 1.7 2001/01/22 13:30:36 martin Exp $
 
-MD5 (patch-aa) = b41e548df25c43ca17c3643d25d863fe
-MD5 (patch-ab) = 4edeb8b7a500e1282f6f340746abe581
-MD5 (patch-ac) = 54c0f72c8fb116d8e4f26fe061d385a9
+MD5 (patch-aa) = 9ec78075724f27131787d185cde65740
+MD5 (patch-ab) = 443fd6e351c3e623921a31a541637396
+MD5 (patch-ac) = 51a9bac0e5fb58c9880b09b251f7613d
diff --git a/security/stunnel/patches/patch-aa b/security/stunnel/patches/patch-aa
index 658790178cf..7aad5516ce2 100644
--- a/security/stunnel/patches/patch-aa
+++ b/security/stunnel/patches/patch-aa
@@ -1,31 +1,35 @@
-$NetBSD: patch-aa,v 1.6 2000/12/19 07:03:22 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2001/01/22 13:30:36 martin Exp $
 
---- Makefile.in.orig	Sat Oct 21 10:02:03 2000
-+++ Makefile.in
+--- Makefile.in.orig	Tue Dec 19 19:42:46 2000
++++ Makefile.in	Mon Jan 22 13:59:59 2001
 @@ -9,7 +9,7 @@
  sbindir=@sbindir@
  libdir=@libdir@
  man8dir=@mandir@/man8
 -piddir=@localstatedir@/stunnel/
-+piddir=/var/run
++piddir=/var/run/
  ssldir=@ssldir@
  PEM_DIR=@PEM_DIR@
  @SET_MAKE@
-@@ -20,11 +20,11 @@
+@@ -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
 -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
+@@ -29,7 +29,7 @@
+ 
  # standard external rules
  
--all: stunnel stunnel.so stunnel.pem
-+all: stunnel stunnel.so
+-all: stunnel stunnel.8 stunnel.html stunnel.so stunnel.pem
++all: stunnel stunnel.8 stunnel.html stunnel.so
  
  install: all installdirs $(DESTFILES)
  
-@@ -52,7 +52,6 @@
+@@ -57,7 +57,6 @@
  
  installdirs: mkinstalldirs
  	./mkinstalldirs $(sbindir) $(libdir) $(man8dir) $(PEM_DIR) $(piddir)
diff --git a/security/stunnel/patches/patch-ab b/security/stunnel/patches/patch-ab
index 213543a42d4..0a37bf45c1f 100644
--- a/security/stunnel/patches/patch-ab
+++ b/security/stunnel/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2000/12/19 07:03:22 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2001/01/22 13:30:36 martin Exp $
 
---- configure.in.orig	Wed Dec 13 05:48:29 2000
-+++ configure.in
-@@ -137,12 +137,14 @@
+--- configure.in.orig	Thu Dec 21 19:12:46 2000
++++ configure.in	Mon Jan 22 14:14:10 2001
+@@ -134,12 +134,14 @@
  
  dnl Check for libwrap library.
  AC_MSG_CHECKING([for hosts_access in -lwrap])
@@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.3 2000/12/19 07:03:22 jlam Exp $
  
  dnl Add SSL includes and libraries
  CFLAGS="$CFLAGS -I$ssldir/include"
-@@ -164,7 +166,7 @@
+@@ -161,7 +163,7 @@
  # AC_HEADER_DIRENT
  # AC_HEADER_STDC
  # AC_HEADER_SYS_WAIT
@@ -28,12 +28,12 @@ $NetBSD: patch-ab,v 1.3 2000/12/19 07:03:22 jlam Exp $
  
  # dnl Checks for typedefs, structures, and compiler characteristics.
  # AC_C_CONST
-@@ -175,6 +177,8 @@
- 
- dnl Checks for library functions.
- AC_CHECK_FUNCS(getopt snprintf vsnprintf openpty _getpty daemon)
+@@ -179,6 +181,8 @@
+ AC_CHECK_SIZEOF(unsigned int)
+ AC_CHECK_SIZEOF(unsigned long)
+ AC_CHECK_SIZEOF(unsigned long long)
 +
 +LIBS="$LIBS $wrap_LIB"
  
- AC_OUTPUT(Makefile stunnel.8)
+ AC_OUTPUT(Makefile)
  
diff --git a/security/stunnel/patches/patch-ac b/security/stunnel/patches/patch-ac
index ae61416a535..f7068a81bdc 100644
--- a/security/stunnel/patches/patch-ac
+++ b/security/stunnel/patches/patch-ac
@@ -1,18 +1,15 @@
-$NetBSD: patch-ac,v 1.1 2000/12/19 07:03:22 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2001/01/22 13:30:36 martin Exp $
 
---- pty.c.orig	Wed Dec 13 17:32:14 2000
-+++ pty.c
-@@ -35,8 +35,12 @@
- #endif
- 
- #ifdef HAVE_UTIL_H
--#include <util.h>
-+#include <util.h>        /* openpty */
+--- pty.c.orig	Wed Dec 13 23:32:14 2000
++++ pty.c	Mon Jan 22 14:07:18 2001
+@@ -38,6 +38,10 @@
+ #include <util.h>
  #endif /* HAVE_UTIL_H */
-+
+ 
 +#ifdef HAVE_SYS_IOCTL_H
-+#include <sys/ioctl.h>   /* ioctl */
++#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