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

7 files changed, 37 insertions, 52 deletions

diff --git a/net/openvpn-acct-wtmpx/MESSAGE b/net/openvpn-acct-wtmpx/MESSAGE
index e7ea4e553b8..922b46b5d59 100644
--- a/net/openvpn-acct-wtmpx/MESSAGE
+++ b/net/openvpn-acct-wtmpx/MESSAGE
@@ -1,10 +1,10 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2010/07/14 04:46:18 manu Exp $
+$NetBSD: MESSAGE,v 1.2 2013/02/10 05:55:07 manu Exp $
 
 In order to enable the use of this module, add this directive to your
 OpenVPN server configuration file
 
-  plugin /usr/pkg/lib/openvpn/openvpn-acct-wtmpx.so openvpn
+  plugin ${OPENVPN_PLUGINSDIR}/openvpn-acct-wtmpx.so openvpn
 
 In order to write to wtmpx(5) databases, OpenVPN needs root privileges.
 It acquires them for that purpose by using the logwtmpx program, which
diff --git a/net/openvpn-acct-wtmpx/Makefile b/net/openvpn-acct-wtmpx/Makefile
index cd0f33976f7..80ce3142254 100644
--- a/net/openvpn-acct-wtmpx/Makefile
+++ b/net/openvpn-acct-wtmpx/Makefile
@@ -1,22 +1,29 @@
-# $NetBSD: Makefile,v 1.3 2012/10/23 17:18:44 asau Exp $
+# $NetBSD: Makefile,v 1.4 2013/02/10 05:55:08 manu Exp $
 #
 
-DISTNAME=	openvpn-acct-wtmpx-20091110
-PKGREVISION=	1
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} openvpn-2.1_rc20.tar.gz
+.include "../../net/openvpn/Makefile.common"
+
+DISTNAME=	openvpn-acct-wtmpx-20130210
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${OPENVPN_DISTFILE}
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.espci.fr/pub/openvpn-acct-wtmpx/
-SITES.openvpn-2.1_rc20.tar.gz=	http://openvpn.net/release/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	manu@NetBSD.org
 HOMEPAGE=	http://ftp.espci.fr/pub/openvpn-acct-wtmpx/
 COMMENT=	Log OpenVPN logins and logouts to wtmpx
+LICENSE=	2-clause-bsd
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=	yes
 USE_TOOLS+=	install
 
-WRKSRC=	${WRKDIR}/openvpn-acct-wtmpx
+MAKE_ENV+=	OPENVPN_PLUGINSDIR=${PREFIX:Q}/${OPENVPN_PLUGINSDIR:Q}
+MAKE_ENV+=	OPENVPN_DISTNAME=${OPENVPN_DISTNAME:Q}
+
+PLIST_SUBST+=	OPENVPN_PLUGINSDIR=${OPENVPN_PLUGINSDIR:Q}
+MESSAGE_SUBST+=	OPENVPN_PLUGINSDIR=${PREFIX:Q}/${OPENVPN_PLUGINSDIR:Q}
 
 SPECIAL_PERMS+=	bin/logwtmpx ${SETUID_ROOT_PERMS}
 
diff --git a/net/openvpn-acct-wtmpx/PLIST b/net/openvpn-acct-wtmpx/PLIST
index 1b6ce9bd160..2e5986ce46d 100644
--- a/net/openvpn-acct-wtmpx/PLIST
+++ b/net/openvpn-acct-wtmpx/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2011/11/23 23:31:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/02/10 05:55:08 manu Exp $
 bin/logwtmpx
-lib/openvpn/openvpn-acct-wtmpx.la
+${OPENVPN_PLUGINSDIR}/openvpn-acct-wtmpx.la
diff --git a/net/openvpn-acct-wtmpx/distinfo b/net/openvpn-acct-wtmpx/distinfo
index 1fb60fef78f..34280bfe2ef 100644
--- a/net/openvpn-acct-wtmpx/distinfo
+++ b/net/openvpn-acct-wtmpx/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.3 2013/01/11 13:32:58 joerg Exp $
+$NetBSD: distinfo,v 1.4 2013/02/10 05:55:08 manu Exp $
 
-SHA1 (openvpn-2.1_rc20.tar.gz) = ab0e928bd7d4896ddb0061bf3aba9f3cd6cefe6e
-RMD160 (openvpn-2.1_rc20.tar.gz) = 4dd7924cb41a268e76a93af66fd05f948f22e5f3
-Size (openvpn-2.1_rc20.tar.gz) = 844253 bytes
-SHA1 (openvpn-acct-wtmpx-20091110.tgz) = 3bbe32fdc4bf17f4decef2b3dfb2fb92885934c9
-RMD160 (openvpn-acct-wtmpx-20091110.tgz) = 1146c27fe190a8b8d6ef863f1861acfeb1f61b39
-Size (openvpn-acct-wtmpx-20091110.tgz) = 1983 bytes
-SHA1 (patch-aa) = 399514cb7eabe9c589d56638e01034fbdb7208a6
-SHA1 (patch-logwtmpx.c) = bca4b658c3f9f44966c9bb8e9965d55177cc5a63
-SHA1 (patch-openvpn-acct-wtmpx.c) = cbf931f474702ca41c7db4ac68c1d7560a088766
+SHA1 (openvpn-2.3.0.tar.gz) = 18b51f7ba0b9e18939451d7787c00e04165efe90
+RMD160 (openvpn-2.3.0.tar.gz) = f24ac128fcd874bf40e8ffd5161065e84170d69f
+Size (openvpn-2.3.0.tar.gz) = 1130659 bytes
+SHA1 (openvpn-acct-wtmpx-20130210.tgz) = cf7bc26b12a65493cdf5db93b03bbb938a2f0f33
+RMD160 (openvpn-acct-wtmpx-20130210.tgz) = d9000789f04606bfa17db1597a45a4235b1119ea
+Size (openvpn-acct-wtmpx-20130210.tgz) = 2778 bytes
+SHA1 (patch-aa) = 8b216edb0e48dd54fd19b436433fafeb686948b8
diff --git a/net/openvpn-acct-wtmpx/patches/patch-aa b/net/openvpn-acct-wtmpx/patches/patch-aa
index 17a41b9c7b7..cf4db015210 100644
--- a/net/openvpn-acct-wtmpx/patches/patch-aa
+++ b/net/openvpn-acct-wtmpx/patches/patch-aa
@@ -1,17 +1,19 @@
-$NetBSD: patch-aa,v 1.2 2011/11/23 23:31:22 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2013/02/10 05:55:08 manu Exp $
 
---- Makefile.orig	2009-11-07 04:12:24.000000000 +0000
-+++ Makefile
-@@ -1,13 +1,13 @@
+--- Makefile.orig	2009-11-07 05:12:24.000000000 +0100
++++ Makefile	2013-02-09 18:22:49.000000000 +0100
+@@ -1,14 +1,14 @@
 -prefix=/usr/pkg
 -PLUGINDIR=$(prefix)/lib/openvpn
 -bindir=/usr/local/bin
 +#prefix=/usr/pkg
-+PLUGINDIR=${DESTDIR}${PREFIX}/lib/openvpn
++PLUGINDIR=${DESTDIR}${OPENVPN_PLUGINSDIR}
 +bindir=${DESTDIR}${PREFIX}/bin
  
- OPENVPN_SRC=../openvpn-2.1_rc20
- CFLAGS= -Wall -Werror -ansi -g -I$(OPENVPN_SRC) -DBINDIR=\"$(bindir)\"
+-OPENVPN_SRC=../openvpn-2.1_rc20
+-CFLAGS= -Wall -Werror -ansi -g -I$(OPENVPN_SRC) -DBINDIR=\"$(bindir)\"
++OPENVPN_SRC=../${OPENVPN_DISTNAME}
++CFLAGS= -Wall -Werror -ansi -g -I$(OPENVPN_SRC)/include -DBINDIR=\"$(bindir)\"
  OPENVPN_GROUP=nobody
  
 -LIBTOOL=libtool
@@ -21,7 +23,9 @@ $NetBSD: patch-aa,v 1.2 2011/11/23 23:31:22 joerg Exp $
  
  
  all: openvpn-acct-wtmpx.la logwtmpx
-@@ -23,9 +23,11 @@ logwtmpx:	logwtmpx.o
+ 
+@@ -22,10 +22,12 @@
+ logwtmpx:	logwtmpx.o
  	$(CC) -o $@ -lutil $?
  
  install:	openvpn-acct-wtmpx.la logwtmpx
diff --git a/net/openvpn-acct-wtmpx/patches/patch-logwtmpx.c b/net/openvpn-acct-wtmpx/patches/patch-logwtmpx.c
deleted file mode 100644
index d8f01fcbb7d..00000000000
--- a/net/openvpn-acct-wtmpx/patches/patch-logwtmpx.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-logwtmpx.c,v 1.1 2013/01/11 13:32:58 joerg Exp $
-
---- logwtmpx.c.orig	2013-01-11 01:19:28.000000000 +0000
-+++ logwtmpx.c
-@@ -1,6 +1,7 @@
- #include <stdio.h>
- #include <err.h>
- #include <util.h>
-+#include <utmpx.h>
- #include <sysexits.h>
- 
- int
diff --git a/net/openvpn-acct-wtmpx/patches/patch-openvpn-acct-wtmpx.c b/net/openvpn-acct-wtmpx/patches/patch-openvpn-acct-wtmpx.c
deleted file mode 100644
index 958ac4ff146..00000000000
--- a/net/openvpn-acct-wtmpx/patches/patch-openvpn-acct-wtmpx.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-openvpn-acct-wtmpx.c,v 1.1 2013/01/11 13:32:58 joerg Exp $
-
---- openvpn-acct-wtmpx.c.orig	2013-01-11 01:18:53.000000000 +0000
-+++ openvpn-acct-wtmpx.c
-@@ -4,6 +4,7 @@
- #include <util.h>
- #include <stdlib.h>
- #include <syslog.h>
-+#include <utmpx.h>
- #include <sys/param.h>
- 
- #include "openvpn-plugin.h"