7 files changed, 90 insertions, 69 deletions

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 173a5eb3ad7f..61e0da16f39a 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -6,41 +6,43 @@
 #
 
 PORTNAME=	stunnel
-PORTVERSION=	3.8
+PORTVERSION=	3.8.4
 CATEGORIES=	security
-MASTER_SITES=	ftp://opensores.thebunker.net/pub/mirrors/stunnel/ \
-		http://mike.daewoo.com.pl/computer/stunnel/ \
+MASTER_SITES=	http://www.stunnel.org/download/stunnel/src/ \
+		ftp://opensores.thebunker.net/pub/mirrors/stunnel/ \
+		ftp://mike.daewoo.com.pl/pub/stunnel/ \
 		ftp://ftp.cryptoarchive.net/pub/cryptoarchive/mirrors/opensores.thebunker.net/pub/mirrors/stunnel/
+DISTNAME=	${PORTNAME}-3.8p4
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	martti.kuparinen@ericsson.com
 
 USE_OPENSSL=	RSA
 
-GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
 CONFIGURE_ARGS=	--localstatedir=/var/run
 
 MAN8=		stunnel.8
 
-cert:
-	@(cd ${WRKSRC}; make cert)
-
-post-build:
+post-install:
+	@${SED} "s+!!PREFIX!!+${PREFIX}+g" < ${FILESDIR}/stunnel.sh \
+		> ${PREFIX}/etc/rc.d/stunnel.sh.sample
+	@${CHMOD} 755 ${PREFIX}/etc/rc.d/stunnel.sh.sample
 	@${ECHO} ""
-	@${ECHO} "********************************************************************"
-	@${ECHO} "To create and install a real certificate, execute \"make cert\" before"
-	@${ECHO} "\"make install\"."
+	@${ECHO} "**************************************************************************"
+	@${ECHO} "To create and install a new certificate, type \"make cert\""
 	@${ECHO} ""
-	@${ECHO} "You can also create a real certificate later by executing"
-	@${ECHO} "      # make cert"
-	@${ECHO} "      # cp work/stunnel/stunnel.pem ${PREFIX}/certs/"
-	@${ECHO} "********************************************************************"
+	@${ECHO} "And don't forget to check out the FAQ at http://www.stunnel.org/"
+	@${ECHO} "**************************************************************************"
 	@${ECHO} ""
 
-post-install:
+cert:
 	@${ECHO} ""
 	@${ECHO} "**************************************************************************"
-	@${ECHO} "Please check out the FAQ at http://www.onsight.com/faq/stunnel/"
+	@${ECHO} "The new certificate will be saved into ${PREFIX}/etc/stunnel.pem"
 	@${ECHO} "**************************************************************************"
 	@${ECHO} ""
+	@(cd ${WRKSRC}; make cert)
+	${INSTALL} -m 600 ${WRKSRC}/stunnel.pem ${PREFIX}/etc/
 
 .include <bsd.port.mk>
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index e8813ba2b56c..68da45de5cf5 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1 +1 @@
-MD5 (stunnel-3.8.tar.gz) = f84f3698b50f7028c94340e546acaa01
+MD5 (stunnel-3.8p4.tgz) = 26bb2f231756ff804a1904e1dc432c2c
diff --git a/security/stunnel/files/patch-ac b/security/stunnel/files/patch-ac
index f6b1166aeb4b..347716c297bf 100644
--- a/security/stunnel/files/patch-ac
+++ b/security/stunnel/files/patch-ac
@@ -1,53 +1,19 @@
-*** configure.orig	Tue Apr  4 11:11:36 2000
---- configure	Tue Apr  4 11:11:40 2000
+*** configure.in.orig	Sun Jun 18 10:25:31 2000
+--- configure.in	Sun Jun 18 10:28:17 2000
 ***************
-*** 935,941 ****
-  
-  
-  checkssldir() { :
-!     if test -d "$1/certs"; then
-          if test -f "$1/include/openssl/ssl.h"; then
-              cat >> confdefs.h <<\EOF
-  #define HAVE_OPENSSL 1
---- 935,941 ----
-  
-  
-  checkssldir() { :
-! #    if test -d "$1/certs"; then
-          if test -f "$1/include/openssl/ssl.h"; then
-              cat >> confdefs.h <<\EOF
-  #define HAVE_OPENSSL 1
-***************
-*** 948,954 ****
-              ssldir="$1"
-              return 0
-          fi
-!     fi
-      return 1
-  }
-  
---- 948,954 ----
-              ssldir="$1"
-              return 0
-          fi
-! #    fi
-      return 1
-  }
-  
-***************
-*** 1260,1266 ****
-  echo $ac_n "checking for RSAref library""... $ac_c" 1>&6
-  echo "configure:1262: checking for RSAref library" >&5
+*** 109,115 ****
+  dnl Check for RSAref library.
+  AC_MSG_CHECKING([for RSAref library])
   saved_LIBS="$LIBS"
 ! LIBS="$saved_LIBS -lRSAglue -lrsaref"
-  cat > conftest.$ac_ext <<EOF
-  #line 1266 "configure"
-  #include "confdefs.h"
---- 1260,1266 ----
-  echo $ac_n "checking for RSAref library""... $ac_c" 1>&6
-  echo "configure:1262: checking for RSAref library" >&5
+  AC_TRY_LINK([], [],
+  [AC_MSG_RESULT(yes); ],
+  [AC_MSG_RESULT(no)]; LIBS="$saved_LIBS")
+--- 109,115 ----
+  dnl Check for RSAref library.
+  AC_MSG_CHECKING([for RSAref library])
   saved_LIBS="$LIBS"
-! LIBS="$saved_LIBS -lRSAglue -L${prefix}/lib -lrsaref"
-  cat > conftest.$ac_ext <<EOF
-  #line 1266 "configure"
-  #include "confdefs.h"
+! LIBS="$saved_LIBS -lRSAglue -L$prefix/lib -lrsaref"
+  AC_TRY_LINK([], [],
+  [AC_MSG_RESULT(yes); ],
+  [AC_MSG_RESULT(no)]; LIBS="$saved_LIBS")
diff --git a/security/stunnel/files/stunnel.in b/security/stunnel/files/stunnel.in
new file mode 100644
index 000000000000..dc074e2771a1
--- /dev/null
+++ b/security/stunnel/files/stunnel.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# A sample stunnel startup script written by martti.kuparinen@ericsson.com
+#
+# $FreeBSD$
+#
+
+# Where is the program
+STUNNEL="!!PREFIX!!/sbin/stunnel"
+
+case "$1" in
+    start)
+        ${STUNNEL} -d 993 -r localhost:imap -p !!PREFIX!!/etc/stunnel.pem
+        ${STUNNEL} -d 995 -r localhost:pop3 -p !!PREFIX!!/etc/stunnel.pem
+        ;;
+
+    stop)
+        killall `basename ${STUNNEL}`
+        ;;
+
+    *)
+        echo ""
+        echo "Usage: `basename $0` { start | stop }"
+        echo ""
+        ;;
+esac
diff --git a/security/stunnel/files/stunnel.sh b/security/stunnel/files/stunnel.sh
new file mode 100644
index 000000000000..dc074e2771a1
--- /dev/null
+++ b/security/stunnel/files/stunnel.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# A sample stunnel startup script written by martti.kuparinen@ericsson.com
+#
+# $FreeBSD$
+#
+
+# Where is the program
+STUNNEL="!!PREFIX!!/sbin/stunnel"
+
+case "$1" in
+    start)
+        ${STUNNEL} -d 993 -r localhost:imap -p !!PREFIX!!/etc/stunnel.pem
+        ${STUNNEL} -d 995 -r localhost:pop3 -p !!PREFIX!!/etc/stunnel.pem
+        ;;
+
+    stop)
+        killall `basename ${STUNNEL}`
+        ;;
+
+    *)
+        echo ""
+        echo "Usage: `basename $0` { start | stop }"
+        echo ""
+        ;;
+esac
diff --git a/security/stunnel/pkg-descr b/security/stunnel/pkg-descr
index 3b305cbdb2f6..e4929f528c5a 100644
--- a/security/stunnel/pkg-descr
+++ b/security/stunnel/pkg-descr
@@ -8,4 +8,4 @@ stunnel can be used to add  SSL  functionality  to  commonly
 used  inetd  daemons  like  POP-2,  POP-3  and  IMAP servers
 without any changes in the programs' code.
 
-WWW: http://mike.daewoo.com.pl/computer/stunnel/
+WWW: http://www.stunnel.org/
diff --git a/security/stunnel/pkg-plist b/security/stunnel/pkg-plist
index 2f5eba5f789a..914268b3a843 100644
--- a/security/stunnel/pkg-plist
+++ b/security/stunnel/pkg-plist
@@ -1,2 +1,3 @@
-sbin/stunnel
+etc/rc.d/stunnel.sh.sample
 lib/stunnel.so
+sbin/stunnel