From c4aaedb7df7f8b06dcfe5abbe52c57355815d3aa Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Sat, 28 Dec 2024 00:24:05 +0800 Subject: [PATCH] update 2024-12-28 00:24:05 --- dae/Makefile | 4 ++-- .../luasrc/model/cbi/passwall/client/global.lua | 3 ++- luci-app-passwall/luasrc/view/passwall/rule_list/js.htm | 6 +++--- natflow/Makefile | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dae/Makefile b/dae/Makefile index d08f5a9d6..87981c2fd 100644 --- a/dae/Makefile +++ b/dae/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dae PKG_VERSION:=0.9.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip PKG_SOURCE_URL:=https://github.com/daeuniverse/dae/releases/download/v$(PKG_VERSION)/dae-full-src.zip? @@ -24,7 +24,7 @@ GO_PKG:=github.com/daeuniverse/dae GO_PKG_EXCLUDES:=control/kern/tests GO_PKG_LDFLAGS_X:= \ $(GO_PKG)/cmd.Version=$(PKG_VERSION) \ - $(GO_PKG)/common/consts.MaxMatchSetLen_=64 + $(GO_PKG)/common/consts.MaxMatchSetLen_=1024 GO_PKG_TAGS:=trace include $(INCLUDE_DIR)/package.mk diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua index ba3363e09..d8719bb47 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -347,6 +347,7 @@ o:value("180.184.1.1") o:value("180.184.2.2") o:value("114.114.114.114") o:value("114.114.115.115") +o:value("119.28.28.28") o:depends("direct_dns_mode", "tcp") o = s:taboption("DNS", Value, "direct_dns_dot", translate("Direct DNS DoT")) @@ -388,7 +389,7 @@ end ---- SmartDNS Forward Mode if api.is_finded("smartdns") then o = s:taboption("DNS", ListValue, "smartdns_dns_mode", translate("Filter Mode")) - o:value("socks", "SOCKS") + o:value("socks", "Socks") if has_singbox then o:value("sing-box", "Sing-Box") end diff --git a/luci-app-passwall/luasrc/view/passwall/rule_list/js.htm b/luci-app-passwall/luasrc/view/passwall/rule_list/js.htm index 63b1fcaff..c950646dd 100644 --- a/luci-app-passwall/luasrc/view/passwall/rule_list/js.htm +++ b/luci-app-passwall/luasrc/view/passwall/rule_list/js.htm @@ -9,7 +9,7 @@ local total_lines_text = translate("Total Lines") fetch('<%= api.url("read_rulelist") %>?type=gfw') .then(response => response.text()) .then(data => { - var total_lines = data.split("\n").length; + var total_lines = data.split("\n").filter(line => line.trim() !== "").length; var textarea = document.getElementById('gfw_textarea'); textarea.innerHTML = data; //textarea.scrollTop = textarea.scrollHeight; @@ -22,7 +22,7 @@ local total_lines_text = translate("Total Lines") fetch('<%= api.url("read_rulelist") %>?type=chn') .then(response => response.text()) .then(data => { - var total_lines = data.split("\n").length; + var total_lines = data.split("\n").filter(line => line.trim() !== "").length; var textarea = document.getElementById('chn_textarea'); textarea.innerHTML = data; //textarea.scrollTop = textarea.scrollHeight; @@ -35,7 +35,7 @@ local total_lines_text = translate("Total Lines") fetch('<%= api.url("read_rulelist") %>?type=chnroute') .then(response => response.text()) .then(data => { - var total_lines = data.split("\n").length; + var total_lines = data.split("\n").filter(line => line.trim() !== "").length; var textarea = document.getElementById('chnroute_textarea'); textarea.innerHTML = data; //textarea.scrollTop = textarea.scrollHeight; diff --git a/natflow/Makefile b/natflow/Makefile index 28f8223c8..dd81f657f 100644 --- a/natflow/Makefile +++ b/natflow/Makefile @@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=natflow -PKG_VERSION:=20241128 +PKG_VERSION:=20241227 PKG_SOURCE_URL:=https://codeload.github.com/ptpt52/natflow/tar.gz/$(PKG_VERSION)? -PKG_HASH:=5048d3ec5d588bd4788e64969c3ada3ddf0b3f180545ec66b42ca9baee960992 +PKG_HASH:=43eb13e0a25f93e9cf75ba2fdd3f13ceac60f571422823a131858360c81b6205 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_MAINTAINER:=Chen Minqiang