Update "stunnel" package to version 3.22. Changes sinc version 3.21c:

- Format string bug fixed in protocol.c
  smtp, pop3 and nntp in client mode were affected.
  (stunnel clients could be attacked by malicious servers)
- Certificate chain can be supplied with -p option or in stunnel.pem.
- Problem with -r and -l options used together fixed.
- memmove() instead of memcpy() is used to move data in buffers.
- More detailed information about negotiated ciphers is printed.
- New ./configure options: "--enable-no-rsa" and "--enable-dh".

4 files changed, 30 insertions, 122 deletions

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 76dae1bd966..090b4e5af84 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2001/11/20 15:15:14 martti Exp $
+# $NetBSD: Makefile,v 1.29 2001/12/28 07:22:29 tron Exp $
 
-DISTNAME=		stunnel-3.21c
-PKGNAME=		stunnel-3.21.3
+DISTNAME=		stunnel-3.22
 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 09c41eaf07b..d560380848d 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2001/11/20 15:15:14 martti Exp $
+$NetBSD: distinfo,v 1.12 2001/12/28 07:22:29 tron Exp $
 
-SHA1 (stunnel-3.21c.tar.gz) = c8b9fdf6b7d3031a1e289338fb6cae7e009bdd0e
-Size (stunnel-3.21c.tar.gz) = 203619 bytes
-SHA1 (patch-aa) = 0e1f6f1d11cbfacf31298f1a3c9c23700ddf5e57
-SHA1 (patch-ab) = a6c1d22f151c1f17ced9597736f01f89868c1e5b
+SHA1 (stunnel-3.22.tar.gz) = c565ef001602faee544d7736bb53b1d4c1a3d162
+Size (stunnel-3.22.tar.gz) = 204413 bytes
+SHA1 (patch-aa) = cf8b1c1658d2aee82fcec36070ccf84c14e0bce7
+SHA1 (patch-ab) = 31f36bdff7548280cb6fb611f368532e734e51e1
diff --git a/security/stunnel/patches/patch-aa b/security/stunnel/patches/patch-aa
index fe5e506d16f..4d6470e6540 100644
--- a/security/stunnel/patches/patch-aa
+++ b/security/stunnel/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.11 2001/11/20 15:15:15 martti Exp $
+$NetBSD: patch-aa,v 1.12 2001/12/28 07:22:30 tron Exp $
 
---- Makefile.in.orig	Sun Nov 11 19:09:51 2001
-+++ Makefile.in	Tue Nov 20 15:43:00 2001
+--- Makefile.in.orig	Sun Dec 23 20:03:25 2001
++++ Makefile.in	Fri Dec 28 08:13:29 2001
 @@ -9,7 +9,7 @@
  sbindir=@sbindir@
  libdir=@libdir@
@@ -9,9 +9,9 @@ $NetBSD: patch-aa,v 1.11 2001/11/20 15:15:15 martti Exp $
 -piddir=@localstatedir@/stunnel/
 +piddir=/var/run/
  ssldir=@ssldir@
+ openssl=$(ssldir)/bin/openssl
  PEM_DIR=@PEM_DIR@
- @SET_MAKE@
-@@ -21,7 +21,7 @@
+@@ -24,7 +24,7 @@
  LIBS=@LIBS@
  HEADERS=common.h prototypes.h client.h
  OBJS=client.o stunnel.o ssl.o protocol.o sthreads.o pty.o log.o options.o
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.11 2001/11/20 15:15:15 martti Exp $
  
  WINGCC=i386-mingw32msvc-gcc 
  WINCFLAGS=-O2 -Wall -DUSE_WIN32=1 -DHAVE_OPENSSL=1 -DFD_SETSIZE=4096 -DVERSION=\"@VERSION@\" -I../openssl-0.9.6b/outinc
-@@ -30,7 +30,7 @@
+@@ -33,7 +33,7 @@
  
  # standard external rules
  
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.11 2001/11/20 15:15:15 martti Exp $
  
  install: all installdirs $(DESTFILES)
  
-@@ -59,7 +59,6 @@
+@@ -62,7 +62,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 d927c59d8cb..2409bfffeea 100644
--- a/security/stunnel/patches/patch-ab
+++ b/security/stunnel/patches/patch-ab
@@ -1,111 +1,20 @@
-$NetBSD: patch-ab,v 1.9 2001/11/20 15:15:15 martti Exp $
+$NetBSD: patch-ab,v 1.10 2001/12/28 07:22:30 tron Exp $
 
---- configure.orig	Tue Nov 20 16:00:52 2001
-+++ configure	Tue Nov 20 16:02:20 2001
-@@ -2189,106 +2189,6 @@
+--- configure.orig	Sun Dec 23 20:52:04 2001
++++ configure	Fri Dec 28 08:15:02 2001
+@@ -2226,6 +2226,7 @@
  
  fi
  
--# OSF hack instead of simple AC_CHECK_LIB here
--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"
--    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
--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
++if false; then
+ # OSF hack instead of simple AC_CHECK_LIB here
+ echo "$as_me:2230: checking for pthread_create in -lpthread" >&5
+ echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+@@ -2324,6 +2325,7 @@
+ #define HAVE_LIBPTHREAD 1
+ EOF
+ 
++fi
+ fi
+ 
+ echo "$as_me:2329: checking for openpty in -lutil" >&5