Upgrade OpenVPN to 2.3.0

Bump openvpn-acct-wtmpx to add its licence and to take into account the
new location of plugin directory

Significant changes since 2.2.x:
 * Full IPv6 support
 * SSL layer modularised, enabling easier implementation for other SSL
   libraries
 * PolarSSL support as a drop-in replacement for OpenSSL
 * New plug-in API providing direct certificate access, improved logging API
   and easier to extend in the future
 * Added 'dev_type' environment variable to scripts and plug-ins - which
   is set to 'TUN' or 'TAP'
 * New feature: --management-external-key - to provide access to the
   encryption keys via the management interface
 * New feature: --x509-track option, more fine grained access to X.509
   fields in scripts and plug-ins
 * New feature: --client-nat support
 * New feature: --mark which can mark encrypted packets from the tunnel,
   suitable for more advanced routing and firewalling
 * New feature: --management-query-proxy - manage proxy settings via the
   management interface (supercedes --http-proxy-fallback)
 * New feature: --stale-routes-check, which cleans up the internal
   routing table
 * New feature: --x509-username-field, where other X.509v3 fields can be
   used for the authentication instead of Common Name
 * Improved client-kill management interface command
 * Improved UTF-8 support - and added --compat-names to provide backwards
   compatibility with older scripts/plug-ins
 * Improved auth-pam with COMMONNAME support, passing the certificate's
   common name in the PAM conversation
 * More options can now be used inside <connection> blocks
 * Completely new build system, enabling easier cross-compilation and
   Windows builds
 * Much of the code has been better documented
 * Many documentation updates
 * Plenty of bug fixes and other code clean-ups

1 files changed, 16 insertions, 31 deletions

diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index 27a45683ab7..e2653b928ff 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile,v 1.48 2013/02/06 23:23:21 jperkin Exp $
+# $NetBSD: Makefile,v 1.49 2013/02/10 05:55:07 manu Exp $
 
-DISTNAME=	openvpn-2.2.2
-PKGREVISION=	3
+DISTNAME=	${OPENVPN_DISTNAME}
 CATEGORIES=	net
-MASTER_SITES=	http://swupdate.openvpn.net/community/releases/
+MASTER_SITES=	${OPENVPN_MASTER_SITES}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://openvpn.net/
 COMMENT=	Easy-to-use SSL VPN daemon
 LICENSE=	gnu-gpl-v2
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LIBTOOL=		yes
 USE_TOOLS+=		grep:run
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--disable-dependency-tracking
@@ -24,50 +26,33 @@ TEST_TARGET=		check
 PKG_SYSCONFSUBDIR=	openvpn
 DATADIR=		${PREFIX}/share/${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
-EASYRSADIR=		${DATADIR}/easy-rsa
 RCD_SCRIPTS=		openvpn
 
-INSTALLATION_DIRS=	${DATADIR}/easy-rsa
 INSTALLATION_DIRS+=	${EGDIR}/config
 INSTALLATION_DIRS+=	${EGDIR}/keys
 INSTALLATION_DIRS+=	${EGDIR}/scripts
 
-REPLACE_SH=		easy-rsa/2.0/*
-SUBST_CLASSES+=		pkitool
-SUBST_STAGE.pkitool=	post-build
-SUBST_MESSAGE.pkitool=	Fixing up default paths to grep & openssl in pkitool.
-SUBST_FILES.pkitool=	easy-rsa/2.0/pkitool
-SUBST_SED.pkitool=	-e "s|\\(GREP\\)=.*|\\1=\""${GREP:Q}"\"|"
-SUBST_SED.pkitool+=	-e "s|\\(OPENSSL\\)=.*|\\1=\""${SSLBASE:Q}/bin/openssl"\"|"
-
 .include "../../mk/bsd.prefs.mk"
 
-OPENVPN_USER?=		openvpn
-OPENVPN_GROUP?=		openvpn
 PKG_GROUPS=		${OPENVPN_GROUP}
 PKG_USERS=		${OPENVPN_USER}:${OPENVPN_GROUP}
 PKG_GECOS.${OPENVPN_USER}=	OpenVPN\ server\ user
 
-post-install: post-install-pam
-	set -e; cd ${WRKSRC}/easy-rsa/2.0; for file in [a-zR]*; do	\
-		case $$file in						\
-		*.orig|tmp) ;;						\
-		[A-Z]*|*.cnf|vars)					\
-			${INSTALL_DATA} $$file ${DESTDIR}${EASYRSADIR} ;; \
-		*)	${INSTALL_SCRIPT} $$file ${DESTDIR}${EASYRSADIR} ;; \
-		esac;							\
-	done
-	set -e; cd ${WRKSRC}/sample-config-files; for file in *; do	\
-		${INSTALL_DATA} $$file ${DESTDIR}${EGDIR}/config;	\
+MESSAGE_SUBST+= OPENVPN_PLUGINSDIR=${PREFIX:Q}/${OPENVPN_PLUGINSDIR:Q}
+
+post-install:
+	set -e; cd ${WRKSRC}/sample/sample-config-files; for file in *; do \
+		${INSTALL_DATA} $$file ${DESTDIR}${EGDIR}/config;	   \
 	done
-	set -e; cd ${WRKSRC}/sample-scripts; for file in *; do		\
-		${INSTALL_DATA} $$file ${DESTDIR}${EGDIR}/scripts;	\
+	set -e; cd ${WRKSRC}/sample/sample-scripts; for file in *; do	   \
+		${INSTALL_DATA} $$file ${DESTDIR}${EGDIR}/scripts;	   \
 	done
-	set -e; cd ${WRKSRC}/sample-keys; for file in *; do		\
-		${INSTALL_DATA} $$file ${DESTDIR}${EGDIR}/keys;		\
+	set -e; cd ${WRKSRC}/sample/sample-keys; for file in *; do	   \
+		${INSTALL_DATA} $$file ${DESTDIR}${EGDIR}/keys;		   \
 	done
 
 .include "options.mk"
+.include "../../net/openvpn/Makefile.common"
 
 # OpenVPN 2.x has a shared module "plugin" architecture that allows
 # inserting callbacks into the server for various tasks.