From: Sven Roederer <devel-sven@geroedel.de>
Date: Sun, 22 Jan 2017 18:00:51 +0000 (+0100)
Subject: openvpn: ssl-enabled variants also provide a virtual openvpn-crypto package
X-Git-Tag: v17.01.0-rc2~59
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7c5bc827b70eaace4578bc39cb8995292d10758d;p=oweals%2Fopenwrt.git

openvpn: ssl-enabled variants also provide a virtual openvpn-crypto package

When relying on x.509 certs for auth and / or encryption of traffic you can't
use package openvpn-nossl.
Just have your package depend on openvpn-crypto to have SSL-encryption and
X.509-support enabled in OpenVPN. If encryption / X.509 is not a must, use
virtual packge openvpn, which is provided by all OpenVPN-variants.

Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
---

diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile
index 80aab0b2eb..7507e2029b 100644
--- a/package/network/services/openvpn/Makefile
+++ b/package/network/services/openvpn/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=openvpn
 
 PKG_VERSION:=2.4.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_URL:=http://swupdate.openvpn.net/community/releases
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@@ -34,7 +34,11 @@ define Package/openvpn/Default
   MENU:=1
   DEPENDS:=+kmod-tun +OPENVPN_$(1)_ENABLE_LZO:liblzo +OPENVPN_$(1)_ENABLE_IPROUTE2:ip $(3)
   VARIANT:=$(1)
+ifeq ($(1),nossl)
   PROVIDES:=openvpn
+else
+  PROVIDES:=openvpn openvpn-crypto
+endif
   MAINTAINER:=Mirko Vogt <mirko@openwrt.org>
 endef