miniupnpd: remove uci-defaults and fw4-include files for nftables variant

* remove firewall4.include file as it is not needed and procuces a firewall
  error on service miniupnpd restart
* remove the uci-defaults file as its sole purpose was to install the
  firewall include file
* modify the Makefile to reflect the deleted files

Signed-off-by: Stan Grishin <stangri@melmac.ca>

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index 6373f309c5fd63a1ac6fe977d9a7245fd5053afe..1526e922cd00044f4cce8ad1978f7e5439f92828 100644 (file)
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
 PKG_VERSION:=2.3.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -109,10 +109,6 @@ endef
 
 define Package/miniupnpd-nftables/install
        $(call Package/miniupnpd/install/Default,$1)
-       $(INSTALL_DIR) $(1)/etc/uci-defaults
-       $(INSTALL_DIR) $(1)/usr/share/miniupnpd
-       $(INSTALL_BIN) ./files/miniupnpd.defaults.nftables $(1)/etc/uci-defaults/99-miniupnpd
-       $(INSTALL_DATA) ./files/firewall4.include $(1)/usr/share/miniupnpd/firewall.include
        $(INSTALL_DIR) $(1)/usr/share/nftables.d
        $(CP) ./files/nftables.d/* $(1)/usr/share/nftables.d/
 endef

diff --git a/net/miniupnpd/files/firewall4.include b/net/miniupnpd/files/firewall4.include
deleted file mode 100644 (file)
index ee5be1f..0000000
--- a/net/miniupnpd/files/firewall4.include
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-/etc/init.d/miniupnpd enabled && /etc/init.d/miniupnpd restart
-exit 0

diff --git a/net/miniupnpd/files/miniupnpd.defaults.nftables b/net/miniupnpd/files/miniupnpd.defaults.nftables
deleted file mode 100644 (file)
index d3e3d87..0000000
--- a/net/miniupnpd/files/miniupnpd.defaults.nftables
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOT
-       delete firewall.miniupnpd
-       set firewall.miniupnpd=include
-       set firewall.miniupnpd.type=script
-       set firewall.miniupnpd.path=/usr/share/miniupnpd/firewall.include
-       commit firewall
-EOT
-
-exit 0