diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/stunnel/Makefile | 5 | ||||
-rw-r--r-- | security/stunnel/distinfo | 11 | ||||
-rw-r--r-- | security/stunnel/patches/patch-aa | 18 | ||||
-rw-r--r-- | security/stunnel/patches/patch-ab | 26 | ||||
-rw-r--r-- | security/stunnel/patches/patch-ac | 21 |
5 files changed, 41 insertions, 40 deletions
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index 6cdf1428716..96c9dd4d2de 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.43 2004/12/28 02:47:49 reed Exp $ +# $NetBSD: Makefile,v 1.44 2004/12/28 09:09:52 martti Exp $ -DISTNAME= stunnel-4.05 -PKGREVISION= 4 +DISTNAME= stunnel-4.06 CATEGORIES= security MASTER_SITES= ftp://ftp.fu-berlin.de/unix/security/stunnel/ \ ftp://stunnel.mirt.net/stunnel/ \ diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo index dfe556c968b..95bb6ef0da6 100644 --- a/security/stunnel/distinfo +++ b/security/stunnel/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.15 2004/02/16 11:48:38 martti Exp $ +$NetBSD: distinfo,v 1.16 2004/12/28 09:09:52 martti Exp $ -SHA1 (stunnel-4.05.tar.gz) = a95b09ed88930fa432f47c5c5d3db770681fe715 -Size (stunnel-4.05.tar.gz) = 341191 bytes -SHA1 (patch-aa) = 0d643d1823a21b1b7c4a380bf8ffdb3c7b578a09 -SHA1 (patch-ab) = d68f146259b1f7180e1e5173236154405f565acc +SHA1 (stunnel-4.06.tar.gz) = cfabfe5b34c694297df6fc1d92fea37217d8f1a1 +Size (stunnel-4.06.tar.gz) = 484200 bytes +SHA1 (patch-aa) = c8795837b7582de4d863fdd551501a4ef561bb0e +SHA1 (patch-ab) = fccc8ffaf5d6023dd20700d201638d022b8638da +SHA1 (patch-ac) = 081f259bbce31cab7a574f98c1f8c03aaa3f6491 diff --git a/security/stunnel/patches/patch-aa b/security/stunnel/patches/patch-aa index 9a6a860108f..cb662b6291e 100644 --- a/security/stunnel/patches/patch-aa +++ b/security/stunnel/patches/patch-aa @@ -1,24 +1,16 @@ -$NetBSD: patch-aa,v 1.15 2004/02/16 11:48:38 martti Exp $ +$NetBSD: patch-aa,v 1.16 2004/12/28 09:09:52 martti Exp $ ---- 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 - +--- tools/Makefile.in.orig 2004-12-26 01:36:52.000000000 +0200 ++++ tools/Makefile.in 2004-12-28 12:28:16.000000000 +0200 +@@ -164,4 +164,4 @@ -confdir = $(sysconfdir)/stunnel -conf_DATA = stunnel.conf-sample stunnel.pem +confdir = $(datadir)/examples/stunnel +conf_DATA = stunnel.conf-sample - docdir = $(datadir)/doc/stunnel - examplesdir = $(docdir)/examples -@@ -251,7 +251,7 @@ - -in stunnel.pem - +@@ -401,3 +401,3 @@ install-data-hook: - chmod 0600 $(DESTDIR)$(confdir)/stunnel.pem + true - clean-local: - -rm -f stunnel.rnd diff --git a/security/stunnel/patches/patch-ab b/security/stunnel/patches/patch-ab index 4d3b307b76c..505be8b752d 100644 --- a/security/stunnel/patches/patch-ab +++ b/security/stunnel/patches/patch-ab @@ -1,29 +1,17 @@ -$NetBSD: patch-ab,v 1.13 2004/02/16 11:48:38 martti Exp $ +$NetBSD: patch-ab,v 1.14 2004/12/28 09:09:52 martti Exp $ ---- configure.orig 2003-12-28 22:55:49.000000000 +0200 -+++ configure 2004-02-16 13:41:46.000000000 +0200 -@@ -8025,6 +8025,7 @@ - fi - +--- configure.orig 2004-12-26 01:31:18.000000000 +0200 ++++ configure 2004-12-28 12:30:28.000000000 +0200 +@@ -21348,2 +21348,3 @@ +if false; then # 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 -@@ -8134,6 +8135,7 @@ - - +@@ -21475,2 +21476,3 @@ fi +fi - - -@@ -10124,7 +10126,7 @@ - +@@ -22019,3 +22021,3 @@ 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 src/stunnel3 doc/Makefile tools/Makefile tools/stunnel.conf-sample tools/stunnel.init" diff --git a/security/stunnel/patches/patch-ac b/security/stunnel/patches/patch-ac new file mode 100644 index 00000000000..c3c12c5ee98 --- /dev/null +++ b/security/stunnel/patches/patch-ac @@ -0,0 +1,21 @@ +$NetBSD: patch-ac,v 1.5 2004/12/28 09:09:52 martti Exp $ + +*** src/network.c 2004-10-14 17:03:49.000000000 +0200 +--- src/network.c 2004-12-27 21:21:16.000000000 +0100 +*************** +*** 125,131 **** + int retval; + + do { /* skip "Interrupted system call" errors */ +! retval=poll(fds->ufds, fds->nfds, 1000*timeout); + /* no timeout -> main loop */ + if(timeout<0 && retval>0 && s_poll_canread(fds, signal_pipe[0])) + signal_pipe_empty(); +--- 125,131 ---- + int retval; + + do { /* skip "Interrupted system call" errors */ +! retval=poll(fds->ufds, fds->nfds, timeout<0 ? -1 : 1000*timeout); + /* no timeout -> main loop */ + if(timeout<0 && retval>0 && s_poll_canread(fds, signal_pipe[0])) + signal_pipe_empty(); |