From: Hannu Nyman <redacted>
Date: Mon, 20 Mar 2017 09:01:23 +0000 (+0200)
Subject: Merge pull request #4167 from stangri/vpnbypass
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=5ee8193dec2468c9d23c6d02100913459f8bd0fa;p=openwrt-packages.git

Merge pull request #4167 from stangri/vpnbypass

vpnbypass: linted (shellshock) init script, modified README, removed unneeded dependencies
---

5ee8193dec2468c9d23c6d02100913459f8bd0fa
diff --cc net/vpnbypass/Makefile
index 44870747e,51ee35296..32e994f33
--- a/net/vpnbypass/Makefile
+++ b/net/vpnbypass/Makefile
@@@ -11,11 -11,11 +11,11 @@@ PKG_MAINTAINER:=Stan Grishin <stangri@m
  
  include $(INCLUDE_DIR)/package.mk
  
 -define Package/$(PKG_NAME)
 +define Package/vpnbypass
  	SECTION:=net
  	CATEGORY:=Network
- 	DEPENDS:=+ip-full +ipset +iptables +ubox +dnsmasq-full
- 	CONFLICTS:=ip dnsmasq
+ 	DEPENDS:=+ipset +iptables
+ 	CONFLICTS:=openvpn-policy-routing
  	TITLE:=Simple VPN Bypass Service
  	PKGARCH:=all
  endef