package/openvpn: add mbedtls support
PATCH v2 1/1 package/openvpn: add mbedtls support
mbedtls (former polarssl) support was dropped with commit 3380da69c5ab490e5c51dca0c4389b0da91743d0
Put it back as openvpn supports mbedtls 2.x since version 2.4.0 and
https://github.com/OpenVPN/openvpn/commit/86d8cd6860dfc74cb1a040ff8fe03140ebe7f930
---
Changes v1 -> v2:
- Remove openssl from openvpn mandatory dependencies
package/openvpn/Config.in | 2 +- package/openvpn/openvpn.mk | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-)
package/openvpn/Config.in +1 -1
@@ -1,7 +1,7 @@ config BR2_PACKAGE_OPENVPN bool "openvpn" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS help OpenVPN is a full-featured SSL VPN solution which can accomodate a wide range of configurations, including road
package/openvpn/openvpn.mk +9 -2
@@ -7,12 +7,11 @@ OPENVPN_VERSION = 2.4.9 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_CONF_OPTS = \ --enable-iproute2 \ - --with-crypto-library=openssl \ $(if $(BR2_STATIC_LIBS),--disable-plugins) OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \ NETSTAT=/bin/netstat \
@@ -51,6 +50,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
Signature · 1 line
2.28.0
PATCH v2 1/1 package/openvpn: add mbedtls support
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
mbedtls (former polarssl) support was dropped with commit
3380da69c5ab490e5c51dca0c4389b0da91743d0
Quoted 7 lines
Put it back as openvpn supports mbedtls 2.x since version 2.4.0 and
https://github.com/OpenVPN/openvpn/commit/86d8cd6860dfc74cb1a040ff8fe03140ebe7f930Signed-off-by Fabrice Fontaine <[email protected]>---
Changes v1 -> v2:
- Remove openssl from openvpn mandatory dependencies
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard