diff options
| author | roam <roam@FreeBSD.org> | 2010-02-03 17:33:25 +0800 |
|---|---|---|
| committer | roam <roam@FreeBSD.org> | 2010-02-03 17:33:25 +0800 |
| commit | f18ac44c43cbb0ccef6d12edef9b571418b46e2b (patch) | |
| tree | 35df3347f5cdb011df6a7c7e86006b93390d7aa2 | |
| parent | 1977fef804416d12ba4aafb4ed7cafdef58d3e06 (diff) | |
| download | freebsd-ports-gnome-f18ac44c43cbb0ccef6d12edef9b571418b46e2b.tar.gz freebsd-ports-gnome-f18ac44c43cbb0ccef6d12edef9b571418b46e2b.tar.zst freebsd-ports-gnome-f18ac44c43cbb0ccef6d12edef9b571418b46e2b.zip | |
Update to stunnel-4.29. I'm holding off on the 4.30 update for
a couple of days until the chroot/SIGHUP/pid file problem discussed
on the stunnel-users mailing list is sorted out upstream.
PR: 142773
Reported by: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
| -rw-r--r-- | security/stunnel/Makefile | 6 | ||||
| -rw-r--r-- | security/stunnel/distinfo | 6 | ||||
| -rw-r--r-- | security/stunnel/files/patch-src::common.h | 4 | ||||
| -rw-r--r-- | security/stunnel/files/patch-src::options.c | 42 |
4 files changed, 6 insertions, 52 deletions
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index 826dcccc2d82..96589d659e2d 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -6,17 +6,13 @@ # PORTNAME= stunnel -PORTVERSION= 4.28 -PORTREVISION= 1 +PORTVERSION= 4.29 CATEGORIES= security MASTER_SITES= http://www.stunnel.org/download/stunnel/src/ \ ftp://stunnel.mirt.net/stunnel/ \ ftp://stunnel.mirt.net/stunnel/OBSOLETE/ \ ftp://opensores.thebunker.net/pub/mirrors/stunnel/download/stunnel/src/ -PATCH_SITES= ftp://stunnel.mirt.net/stunnel/ -PATCHFILES= execargs.patch - MAINTAINER= roam@FreeBSD.org COMMENT= SSL encryption wrapper for standard network daemons diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo index 2afb56df4829..35ffa036e205 100644 --- a/security/stunnel/distinfo +++ b/security/stunnel/distinfo @@ -1,6 +1,6 @@ -MD5 (stunnel-4.28.tar.gz) = 5bf753a042047f40a938e82ec7ece569 -SHA256 (stunnel-4.28.tar.gz) = 9be98fb1aa5e96e44095df267d89b776aa539e6dce90dd0d54db675e9a95cd80 -SIZE (stunnel-4.28.tar.gz) = 543008 +MD5 (stunnel-4.29.tar.gz) = 14dc3f8412947f0548975cbce74d6863 +SHA256 (stunnel-4.29.tar.gz) = 018064e852a2a125bcfb4b81baa77b5701ccf6aabe6a47564bfc046b18d11f9b +SIZE (stunnel-4.29.tar.gz) = 544292 MD5 (execargs.patch) = c893028f869f6d1f527373334605d639 SHA256 (execargs.patch) = 88e682c0deee13d9768c8cbdd3e71f90dd26d92621d2e64542d5379a3939ac4c SIZE (execargs.patch) = 756 diff --git a/security/stunnel/files/patch-src::common.h b/security/stunnel/files/patch-src::common.h index 55355581921c..fb872c929110 100644 --- a/security/stunnel/files/patch-src::common.h +++ b/security/stunnel/files/patch-src::common.h @@ -1,11 +1,11 @@ Description: Build on FreeBSD versions of OpenSSL < 0.9.8b. Forwarded: not-needed Author: Peter Pentchev <roam@FreeBSD.org> -Last-Update: 2009-11-13 +Last-Update: 2010-02-01 --- src/common.h.orig +++ src/common.h -@@ -339,9 +339,6 @@ +@@ -344,9 +344,6 @@ #define OPENSSL_THREAD_DEFINES #include <openssl/opensslconf.h> diff --git a/security/stunnel/files/patch-src::options.c b/security/stunnel/files/patch-src::options.c deleted file mode 100644 index 78e15612cbc2..000000000000 --- a/security/stunnel/files/patch-src::options.c +++ /dev/null @@ -1,42 +0,0 @@ -Description: Build on older OpenSSL versions without some options. -Forwarded: https://stunnel.mirt.net/cgi-bin/bugzilla3/show_bug.cgi?id=3 -Author: Michal Trojnara <Michal.Trojnara@mirt.net> - Peter Pentchev <roam@ringlet.net> -Last-Update: 2009-11-19 - ---- src/options.c.orig -+++ src/options.c -@@ -1136,7 +1136,9 @@ - if(strcasecmp(opt, "sessiond")) - break; - section->option.sessiond=1; -+#ifdef SSL_OP_NO_TICKET - section->ssl_options|=SSL_OP_NO_TICKET; -+#endif - if(!name2addrlist(§ion->sessiond_addr, arg, DEFAULT_LOOPBACK)) - return "Failed to resolve sessiond server address"; - return NULL; /* OK */ -@@ -1704,15 +1706,23 @@ - {"TLS_D5_BUG", SSL_OP_TLS_D5_BUG}, - {"TLS_BLOCK_PADDING_BUG", SSL_OP_TLS_BLOCK_PADDING_BUG}, - {"DONT_INSERT_EMPTY_FRAGMENTS", SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS}, -+#ifdef SSL_OP_NO_QUERY_MTU - {"NO_QUERY_MTU", SSL_OP_NO_QUERY_MTU}, -+#endif -+#ifdef SSL_OP_COOKIE_EXCHANGE - {"COOKIE_EXCHANGE", SSL_OP_COOKIE_EXCHANGE}, -+#endif -+#ifdef SSL_OP_NO_TICKET - {"NO_TICKET", SSL_OP_NO_TICKET}, -+#endif - {"NO_SESSION_RESUMPTION_ON_RENEGOTIATION", - SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION}, - #ifdef SSL_OP_NO_COMPRESSION - {"NO_COMPRESSION", SSL_OP_NO_COMPRESSION}, - #endif -+#ifdef SSL_OP_SINGLE_ECDH_USE - {"SINGLE_ECDH_USE", SSL_OP_SINGLE_ECDH_USE}, -+#endif - {"SINGLE_DH_USE", SSL_OP_SINGLE_DH_USE}, - {"EPHEMERAL_RSA", SSL_OP_EPHEMERAL_RSA}, - {"CIPHER_SERVER_PREFERENCE", SSL_OP_CIPHER_SERVER_PREFERENCE}, |