aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroam <roam@FreeBSD.org>2006-01-31 17:11:38 +0800
committerroam <roam@FreeBSD.org>2006-01-31 17:11:38 +0800
commit536a050bfa5fc937ca6c983d9ea5c0b0922ad2eb (patch)
treec1dc981564f6d99accd5edfeee8524158b91b437
parent5a349959ef05fea3f85a1fa53b9db2db19a18578 (diff)
downloadfreebsd-ports-gnome-536a050bfa5fc937ca6c983d9ea5c0b0922ad2eb.tar.gz
freebsd-ports-gnome-536a050bfa5fc937ca6c983d9ea5c0b0922ad2eb.tar.zst
freebsd-ports-gnome-536a050bfa5fc937ca6c983d9ea5c0b0922ad2eb.zip
Catch up with stunnel's tools/Makefile to make the port's "make cert"
target actually work again. Follow the upstream author's idea of keeping all stunnel-related configuration files into ${PREFIX}/etc/stunnel/ - now "make cert" also installs the certificate there instead of ${PREFIX}/etc/. Bump PORTREVISION and add a note to UPDATING for the certificate location change. PR: 91991 Reported by: Jiri Pridal <jiri.pridal@firebrno.cz>
-rw-r--r--UPDATING8
-rw-r--r--security/stunnel/Makefile7
2 files changed, 11 insertions, 4 deletions
diff --git a/UPDATING b/UPDATING
index 130961cf7c1f..cf00d2f2a7dd 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,14 @@ You should get into the habit of checking this file for changes each
time you update your ports collection, before attempting any port
upgrades.
+20060131:
+ AFFECTS: users of security/stunnel
+ AUTHOR: roam@FreeBSD.org
+
+ Since stunnel-4.14_1, the stunnel.pem certificate generated by
+ "make cert" is installed into /usr/local/etc/stunnel/ instead of
+ /usr/local/etc/.
+
20060130:
AFFECTS: users of sysutils/portsnap
AUTHOR: cperciva@FreeBSD.org
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index ae286e2899ac..db57da0864ac 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= stunnel
PORTVERSION= 4.14
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://www.stunnel.org/download/stunnel/src/ \
ftp://stunnel.mirt.net/stunnel/ \
@@ -17,7 +18,6 @@ MAINTAINER= roam@FreeBSD.org
COMMENT= SSL encryption wrapper for standard network daemons
USE_OPENSSL= YES
-USE_REINPLACE= YES
USE_AUTOTOOLS= libtool:15
USE_RC_SUBR= YES
@@ -98,11 +98,10 @@ post-install:
cert:
@${ECHO} ""
@${ECHO} "**************************************************************************"
- @${ECHO} "The new certificate will be saved into ${PREFIX}/etc/stunnel.pem"
+ @${ECHO} "The new certificate will be saved into ${PREFIX}/etc/stunnel/stunnel.pem"
@${ECHO} "**************************************************************************"
@${ECHO} ""
- @(cd ${WRKSRC}/tools/; make stunnel.pem)
- ${INSTALL} -m 600 ${WRKSRC}/tools/stunnel.pem ${PEM_DIR}/
+ @(cd ${WRKSRC}/tools/; make install-data-local)
.if ${OSVERSION} > 500000
.if !defined(WITH_STUNNEL_SSL_ENGINE)