Updated to version 3.21.3 (a.k.a 3.21c).

Changelog for version 3.21c, 2001.11.11, urgency: LOW:

* autoconf scripts upgraded to version 2.52.
* Problem with pthread_sigmask on Darwin fixed (I hope).
* Some documentation typos corrected.
* Attempt to ignore EINTR in transfer().
* Shared library version reported on startup.
* DLLs for OpenSSL 0.9.6b.

4 files changed, 116 insertions, 36 deletions

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 9f0c288c232..76dae1bd966 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2001/11/03 16:58:03 martti Exp $
+# $NetBSD: Makefile,v 1.28 2001/11/20 15:15:14 martti Exp $
 
-DISTNAME=		stunnel-3.21b
-PKGNAME=		stunnel-3.21.2
+DISTNAME=		stunnel-3.21c
+PKGNAME=		stunnel-3.21.3
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.fu-berlin.de/pub/unix/security/stunnel/ \
 			ftp://stunnel.mirt.net/stunnel/ \
@@ -11,8 +11,6 @@ MAINTAINER=		martti@netbsd.org
 HOMEPAGE=		http://www.stunnel.org/
 COMMENT=		Universal SSL tunnel
 
-BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
-
 USE_BUILDLINK_ONLY=	# defined
 USE_SSL=		# defined
 GNU_CONFIGURE=		# defined
@@ -21,8 +19,5 @@ CONFIGURE_ARGS+=	--with-ssl=${SSLBASE} \
 			--with-pem-dir="${SSLCERTS}" \
 			--with-tcp-wrappers
 
-pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
-
 .include "../../security/openssl/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index 9b05f5b7e5a..09c41eaf07b 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2001/11/03 16:58:04 martti Exp $
+$NetBSD: distinfo,v 1.11 2001/11/20 15:15:14 martti Exp $
 
-SHA1 (stunnel-3.21b.tar.gz) = d272596760d8990802453ca5f33dbcd4a4b0cb9a
-Size (stunnel-3.21b.tar.gz) = 181355 bytes
-SHA1 (patch-aa) = 3f881e1bcee219a0256dbf9f84fbd218befeb099
-SHA1 (patch-ab) = fb989cc7f46ac07f5c904e8561163c4b597c3160
+SHA1 (stunnel-3.21c.tar.gz) = c8b9fdf6b7d3031a1e289338fb6cae7e009bdd0e
+Size (stunnel-3.21c.tar.gz) = 203619 bytes
+SHA1 (patch-aa) = 0e1f6f1d11cbfacf31298f1a3c9c23700ddf5e57
+SHA1 (patch-ab) = a6c1d22f151c1f17ced9597736f01f89868c1e5b
diff --git a/security/stunnel/patches/patch-aa b/security/stunnel/patches/patch-aa
index 238eb19868f..fe5e506d16f 100644
--- a/security/stunnel/patches/patch-aa
+++ b/security/stunnel/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.10 2001/10/31 10:00:24 martti Exp $
+$NetBSD: patch-aa,v 1.11 2001/11/20 15:15:15 martti Exp $
 
---- Makefile.in.orig	Tue Oct 30 22:38:38 2001
-+++ Makefile.in	Wed Oct 31 09:02:39 2001
+--- Makefile.in.orig	Sun Nov 11 19:09:51 2001
++++ Makefile.in	Tue Nov 20 15:43:00 2001
 @@ -9,7 +9,7 @@
  sbindir=@sbindir@
  libdir=@libdir@
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.10 2001/10/31 10:00:24 martti Exp $
 +DESTFILES=$(sbindir)/stunnel $(libdir)/stunnel.so $(man8dir)/stunnel.8
  
  WINGCC=i386-mingw32msvc-gcc 
- WINCFLAGS=-O2 -Wall -DUSE_WIN32=1 -DHAVE_OPENSSL=1 -DFD_SETSIZE=4096 -DVERSION=\"@VERSION@\" -I../openssl-0.9.6/outinc
+ WINCFLAGS=-O2 -Wall -DUSE_WIN32=1 -DHAVE_OPENSSL=1 -DFD_SETSIZE=4096 -DVERSION=\"@VERSION@\" -I../openssl-0.9.6b/outinc
 @@ -30,7 +30,7 @@
  
  # standard external rules
diff --git a/security/stunnel/patches/patch-ab b/security/stunnel/patches/patch-ab
index c2a5a087b2a..d927c59d8cb 100644
--- a/security/stunnel/patches/patch-ab
+++ b/security/stunnel/patches/patch-ab
@@ -1,26 +1,111 @@
-$NetBSD: patch-ab,v 1.8 2001/08/19 16:26:08 martin Exp $
+$NetBSD: patch-ab,v 1.9 2001/11/20 15:15:15 martti Exp $
 
---- 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)
+--- configure.orig	Tue Nov 20 16:00:52 2001
++++ configure	Tue Nov 20 16:02:20 2001
+@@ -2189,106 +2189,6 @@
+ 
+ fi
  
 -# OSF hack instead of simple AC_CHECK_LIB here
--AC_MSG_CHECKING([for pthread_create in -lpthread])
+-echo "$as_me:2193: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
 -    saved_LIBS="$LIBS"
 -    LIBS="-lpthread $saved_LIBS"
--    AC_TRY_LINK([#include <pthread.h>],
--      [pthread_create((void *)0, (void *)0, (void *)0, (void *)0)],
--      [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LIBPTHREAD)],
--      [AC_MSG_RESULT(no); LIBS="$saved_LIBS"])
+-    cat >conftest.$ac_ext <<_ACEOF
+-#line 2198 "configure"
+-#include "confdefs.h"
+-#include <pthread.h>
+-int
+-main ()
+-{
+-pthread_create((void *)0, (void *)0, (void *)0, (void *)0)
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:2210: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:2213: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:2216: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:2219: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  echo "$as_me:2221: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\EOF
+-#define HAVE_LIBPTHREAD 1
+-EOF
+-
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-echo "$as_me:2229: result: no" >&5
+-echo "${ECHO_T}no" >&6; LIBS="$saved_LIBS"
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 -
 -# 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)
- 
+-echo "$as_me:2235: checking for pthread_create in -lc_r" >&5
+-echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6
+-if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lc_r  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-#line 2243 "configure"
+-#include "confdefs.h"
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char pthread_create ();
+-int
+-main ()
+-{
+-pthread_create ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:2262: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:2265: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:2268: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:2271: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_c_r_pthread_create=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_c_r_pthread_create=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:2282: result: $ac_cv_lib_c_r_pthread_create" >&5
+-echo "${ECHO_T}$ac_cv_lib_c_r_pthread_create" >&6
+-if test $ac_cv_lib_c_r_pthread_create = yes; then
+-   LIBS="$LIBS -pthread"
+-	cat >>confdefs.h <<\EOF
+-#define HAVE_LIBPTHREAD 1
+-EOF
+-
+-fi
+-
+ echo "$as_me:2292: checking for openpty in -lutil" >&5
+ echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
+ if test "${ac_cv_lib_util_openpty+set}" = set; then