Update to stunnel 4.15, which has the major new feature of almost all

connection options being configurable per connection, not global anymore.

8 files changed, 25 insertions, 42 deletions

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index b3fe0620df1a..4b101f76e102 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	stunnel
-PORTVERSION=	4.14
-PORTREVISION=	2
+PORTVERSION=	4.15
 CATEGORIES=	security
 MASTER_SITES=	http://www.stunnel.org/download/stunnel/src/ \
 		ftp://stunnel.mirt.net/stunnel/ \
@@ -17,6 +16,10 @@ MASTER_SITES=	http://www.stunnel.org/download/stunnel/src/ \
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	SSL encryption wrapper for standard network daemons
 
+PATCHFILES+=	fdputline.patch:fdputline
+PATCH_SITES+=	ftp://ftp.mirt.net/stunnel/:fdputline
+PATCH_DIST_STRIP=	-p1
+
 USE_OPENSSL=	YES
 USE_RC_SUBR=	YES
 
@@ -62,11 +65,11 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${PT
 post-patch:
 # place files under /var/tmp so that this can be run by an unprivileged
 # user stunnel and group stunnel
-	@${REINPLACE_CMD} -E -e 's|\@prefix\@/var/run/stunnel/|/var/tmp/stunnel|; \
+	@${REINPLACE_CMD} -E -e 's|\@prefix\@/var/lib/stunnel/|/var/tmp/stunnel|; \
 		s|nobody|stunnel|;s|nogroup|stunnel|' \
 		${WRKSRC}/tools/stunnel.conf-sample.in
-	@${REINPLACE_CMD} -E -e 's|localstatedir/run/stunnel.pid|localstatedir/stunnel.pid|' \
-		${WRKSRC}/configure.ac ${WRKSRC}/configure
+	${REINPLACE_CMD} -E -e 's|\$$\(prefix\)/var/run/stunnel/stunnel.pid|$$(localstatedir)/stunnel.pid|' \
+		${WRKSRC}/src/Makefile.in
 	@${FIND} ${WRKSRC} -type f -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -E -e 's,@(ACLOCAL|AUTO(MAKE|CONF|HEADER))@,/usr/bin/true,'
 .ifdef(NOPORTDOCS)
 	@${REINPLACE_CMD} -E -e 's/ install-docDATA/ /; s/^(SUBDIRS.+)doc/\1/' \
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index f54b95dfe8b6..c8a323c1af7e 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,3 +1,6 @@
-MD5 (stunnel-4.14.tar.gz) = 0969cc4868dfd75f22792ecccc9ec555
-SHA256 (stunnel-4.14.tar.gz) = 8a5712ec0130ca7dff4d954a7aac39b9bc4209bdbcf5ae64a276a55d51a68941
-SIZE (stunnel-4.14.tar.gz) = 488512
+MD5 (stunnel-4.15.tar.gz) = 2c00153ad099a5f9c5609e8d1dbbe470
+SHA256 (stunnel-4.15.tar.gz) = 53328496fb9c2ad44bfea31c8beae93b99f5d8f577d5d60cceffc7e160936fe9
+SIZE (stunnel-4.15.tar.gz) = 497103
+MD5 (fdputline.patch) = e98b1aea6f3e41e10dfe6c0bbdd17eb7
+SHA256 (fdputline.patch) = 961f8f9ea5704ebf64c5ca5e029c414910ee1ab5c32c854036b902e9b17d5545
+SIZE (fdputline.patch) = 5217
diff --git a/security/stunnel/files/patch-configure b/security/stunnel/files/patch-configure
deleted file mode 100644
index 15633529ae77..000000000000
--- a/security/stunnel/files/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN stunnel-4.13/configure stunnel-4.14/configure
---- configure	Thu Oct 20 11:00:50 2005
-+++ configure	Tue Oct 25 23:21:23 2005
-@@ -23194,7 +23339,7 @@
- 
- { echo "$as_me:$LINENO: **************************************** write the results" >&5
- echo "$as_me: **************************************** write the results" >&6;}
--CPPFLAGS="$CPPFLAGS -DLIBDIR=\\\"$libdir\\\" -DCONFDIR=\\\"$sysconfdir/stunnel\\\" -DPIDFILE=\\\"$localstatedir/stunnel/stunnel.pid\\\""
-+CPPFLAGS="$CPPFLAGS -DLIBDIR=\\\"$libdir\\\" -DCONFDIR=\\\"$sysconfdir/stunnel\\\" -DPIDFILE=\\\"$localstatedir/run/stunnel.pid\\\""
-                                                                       ac_config_files="$ac_config_files Makefile src/Makefile src/stunnel3 doc/Makefile tools/Makefile tools/stunnel.conf-sample tools/stunnel.init"
- 
- cat >confcache <<\_ACEOF
diff --git a/security/stunnel/files/patch-configure.ac b/security/stunnel/files/patch-configure.ac
deleted file mode 100644
index 7573e5d78493..000000000000
--- a/security/stunnel/files/patch-configure.ac
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN stunnel-4.13/configure.ac stunnel-4.14/configure.ac
---- configure.ac	Thu Oct 20 10:25:51 2005
-+++ configure.ac	Tue Oct 25 23:20:00 2005
-@@ -295,7 +296,7 @@
- )
- 
- AC_MSG_NOTICE([**************************************** write the results])
--CPPFLAGS="$CPPFLAGS -DLIBDIR=\\\"$libdir\\\" -DCONFDIR=\\\"$sysconfdir/stunnel\\\" -DPIDFILE=\\\"$localstatedir/stunnel/stunnel.pid\\\""
-+CPPFLAGS="$CPPFLAGS -DLIBDIR=\\\"$libdir\\\" -DCONFDIR=\\\"$sysconfdir/stunnel\\\" -DPIDFILE=\\\"$localstatedir/run/stunnel.pid\\\""
- AC_CONFIG_FILES([Makefile src/Makefile src/stunnel3 doc/Makefile tools/Makefile tools/stunnel.conf-sample tools/stunnel.init])
- AC_OUTPUT
- 
diff --git a/security/stunnel/files/ssl-noengine.patch b/security/stunnel/files/ssl-noengine.patch
index 13fda4281e24..734b79eb6704 100644
--- a/security/stunnel/files/ssl-noengine.patch
+++ b/security/stunnel/files/ssl-noengine.patch
@@ -1,11 +1,11 @@
---- src/ssl.c.orig	Mon Dec 27 13:47:16 2004
-+++ src/ssl.c	Mon Dec 27 13:50:36 2004
-@@ -116,6 +116,8 @@
- static void init_engine(void) {
-     ENGINE *e;
+--- src/ssl.c.old	Fri Apr 21 10:44:23 2006
++++ src/ssl.c	Fri Apr 21 10:44:26 2006
+@@ -256,6 +256,8 @@
+ }
  
+ static void init_engine() {
 +    s_log(LOG_ERR, "This version of stunnel was compiled WITHOUT support for OpenSSL hardware engines!  If you need this functionality, rebuild the FreeBSD port with the WITH_STUNNEL_SSL_ENGINE option set to 'yes'; contact Peter Pentchev <roam@FreeBSD.org> for details.");
 +    exit(1);
-     ENGINE_load_builtin_engines();
-     if(!strcasecmp(options.engine, "auto")) {
-         s_log(LOG_DEBUG, "Enabling auto engine support");
+     if(engine_initialized)
+         return;
+     engine_initialized=1;
diff --git a/security/stunnel/files/stunnel.in b/security/stunnel/files/stunnel.in
index f9a485fee264..0d3a9472b03e 100644
--- a/security/stunnel/files/stunnel.in
+++ b/security/stunnel/files/stunnel.in
@@ -17,7 +17,7 @@
 #				that stunnel will use during the automated
 #				start-up.
 # stunnel_pidfile (str):	Default "!!PREFIX!!/var/stunnel/stunnel.pid"
-#				Set it to the value of 'pidfile' in
+#				Set it to the value of 'pid' in
 #				the stunnel.conf file.
 #
 
diff --git a/security/stunnel/files/stunnel.sh b/security/stunnel/files/stunnel.sh
index f9a485fee264..0d3a9472b03e 100644
--- a/security/stunnel/files/stunnel.sh
+++ b/security/stunnel/files/stunnel.sh
@@ -17,7 +17,7 @@
 #				that stunnel will use during the automated
 #				start-up.
 # stunnel_pidfile (str):	Default "!!PREFIX!!/var/stunnel/stunnel.pid"
-#				Set it to the value of 'pidfile' in
+#				Set it to the value of 'pid' in
 #				the stunnel.conf file.
 #
 
diff --git a/security/stunnel/pkg-plist b/security/stunnel/pkg-plist
index c480d3c4f2db..8114d410366f 100644
--- a/security/stunnel/pkg-plist
+++ b/security/stunnel/pkg-plist
@@ -23,6 +23,7 @@ sbin/stunnel3
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.W32
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.WCE
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/PORTS
 %%PORTDOCS%%%%DOCSDIR%%/README