summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2010-01-19 16:54:45 -0300
committerPeter Korsgaard <jacmet@sunsite.dk>2010-01-20 11:10:32 +0100
commitb3febdac86d3ec64b6c51ed4db421304f2872347 (patch)
tree1489d359d3c7fbd07de34ca0343a64da159a4c7c /package
parentdb9dcbee6e241d8ede6f3fbda2ea9cd7ab291b89 (diff)
Bump openvpn to 2.1.1
Closes #937. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package')
-rw-r--r--package/openvpn/Config.in21
-rw-r--r--package/openvpn/openvpn.mk17
2 files changed, 29 insertions, 9 deletions
diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in
index 6bbb85949..9f9057df0 100644
--- a/package/openvpn/Config.in
+++ b/package/openvpn/Config.in
@@ -1,10 +1,5 @@
-comment "openvpn has no inherent support for AVR32"
- depends on BR2_avr32 && BR2_PACKAGE_OPENVPN
-
config BR2_PACKAGE_OPENVPN
bool "openvpn"
- select BR2_PACKAGE_LZO
- select BR2_PACKAGE_OPENSSL
help
OpenVPN is a full-featured SSL VPN solution which can
accomodate a wide range of configurations, including road
@@ -14,3 +9,19 @@ config BR2_PACKAGE_OPENVPN
fine-grained access-controls.
http://openvpn.sourceforge.net/
+
+config BR2_PACKAGE_OPENVPN_LZO
+ bool "LZO compression"
+ default y
+ depends on BR2_PACKAGE_OPENVPN
+ select BR2_PACKAGE_LZO
+ help
+ Enable LZO compression.
+
+config BR2_PACKAGE_OPENVPN_OPENSSL
+ bool "OpenSSL support"
+ default y
+ depends on BR2_PACKAGE_OPENVPN
+ select BR2_PACKAGE_OPENSSL
+ help
+ Enable TLS-based key exchange and OpenSSL crypto support.
diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index bfacc4185..084ee2f79 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -4,11 +4,8 @@
#
#############################################################
-OPENVPN_VERSION = 2.0.9
-OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.gz
+OPENVPN_VERSION = 2.1.1
OPENVPN_SITE = http://openvpn.net/release
-OPENVPN_DEPENDENCIES = lzo openssl
-
OPENVPN_CONF_OPT = --enable-small
ifeq ($(BR2_PTHREADS_NATIVE),y)
@@ -17,6 +14,18 @@ else
OPENVPN_CONF_OPT += --enable-pthread
endif
+ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y)
+ OPENVPN_DEPENDENCIES += lzo
+else
+ OPENVPN_CONF_OPT += --disable-lzo
+endif
+
+ifeq ($(BR2_PACKAGE_OPENVPN_OPENSSL),y)
+ OPENVPN_DEPENDENCIES += openssl
+else
+ OPENVPN_CONF_OPT += --disable-crypto --disable-ssl
+endif
+
$(eval $(call AUTOTARGETS,package,openvpn))
$(OPENVPN_TARGET_INSTALL_TARGET):