diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile index d33da6a5..fc661c9d 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:=193 -PKG_RELEASE:=23 +PKG_RELEASE:=24 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \ @@ -39,6 +39,10 @@ LUCI_DEPENDS:= \ +PACKAGE_$(PKG_NAME)_INCLUDE_Shadow_TLS:shadow-tls \ +PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun:kcptun-client \ +PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy:naiveproxy \ + +PACKAGE_$(PKG_NAME)_INCLUDE_Http_Proxy:3proxy \ + +PACKAGE_$(PKG_NAME)_INCLUDE_Mihomo:mihomo \ + +PACKAGE_$(PKG_NAME)_INCLUDE_GeoData:v2ray-geoip \ + +PACKAGE_$(PKG_NAME)_INCLUDE_GeoData:v2ray-geosite \ +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Client:shadowsocks-rust-sslocal \ +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Server:shadowsocks-rust-ssserver \ +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Simple_Obfs:simple-obfs-client \ @@ -120,19 +124,15 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_MosDNS config PACKAGE_$(PKG_NAME)_INCLUDE_Http_Proxy bool "Include HTTP(S) Proxy Server" - select PACKAGE_3proxy - default y if (aarch64||arm||i386||loongarch64||riscv64||x86_64) + default y if (aarch64||i386||loongarch64||riscv64||x86_64) config PACKAGE_$(PKG_NAME)_INCLUDE_Mihomo bool "Include Mihomo (Clash Support)" - select PACKAGE_mihomo depends on aarch64||arm||i386||loongarch64||riscv64||x86_64 - default y if aarch64||arm||i386||loongarch64||riscv64||x86_64 + default y if aarch64||i386||loongarch64||riscv64||x86_64 config PACKAGE_$(PKG_NAME)_INCLUDE_GeoData bool "Include GeoData (GeoIP and GeoSite)" - select PACKAGE_v2ray-geoip - select PACKAGE_v2ray-geosite default y if i386||x86_64 config PACKAGE_$(PKG_NAME)_INCLUDE_Shadow_TLS diff --git a/momo/Makefile b/momo/Makefile index b361697c..1adf4e95 100644 --- a/momo/Makefile +++ b/momo/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=momo PKG_VERSION:=2026.06.03 -PKG_RELEASE:=9 +PKG_RELEASE:=10 PKG_LICENSE:=GPL-3.0+ PKG_MAINTAINER:=Joseph Mory diff --git a/momo/files/ucode/hijack.ut b/momo/files/ucode/hijack.ut index 31ddaa0e..8e61d8d3 100644 --- a/momo/files/ucode/hijack.ut +++ b/momo/files/ucode/hijack.ut @@ -499,7 +499,9 @@ table inet momo { {% elif (cgroups_version == 2): %} socket cgroupv2 level 2 "services/{{ cgroup_name }}" counter return {% endif %} + {% if (length(dns_hijack_nfproto) > 0): %} jump router_dns_hijack + {% endif %} {% if (tcp_mode == 'redirect'): %} fib daddr type { local, broadcast, anycast, multicast } counter return ct direction reply counter return @@ -563,7 +565,9 @@ table inet momo { {% if (lan_proxy): %} chain dstnat { type nat hook prerouting priority dstnat + 1; policy accept; + {% if (length(dns_hijack_nfproto) > 0): %} iifname @lan_inbound_device jump lan_dns_hijack + {% endif %} {% if (tcp_mode == 'redirect'): %} fib daddr type { local, broadcast, anycast, multicast } counter return ct direction reply counter return @@ -615,4 +619,4 @@ include "/etc/momo/firewall/geoip_cn.nft" {% endif %} {% if (bypass_china_mainland_ip6): %} include "/etc/momo/firewall/geoip6_cn.nft" -{% endif %} \ No newline at end of file +{% endif %} diff --git a/torrserver/Makefile b/torrserver/Makefile index 47ec4eac..97946493 100644 --- a/torrserver/Makefile +++ b/torrserver/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=torrserver -PKG_VERSION:=MatriX.141.4 -PKG_RELEASE:=5 +PKG_VERSION:=MatriX.141.5 +PKG_RELEASE:=6 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/YouROK/TorrServer.git -PKG_SOURCE_VERSION:=b79dbaf99ddc31c2b7f62fed997813861347ad9a +PKG_SOURCE_VERSION:=2d4acdbfea6ccae2b90a30941cfb3546cbfa18c1 PKG_MIRROR_HASH:=skip PKG_MAINTAINER:=Konstantine Shevlakov