- Security update to version 2.0.1, fixing four denial of service bugs,

  CAN-2005-2531, CAN-2005-2532, CAN-2005-2533, CAN-2005-2534
- Drop old init script and add a modern rcNG script in its place,
  requested by Matthias Grimm and Dirk Gouders (although the script below is
  one I, Matthias Andree, wrote). It can automatically load tun/tap drivers.
- move pkg-message to files/pkg-message.in, revise it, list it in SUB_FILES
  to expand ${PREFIX}.
- print pkg-message after installation from port
- switch to official "make check" as smoke-test, rather than wiring our own.
- prefer LZO2 in most situations, as OpenVPN will pick up LZO2 rather than
  LZO1 if both are installed.

PR:		ports/85109
Submitted by:	maintainer
Approved by:	portmgr (krion)

1 files changed, 18 insertions, 14 deletions

diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile
index b39638a..aa1e99c 100644
--- a/security/openvpn-devel/Makefile
+++ b/security/openvpn-devel/Makefile
@@ -1,21 +1,18 @@
 # New ports collection makefile for:	openvpn
 # Date created:		2002-06-23
-# Whom:			Matthias Andree <matthias.andree@web.de>
+# Whom:			Matthias Andree <matthias.andree@gmx.de>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openvpn
-DISTVERSION=	2.0
-PORTREVISION=	3
+DISTVERSION=	2.0.1
 CATEGORIES=	security
 MASTER_SITES=	http://openvpn.net/release/
 
 MAINTAINER=	matthias.andree@gmx.de
 COMMENT=	Secure IP/Ethernet tunnel daemon
 
-LIB_DEPENDS=	lzo.1:${PORTSDIR}/archivers/lzo
-
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
@@ -26,25 +23,31 @@ MAN8=		openvpn.8
 
 OPTIONS=	PW_SAVE "Interactive passwords may be read from a file" off
 
+USE_RC_SUBR=	openvpn.sh
+
+SUB_FILES=	pkg-message
+
 .include <bsd.port.pre.mk>
 
+# NOTE: there is no way to explicitly specify the LZO version to OpenVPN,
+# if LZO2 and LZO1 are installed, OpenVPN will pick LZO2.
+# So depend on LZO1 only if it's already there and LZO2 isn't.
+# PACKAGE_BUILDING will also force LZO2.
+.if exists(${LOCALBASE}/lib/liblzo2.so.2) || !exists(${LOCALBASE}/lib/liblzo.so.1) || defined(PACKAGE_BUILDING)
+LIB_DEPENDS=	lzo2.2:${PORTSDIR}/archivers/lzo2
+.else
+LIB_DEPENDS=	lzo.1:${PORTSDIR}/archivers/lzo
+.endif
+
 .if defined(WITH_PW_SAVE)
 CONFIGURE_ARGS+=	--enable-password-save
 .endif
 
 # self-tests here
 post-build:
-	( set -e ; cd ${WRKSRC} && \
-	./openvpn --genkey --secret key && \
-	./openvpn --test-crypto --secret key && ${RM} key )
-	( set -e ; cd ${WRKSRC} && { \
-	./openvpn --config sample-config-files/loopback-server & \
-	./openvpn --config sample-config-files/loopback-client ; \
-	wait ; })
+	cd ${WRKSRC} && ${MAKE} check
 
 post-install:
-	${INSTALL_SCRIPT} ${FILESDIR}/openvpn.sh.sample \
-		${PREFIX}/etc/rc.d/openvpn.sh.sample
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for docs in AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL NEWS \
@@ -56,5 +59,6 @@ post-install:
 	| ${GREP} -v easy-rsa/Windows \
 	| ${CPIO} -pdmu ${DOCSDIR} )
 .endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>