From 4c934aea718ceb682551b9bab0a8618e4b12920d Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Fri, 25 Aug 2023 17:59:22 +0000 Subject: [PATCH 1/2] 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 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 From a2b9e9c8562f087fd6a7166e60c9a7d7d70ca48a Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Mon, 28 Aug 2023 18:36:16 +0200 Subject: [PATCH 2/2] tang: updated to v14 Signed-off-by: Nikos Mavrogiannopoulos --- utils/tang/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/tang/Makefile b/utils/tang/Makefile index 227fed460..8eee5becd 100644 --- a/utils/tang/Makefile +++ b/utils/tang/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tang -PKG_VERSION:=12 -PKG_RELEASE:=2 +PKG_VERSION:=14 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/latchset/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/ -PKG_HASH:=892e0b26ee2db01f2c257b083fbb85aede7d3f59de7361c9c9528c0d5783e69c +PKG_HASH:=0b56702a8ac19ff320d7e13a49682efba32403933c84ab1dae0b26ddcc4e3fe5 PKG_MAINTAINER:=Tibor Dudlák PKG_LICENSE:=GPL-3.0-or-later