Merge branch 'openwrt:master' into master
This commit is contained in:
commit
56517fae9c
4 changed files with 4 additions and 23 deletions
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=miniupnpd
|
PKG_NAME:=miniupnpd
|
||||||
PKG_VERSION:=2.3.3
|
PKG_VERSION:=2.3.3
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
|
|
||||||
PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files
|
PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
|
@ -109,10 +109,6 @@ endef
|
||||||
|
|
||||||
define Package/miniupnpd-nftables/install
|
define Package/miniupnpd-nftables/install
|
||||||
$(call Package/miniupnpd/install/Default,$1)
|
$(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
|
$(INSTALL_DIR) $(1)/usr/share/nftables.d
|
||||||
$(CP) ./files/nftables.d/* $(1)/usr/share/nftables.d/
|
$(CP) ./files/nftables.d/* $(1)/usr/share/nftables.d/
|
||||||
endef
|
endef
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
/etc/init.d/miniupnpd enabled && /etc/init.d/miniupnpd restart
|
|
||||||
exit 0
|
|
|
@ -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
|
|
|
@ -8,12 +8,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=tang
|
PKG_NAME:=tang
|
||||||
PKG_VERSION:=12
|
PKG_VERSION:=14
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=https://github.com/latchset/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/
|
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 <tibor.dudlak@gmail.com>
|
PKG_MAINTAINER:=Tibor Dudlák <tibor.dudlak@gmail.com>
|
||||||
PKG_LICENSE:=GPL-3.0-or-later
|
PKG_LICENSE:=GPL-3.0-or-later
|
||||||
|
|
Loading…
Reference in a new issue