openvpn: bump version, fix build with --disable-crypto

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/openvpn/openvpn-2.1.3-fix-build-with-disable-crypto.patch b/package/openvpn/openvpn-2.1.3-fix-build-with-disable-crypto.patch
new file mode 100644 (file)
index 0000000..5466558
--- /dev/null
+++ b/package/openvpn/openvpn-2.1.3-fix-build-with-disable-crypto.patch
@@ -0,0 +1,30 @@
+[PATCH] fix build with --disable-crypto
+
+options.c is missing the definition for struct context when built with
+--disable-crypto, as it then doesn't get pulled in through push.h,
+leading to build errors like:
+
+options.c: In function ‘parse_http_proxy_fallback’:
+options.c:1474: error: dereferencing pointer to incomplete type
+options.c:1477: error: dereferencing pointer to incomplete type
+options.c:1478: error: dereferencing pointer to incomplete type
+
+Fix it by including forward.h
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ options.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: openvpn-2.1.3/options.c
+===================================================================
+--- openvpn-2.1.3.orig/options.c
++++ openvpn-2.1.3/options.c
+@@ -29,6 +29,7 @@
+ 
+ #include "syshead.h"
+ 
++#include "forward.h"
+ #include "buffer.h"
+ #include "error.h"
+ #include "common.h"

diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index 8d99cab212b2f6c7d0759caed53f82f9ec69c06d..7d8fb0c6f3d4ae7f08562f669b5571c9790536fc 100644 (file)
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENVPN_VERSION = 2.1.2
+OPENVPN_VERSION = 2.1.3
 OPENVPN_SITE = http://openvpn.net/release
 OPENVPN_CONF_OPT = --enable-small