From 7d11fa2d16c2d458999474572547b7a22bb33abc Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 16 Jan 2013 04:01:30 +0100
Subject: [PATCH] openvpn: update to openvpn-2.3.0

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/openvpn/build                       |  6 +++++-
 packages/network/openvpn/meta                        |  4 ++--
 .../patches/openvpn-2.2.2-automake-1.13.patch        | 12 ------------
 .../patches/openvpn-2.3.0-automake-1.13.patch        | 12 ++++++++++++
 4 files changed, 19 insertions(+), 15 deletions(-)
 delete mode 100644 packages/network/openvpn/patches/openvpn-2.2.2-automake-1.13.patch
 create mode 100644 packages/network/openvpn/patches/openvpn-2.3.0-automake-1.13.patch

diff --git a/packages/network/openvpn/build b/packages/network/openvpn/build
index f6c6452ca8..66874186de 100755
--- a/packages/network/openvpn/build
+++ b/packages/network/openvpn/build
@@ -27,6 +27,10 @@ cd $PKG_BUILD
             --build=$HOST_NAME \
             --prefix=/usr \
             --disable-server \
-            --enable-password-save
+            --enable-password-save \
+            --disable-plugin-auth-pam \
+            --disable-plugin-down-root \
+            --enable-iproute2 IPROUTE="/bin/ip" \
+
 
 make
diff --git a/packages/network/openvpn/meta b/packages/network/openvpn/meta
index 3f235c927e..dfb8bf0b07 100644
--- a/packages/network/openvpn/meta
+++ b/packages/network/openvpn/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="openvpn"
-PKG_VERSION="2.2.2"
+PKG_VERSION="2.3.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://openvpn.net"
-PKG_URL="http://swupdate.openvpn.org/community/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://swupdate.openvpn.org/community/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="openssl"
 PKG_BUILD_DEPENDS="toolchain lzo openssl"
 PKG_PRIORITY="optional"
diff --git a/packages/network/openvpn/patches/openvpn-2.2.2-automake-1.13.patch b/packages/network/openvpn/patches/openvpn-2.2.2-automake-1.13.patch
deleted file mode 100644
index f693197228..0000000000
--- a/packages/network/openvpn/patches/openvpn-2.2.2-automake-1.13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur openvpn-2.2.2/configure.ac openvpn-2.2.2.patch/configure.ac
---- openvpn-2.2.2/configure.ac	2011-12-13 17:58:56.000000000 +0100
-+++ openvpn-2.2.2.patch/configure.ac	2013-01-12 00:50:12.273055490 +0100
-@@ -27,7 +27,7 @@
- 
- m4_include(version.m4)
- AC_INIT([OpenVPN], [PRODUCT_VERSION], [openvpn-users@lists.sourceforge.net], [openvpn])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_SRCDIR(syshead.h)
- 
- dnl Guess host type.
diff --git a/packages/network/openvpn/patches/openvpn-2.3.0-automake-1.13.patch b/packages/network/openvpn/patches/openvpn-2.3.0-automake-1.13.patch
new file mode 100644
index 0000000000..46dc975303
--- /dev/null
+++ b/packages/network/openvpn/patches/openvpn-2.3.0-automake-1.13.patch
@@ -0,0 +1,12 @@
+diff -Naur openvpn-2.3.0/configure.ac openvpn-2.3.0.patch/configure.ac
+--- openvpn-2.3.0/configure.ac	2012-11-29 21:47:57.000000000 +0100
++++ openvpn-2.3.0.patch/configure.ac	2013-01-16 03:36:51.567034700 +0100
+@@ -32,7 +32,7 @@
+ AC_DEFINE([OPENVPN_VERSION_RESOURCE], [PRODUCT_VERSION_RESOURCE], [Version in windows resource format])
+ 
+ AC_CONFIG_AUX_DIR([.])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_SRCDIR([src/openvpn/syshead.h])
+ AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE