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, 25 insertions, 21 deletions

diff --git a/net/openvpn/patches/patch-ae b/net/openvpn/patches/patch-ae
index 0352524afd2..33599303d0d 100644
--- a/net/openvpn/patches/patch-ae
+++ b/net/openvpn/patches/patch-ae
@@ -1,22 +1,26 @@
-$NetBSD: patch-ae,v 1.5 2011/04/28 07:27:25 adam Exp $
+$NetBSD: patch-ae,v 1.6 2013/02/10 05:55:07 manu Exp $
 
---- configure.ac.orig	2011-04-14 21:30:08.000000000 +0000
-+++ configure.ac
-@@ -375,6 +375,7 @@ if test "${WIN32}" != "yes"; then
- 		 sys/mman.h fcntl.h sys/file.h stdlib.h stdint.h dnl
- 		 stdarg.h unistd.h signal.h stdio.h string.h dnl
- 		 strings.h ctype.h errno.h syslog.h pwd.h grp.h dnl
-+		 net/if_tap.h
- 		 net/if_tun.h net/tun/if_tun.h stropts.h sys/sockio.h dnl
- 		 netinet/in.h netinet/in_systm.h dnl
- 		 netinet/tcp.h arpa/inet.h dnl
-@@ -407,6 +408,9 @@ if test "${WIN32}" != "yes"; then
- 		  #ifdef HAVE_SYS_SOCKET_H
- 		  # include <sys/socket.h>
- 		  #endif
-+		  #ifdef HAVE_NET_IF_H
-+		  # include <net/if.h>
-+		  #endif
- 		  #ifdef HAVE_NETINET_IN_H
- 		  # include <netinet/in.h>
- 		  #endif
+--- configure.ac.orig	2012-11-29 20:47:57.000000000 +0000
++++ configure.ac	2013-01-28 09:26:04.000000000 +0000
+@@ -418,8 +418,9 @@
+ 	sys/time.h sys/ioctl.h sys/stat.h \
+ 	sys/mman.h sys/file.h sys/wait.h \
+ 	unistd.h signal.h libgen.h stropts.h \
+ 	syslog.h pwd.h grp.h \
++	net/if_tap.h \
+ 	sys/sockio.h sys/uio.h linux/sockios.h \
+ 	linux/types.h sys/poll.h sys/epoll.h err.h \
+ ])
+ 
+@@ -432,8 +433,11 @@
+ #endif
+ #ifdef HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
++#ifdef HAVE_NET_IF_H
++#include <net/if.h>
++#endif
+ #ifdef HAVE_NETINET_IN_H
+ #include <netinet/in.h>
+ #endif
+ #ifdef HAVE_WINDOWS_H