diff --git a/grpcurl/Makefile b/grpcurl/Makefile index ee9bdcf0..40e448e8 100644 --- a/grpcurl/Makefile +++ b/grpcurl/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=grpcurl -PKG_VERSION:=1.9.3 -PKG_RELEASE:=1 +PKG_VERSION:=1.8.6 +PKG_RELEASE:=2 PKG_SOURCE:=v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/fullstorydev/grpcurl/archive/refs/tags/ diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index bf91dc24..f04f6e88 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=26.5.3 -PKG_RELEASE:=113 +PKG_RELEASE:=114 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall/root/usr/share/passwall/iptables.sh b/luci-app-passwall/root/usr/share/passwall/iptables.sh index 81500ca0..7100a691 100755 --- a/luci-app-passwall/root/usr/share/passwall/iptables.sh +++ b/luci-app-passwall/root/usr/share/passwall/iptables.sh @@ -795,6 +795,8 @@ filter_direct_node_list() { update_wan_sets() { local log=$1 + [ -z "$(command -v get_wan_ips)" ] && . "$UTILS_PATH" + local WAN_IP=$(get_wan_ips ip4) [ -n "$WAN_IP" ] && { ipset -F "$IPSET_WAN" @@ -1487,7 +1489,7 @@ start() { } stop() { - [ -z "$(command -v echolog)" ] && . /usr/share/passwall/utils.sh + [ -z "$(command -v echolog)" ] && . "$UTILS_PATH" del_firewall_rule [ $(config_t_get global flush_set_on_reboot "0") = "1" -o $(config_t_get global flush_set "0") = "1" ] && { uci -q delete ${CONFIG}.@global[0].flush_set diff --git a/luci-app-passwall/root/usr/share/passwall/nftables.sh b/luci-app-passwall/root/usr/share/passwall/nftables.sh index 3929f7bd..ac1b0a36 100755 --- a/luci-app-passwall/root/usr/share/passwall/nftables.sh +++ b/luci-app-passwall/root/usr/share/passwall/nftables.sh @@ -861,6 +861,8 @@ mwan3_start() { update_wan_sets() { local log=$1 + [ -z "$(command -v get_wan_ips)" ] && . "$UTILS_PATH" + local WAN_IP=$(get_wan_ips ip4) [ -n "$WAN_IP" ] && { nft flush set $NFTABLE_NAME $NFTSET_WAN @@ -1502,7 +1504,7 @@ start() { } stop() { - [ -z "$(command -v echolog)" ] && . /usr/share/passwall/utils.sh + [ -z "$(command -v echolog)" ] && . "$UTILS_PATH" del_firewall_rule [ $(config_t_get global flush_set_on_reboot "0") = "1" -o $(config_t_get global flush_set "0") = "1" ] && { uci -q delete ${CONFIG}.@global[0].flush_set diff --git a/netdata/Makefile b/netdata/Makefile index ad97f2c6..4fd48e5a 100644 --- a/netdata/Makefile +++ b/netdata/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netdata -PKG_VERSION:=2.10.3 -PKG_RELEASE:=10 +PKG_VERSION:=2.10.0 +PKG_RELEASE:=11 PKG_MAINTAINER:=Josef Schlehofer , Daniel Engberg PKG_LICENSE:=GPL-3.0-or-later