From patchwork Wed Jan 20 19:22:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Dickinson X-Patchwork-Id: 570881 X-Patchwork-Delegate: nbd@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 50099140B0F for ; Thu, 21 Jan 2016 06:23:50 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id AD59528C080; Wed, 20 Jan 2016 20:21:50 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-0.3 required=5.0 tests=BAYES_00,RDNS_NONE autolearn=no version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 32EA928C080 for ; Wed, 20 Jan 2016 20:21:48 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from s2.neomailbox.net (unknown [5.148.176.60]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 20 Jan 2016 20:21:45 +0100 (CET) From: openwrt@daniel.thecshore.com To: openwrt-devel@lists.openwrt.org Date: Wed, 20 Jan 2016 14:22:04 -0500 Message-Id: <1453317725-93230-2-git-send-email-openwrt@daniel.thecshore.com> In-Reply-To: <1453317725-93230-1-git-send-email-openwrt@daniel.thecshore.com> References: <1453317725-93230-1-git-send-email-openwrt@daniel.thecshore.com> Subject: [OpenWrt-Devel] [PATCH 2/3] packaget/network/services/openvpn: Drop ifconfig/route in favour of ip X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" From: Daniel Dickinson NB: Only compile tested. Stop depending on ifconfig/route and use busybox (or real) iproute2 utility instead. Depend on virtual ip package provided by previous commit so as not to force a particular version of the ip command. Signed-off-by: Daniel Dickinson --- package/network/services/openvpn/Config-nossl.in | 4 ---- package/network/services/openvpn/Config-openssl.in | 4 ---- package/network/services/openvpn/Config-polarssl.in | 4 ---- package/network/services/openvpn/Makefile | 6 +++--- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/package/network/services/openvpn/Config-nossl.in b/package/network/services/openvpn/Config-nossl.in index 3eaa228..24dbb03 100644 --- a/package/network/services/openvpn/Config-nossl.in +++ b/package/network/services/openvpn/Config-nossl.in @@ -40,10 +40,6 @@ config OPENVPN_nossl_ENABLE_PF bool "Enable internal packet filter" default y -config OPENVPN_nossl_ENABLE_IPROUTE2 - bool "Enable support for iproute2" - default n - config OPENVPN_nossl_ENABLE_SMALL bool "Enable size optimization" default y diff --git a/package/network/services/openvpn/Config-openssl.in b/package/network/services/openvpn/Config-openssl.in index ac4c774..c7bd308 100644 --- a/package/network/services/openvpn/Config-openssl.in +++ b/package/network/services/openvpn/Config-openssl.in @@ -52,10 +52,6 @@ config OPENVPN_openssl_ENABLE_PF bool "Enable internal packet filter" default y -config OPENVPN_openssl_ENABLE_IPROUTE2 - bool "Enable support for iproute2" - default n - config OPENVPN_openssl_ENABLE_SMALL bool "Enable size optimization" default y diff --git a/package/network/services/openvpn/Config-polarssl.in b/package/network/services/openvpn/Config-polarssl.in index 26692ce..501e0f3 100644 --- a/package/network/services/openvpn/Config-polarssl.in +++ b/package/network/services/openvpn/Config-polarssl.in @@ -52,10 +52,6 @@ config OPENVPN_polarssl_ENABLE_PF bool "Enable internal packet filter" default y -config OPENVPN_polarssl_ENABLE_IPROUTE2 - bool "Enable support for iproute2" - default n - config OPENVPN_polarssl_ENABLE_SMALL bool "Enable size optimization" default y diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile index 6c68b49..8edf97a 100644 --- a/package/network/services/openvpn/Makefile +++ b/package/network/services/openvpn/Makefile @@ -32,7 +32,7 @@ define Package/openvpn/Default URL:=http://openvpn.net SUBMENU:=VPN MENU:=1 - DEPENDS:=+kmod-tun +OPENVPN_$(1)_ENABLE_LZO:liblzo +OPENVPN_$(1)_ENABLE_IPROUTE2:ip $(3) + DEPENDS:=+kmod-tun +OPENVPN_$(1)_ENABLE_LZO:liblzo $(3) +ip VARIANT:=$(1) MAINTAINER:=Mirko Vogt endef @@ -42,6 +42,8 @@ Package/openvpn-polarssl=$(call Package/openvpn/Default,polarssl,PolarSSL,+libpo Package/openvpn-nossl=$(call Package/openvpn/Default,nossl,plaintext (no SSL)) define Package/openvpn/config/Default + select PACKAGE_ip if !BUSYBOX_DEFAULT_IP + source "$(SOURCE)/Config-$(1).in" endef @@ -60,8 +62,6 @@ CONFIG_OPENVPN_NOSSL:=y endif CONFIGURE_VARS += \ - IFCONFIG=/sbin/ifconfig \ - ROUTE=/sbin/route \ IPROUTE=/sbin/ip \ NETSTAT=/sbin/netstat