diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2023-08-29 09:51:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-29 09:51:03 +0200 |
| commit | 643ece1612f593d614e181cd2f451b3590b3ccea (patch) | |
| tree | 98ea5f7df0d8027ffd79c1b5c6f28d0c37965bdf /net | |
| parent | 40d5ba9378127a852b0b4735b02798be17e2e12c (diff) | |
| parent | 4c934aea718ceb682551b9bab0a8618e4b12920d (diff) | |
Merge pull request #21928 from stangri/miniupnpd-nftables
miniupnpd: remove uci-defaults and fw4-include files for nftables variant
Diffstat (limited to 'net')
| -rw-r--r-- | net/miniupnpd/Makefile | 6 | ||||
| -rw-r--r-- | net/miniupnpd/files/firewall4.include | 4 | ||||
| -rw-r--r-- | net/miniupnpd/files/miniupnpd.defaults.nftables | 11 |
3 files changed, 1 insertions, 20 deletions
diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile index 6373f309c..1526e922c 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 ee5be1f1b..000000000 --- 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 d3e3d8720..000000000 --- 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 |