aboutsummaryrefslogtreecommitdiff
path: root/package/openvpn/openvpn.mk
diff options
context:
space:
mode:
Diffstat (limited to 'package/openvpn/openvpn.mk')
-rw-r--r--package/openvpn/openvpn.mk26
1 files changed, 13 insertions, 13 deletions
diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index 4234675d9f..7c67e95074 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -4,20 +4,17 @@
#
################################################################################
-OPENVPN_VERSION = 2.4.9
+OPENVPN_VERSION = 2.5.0
OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz
OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
-OPENVPN_DEPENDENCIES = host-pkgconf openssl
+OPENVPN_DEPENDENCIES = host-pkgconf
OPENVPN_LICENSE = GPL-2.0
OPENVPN_LICENSE_FILES = COPYRIGHT.GPL
+OPENVPN_CPE_ID_VENDOR = openvpn
OPENVPN_CONF_OPTS = \
- --enable-iproute2 \
- --with-crypto-library=openssl \
+ --disable-unit-tests \
$(if $(BR2_STATIC_LIBS),--disable-plugins)
-OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \
- NETSTAT=/bin/netstat \
- ROUTE=/sbin/route \
- IPROUTE=/sbin/ip
+OPENVPN_CONF_ENV = NETSTAT=/bin/netstat
ifeq ($(BR2_PACKAGE_OPENVPN_SMALL),y)
OPENVPN_CONF_OPTS += \
@@ -51,6 +48,14 @@ else
OPENVPN_CONF_OPTS += --disable-plugin-auth-pam
endif
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+OPENVPN_DEPENDENCIES += openssl
+OPENVPN_CONF_OPTS += --with-crypto-library=openssl
+else ifeq ($(BR2_PACKAGE_MBEDTLS),y)
+OPENVPN_DEPENDENCIES += mbedtls
+OPENVPN_CONF_OPTS += --with-crypto-library=mbedtls
+endif
+
ifeq ($(BR2_PACKAGE_PKCS11_HELPER),y)
OPENVPN_DEPENDENCIES += pkcs11-helper
OPENVPN_CONF_OPTS += --enable-pkcs11
@@ -65,11 +70,6 @@ else
OPENVPN_CONF_OPTS += --disable-systemd
endif
-define OPENVPN_INSTALL_TARGET_CMDS
- $(INSTALL) -m 755 $(@D)/src/openvpn/openvpn \
- $(TARGET_DIR)/usr/sbin/openvpn
-endef
-
define OPENVPN_INSTALL_INIT_SYSV
$(INSTALL) -m 755 -D package/openvpn/S60openvpn \
$(TARGET_DIR)/etc/init.d/S60openvpn