Skip site navigation (1)Skip section navigation (2)
Date:      Sun,  2 Jul 2000 11:37:44 +0300 (EEST)
From:      martti.kuparinen@ericsson.com
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/19637: [PATCH] ports/security/stunnel
Message-ID:  <20000702083744.D7ABB763DC@ws2.piuha.net>

next in thread | raw e-mail | index | archive | help

>Number:         19637
>Category:       ports
>Synopsis:       [PATCH] ports/security/stunnel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 02 01:40:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Martti Kuparinen
>Release:        FreeBSD 3.5-STABLE i386
>Organization:
Oy L M Ericsson Ab
>Environment:

	

>Description:

Here's an update to the stunnel port. Although this is not an official
release, there have been some issues this should fix.

>How-To-Repeat:

	

>Fix:

diff -crN /usr/ports/security/stunnel/Makefile stunnel/Makefile
*** /usr/ports/security/stunnel/Makefile	Sat May  6 08:39:12 2000
--- stunnel/Makefile	Sat Jul  1 14:26:51 2000
***************
*** 6,46 ****
  #
  
  PORTNAME=	stunnel
! PORTVERSION=	3.8
  CATEGORIES=	security
! MASTER_SITES=	ftp://opensores.thebunker.net/pub/mirrors/stunnel/ \
! 		http://mike.daewoo.com.pl/computer/stunnel/ \
  		ftp://ftp.cryptoarchive.net/pub/cryptoarchive/mirrors/opensores.thebunker.net/pub/mirrors/stunnel/
  
  MAINTAINER=	martti.kuparinen@ericsson.com
  
  USE_OPENSSL=	RSA
  
  GNU_CONFIGURE=	yes
  CONFIGURE_ARGS=	--localstatedir=/var/run
  
  MAN8=		stunnel.8
  
! cert:
! 	@(cd ${WRKSRC}; make cert)
! 
! post-build:
  	@${ECHO} ""
! 	@${ECHO} "********************************************************************"
! 	@${ECHO} "To create and install a real certificate, execute \"make cert\" before"
! 	@${ECHO} "\"make install\"."
  	@${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} ""
  
! post-install:
  	@${ECHO} ""
  	@${ECHO} "**************************************************************************"
! 	@${ECHO} "Please check out the FAQ at http://www.onsight.com/faq/stunnel/"
  	@${ECHO} "**************************************************************************"
  	@${ECHO} ""
  
  .include <bsd.port.mk>
--- 6,51 ----
  #
  
  PORTNAME=	stunnel
! PORTVERSION=	3.8.4
! 
! DISTNAME=	${PORTNAME}-3.8p4
! EXTRACT_SUFX=	.tgz
! 
  CATEGORIES=	security
! 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/
  
  MAINTAINER=	martti.kuparinen@ericsson.com
  
  USE_OPENSSL=	RSA
  
+ USE_AUTOCONF=	yes
  GNU_CONFIGURE=	yes
  CONFIGURE_ARGS=	--localstatedir=/var/run
  
  MAN8=		stunnel.8
  
! 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 new certificate, type \"make cert\""
  	@${ECHO} ""
! 	@${ECHO} "And don't forget to check out the FAQ at http://www.stunnel.org/"
! 	@${ECHO} "**************************************************************************"
  	@${ECHO} ""
  
! cert:
  	@${ECHO} ""
  	@${ECHO} "**************************************************************************"
! 	@${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 -crN /usr/ports/security/stunnel/files/md5 stunnel/files/md5
*** /usr/ports/security/stunnel/files/md5	Sat May  6 08:39:12 2000
--- stunnel/files/md5	Sat Jul  1 11:47:13 2000
***************
*** 1 ****
! MD5 (stunnel-3.8.tar.gz) = f84f3698b50f7028c94340e546acaa01
--- 1 ----
! MD5 (stunnel-3.8p4.tgz) = 26bb2f231756ff804a1904e1dc432c2c
diff -crN /usr/ports/security/stunnel/files/stunnel.sh stunnel/files/stunnel.sh
*** /usr/ports/security/stunnel/files/stunnel.sh	Thu Jan  1 02:00:00 1970
--- stunnel/files/stunnel.sh	Sat Jul  1 14:40:38 2000
***************
*** 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 -crN /usr/ports/security/stunnel/patches/patch-ac stunnel/patches/patch-ac
*** /usr/ports/security/stunnel/patches/patch-ac	Sat May  6 08:39:12 2000
--- stunnel/patches/patch-ac	Sun Jun 18 10:28:40 2000
***************
*** 1,53 ****
! *** configure.orig	Tue Apr  4 11:11:36 2000
! --- configure	Tue Apr  4 11:11:40 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
    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
    saved_LIBS="$LIBS"
! ! LIBS="$saved_LIBS -lRSAglue -L${prefix}/lib -lrsaref"
!   cat > conftest.$ac_ext <<EOF
!   #line 1266 "configure"
!   #include "confdefs.h"
--- 1,19 ----
! *** configure.in.orig	Sun Jun 18 10:25:31 2000
! --- configure.in	Sun Jun 18 10:28:17 2000
  ***************
! *** 109,115 ****
!   dnl Check for RSAref library.
!   AC_MSG_CHECKING([for RSAref library])
    saved_LIBS="$LIBS"
  ! LIBS="$saved_LIBS -lRSAglue -lrsaref"
!   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"
!   AC_TRY_LINK([], [],
!   [AC_MSG_RESULT(yes); ],
!   [AC_MSG_RESULT(no)]; LIBS="$saved_LIBS")
diff -crN /usr/ports/security/stunnel/pkg/DESCR stunnel/pkg/DESCR
*** /usr/ports/security/stunnel/pkg/DESCR	Sat May  6 08:39:12 2000
--- stunnel/pkg/DESCR	Sun Jun 18 09:07:32 2000
***************
*** 8,11 ****
  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/
--- 8,11 ----
  used  inetd  daemons  like  POP-2,  POP-3  and  IMAP servers
  without any changes in the programs' code.
  
! WWW: http://www.stunnel.org/
diff -crN /usr/ports/security/stunnel/pkg/PLIST stunnel/pkg/PLIST
*** /usr/ports/security/stunnel/pkg/PLIST	Tue Feb 15 09:48:08 2000
--- stunnel/pkg/PLIST	Sat Jul  1 14:37:22 2000
***************
*** 1,2 ****
--- 1,3 ----
  sbin/stunnel
  lib/stunnel.so
+ etc/rc.d/stunnel.sh.sample

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000702083744.D7ABB763DC>