From: Dirk Brenken <dev@brenken.org>
Date: Tue, 3 Nov 2020 18:44:22 +0000 (+0100)
Subject: banip: adapt openwrt rc.common changes
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F13848%2Fhead;p=feed%2Fpackages.git

banip: adapt openwrt rc.common changes

* since openwrt master has merged the depending P/R, the old
extra_help/extra_commands syntax is no longer working, see #13798 for
reference

* removed logd dependency, see #13820 for reference

Signed-off-by: Dirk Brenken <dev@brenken.org>
---

diff --git a/net/banip/Makefile b/net/banip/Makefile
index 20c52bee6d..e2170a172d 100644
--- a/net/banip/Makefile
+++ b/net/banip/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=banip
 PKG_VERSION:=0.3.12
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 
@@ -17,7 +17,7 @@ define Package/banip
 	SECTION:=net
 	CATEGORY:=Network
 	TITLE:=Ban incoming and/or outgoing ip adresses via ipsets
-	DEPENDS:=+jshn +jsonfilter +ip +ipset +iptables +ca-bundle +logd
+	DEPENDS:=+jshn +jsonfilter +ip +ipset +iptables +ca-bundle
 	PKGARCH:=all
 endef
 
diff --git a/net/banip/files/banip.init b/net/banip/files/banip.init
index 75fbe5e92a..034050d589 100755
--- a/net/banip/files/banip.init
+++ b/net/banip/files/banip.init
@@ -4,8 +4,7 @@
 START=30
 USE_PROCD=1
 
-EXTRA_COMMANDS="refresh"
-EXTRA_HELP="	refresh	Refresh ipsets without new list downloads"
+extra_command "refresh" "Refresh ipsets without new list downloads"
 
 ban_init="/etc/init.d/banip"
 ban_script="/usr/bin/banip.sh"