Update to version 3.8.

PR:		17792
Submitted by:	Keith Ray <kmray@slb.com>

4 files changed, 41 insertions, 84 deletions

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 1016dc36abd7..173a5eb3ad7f 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	stunnel
-PORTVERSION=	3.7
+PORTVERSION=	3.8
 CATEGORIES=	security
-MASTER_SITES=	http://opensores.thebunker.net/pub/mirrors/stunnel/ \
+MASTER_SITES=	ftp://opensores.thebunker.net/pub/mirrors/stunnel/ \
 		http://mike.daewoo.com.pl/computer/stunnel/ \
-		ftp://ftp.fu-berlin.de/unix/security/stunnel/ \
-		ftp://ftp.uni-freiburg.de/pub/net/stunnel/ \
-		ftp://ftp.all.de/pub2/unix/security/stunnel/
+		ftp://ftp.cryptoarchive.net/pub/cryptoarchive/mirrors/opensores.thebunker.net/pub/mirrors/stunnel/
 
 MAINTAINER=	martti.kuparinen@ericsson.com
 
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index e882ed2536fe..e8813ba2b56c 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1 +1 @@
-MD5 (stunnel-3.7.tar.gz) = ee8ad5c5365e0a79e1a058e305433575
+MD5 (stunnel-3.8.tar.gz) = f84f3698b50f7028c94340e546acaa01
diff --git a/security/stunnel/files/patch-ac b/security/stunnel/files/patch-ac
index 084c75b1f7d6..f6b1166aeb4b 100644
--- a/security/stunnel/files/patch-ac
+++ b/security/stunnel/files/patch-ac
@@ -1,96 +1,53 @@
-*** configure.orig	Thu Feb 10 12:18:18 2000
---- configure	Tue Feb 29 13:56:21 2000
+*** configure.orig	Tue Apr  4 11:11:36 2000
+--- configure	Tue Apr  4 11:11:40 2000
 ***************
-*** 1051,1064 ****
-    echo "$ac_t""no" 1>&6
-  fi
+*** 935,941 ****
   
-! echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-! echo "configure:1056: checking for pthread_create in -lpthread" >&5
-! ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-  else
-    ac_save_LIBS="$LIBS"
-! LIBS="-lpthread  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-  #line 1064 "configure"
-  #include "confdefs.h"
---- 1051,1064 ----
-    echo "$ac_t""no" 1>&6
-  fi
-  
-! echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-! echo "configure:1056: checking for pthread_create in -lc_r" >&5
-! ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-  else
-    ac_save_LIBS="$LIBS"
-! LIBS="-pthread  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-  #line 1064 "configure"
-  #include "confdefs.h"
-***************
-*** 1086,1098 ****
-  fi
-  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-    echo "$ac_t""yes" 1>&6
-!     ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-      -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-    cat >> confdefs.h <<EOF
-  #define $ac_tr_lib 1
-  EOF
   
-!   LIBS="-lpthread $LIBS"
+  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 ----
   
-  else
-    echo "$ac_t""no" 1>&6
---- 1086,1098 ----
-  fi
-  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-    echo "$ac_t""yes" 1>&6
-!     ac_tr_lib=HAVE_LIB`echo c_r | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-      -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-    cat >> confdefs.h <<EOF
-  #define $ac_tr_lib 1
-  EOF
   
-!   LIBS="-pthread $LIBS"
-  
-  else
-    echo "$ac_t""no" 1>&6
+  checkssldir() { :
+! #    if test -d "$1/certs"; then
+          if test -f "$1/include/openssl/ssl.h"; then
+              cat >> confdefs.h <<\EOF
+  #define HAVE_OPENSSL 1
 ***************
-*** 1174,1180 ****
-  
-  echo $ac_n "checking for SSL directory""... $ac_c" 1>&6
-  echo "configure:1177: checking for SSL directory" >&5
-! for dir in ${prefix} /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do
-      ssldir="$dir"
-      if test -f "$dir/include/openssl/ssl.h"; then
-          cat >> confdefs.h <<\EOF
---- 1174,1180 ----
+*** 948,954 ****
+              ssldir="$1"
+              return 0
+          fi
+!     fi
+      return 1
+  }
+  
+--- 948,954 ----
+              ssldir="$1"
+              return 0
+          fi
+! #    fi
+      return 1
+  }
   
-  echo $ac_n "checking for SSL directory""... $ac_c" 1>&6
-  echo "configure:1177: checking for SSL directory" >&5
-! for dir in /usr ${prefix} /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local; do
-      ssldir="$dir"
-      if test -f "$dir/include/openssl/ssl.h"; then
-          cat >> confdefs.h <<\EOF
 ***************
-*** 1199,1205 ****
+*** 1260,1266 ****
   echo $ac_n "checking for RSAref library""... $ac_c" 1>&6
-  echo "configure:1201: checking for RSAref library" >&5
+  echo "configure:1262: checking for RSAref library" >&5
   saved_LIBS="$LIBS"
 ! LIBS="$saved_LIBS -lRSAglue -lrsaref"
   cat > conftest.$ac_ext <<EOF
-  #line 1205 "configure"
+  #line 1266 "configure"
   #include "confdefs.h"
---- 1199,1205 ----
+--- 1260,1266 ----
   echo $ac_n "checking for RSAref library""... $ac_c" 1>&6
-  echo "configure:1201: checking for RSAref library" >&5
+  echo "configure:1262: checking for RSAref library" >&5
   saved_LIBS="$LIBS"
 ! LIBS="$saved_LIBS -lRSAglue -L${prefix}/lib -lrsaref"
   cat > conftest.$ac_ext <<EOF
-  #line 1205 "configure"
+  #line 1266 "configure"
   #include "confdefs.h"
diff --git a/security/stunnel/pkg-descr b/security/stunnel/pkg-descr
index 411bf75de432..3b305cbdb2f6 100644
--- a/security/stunnel/pkg-descr
+++ b/security/stunnel/pkg-descr
@@ -7,3 +7,5 @@ communicate with clients over secure SSL channel.
 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/