diff -urN stunnel/Makefile.orig stunnel/Makefile
--- stunnel/Makefile.orig	2009-11-20 06:19:12.000000000 +0900
+++ stunnel/Makefile	2010-01-13 13:23:51.000000000 +0900
@@ -6,17 +6,12 @@
 #
 
 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 -urN stunnel/distinfo.orig stunnel/distinfo
--- stunnel/distinfo.orig	2009-11-20 06:19:12.000000000 +0900
+++ stunnel/distinfo	2010-01-13 13:23:55.000000000 +0900
@@ -1,6 +1,3 @@
-MD5 (stunnel-4.28.tar.gz) = 5bf753a042047f40a938e82ec7ece569
-SHA256 (stunnel-4.28.tar.gz) = 9be98fb1aa5e96e44095df267d89b776aa539e6dce90dd0d54db675e9a95cd80
-SIZE (stunnel-4.28.tar.gz) = 543008
-MD5 (execargs.patch) = c893028f869f6d1f527373334605d639
-SHA256 (execargs.patch) = 88e682c0deee13d9768c8cbdd3e71f90dd26d92621d2e64542d5379a3939ac4c
-SIZE (execargs.patch) = 756
+MD5 (stunnel-4.29.tar.gz) = 14dc3f8412947f0548975cbce74d6863
+SHA256 (stunnel-4.29.tar.gz) = 018064e852a2a125bcfb4b81baa77b5701ccf6aabe6a47564bfc046b18d11f9b
+SIZE (stunnel-4.29.tar.gz) = 544292
diff -urN stunnel/files/patch-src::options.c.orig stunnel/files/patch-src::options.c
--- stunnel/files/patch-src::options.c.orig	2009-11-19 20:06:25.000000000 +0900
+++ stunnel/files/patch-src::options.c	1970-01-01 09:00:00.000000000 +0900
@@ -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(&section->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},