5 files changed, 45 insertions, 21 deletions

diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile
index ea123505c16a..af6f794fbe9e 100644
--- a/security/openvpn/Makefile
+++ b/security/openvpn/Makefile
@@ -6,42 +6,46 @@
 #
 
 PORTNAME=	openvpn
-PORTVERSION=	1.6.0
+DISTVERSION=	2.0
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://osdn.dl.sourceforge.net/sourceforge/${PORTNAME}/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://openvpn.net/release/
 
 MAINTAINER=	matthias.andree@gmx.de
 COMMENT=	Secure IP/Ethernet tunnel daemon
 
 LIB_DEPENDS=	lzo.1:${PORTSDIR}/archivers/lzo
 
-CONFLICTS=	openvpn-devel-*
-
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-lzo-lib=${LOCALBASE}/lib \
-		--with-lzo-headers=${LOCALBASE}/include \
-		--prefix=${PREFIX}
+		--with-lzo-headers=${LOCALBASE}/include
 
 MAN8=		openvpn.8
 
+# 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 ; })
+
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/openvpn.sh.sample \
 		${PREFIX}/etc/rc.d/openvpn.sh.sample
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
 .for docs in AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL NEWS \
 	PORTS README
-	@${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
-.endfor
-.for dirs in easy-rsa sample-config-files sample-scripts
-	@${MKDIR} ${DOCSDIR}/${dirs}
-	@${INSTALL_DATA} ${WRKSRC}/${dirs}/* ${DOCSDIR}/${dirs}
+	${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
 .endfor
-	@${CAT} ${PKGMESSAGE}
+	( cd ${WRKSRC} \
+	&& ${FIND} easy-rsa sample-config-files sample-scripts -depth \
+	| ${GREP} -v easy-rsa/Windows \
+	| ${CPIO} -pdmu ${DOCSDIR} )
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/openvpn/distinfo b/security/openvpn/distinfo
index 67bb70161441..dd29196f185e 100644
--- a/security/openvpn/distinfo
+++ b/security/openvpn/distinfo
@@ -1,2 +1,2 @@
-MD5 (openvpn-1.6.0.tar.gz) = 9eab3719b280a12d19ef1fda286cc363
-SIZE (openvpn-1.6.0.tar.gz) = 430324
+MD5 (openvpn-2.0.tar.gz) = 7401faebc6baee9add32608709c54eec
+SIZE (openvpn-2.0.tar.gz) = 639201
diff --git a/security/openvpn/pkg-descr b/security/openvpn/pkg-descr
index d5f0eb29a86f..4f835080cd33 100644
--- a/security/openvpn/pkg-descr
+++ b/security/openvpn/pkg-descr
@@ -7,4 +7,4 @@ used to authenticate the sites, or they can use a pre-shared secret.
 WWW: http://openvpn.sourceforge.net/
 
 - Matthias Andree
-matthias.andree@web.de
+matthias.andree@gmx.de
diff --git a/security/openvpn/pkg-message b/security/openvpn/pkg-message
index ad69e3b90101..8b4e025ff42c 100644
--- a/security/openvpn/pkg-message
+++ b/security/openvpn/pkg-message
@@ -3,13 +3,22 @@
 ###  See ${PREFIX}/etc/rc.d/openvpn.sh.sample for how to do this  	   ###
 ###  automatically at system boot-up time.                                 ###
 ### ---------------------------------------------------------------------- ###
-###  To retain backwards compatibility of OpenVPN 1.3.0 with OpenVPN peers ###
-###  that run older versions (back to 1.1.0), you will have to set the MTU ###
-###  explicitly by command line options since OpenVPN 1.3.0.               ###
+###  To get OpenVPN 2.0 to talk with the 1.5/1.6 versions, you may need to ###
+###  edit the 1.X configuration file by adding these lines:                ###
 ###                                                                        ###
+###    tun-mtu 1500							   ###
+###    tun-mtu-extra 32							   ###
+###    mssfix 1450							   ###
+###                                                                        ###
+###    key-method 2       <- this key-method line only for TLS setups	   ###
+### ---------------------------------------------------------------------- ###
 ###  When connecting to 1.4.X or older peers with a TAP-style tunnel, set  ###
 ###  --tun-mtu 1500 --tun-mtu-extra 32 on the peer.			   ###
 ###                                                                        ###
+###  To retain backwards compatibility of OpenVPN 1.3.0 with OpenVPN peers ###
+###  that run older versions (back to 1.1.0), you will have to set the MTU ###
+###  explicitly by command line options since OpenVPN 1.3.0.               ###
+###                                                                        ###
 ###  When using TLS security and your peer runs OpenVPN 1.3.X, the PEER    ###
 ###  must use --disable-occ.  This version of OpenVPN cannot use TLS mode  ###
 ###  to peers running OpenVPN 1.2.x or older.                              ###
diff --git a/security/openvpn/pkg-plist b/security/openvpn/pkg-plist
index cee89a468518..9fb4fbf7a7dc 100644
--- a/security/openvpn/pkg-plist
+++ b/security/openvpn/pkg-plist
@@ -14,13 +14,20 @@ etc/rc.d/openvpn.sh.sample
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-inter
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-key
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-key-pass
+%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-key-pkcs12
+%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-key-server
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-req
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-req-pass
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/clean-all
+%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/list-crl
+%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/make-crl
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/openssl.cnf
+%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/revoke-crt
+%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/revoke-full
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/sign-req
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/vars
 %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/README
+%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/client.conf
 %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/firewall.sh
 %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/home.up
 %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/loopback-client
@@ -28,12 +35,16 @@ etc/rc.d/openvpn.sh.sample
 %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/office.up
 %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/openvpn-shutdown.sh
 %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/openvpn-startup.sh
+%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/server.conf
 %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/static-home.conf
 %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/static-office.conf
 %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/tls-home.conf
 %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/tls-office.conf
 %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/xinetd-client-config
 %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/xinetd-server-config
+%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/auth-pam.pl
+%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/bridge-start
+%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/bridge-stop
 %%PORTDOCS%%%%DOCSDIR%%/sample-scripts/openvpn.init
 %%PORTDOCS%%%%DOCSDIR%%/sample-scripts/verify-cn
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/sample-scripts