7 files changed, 29 insertions, 18 deletions

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index dc5ad8e29b09..4ad40c6dcb84 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	stunnel
-PORTVERSION=	4.20
-PORTREVISION=	1
+PORTVERSION=	4.21
 CATEGORIES=	security
 MASTER_SITES=	http://www.stunnel.org/download/stunnel/src/ \
 		ftp://stunnel.mirt.net/stunnel/ \
@@ -24,7 +23,7 @@ USE_RC_SUBR=	YES
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=/var/tmp --with-pem-dir=${PEM_DIR} \
-		--enable-static
+		--enable-static --disable-fips
 
 .if !defined(NOPORTDOCS)
 MAN8=		stunnel.8 stunnel.fr.8 stunnel.pl.8
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index 3f55ee619fb3..0a1f8e920712 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,3 +1,3 @@
-MD5 (stunnel-4.20.tar.gz) = cf9940395d3503018f721c962528d2ec
-SHA256 (stunnel-4.20.tar.gz) = 2926b8eda6d90872056145da8a260bd2eab41621c143f8a014ffa7a92e81fd10
-SIZE (stunnel-4.20.tar.gz) = 513394
+MD5 (stunnel-4.21.tar.gz) = 1eaec5228979beca4d548f453304e311
+SHA256 (stunnel-4.21.tar.gz) = b1121c1157c48320491f1929eb1f1c64ba20f76c7352c0df01c77cf09be19add
+SIZE (stunnel-4.21.tar.gz) = 528196
diff --git a/security/stunnel/files/patch-src::common.h b/security/stunnel/files/patch-src::common.h
new file mode 100644
index 000000000000..9763da6add4c
--- /dev/null
+++ b/security/stunnel/files/patch-src::common.h
@@ -0,0 +1,12 @@
+--- src/common.h.old	2007-10-29 17:56:21.000000000 +0200
++++ src/common.h	2007-10-29 18:07:22.000000000 +0200
+@@ -314,9 +314,6 @@
+ 
+ #define OPENSSL_THREAD_DEFINES
+ #include <openssl/opensslconf.h>
+-#if !defined(OPENSSL_THREADS) && defined(USE_PTHREAD)
+-#error OpenSSL library compiled without thread support
+-#endif /* !OPENSSL_THREADS && USE_PTHREAD */
+ 
+ #include <openssl/lhash.h>
+ #include <openssl/ssl.h>
diff --git a/security/stunnel/files/patch-tools::stunnel.init.in b/security/stunnel/files/patch-tools::stunnel.init.in
index b5ff244333c9..3a6af7908981 100644
--- a/security/stunnel/files/patch-tools::stunnel.init.in
+++ b/security/stunnel/files/patch-tools::stunnel.init.in
@@ -1,10 +1,9 @@
-diff -urN stunnel-4.13/tools/stunnel.init.in stunnel-4.14/tools/stunnel.init.in
---- tools/stunnel.init.in	Sun Aug 11 01:17:48 2002
-+++ tools/stunnel.init.in	Tue Oct 25 23:34:39 2005
+--- tools/stunnel.init.in.old	2007-10-29 13:12:01.000000000 +0200
++++ tools/stunnel.init.in	2007-10-29 13:12:50.000000000 +0200
 @@ -5,7 +5,7 @@
  PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
  PREFIX=@prefix@
- DAEMON=$PREFIX/sbin/stunnel
+ DAEMON=$PREFIX/bin/stunnel
 -PIDFILE=$PREFIX/var/stunnel/stunnel.pid
 +PIDFILE=$PREFIX/var/run/stunnel/stunnel.pid
  
diff --git a/security/stunnel/files/stunnel.in b/security/stunnel/files/stunnel.in
index 0d3a9472b03e..3ab996452b19 100644
--- a/security/stunnel/files/stunnel.in
+++ b/security/stunnel/files/stunnel.in
@@ -27,7 +27,7 @@ name="stunnel"
 rcvar=`set_rcvar`
 stunnel_config="!!PREFIX!!/etc/stunnel/${name}.conf"
 stunnel_pidfile="/var/run/${name}.pid"
-command="!!PREFIX!!/sbin/stunnel"
+command="!!PREFIX!!/bin/stunnel"
 
 [ -z "$stunnel_enable" ]		&& stunnel_enable="NO"
 
diff --git a/security/stunnel/files/stunnel.sh b/security/stunnel/files/stunnel.sh
index 0d3a9472b03e..3ab996452b19 100644
--- a/security/stunnel/files/stunnel.sh
+++ b/security/stunnel/files/stunnel.sh
@@ -27,7 +27,7 @@ name="stunnel"
 rcvar=`set_rcvar`
 stunnel_config="!!PREFIX!!/etc/stunnel/${name}.conf"
 stunnel_pidfile="/var/run/${name}.pid"
-command="!!PREFIX!!/sbin/stunnel"
+command="!!PREFIX!!/bin/stunnel"
 
 [ -z "$stunnel_enable" ]		&& stunnel_enable="NO"
 
diff --git a/security/stunnel/pkg-plist b/security/stunnel/pkg-plist
index 8114d410366f..2e7f6d48abb8 100644
--- a/security/stunnel/pkg-plist
+++ b/security/stunnel/pkg-plist
@@ -1,10 +1,10 @@
+bin/stunnel
+bin/stunnel3
 etc/rc.d/stunnel.sh
 etc/stunnel/stunnel.conf-sample
-lib/libstunnel.a
-lib/libstunnel.la
-lib/libstunnel.so
-sbin/stunnel
-sbin/stunnel3
+lib/stunnel/libstunnel.a
+lib/stunnel/libstunnel.la
+lib/stunnel/libstunnel.so
 %%PORTDOCS%%%%DOCSDIR%%/stunnel.html
 %%PORTDOCS%%%%DOCSDIR%%/stunnel.fr.html
 %%PORTDOCS%%%%DOCSDIR%%/stunnel.pl.html
@@ -22,12 +22,13 @@ sbin/stunnel3
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.GPL
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.FIPS
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.W32
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.WCE
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/PORTS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/stunnel
 @unexec rmdir %D/etc/stunnel 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/stunnel`` to remove any configuration files left." | fmt