diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index 9d39e0f1..c373639a 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.6.2 -PKG_RELEASE:=168 +PKG_RELEASE:=169 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall/luasrc/passwall/api.lua b/luci-app-passwall/luasrc/passwall/api.lua index e91f996a..42e76d84 100644 --- a/luci-app-passwall/luasrc/passwall/api.lua +++ b/luci-app-passwall/luasrc/passwall/api.lua @@ -1278,7 +1278,14 @@ end function to_check_self() local url = "https://raw.githubusercontent.com/Openwrt-Passwall/openwrt-passwall/main/luci-app-passwall/Makefile" local tmp_file = "/tmp/passwall_makefile" - local return_code, result = curl_auto(url, tmp_file, curl_args) + local gh_proxy = uci_get_type("global_app", "github_proxy", "0") + local return_code, result + if gh_proxy == "1" then + url = "https://gh-proxy.org/" .. url + return_code, result = curl_base(url, tmp_file, curl_args) + else + return_code, result = curl_auto(url, tmp_file, curl_args) + end result = return_code == 0 if not result then exec("/bin/rm", {"-f", tmp_file}) diff --git a/luci-app-passwall/root/usr/share/passwall/app.sh b/luci-app-passwall/root/usr/share/passwall/app.sh index ed887913..4e8e67f1 100755 --- a/luci-app-passwall/root/usr/share/passwall/app.sh +++ b/luci-app-passwall/root/usr/share/passwall/app.sh @@ -1913,8 +1913,9 @@ stop() { kill -9 "$pid" >/dev/null 2>&1 fi done - busybox pgrep -f "sleep.*(6s|9s|58s)" | xargs kill -9 >/dev/null 2>&1 - busybox pgrep -af "${CONFIG}/" | awk '! /app\.sh|subscribe\.lua|rule_update\.lua|tasks\.sh|server_app\.lua|ujail/{print $1}' | xargs kill -9 >/dev/null 2>&1 + busybox pgrep -af "${CONFIG}/monitor\.sh" | xargs -r kill -9 >/dev/null 2>&1 + busybox pgrep -f "sleep.*(6s|9s|58s)" | xargs -r kill -9 >/dev/null 2>&1 + busybox pgrep -af "${CONFIG}/" | awk '! /app\.sh|subscribe\.lua|rule_update\.lua|tasks\.sh|server_app\.lua|ujail/{print $1}' | xargs -r kill -9 >/dev/null 2>&1 unset V2RAY_LOCATION_ASSET unset XRAY_LOCATION_ASSET unset SS_SYSTEM_DNS_RESOLVER_FORCE_BUILTIN diff --git a/natflow/Makefile b/natflow/Makefile index 1336b39f..b8b6ec40 100644 --- a/natflow/Makefile +++ b/natflow/Makefile @@ -10,12 +10,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=natflow PKG_VERSION:=20260531 -PKG_RELEASE:=25 +PKG_RELEASE:=26 PKG_SOURCE:=$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/ptpt52/natflow.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=bf84c587500484bfd7f0f11cbc4dc2ff9b8ad1af +PKG_SOURCE_VERSION:=dab8eb7a37937b4cc848e63003a6a22097098b15 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Chen Minqiang PKG_LICENSE:=GPL-2.0 diff --git a/torrserver/Makefile b/torrserver/Makefile index 692bfd89..0a5443eb 100644 --- a/torrserver/Makefile +++ b/torrserver/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=torrserver -PKG_VERSION:=MatriX.141.7 -PKG_RELEASE:=8 +PKG_VERSION:=MatriX.141.8 +PKG_RELEASE:=9 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/YouROK/TorrServer.git -PKG_SOURCE_VERSION:=dc6cb16023986321c129a6e3c3700b15ee5a8a47 +PKG_SOURCE_VERSION:=6e2e02d1be6ac8e75023c5fb3fb4f7c554b6c98c PKG_MIRROR_HASH:=skip PKG_MAINTAINER:=Konstantine Shevlakov