From a87ff6e9e5563febe9190756f0947d8d8d945750 Mon Sep 17 00:00:00 2001 From: martti Date: Mon, 16 Feb 2004 11:48:38 +0000 Subject: Updated stunnel to 4.05 * New feature sponsored by SURFnet http://www.surfnet.nl/ - Support for CIFS aka SMB protocol SSL negotiation. * New features - CRL support with new CApath and CAfile global options. - New 'taskbar' option on WIN32 (thx to Ken Mattsen ). - New -fd command line parameter to read configuration from a specified file descriptor instead of a file. - accept is reported as error with [section] defined (in stunnel 4.04 it was silently ignored causing problems for lusers that did not read the fine manual). - Use fcntl() instead of ioctlsocket() to set socket nonblocking when it is supported. - Basic support for hardware engines with OpenSSL >= 0.9.7. - French manual by Bernard Choppy . - Thread stack size reduced to 64KB for maximum scalability. - Added optional code to debug thread stack usage. - Support for nsr-tandem-nsk (thx to Tom Bates ). * Bugfixes - TCP wrappers code moved to CRIT_NTOA critical section since it uses static inet_ntoa() result buffer. - SSL_ERROR_SYSCALL handling problems fixed. - added code to retry nonblocking SSL_shutdown() calls. - Use FD_SETSIZE instead of 16 file descriptors in inetd mode. - fdscanf groks lowercase protocol negotiation commands. - WIN32 taskbar GDI objects leak fixed. - Libwrap detection bug in ./configure script fixed. - grp.h header detection fixed for NetBSD and possibly other systems. - Some other minor updates. --- security/stunnel/Makefile | 5 ++--- security/stunnel/PLIST | 5 ++++- security/stunnel/distinfo | 10 +++++----- security/stunnel/patches/patch-aa | 14 +++++++------- security/stunnel/patches/patch-ab | 14 +++++++------- 5 files changed, 25 insertions(+), 23 deletions(-) (limited to 'security') diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index 1755e5be7d3..c984182e12b 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.37 2004/01/20 03:08:25 grant Exp $ +# $NetBSD: Makefile,v 1.38 2004/02/16 11:48:38 martti Exp $ -DISTNAME= stunnel-4.04 -PKGREVISION= 3 +DISTNAME= stunnel-4.05 CATEGORIES= security MASTER_SITES= ftp://ftp.fu-berlin.de/unix/security/stunnel/ \ ftp://stunnel.mirt.net/stunnel/ \ diff --git a/security/stunnel/PLIST b/security/stunnel/PLIST index 688ee28d908..a189b239ef4 100644 --- a/security/stunnel/PLIST +++ b/security/stunnel/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.3 2003/07/29 11:18:39 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.4 2004/02/16 11:48:38 martti Exp $ lib/libstunnel.la lib/libstunnel.so man/man8/stunnel.8 +man/man8/stunnel.fr.8 man/man8/stunnel.pl.8 sbin/stunnel share/doc/stunnel/AUTHORS @@ -20,8 +21,10 @@ share/doc/stunnel/examples/ca.html share/doc/stunnel/examples/ca.pl share/doc/stunnel/examples/importCA.html share/doc/stunnel/examples/importCA.sh +share/doc/stunnel/examples/script.sh share/doc/stunnel/examples/stunnel.init share/doc/stunnel/examples/stunnel.spec +share/doc/stunnel/stunnel.fr.html share/doc/stunnel/stunnel.html share/doc/stunnel/stunnel.pl.html share/examples/stunnel/stunnel.conf-sample diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo index 8518dfe0b3c..dfe556c968b 100644 --- a/security/stunnel/distinfo +++ b/security/stunnel/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.14 2003/07/29 11:18:40 jmmv Exp $ +$NetBSD: distinfo,v 1.15 2004/02/16 11:48:38 martti Exp $ -SHA1 (stunnel-4.04.tar.gz) = 9f0f85eb0620ee4f4f68d833eb3f39eb31960f31 -Size (stunnel-4.04.tar.gz) = 309072 bytes -SHA1 (patch-aa) = b003ce55806452a4fc081b488db6974b4d04a3a5 -SHA1 (patch-ab) = e340b31da4c492734af82679e3765b406d7243c6 +SHA1 (stunnel-4.05.tar.gz) = a95b09ed88930fa432f47c5c5d3db770681fe715 +Size (stunnel-4.05.tar.gz) = 341191 bytes +SHA1 (patch-aa) = 0d643d1823a21b1b7c4a380bf8ffdb3c7b578a09 +SHA1 (patch-ab) = d68f146259b1f7180e1e5173236154405f565acc diff --git a/security/stunnel/patches/patch-aa b/security/stunnel/patches/patch-aa index 3e52a4396d9..9a6a860108f 100644 --- a/security/stunnel/patches/patch-aa +++ b/security/stunnel/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.14 2003/07/29 11:18:42 jmmv Exp $ +$NetBSD: patch-aa,v 1.15 2004/02/16 11:48:38 martti Exp $ ---- tools/Makefile.in.orig 2003-01-12 16:48:39.000000000 +0100 -+++ tools/Makefile.in -@@ -82,8 +82,8 @@ DISTCLEANFILES = stunnel.pem - EXTRA_DIST = ca.html ca.pl importCA.html importCA.sh stunnel.spec stunnel.mak stunnel.cnf +--- tools/Makefile.in.orig 2004-02-14 16:31:34.000000000 +0200 ++++ tools/Makefile.in 2004-02-16 13:41:21.000000000 +0200 +@@ -82,8 +82,8 @@ + EXTRA_DIST = ca.html ca.pl importCA.html importCA.sh script.sh stunnel.spec stunnel.mak stunnel.cnf -confdir = $(sysconfdir)/stunnel @@ -13,11 +13,11 @@ $NetBSD: patch-aa,v 1.14 2003/07/29 11:18:42 jmmv Exp $ docdir = $(datadir)/doc/stunnel examplesdir = $(docdir)/examples -@@ -251,7 +251,7 @@ stunnel.pem: stunnel.cnf +@@ -251,7 +251,7 @@ -in stunnel.pem install-data-hook: -- chmod 0600 $(confdir)/stunnel.pem +- chmod 0600 $(DESTDIR)$(confdir)/stunnel.pem + true clean-local: diff --git a/security/stunnel/patches/patch-ab b/security/stunnel/patches/patch-ab index ed107e96bf5..4d3b307b76c 100644 --- a/security/stunnel/patches/patch-ab +++ b/security/stunnel/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.12 2003/07/29 11:18:42 jmmv Exp $ +$NetBSD: patch-ab,v 1.13 2004/02/16 11:48:38 martti Exp $ ---- configure.orig 2003-01-01 15:26:05.000000000 +0100 -+++ configure -@@ -7471,6 +7471,7 @@ _ACEOF +--- configure.orig 2003-12-28 22:55:49.000000000 +0200 ++++ configure 2004-02-16 13:41:46.000000000 +0200 +@@ -8025,6 +8025,7 @@ fi @@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.12 2003/07/29 11:18:42 jmmv Exp $ # OSF hack instead of simple AC_CHECK_LIB here echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 -@@ -7583,6 +7584,7 @@ _ACEOF +@@ -8134,6 +8135,7 @@ fi @@ -18,12 +18,12 @@ $NetBSD: patch-ab,v 1.12 2003/07/29 11:18:42 jmmv Exp $ -@@ -9543,7 +9545,7 @@ _ACEOF +@@ -10124,7 +10126,7 @@ LIBS="$LIBS $wrap_LIB" -CPPFLAGS="$CPPFLAGS -DLIBDIR=\\\"$libdir\\\" -DCONFDIR=\\\"$sysconfdir/stunnel\\\" -DPIDFILE=\\\"$localstatedir/run/stunnel.pid\\\"" +CPPFLAGS="$CPPFLAGS -DLIBDIR=\\\"$libdir\\\" -DCONFDIR=\\\"$sysconfdir\\\" -DPIDFILE=\\\"$localstatedir/run/stunnel.pid\\\"" - ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile tools/Makefile tools/stunnel.conf-sample tools/stunnel.init" + ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile tools/Makefile tools/stunnel.conf-sample tools/stunnel.init" -- cgit v1.2.3