From 89d954547eb304e4731687f4101c9d3045d45f8a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 09:28:03 +0800 Subject: [PATCH] update 2023-02-11 09:28:03 --- luci-app-passwall/Makefile | 2 +- luci-app-passwall/root/etc/hotplug.d/iface/98-passwall | 7 +++++-- v2ray-geodata/Makefile | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index 9f01f8d84..84fc7f79d 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=4.58 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \ diff --git a/luci-app-passwall/root/etc/hotplug.d/iface/98-passwall b/luci-app-passwall/root/etc/hotplug.d/iface/98-passwall index d89385efd..dbd3a4b78 100644 --- a/luci-app-passwall/root/etc/hotplug.d/iface/98-passwall +++ b/luci-app-passwall/root/etc/hotplug.d/iface/98-passwall @@ -1,6 +1,9 @@ #!/bin/sh [[ "$ACTION" == "ifup" && $(uci get "passwall.@global[0].enabled") == "1" ]] && { - /etc/init.d/passwall restart - echo "passwall: restart when $INTERFACE ifup" > /dev/kmsg + default_device=$(ip route | grep default | awk -F 'dev ' '{print $2}' | awk '{print $1}') + [ "$default_device" == "$DEVICE" ] && { + /etc/init.d/passwall restart + echo "passwall: restart when $INTERFACE ifup" > /dev/kmsg + } } diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index dd3f08016..0e152f289 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -21,13 +21,13 @@ define Download/geoip HASH:=38e200a655c3e401dde6a438e79d493c3dbdd224e104a5158bef01f78ad4a151 endef -GEOSITE_VER:=20230210014344 +GEOSITE_VER:=20230210153419 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=4a435a0f6e86cf58ac71853ac349f1fbd3f46307e42b906921cba62fff0e108a + HASH:=2a92cd713c1f275efa0a307b232ae485dee9394f621597fa434503e5a0ed97e2 endef define Package/v2ray-geodata/template