5 files changed, 11 insertions, 58 deletions

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index a8588ec0c460..dd3acbf775af 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	stunnel
-PORTVERSION=	4.34
-PORTREVISION=	2
+PORTVERSION=	4.35
 CATEGORIES=	security
-MASTER_SITES=	http://www.stunnel.org/download/stunnel/src/ \
+MASTER_SITES=	ftp://ftp.stunnel.org/stunnel/%SUBDIR%/ \
 		http://mirrors.zerg.biz/stunnel/%SUBDIR%/ \
 		ftp://stunnel.mirt.net/stunnel/%SUBDIR%/ \
 		ftp://ftp.nluug.nl/pub/networking/stunnel/%SUBDIR%/ \
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index c2edb4ab2058..a06897e00253 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (stunnel-4.34.tar.gz) = f15ff844ad8e234c645031ea8f9c509cbcfd11467a31835f099f328dbf2b4084
-SIZE (stunnel-4.34.tar.gz) = 526336
+SHA256 (stunnel-4.35.tar.gz) = a810e220498239483e14fae24eeb2a188a6167e9118958b903f8793768c4460f
+SIZE (stunnel-4.35.tar.gz) = 541012
diff --git a/security/stunnel/files/patch-src::client.c b/security/stunnel/files/patch-src::client.c
deleted file mode 100644
index ff6956a35df0..000000000000
--- a/security/stunnel/files/patch-src::client.c
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Allow transparent proxying using IP_BINDANY.
-Forwarded: yes
-Author: Peter Pentchev <roam@FreeBSD.org>,
-	Jason Helfman <jhelfman@experts-exchange.com>
-Last-Updated: 2011-01-04
-
---- src/client.c.orig
-+++ src/client.c
-@@ -1034,15 +1034,16 @@
- static void local_bind(CLI *c) {
-     SOCKADDR_UNION addr;
- 
--#ifdef IP_TRANSPARENT
-+#ifdef STUNNEL_TRANSPARENT
-     int on=1;
-     if(c->opt->option.transparent) {
--        if(setsockopt(c->fd, SOL_IP, IP_TRANSPARENT, &on, sizeof on))
--            sockerror("setsockopt IP_TRANSPARENT");
-+        if(setsockopt(c->fd, STUNNEL_TRANSPARENT_LEVEL,
-+	   STUNNEL_TRANSPARENT, &on, sizeof on))
-+            sockerror("setsockopt " STUNNEL_TRANSPARENT_NAME);
-         /* ignore the error to retain Linux 2.2 compatibility */
-         /* the error will be handled by bind(), anyway */
-     }
--#endif /* IP_TRANSPARENT */
-+#endif /* STUNNEL_TRANSPARENT */
- 
-     memcpy(&addr, &c->bind_addr.addr[0], sizeof addr);
-     if(ntohs(addr.in.sin_port)>=1024) { /* security check */
diff --git a/security/stunnel/files/patch-src::common.h b/security/stunnel/files/patch-src::common.h
index a84ee300439a..63e6ca8f4589 100644
--- a/security/stunnel/files/patch-src::common.h
+++ b/security/stunnel/files/patch-src::common.h
@@ -1,28 +1,11 @@
-Description: Build with older OpenSSL and enable transparent binding.
-Forwarded: yes (the transparent proxying part)
-Author: Peter Pentchev <roam@FreeBSD.org>,
-	Jason Helfman <jhelfman@experts-exchange.com>
-Last-Update: 2011-01-04
+Description: Build on FreeBSD versions of OpenSSL < 0.9.8b.
+Forwarded: not-needed
+Author: Peter Pentchev <roam@FreeBSD.org>
+Last-Update: 2011-02-10
 
 --- src/common.h.orig
 +++ src/common.h
-@@ -337,6 +337,15 @@
- /* old kernel headers without IP_TRANSPARENT definition */
- #define IP_TRANSPARENT 19
- #endif /* IP_TRANSPARENT */
-+#define STUNNEL_TRANSPARENT IP_TRANSPARENT
-+#define STUNNEL_TRANSPARENT_NAME "IP_TRANSPARENT"
-+#define STUNNEL_TRANSPARENT_LEVEL SOL_IP
-+#else /* __linux__ */
-+#ifdef IP_BINDANY
-+#define STUNNEL_TRANSPARENT IP_BINDANY
-+#define STUNNEL_TRANSPARENT_NAME "IP_BINDANY"
-+#define STUNNEL_TRANSPARENT_LEVEL IPPROTO_IP
-+#endif
- #endif /* __linux__ */
- 
- #endif /* USE_WIN32 */
-@@ -347,9 +356,6 @@
+@@ -353,9 +353,6 @@
  
  #define OPENSSL_THREAD_DEFINES
  #include <openssl/opensslconf.h>
diff --git a/security/stunnel/files/ssl-noengine.patch b/security/stunnel/files/ssl-noengine.patch
index 974099f52093..dd37c780fda7 100644
--- a/security/stunnel/files/ssl-noengine.patch
+++ b/security/stunnel/files/ssl-noengine.patch
@@ -1,11 +1,11 @@
 Description: Disable the OpenSSL engine support for the FreeBSD port.
 Forwaded: not-needed
 Author: Peter Pentchev <roam@FreeBSD.org>
-Last-Update: 2010-09-20
+Last-Update: 2011-02-10
 
 --- src/ssl.c.orig
 +++ src/ssl.c
-@@ -256,6 +256,8 @@
+@@ -259,6 +259,8 @@
  }
  
  static char *init_engine(void) {