From 4c934aea718ceb682551b9bab0a8618e4b12920d Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Fri, 25 Aug 2023 17:59:22 +0000 Subject: [PATCH] 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 --- net/miniupnpd/Makefile | 6 +----- net/miniupnpd/files/firewall4.include | 4 ---- net/miniupnpd/files/miniupnpd.defaults.nftables | 11 ----------- 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 net/miniupnpd/files/firewall4.include delete mode 100644 net/miniupnpd/files/miniupnpd.defaults.nftables diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile index 6373f309c5..1526e922cd 100644 --- 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 index ee5be1f1b7..0000000000 --- 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 index d3e3d8720b..0000000000 --- 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