diff options
author | martin <martin@pkgsrc.org> | 2001-08-10 14:41:18 +0000 |
---|---|---|
committer | martin <martin@pkgsrc.org> | 2001-08-10 14:41:18 +0000 |
commit | a25568677cd661fd0855e58bf20b60903291c182 (patch) | |
tree | aed5964579e5a1667aa33f6b1a761e7bba946adf /security | |
parent | a365c253c17a23b0765be6fce243dc4839c610c0 (diff) | |
download | pkgsrc-a25568677cd661fd0855e58bf20b60903291c182.tar.gz |
Update stunnel to version 3.19.
Based on PR pkg/13679 by Martti Kuparinen.
Changelog for version 3.19, 2001.08.10, urgency: MEDIUM:
* Critical section added around non MT-safe TCP Wrappers code.
* Problem with "select: Interrupted system call" error fixed.
* errno replaced with get_last_socket_error() for Win32.
* Some FreeBSD/NetBSD patches to ./configure from Martti Kuparinen.
* Local mode process pid logged.
* Default FQDN (localhost) removed from stunnel.cnf
* ./configure changed to recognize POSIX threads library on OSF.
* New -O option to set socket options.
Diffstat (limited to 'security')
-rw-r--r-- | security/stunnel/Makefile | 4 | ||||
-rw-r--r-- | security/stunnel/distinfo | 12 | ||||
-rw-r--r-- | security/stunnel/patches/patch-aa | 8 | ||||
-rw-r--r-- | security/stunnel/patches/patch-ab | 54 | ||||
-rw-r--r-- | security/stunnel/patches/patch-ac | 8 |
5 files changed, 32 insertions, 54 deletions
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index c25e61b6326..c736eac2e95 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2001/07/23 10:03:09 martin Exp $ +# $NetBSD: Makefile,v 1.21 2001/08/10 14:41:18 martin Exp $ # -DISTNAME= stunnel-3.16 +DISTNAME= stunnel-3.19 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 0f662fc2aac..4085a850a8f 100644 --- a/security/stunnel/distinfo +++ b/security/stunnel/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2001/07/23 10:03:09 martin Exp $ +$NetBSD: distinfo,v 1.6 2001/08/10 14:41:18 martin Exp $ -SHA1 (stunnel-3.16.tar.gz) = 918a5ddf3555c33c67d9c3bbea6fe4ab1ab7859a -Size (stunnel-3.16.tar.gz) = 121666 bytes -SHA1 (patch-aa) = 9ef36b68a7689e9130da6b11f21a9ff9e6fcda90 -SHA1 (patch-ab) = 30e7b84b35511ff29f482e01e57a6c8e9634b057 -SHA1 (patch-ac) = 9246c0855f0fa12f79d00f7729c54c9b1703bdb9 +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 diff --git a/security/stunnel/patches/patch-aa b/security/stunnel/patches/patch-aa index 7aad5516ce2..56280b83d77 100644 --- a/security/stunnel/patches/patch-aa +++ b/security/stunnel/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.7 2001/01/22 13:30:36 martin Exp $ +$NetBSD: patch-aa,v 1.8 2001/08/10 14:41:19 martin Exp $ ---- Makefile.in.orig Tue Dec 19 19:42:46 2000 -+++ Makefile.in Mon Jan 22 13:59:59 2001 +--- Makefile.in.orig Mon Aug 6 18:41:24 2001 ++++ Makefile.in Fri Aug 10 16:26:56 2001 @@ -9,7 +9,7 @@ sbindir=@sbindir@ libdir=@libdir@ @@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.7 2001/01/22 13:30:36 martin Exp $ @@ -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 + OBJS=stunnel.o ssl.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 diff --git a/security/stunnel/patches/patch-ab b/security/stunnel/patches/patch-ab index ce313e981da..4c4ccdd7903 100644 --- a/security/stunnel/patches/patch-ab +++ b/security/stunnel/patches/patch-ab @@ -1,43 +1,30 @@ -$NetBSD: patch-ab,v 1.6 2001/07/23 10:03:10 martin Exp $ +$NetBSD: patch-ab,v 1.7 2001/08/10 14:41:19 martin Exp $ ---- configure.in.orig Wed Jul 18 08:55:23 2001 -+++ configure.in Mon Jul 23 11:54:52 2001 -@@ -124,12 +124,7 @@ - AC_CHECK_LIB(dl, dlopen) +--- configure.in.orig Fri Aug 10 11:30:46 2001 ++++ configure.in Fri Aug 10 16:33:18 2001 +@@ -125,20 +125,7 @@ AC_CHECK_LIB(nsl, gethostbyname) AC_CHECK_LIB(socket, socket) --AC_CHECK_LIB(pthread, pthread_create) + +-# OSF hack instead of simple AC_CHECK_LIB here +-AC_MSG_CHECKING([for pthread_create in -lpthread]) +- 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"]) +- -# 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) + AC_CHECK_LIB(util, openpty) -@@ -138,17 +133,19 @@ - AC_ARG_WITH(tcp-wrappers, - [ --with-tcp-wrappers Use the libwrap (TCP wrappers) library], - [ -+ saved_LIBS="$LIBS" - if test "$withval" = "yes"; then - AC_MSG_RESULT(yes) - AC_MSG_CHECKING([for hosts_access in -lwrap]) - LIBS="-lwrap $LIBS" - AC_TRY_LINK([int hosts_access(); int allow_severity, deny_severity;], - [hosts_access()], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LIBWRAP)], -+ [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LIBWRAP) wrap_LIB="-lwrap"], - [AC_MSG_RESULT(not found); exit 1]) - else - AC_MSG_RESULT(no) - fi -+ LIBS="$saved_LIBS" - ], - [ - AC_MSG_RESULT((default)) -@@ -184,7 +181,7 @@ +@@ -195,7 +182,7 @@ # AC_HEADER_DIRENT # AC_HEADER_STDC # AC_HEADER_SYS_WAIT @@ -46,12 +33,3 @@ $NetBSD: patch-ab,v 1.6 2001/07/23 10:03:10 martin Exp $ # dnl Checks for typedefs, structures, and compiler characteristics. # AC_C_CONST -@@ -202,6 +199,8 @@ - AC_CHECK_SIZEOF(unsigned int) - AC_CHECK_SIZEOF(unsigned long) - AC_CHECK_SIZEOF(unsigned long long) -+ -+LIBS="$LIBS $wrap_LIB" - - AC_OUTPUT(Makefile) - diff --git a/security/stunnel/patches/patch-ac b/security/stunnel/patches/patch-ac index f7068a81bdc..76ef902dfea 100644 --- a/security/stunnel/patches/patch-ac +++ b/security/stunnel/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2001/01/22 13:30:36 martin Exp $ +$NetBSD: patch-ac,v 1.3 2001/08/10 14:41:19 martin Exp $ ---- pty.c.orig Wed Dec 13 23:32:14 2000 -+++ pty.c Mon Jan 22 14:07:18 2001 -@@ -38,6 +38,10 @@ +--- pty.c.orig Fri Aug 10 10:48:25 2001 ++++ pty.c Fri Aug 10 16:32:18 2001 +@@ -26,6 +26,10 @@ #include <util.h> #endif /* HAVE_UTIL_H */ |