Date: Fri, 4 Jun 1999 07:54:24 +0300 (EEST) From: martti.kuparinen@ericsson.com To: FreeBSD-gnats-submit@freebsd.org Subject: ports/12018: [PATCH] ports/security/stunnel update Message-ID: <199906040454.HAA53801@ws125.research.zopps.fi>
next in thread | raw e-mail | index | archive | help
>Number: 12018
>Category: ports
>Synopsis: ports/security/stunnel needs to be updated to version 3.x
>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: Thu Jun 3 22:00:00 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator: Martti Kuparinen
>Release: FreeBSD 3.2-RELEASE i386
>Organization:
Oy L M Ericsson Ab
>Environment:
>Description:
The current stunnel 2.1 should be updated to 3.x. While waiting for
version 3.3, here is 3.2 as so many users have requested it directly
from me.
>How-To-Repeat:
Apply the following patch as
# cd /usr/ports/security/stunnel
# patch -p1 < /tmp/foobar
>Fix:
diff -rc old/Makefile stunnel/Makefile
*** old/Makefile Fri Jun 4 07:37:19 1999
--- stunnel/Makefile Tue May 4 11:53:31 1999
***************
*** 1,14 ****
# New ports collection makefile for: stunnel
! # Version required: 2.1
# Date created: Mon Jan 11 11:53:54 EET 1999
# Whom: Martti Kuparinen <martti.kuparinen@ericsson.com>
#
# $Id: Makefile,v 1.4 1999/05/03 02:10:08 steve Exp $
#
! DISTNAME= stunnel-2.1
CATEGORIES= security
MASTER_SITES= 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/
--- 1,15 ----
# New ports collection makefile for: stunnel
! # Version required: 3.2
# Date created: Mon Jan 11 11:53:54 EET 1999
# Whom: Martti Kuparinen <martti.kuparinen@ericsson.com>
#
# $Id: Makefile,v 1.4 1999/05/03 02:10:08 steve Exp $
#
! DISTNAME= stunnel-3.2
CATEGORIES= security
MASTER_SITES= http://mike.daewoo.com.pl/computer/stunnel/ \
+ http://opensores.thebunker.net/pub/mirrors/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/
***************
*** 28,32 ****
--- 29,55 ----
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/stunnel
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://mike.daewoo.com.pl/computer/stunnel/FAQ"
+ @${ECHO} "**************************************************************************"
+ @${ECHO} ""
.include <bsd.port.mk>
diff -rc old/files/md5 stunnel/files/md5
*** old/files/md5 Fri Jun 4 07:38:03 1999
--- stunnel/files/md5 Tue May 4 10:03:30 1999
***************
*** 1 ****
! MD5 (stunnel-2.1.tar.gz) = 3409d14c4916be25fe88d5f24c90f7cf
--- 1 ----
! MD5 (stunnel-3.2.tar.gz) = 16efa198ba58561fc835dc1b4bfdd63c
diff -rc old/patches/patch-aa stunnel/patches/patch-aa
*** old/patches/patch-aa Fri Jun 4 07:38:14 1999
--- stunnel/patches/patch-aa Thu Jun 3 08:59:33 1999
***************
*** 1,38 ****
! --- Makefile.in.orig Mon Jun 1 05:07:59 1998
! +++ Makefile.in Sun Jan 17 17:12:35 1999
! @@ -4,18 +4,20 @@
!
! VERSION=2.1
! HOST=@host@
! -SBINDIR=/usr/sbin
! -MANDIR=/usr/man/man8
! +SBINDIR=$(PREFIX)/sbin
! +MANDIR=$(PREFIX)/man/man8
!
! CC=@CC@
! INSTALL=@INSTALL@
! -CFLAGS=@CFLAGS@ -Wall -I/usr/local/ssl/include
! -LIBS=@LIBS@ -L/usr/local/ssl/lib -lssl -lcrypto
! +CFLAGS=@CFLAGS@ -Wall -I$(PREFIX)/include -I$(PREFIX)/include/openssl
! +LIBS=@LIBS@ -L$(PREFIX)/lib -lssl -lcrypto ${EXTRA_SSL_LIBS}
! +
! +all: stunnel
!
! stunnel: stunnel.o
! $(CC) $(LDFLAGS) -s -o stunnel stunnel.o $(LIBS)
! - mkdir -p ../distrib
! - gzip < stunnel > ../distrib/stunnel-$(VERSION)-$(HOST).gz
! +# mkdir -p ../distrib
! +# gzip < stunnel > ../distrib/stunnel-$(VERSION)-$(HOST).gz
!
! stunnel.o: stunnel.c
! $(CC) -c $(CFLAGS) stunnel.c
! @@ -29,7 +31,7 @@
! install: $(SBINDIR)/stunnel $(MANDIR)/stunnel.8
!
! cert:
! - /usr/local/ssl/bin/ssleay req -new -x509 -nodes \
! + $(PREFIX)/bin/openssl req -new -x509 -nodes \
! -out server.pem -days 365 -keyout server.pem
!
! clean:
--- 1,42 ----
! *** Makefile.in.orig Fri Apr 16 18:47:06 1999
! --- Makefile.in Thu Jun 3 08:58:32 1999
! ***************
! *** 4,10 ****
!
! VERSION=@VERSION@
! HOST=@host@
! ! DESTDIR=/usr
! SBINDIR=$(DESTDIR)/sbin
! MANDIR=$(DESTDIR)/man/man8
! SSLDIR=@SSLDIR@
! --- 4,10 ----
!
! VERSION=@VERSION@
! HOST=@host@
! ! DESTDIR=$(PREFIX)
! SBINDIR=$(DESTDIR)/sbin
! MANDIR=$(DESTDIR)/man/man8
! SSLDIR=@SSLDIR@
! ***************
! *** 12,20 ****
!
! CC=@CC@
! INSTALL=@INSTALL@
! ! CFLAGS=@CFLAGS@ -Wall -I$(SSLDIR)/include
! ! LIBS=-L$(SSLDIR)/lib @LIBS@ -lssl -lcrypto
! OBJS=stunnel.o sthreads.o log.o
!
! stunnel: $(OBJS)
! $(CC) $(LDFLAGS) -o stunnel $(OBJS) $(LIBS)
! --- 12,22 ----
!
! CC=@CC@
! INSTALL=@INSTALL@
! ! CFLAGS=@CFLAGS@ -Wall -I$(SSLDIR)/include -I$(SSLDIR)/include/openssl
! ! LIBS=-L$(SSLDIR)/lib @LIBS@ -lssl -lcrypto ${EXTRA_SSL_LIBS}
! OBJS=stunnel.o sthreads.o log.o
! +
! + all: stunnel stunnel.8
!
! stunnel: $(OBJS)
! $(CC) $(LDFLAGS) -o stunnel $(OBJS) $(LIBS)
diff -rc old/patches/patch-ab stunnel/patches/patch-ab
*** old/patches/patch-ab Fri Jun 4 07:38:22 1999
--- stunnel/patches/patch-ab Thu Jun 3 11:24:05 1999
***************
*** 0 ****
--- 1,13 ----
+ *** configure.orig Tue Apr 27 17:33:26 1999
+ --- configure Thu Jun 3 11:23:37 1999
+ ***************
+ *** 836,841 ****
+ --- 836,843 ----
+ SSLDIR="/usr/local/ssl"
+ test -f $SSLDIR/include/ssl.h || SSLDIR="/usr/lib/ssl"
+ test -f $SSLDIR/include/ssl.h || SSLDIR="/usr"
+ + test -f $SSLDIR/include/ssl.h || SSLDIR="/usr/local"
+ + test -f $SSLDIR/include/openssl/ssl.h || SSLDIR="/usr/local"
+ echo "$ac_t""$SSLDIR" 1>&6
+
+ cat >> confdefs.h <<EOF
diff -rc old/patches/patch-ac stunnel/patches/patch-ac
*** old/patches/patch-ac Fri Jun 4 07:38:23 1999
--- stunnel/patches/patch-ac Thu Jun 3 11:24:38 1999
***************
*** 0 ****
--- 1,13 ----
+ *** configure.in.orig Tue Apr 27 18:38:28 1999
+ --- configure.in Thu Jun 3 11:24:20 1999
+ ***************
+ *** 16,21 ****
+ --- 16,23 ----
+ SSLDIR="/usr/local/ssl"
+ test -f $SSLDIR/include/ssl.h || SSLDIR="/usr/lib/ssl"
+ test -f $SSLDIR/include/ssl.h || SSLDIR="/usr"
+ + test -f $SSLDIR/include/ssl.h || SSLDIR="/usr/local"
+ + test -f $SSLDIR/include/openssl/ssl.h || SSLDIR="/usr/local"
+ AC_MSG_RESULT($SSLDIR)
+ AC_SUBST(SSLDIR)
+ AC_DEFINE_UNQUOTED(SSLDIR, "$SSLDIR")
diff -rc old/patches/patch-ad stunnel/patches/patch-ad
*** old/patches/patch-ad Fri Jun 4 07:38:24 1999
--- stunnel/patches/patch-ad Tue May 4 11:48:12 1999
***************
*** 0 ****
--- 1,19 ----
+ *** stunnel.8.orig Tue May 4 11:47:14 1999
+ --- stunnel.8 Tue May 4 11:47:50 1999
+ ***************
+ *** 29,35 ****
+ .B -p pemfile
+ certificate (*.pem) file name
+ .RS
+ ! default: /usr/lib/ssl/certs/stunnel.pem
+ .RE
+ .TP
+ .B -v level
+ --- 29,35 ----
+ .B -p pemfile
+ certificate (*.pem) file name
+ .RS
+ ! default: /usr/local/certs/stunnel.pem
+ .RE
+ .TP
+ .B -v level
diff -rc old/patches/patch-ae stunnel/patches/patch-ae
*** old/patches/patch-ae Fri Jun 4 07:38:25 1999
--- stunnel/patches/patch-ae Tue May 4 16:11:20 1999
***************
*** 0 ****
--- 1,23 ----
+ *** fixman.sh.orig Tue May 4 16:11:00 1999
+ --- fixman.sh Tue May 4 16:10:54 1999
+ ***************
+ *** 0 ****
+ --- 1,18 ----
+ + #!/bin/sh
+ + #
+ + # Author: Martti Kuparinen <martti.kuparinen@ericsson.com>
+ + #
+ + # $Id$
+ + #
+ +
+ + if [ ! -f config.h ]; then
+ + echo "** You must run ./configure first **"
+ + exit 1
+ + fi
+ + if [ ! -f stunnel.8.in ]; then
+ + echo "** Can not find the manual page source file **"
+ + exit 1
+ + fi
+ +
+ + SSLDIR=`grep SSLDIR config.h | sed 's/.*"\(.*\)".*/\1/'`
+ + sed s+!!SSLDIR!!+${SSLDIR}+g < stunnel.8.in > stunnel.8
>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?199906040454.HAA53801>