diff options
| -rw-r--r-- | security/openvpn/Makefile | 29 | ||||
| -rw-r--r-- | security/openvpn/distinfo | 4 | ||||
| -rw-r--r-- | security/openvpn/pkg-plist | 3 |
3 files changed, 20 insertions, 16 deletions
diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile index 66504ff9d6ac..b00fa188895e 100644 --- a/security/openvpn/Makefile +++ b/security/openvpn/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openvpn -DISTVERSION= 2.2.0 +DISTVERSION= 2.2.1 CATEGORIES= security net # MASTER_SITES points to hosts in distinct data centers, # so just one MASTER_SITES entry should be OK. @@ -44,18 +44,6 @@ SUB_LIST+= OSVERSION=${OSVERSION} CFLAGS+= -DLOG_OPENVPN=${LOG_OPENVPN} .endif -pre-configure: -.ifdef (LOG_OPENVPN) - @${ECHO} "Building with LOG_OPENVPN=${LOG_OPENVPN}" -.else - @${ECHO} "" - @${ECHO} "You may use the following build options:" - @${ECHO} "" - @${ECHO} " LOG_OPENVPN={Valid syslog facility, default LOG_DAEMON}" - @${ECHO} " EXAMPLE: make LOG_OPENVPN=LOG_DAEMON" - @${ECHO} "" -.endif - LIB_DEPENDS+= lzo2.2:${PORTSDIR}/archivers/lzo2 .if defined(WITH_PW_SAVE) @@ -68,6 +56,9 @@ LIB_DEPENDS+= pkcs11-helper.1:${PORTSDIR}/security/pkcs11-helper CONFIGURE_ARGS+= --disable-pkcs11 .endif +post-extract: + @${RM} ${WRKSRC}/easy-rsa/2.0/openssl-1.0.0.cnf-old-copy + post-patch: @${FIND} ${WRKSRC}/easy-rsa/?.0 -type f \ -exec ${REINPLACE_CMD} -e 's;#!/bin/bash;#!/bin/sh;' \ @@ -76,6 +67,18 @@ post-patch: -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}" +.else + @${ECHO} "" + @${ECHO} "You may use the following build options:" + @${ECHO} "" + @${ECHO} " LOG_OPENVPN={Valid syslog facility, default LOG_DAEMON}" + @${ECHO} " EXAMPLE: make LOG_OPENVPN=LOG_DAEMON" + @${ECHO} "" +.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 diff --git a/security/openvpn/distinfo b/security/openvpn/distinfo index 02b1d99aef4e..3909df1be538 100644 --- a/security/openvpn/distinfo +++ b/security/openvpn/distinfo @@ -1,2 +1,2 @@ -SHA256 (openvpn-2.2.0.tar.xz) = f4fd245b466722a9ae71c2185462fba690d42b7ab1d251b77d3bc507566280ea -SIZE (openvpn-2.2.0.tar.xz) = 640440 +SHA256 (openvpn-2.2.1.tar.xz) = 6f41943facdcc772802b98643a81d5b66c1325695431f1728bdef2491601835f +SIZE (openvpn-2.2.1.tar.xz) = 641944 diff --git a/security/openvpn/pkg-plist b/security/openvpn/pkg-plist index d543a0e92fac..7200816ad93e 100644 --- a/security/openvpn/pkg-plist +++ b/security/openvpn/pkg-plist @@ -43,7 +43,8 @@ lib/openvpn-down-root.so %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/inherit-inter %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/list-crl %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/openssl-0.9.6.cnf -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/openssl.cnf +%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/openssl-0.9.8.cnf +%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/openssl-1.0.0.cnf %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/pkitool %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/revoke-full %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/sign-req |