diff options
Diffstat (limited to 'security/openvpn/Makefile')
| -rw-r--r-- | security/openvpn/Makefile | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile index 516ccf0e902a..dfcf0d0f2fff 100644 --- a/security/openvpn/Makefile +++ b/security/openvpn/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openvpn -DISTVERSION= 2.2.2 +DISTVERSION= 2.3.0 CATEGORIES= security net # MASTER_SITES points to hosts in distinct data centers, # so just one MASTER_SITES entry should be OK. @@ -14,15 +14,17 @@ COMMENT= Secure IP/Ethernet tunnel daemon LICENSE= GPLv2 -CONFLICTS_INSTALL= openvpn-devel-[0-9]* openvpn-2.0* openvpn-beta-[0-9]* +CONFLICTS_INSTALL= openvpn-2.[!3].* openvpn-[!2].* openvpn-beta-[0-9]* openvpn-devel-[0-9]* GNU_CONFIGURE= yes USE_OPENSSL= yes USE_XZ= yes -CONFIGURE_ARGS= --with-lzo-lib=${LOCALBASE}/lib \ - --with-lzo-headers=${LOCALBASE}/include +# let OpenVPN's configure script pick up the libraries +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= PW_SAVE PKCS11 +# PolarSSL missing: OpenVPN does not currently compile with PolarSSL 1.2.0+ +OPTIONS_DEFINE= PW_SAVE PKCS11 PW_SAVE_DESC= Interactive passwords may be read from a file PKCS11_DESC= Use security/pkcs11-helper @@ -63,14 +65,6 @@ LIB_DEPENDS+= pkcs11-helper:${PORTSDIR}/security/pkcs11-helper CONFIGURE_ARGS+= --disable-pkcs11 .endif -post-patch: - @${FIND} ${WRKSRC}/easy-rsa/?.0 -type f \ - -exec ${REINPLACE_CMD} -e 's;#!/bin/bash;#!/bin/sh;' \ - -e 's,source ./vars,. ./vars,' \{\} + - @${FIND} ${WRKSRC}/plugin -name Makefile \ - -exec ${REINPLACE_CMD} -e 's;gcc;${CC};g' '{}' + - @${FIND} ${WRKSRC} \( -name \*.orig -o -name \*.bak \) -delete - pre-configure: .ifdef (LOG_OPENVPN) @${ECHO} "Building with LOG_OPENVPN=${LOG_OPENVPN}" @@ -84,8 +78,6 @@ pre-configure: .endif post-build: - cd ${WRKSRC}/plugin/down-root && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} - cd ${WRKSRC}/plugin/auth-pam && ${CC} ${CPPFLAGS} -I../.. -DDLOPEN_PAM=0 ${CFLAGS} -fPIC -shared -Wl,-soname,openvpn-auth-pam.so -o openvpn-auth-pam.so auth-pam.c pamdl.c -lc -lpam @# self-tests here .if !defined(WITHOUT_CHECK) @${ECHO} ; ${ECHO} "### Note that you can skip these lengthy selftests with WITHOUT_CHECK=yes ###" ; ${ECHO} @@ -94,21 +86,18 @@ post-build: post-install: ${MKDIR} ${PREFIX}/lib - ${INSTALL_PROGRAM} ${WRKSRC}/plugin/down-root/openvpn-down-root.so ${PREFIX}/lib/ - ${INSTALL_PROGRAM} ${WRKSRC}/plugin/auth-pam/openvpn-auth-pam.so ${PREFIX}/lib/ .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/plugin/down-root/README ${DOCSDIR}/README.openvpn-down-root - ${INSTALL_DATA} ${WRKSRC}/plugin/auth-pam/README ${DOCSDIR}/README.openvpn-auth-pam .for docs in AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL \ PORTS README ${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}/ .endfor -.for dir in easy-rsa easy-rsa/1.0 easy-rsa/2.0 sample-config-files +.for dir in sample/sample-config-files + ${RM} -f ${WRKSRC}/${dir}/*.orig ${MKDIR} ${DOCSDIR}/${dir} ${FIND} ${WRKSRC}/${dir}/ -maxdepth 1 -type f -exec ${INSTALL_DATA} \{\} ${DOCSDIR}/${dir} \; .endfor -.for dir in sample-scripts +.for dir in sample/sample-scripts ${MKDIR} ${DOCSDIR}/${dir} ${FIND} ${WRKSRC}/${dir}/ -maxdepth 1 -type f -exec ${INSTALL_SCRIPT} \{\} ${DOCSDIR}/${dir} \; .endfor |