From e5346defb946967267b8f1f39b2af458bc51f872 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 1 Jul 2026 00:17:42 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=89=20Sync=202026-07-01=2000:17:42?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luci-app-passwall/Makefile | 4 ++-- luci-app-passwall/root/usr/share/passwall/iptables.sh | 11 +++++++++++ luci-app-passwall/root/usr/share/passwall/nftables.sh | 11 +++++++++++ luci-app-ssr-plus/Makefile | 2 +- .../root/usr/share/shadowsocksr/clash_yaml.lua | 1 - torrserver/Makefile | 6 +++--- 6 files changed, 28 insertions(+), 7 deletions(-) diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index 92ee881d..fda2c538 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall -PKG_VERSION:=26.6.2 -PKG_RELEASE:=170 +PKG_VERSION:=26.7.1 +PKG_RELEASE:=171 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 1f8a1159..e34b2b99 100755 --- a/luci-app-passwall/root/usr/share/passwall/iptables.sh +++ b/luci-app-passwall/root/usr/share/passwall/iptables.sh @@ -829,8 +829,19 @@ update_wan_sets() { } } +set_tproxy_sysctl() { + # Disable IPv4 rp_filter for TPROXY compatibility. + sysctl -w net.ipv4.conf.all.rp_filter=0 >/dev/null 2>&1 + sysctl -w net.ipv4.conf.default.rp_filter=0 >/dev/null 2>&1 + local f + for f in /proc/sys/net/ipv4/conf/*/rp_filter; do + echo 0 > "$f" 2>/dev/null + done +} + add_firewall_rule() { echolog "开始加载 iptables 防火墙规则..." + set_tproxy_sysctl ipset -! create $IPSET_LOCAL nethash maxelem 1048576 ipset -! create $IPSET_WAN nethash maxelem 1048576 ipset -! create $IPSET_LAN nethash maxelem 1048576 diff --git a/luci-app-passwall/root/usr/share/passwall/nftables.sh b/luci-app-passwall/root/usr/share/passwall/nftables.sh index 14039fd4..093ab5a2 100755 --- a/luci-app-passwall/root/usr/share/passwall/nftables.sh +++ b/luci-app-passwall/root/usr/share/passwall/nftables.sh @@ -891,11 +891,22 @@ update_wan_sets() { } } +set_tproxy_sysctl() { + # Disable IPv4 rp_filter for TPROXY compatibility. + sysctl -w net.ipv4.conf.all.rp_filter=0 >/dev/null 2>&1 + sysctl -w net.ipv4.conf.default.rp_filter=0 >/dev/null 2>&1 + local f + for f in /proc/sys/net/ipv4/conf/*/rp_filter; do + echo 0 > "$f" 2>/dev/null + done +} + add_firewall_rule() { echolog "开始加载 nftables 防火墙规则..." gen_nft_tables add_script_mwan3 mwan3_start + set_tproxy_sysctl gen_nftset $NFTSET_WAN ipv4_addr 0 "-1" gen_nftset $NFTSET_VPS ipv4_addr 0 "-1" gen_nftset $NFTSET_GFW ipv4_addr "2d" 0 diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile index 25623755..052b2c8e 100644 --- a/luci-app-ssr-plus/Makefile +++ b/luci-app-ssr-plus/Makefile @@ -4,7 +4,7 @@ LUCI_TITLE:=luci-app-ssr-plus LUCI_PKGARCH:=all PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=196 -PKG_RELEASE:=35 +PKG_RELEASE:=36 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \ diff --git a/luci-app-ssr-plus/root/usr/share/shadowsocksr/clash_yaml.lua b/luci-app-ssr-plus/root/usr/share/shadowsocksr/clash_yaml.lua index 0c8a3820..8d439f3e 100644 --- a/luci-app-ssr-plus/root/usr/share/shadowsocksr/clash_yaml.lua +++ b/luci-app-ssr-plus/root/usr/share/shadowsocksr/clash_yaml.lua @@ -840,7 +840,6 @@ local function build_v2ray_mihomo_proxy(sid) proxy.down = string_or_nil(get_server_field(sid, "downlink_capacity", "")) and (get_server_field(sid, "downlink_capacity", "") .. " Mbps") or nil proxy.sni = string_or_nil(get_server_field(sid, "tls_host", "")) proxy.fingerprint = string_or_nil(get_server_field(sid, "tls_CertSha", "")) - proxy["cert-name"] = string_or_nil(get_server_field(sid, "tls_CertByName", "")) proxy["skip-cert-verify"] = bool_enabled(get_server_field(sid, "insecure", "0")) local alpn = split_alpn(get_server_field(sid, "tls_alpn", "")) if #alpn > 0 then diff --git a/torrserver/Makefile b/torrserver/Makefile index bc72c5aa..a1e6c124 100644 --- a/torrserver/Makefile +++ b/torrserver/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=torrserver -PKG_VERSION:=MatriX.141.9 -PKG_RELEASE:=10 +PKG_VERSION:=MatriX.141.10 +PKG_RELEASE:=11 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/YouROK/TorrServer.git -PKG_SOURCE_VERSION:=9ba8f2a8a37869eda85eb2f1deaac71e89a183af +PKG_SOURCE_VERSION:=394c915bfc64c8448a7da166e909da074420172e PKG_MIRROR_HASH:=skip PKG_MAINTAINER:=Konstantine Shevlakov