🦄 Sync 2024-04-28 00:23

luci-app-ddns-go/ddns-go/Makefile

@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ddns-go
-PKG_VERSION:=6.3.2
+PKG_VERSION:=6.5.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/jeessy2/ddns-go.git
-PKG_MIRROR_HASH:=4948bd5606dbe3cfb0552d943fe44255c292a6b3490c9f374bc32b8a5cc3964d
+PKG_MIRROR_HASH:=3b2f219cf96446bae23cf57b3504ca086e576b3afafa78aa47e7dd09d5addceb
-PKG_SOURCE_VERSION:=da880a787ee56ef3bdd9d16b05128fde0b51b622
+PKG_SOURCE_VERSION:=63b510bef20effd0fe9edd09cee8fafe96e884ea
 
 PKG_LICENSE:=AGPL-3.0-only
 PKG_LICENSE_FILES:=LICENSE

luci-app-partexp/root/etc/init.d/partexp

@@ -192,7 +192,7 @@ fdiskB(){
 			    fi
 			    log "保留数据根目录扩展/dev/$b成功！"
 
-			    seelp 5
+			    sleep 5
 			    log "设备重启才能生效"
 			    expquit 2
 
@@ -222,7 +222,7 @@ fdiskB(){
 			    uci set fstab.@global[0].delay_root="15"
 			    uci commit fstab
 			    log "保留数据overlay扩展/dev/$b成功！"
-			    seelp 5
+			    sleep 5
 			    log "设备重启才能生效"
 			    expquit 2
 
@@ -250,7 +250,7 @@ fdiskB(){
 			    uci commit fstab
 			    log "不保留数据overlay扩展/dev/$b成功！"
 			    
-			    seelp 5
+			    sleep 5
 			    log "设备重启才能生效"
 			    expquit 2
 

luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua

@@ -260,6 +260,12 @@ o = s:option(DummyValue, "switch_mode", " ")
 o.template = appname .. "/global/proxy"
 o:depends({ tcp_node = "",  ['!reverse'] = true })
 
+---- DNS
+o = s:option(ListValue, "dns_shunt", "DNS " .. translate("Shunt"))
+o:depends({ tcp_node = "",  ['!reverse'] = true })
+o:value("dnsmasq", "Dnsmasq")
+o:value("chinadns-ng", "Dnsmasq + ChinaDNS-NG")
+
 o = s:option(Flag, "filter_proxy_ipv6", translate("Filter Proxy Host IPv6"), translate("Experimental feature."))
 o.default = "0"
 o:depends({ tcp_node = "",  ['!reverse'] = true })
@@ -362,24 +368,18 @@ if has_singbox or has_xray then
 	end
 end
 
-if api.is_finded("chinadns-ng") then
+o = s:option(ListValue, "chinadns_ng_default_tag", translate("ChinaDNS-NG Domain Default Tag"))
-	o = s:option(Flag, "chinadns_ng", translate("ChinaDNS-NG"), translate("The effect is better, recommend."))
+o.default = "none"
-	o.default = "0"
+o:value("none", translate("Default"))
-	o:depends({ dns_mode = "",  ['!reverse'] = true })
+o:value("gfw", translate("Remote DNS"))
-
+o:value("chn", translate("Direct DNS"))
-	o = s:option(ListValue, "chinadns_ng_default_tag", translate("ChinaDNS-NG Domain Default Tag"))
+o.description = "<ul>"
-	o.default = "none"
+		.. "<li>" .. translate("When not matching any domain name list:") .. "</li>"
-	o:value("none", translate("Default"))
+		.. "<li>" .. translate("Default: Forward to both direct and remote DNS, if the direct DNS resolution result is a mainland China ip, then use the direct result, otherwise use the remote result.") .. "</li>"
-	o:value("gfw", translate("Remote DNS"))
+		.. "<li>" .. translate("Remote DNS: Can avoid more DNS leaks, but some domestic domain names maybe to proxy!") .. "</li>"
-	o:value("chn", translate("Direct DNS"))
+		.. "<li>" .. translate("Direct DNS: Internet experience may be better, but DNS will be leaked!") .. "</li>"
-	o.description = "<ul>"
+		.. "</ul>"
-			.. "<li>" .. translate("When not matching any domain name list:") .. "</li>"
+o:depends({dns_shunt = "chinadns-ng", tcp_proxy_mode = "proxy", chn_list = "direct"})
-			.. "<li>" .. translate("Default: Forward to both direct and remote DNS, if the direct DNS resolution result is a mainland China ip, then use the direct result, otherwise use the remote result.") .. "</li>"
-			.. "<li>" .. translate("Remote DNS: Can avoid more DNS leaks, but some domestic domain names maybe to proxy!") .. "</li>"
-			.. "<li>" .. translate("Direct DNS: Internet experience may be better, but DNS will be leaked!") .. "</li>"
-			.. "</ul>"
-	o:depends({chinadns_ng = true, chn_list = "direct"})
-end
 
 o = s:option(ListValue, "use_default_dns", translate("Default DNS"))
 o.default = "direct"
@@ -390,10 +390,6 @@ o.description = "<ul>"
 		.. "<li>" .. translate("Remote DNS: Can avoid more DNS leaks, but some domestic domain names maybe to proxy!") .. "</li>"
 		.. "<li>" .. translate("Direct DNS: Internet experience may be better, but DNS will be leaked!") .. "</li>"
 		.. "</ul>"
-local _depends = {tcp_proxy_mode = "proxy"}
+o:depends({dns_shunt = "dnsmasq", tcp_proxy_mode = "proxy", chn_list = "direct"})
-if api.is_finded("chinadns-ng") then
-	_depends["chinadns_ng"] = false
-end
-o:depends(_depends)
 
 return m

luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua

@@ -261,13 +261,17 @@ end
 
 s:tab("DNS", translate("DNS"))
 
+dns_shunt = s:taboption("DNS", ListValue, "dns_shunt", "DNS " .. translate("Shunt"))
+dns_shunt:value("dnsmasq", "Dnsmasq")
+dns_shunt:value("chinadns-ng", "Dnsmasq + ChinaDNS-NG")
+
 o = s:taboption("DNS", Flag, "filter_proxy_ipv6", translate("Filter Proxy Host IPv6"), translate("Experimental feature."))
 o.default = "0"
 
 ---- DNS Forward Mode
 dns_mode = s:taboption("DNS", ListValue, "dns_mode", translate("Filter Mode"))
-dns_mode:value("tcp", translatef("Requery DNS By %s", "TCP"))
 dns_mode:value("udp", translatef("Requery DNS By %s", "UDP"))
+dns_mode:value("tcp", translatef("Requery DNS By %s", "TCP"))
 if api.is_finded("dns2socks") then
 	dns_mode:value("dns2socks", "dns2socks")
 end
@@ -357,7 +361,7 @@ o:depends({dns_mode = "xray"})
 
 o = s:taboption("DNS", Flag, "remote_fakedns", "FakeDNS", translate("Use FakeDNS work in the shunt domain that proxy."))
 o.default = "0"
-o:depends({dns_mode = "sing-box"})
+o:depends({dns_mode = "sing-box", dns_shunt = "dnsmasq"})
 o.validate = function(self, value, t)
 	if value and value == "1" then
 		local _dns_mode = dns_mode:formvalue(t)
@@ -371,24 +375,18 @@ o.validate = function(self, value, t)
 	return value
 end
 
-if api.is_finded("chinadns-ng") then
+o = s:taboption("DNS", ListValue, "chinadns_ng_default_tag", translate("ChinaDNS-NG Domain Default Tag"))
-	o = s:taboption("DNS", Flag, "chinadns_ng", translate("ChinaDNS-NG"), translate("The effect is better, recommend."))
+o.default = "none"
-	o.default = "0"
+o:value("none", translate("Default"))
-	o:depends({remote_fakedns = false})
+o:value("gfw", translate("Remote DNS"))
-
+o:value("chn", translate("Direct DNS"))
-	o = s:taboption("DNS", ListValue, "chinadns_ng_default_tag", translate("ChinaDNS-NG Domain Default Tag"))
+o.description = "<ul>"
-	o.default = "none"
+		.. "<li>" .. translate("When not matching any domain name list:") .. "</li>"
-	o:value("none", translate("Default"))
+		.. "<li>" .. translate("Default: Forward to both direct and remote DNS, if the direct DNS resolution result is a mainland China ip, then use the direct result, otherwise use the remote result.") .. "</li>"
-	o:value("gfw", translate("Remote DNS"))
+		.. "<li>" .. translate("Remote DNS: Can avoid more DNS leaks, but some domestic domain names maybe to proxy!") .. "</li>"
-	o:value("chn", translate("Direct DNS"))
+		.. "<li>" .. translate("Direct DNS: Internet experience may be better, but DNS will be leaked!") .. "</li>"
-	o.description = "<ul>"
+		.. "</ul>"
-			.. "<li>" .. translate("When not matching any domain name list:") .. "</li>"
+o:depends({dns_shunt = "chinadns-ng", tcp_proxy_mode = "proxy", chn_list = "direct"})
-			.. "<li>" .. translate("Default: Forward to both direct and remote DNS, if the direct DNS resolution result is a mainland China ip, then use the direct result, otherwise use the remote result.") .. "</li>"
-			.. "<li>" .. translate("Remote DNS: Can avoid more DNS leaks, but some domestic domain names maybe to proxy!") .. "</li>"
-			.. "<li>" .. translate("Direct DNS: Internet experience may be better, but DNS will be leaked!") .. "</li>"
-			.. "</ul>"
-	o:depends({chinadns_ng = true, chn_list = "direct"})
-end
 
 o = s:taboption("DNS", ListValue, "use_default_dns", translate("Default DNS"))
 o.default = "direct"
@@ -399,11 +397,7 @@ o.description = "<ul>"
 		.. "<li>" .. translate("Remote DNS: Can avoid more DNS leaks, but some domestic domain names maybe to proxy!") .. "</li>"
 		.. "<li>" .. translate("Direct DNS: Internet experience may be better, but DNS will be leaked!") .. "</li>"
 		.. "</ul>"
-local _depends = {tcp_proxy_mode = "proxy"}
+o:depends({dns_shunt = "dnsmasq", tcp_proxy_mode = "proxy", chn_list = "direct"})
-if api.is_finded("chinadns-ng") then
-	_depends["chinadns_ng"] = false
-end
-o:depends(_depends)
 
 o = s:taboption("DNS", Button, "clear_ipset", translate("Clear IPSET"), translate("Try this feature if the rule modification does not take effect."))
 o.inputstyle = "remove"

luci-app-passwall/root/usr/share/passwall/0_default_config

@@ -6,10 +6,10 @@ config global
 	option udp_node 'nil'
 	option tcp_node_socks_port '1070'
 	option filter_proxy_ipv6 '1'
+	option dns_shunt 'chinadns-ng'
 	option dns_mode 'tcp'
 	option remote_dns '1.1.1.1'
 	option use_default_dns 'direct'
-	option chinadns_ng '1'
 	option chinadns_ng_default_tag 'none'
 	option use_direct_list '1'
 	option use_proxy_list '1'

luci-app-passwall/root/usr/share/passwall/app.sh

@@ -485,7 +485,7 @@ run_dns2socks() {
 run_chinadns_ng() {
 	local _flag _listen_port _dns_local _dns_trust _no_ipv6_trust _use_direct_list _use_proxy_list _gfwlist _chnlist _default_mode _default_tag
 	eval_set_val $@
-	
+
 	local _CONF_FILE=$TMP_ACL_PATH/$_flag/chinadns_ng.conf
 	local _LOG_FILE=$TMP_ACL_PATH/$_flag/chinadns_ng.log
 	_LOG_FILE="/dev/null"
@@ -513,7 +513,7 @@ run_chinadns_ng() {
 			group-ipset ${whitelist4_set},${whitelist6_set}
 		EOF
 	}
-	
+
 	[ "${_use_proxy_list}" = "1" ] && [ -s "${RULES_PATH}/proxy_host" ] && {
 		local blacklist4_set="passwall_blacklist"
 		local blacklist6_set="passwall_blacklist6"
@@ -529,7 +529,7 @@ run_chinadns_ng() {
 		EOF
 		[ "${_no_ipv6_trust}" = "1" ] && echo "no-ipv6 tag:proxylist" >> ${_CONF_FILE}
 	}
-	
+
 	[ "${_gfwlist}" = "1" ] && [ -s "${RULES_PATH}/gfwlist" ] && {
 		local gfwlist4_set="passwall_gfwlist"
 		local gfwlist6_set="passwall_gfwlist6"
@@ -543,7 +543,7 @@ run_chinadns_ng() {
 		EOF
 		[ "${_no_ipv6_trust}" = "1" ] && echo "no-ipv6 tag:gfw" >> ${_CONF_FILE}
 	}
-	
+
 	[ "${_chnlist}" != "0" ] && [ -s "${RULES_PATH}/chnlist" ] && {
 		local chnroute4_set="passwall_chnroute"
 		local chnroute6_set="passwall_chnroute6"
@@ -573,7 +573,7 @@ run_chinadns_ng() {
 			[ "${_no_ipv6_trust}" = "1" ] && echo "no-ipv6 tag:chn_proxy" >> ${_CONF_FILE}
 		}
 	}
-	
+
 	#只使用gfwlist模式，GFW列表以外的域名及默认使用本地DNS
 	[ "${_gfwlist}" = "1" ] && [ "${_chnlist}" = "0" ] && _default_tag="chn"
 	#回中国模式，中国列表以外的域名及默认使用本地DNS
@@ -583,7 +583,7 @@ run_chinadns_ng() {
 		_default_tag="gfw"
 		[ "${_no_ipv6_trust}" = "1" ] && echo "no-ipv6" >> ${_CONF_FILE}
 	}
-	
+
 	([ -z "${_default_tag}" ] || [ "${_default_tag}" = "smart" ]) && _default_tag="none"
 	echo "default-tag ${_default_tag}" >> ${_CONF_FILE}
 
@@ -1297,7 +1297,7 @@ start_dns() {
 	;;
 	udp)
 		use_udp_node_resolve_dns=1
-		if [ "$CHINADNS_NG" = "1" ] && [ -n "$(first_type chinadns-ng)" ]; then
+		if [ "$DNS_SHUNT" = "chinadns-ng" ] && [ -n "$(first_type chinadns-ng)" ]; then
 			local china_ng_listen_port=${dns_listen_port}
 			local china_ng_trust_dns="udp://$(get_first_dns REMOTE_DNS 53 | sed 's/:/#/g')"
 		else
@@ -1307,7 +1307,7 @@ start_dns() {
 	;;
 	*)
 		use_tcp_node_resolve_dns=1
-		if [ "$CHINADNS_NG" = "1" ] && [ -n "$(first_type chinadns-ng)" ]; then
+		if [ "$DNS_SHUNT" = "chinadns-ng" ] && [ -n "$(first_type chinadns-ng)" ]; then
 			local china_ng_listen_port=${dns_listen_port}
 			local china_ng_trust_dns="tcp://$(get_first_dns REMOTE_DNS 53 | sed 's/:/#/g')"
 		else
@@ -1322,7 +1322,7 @@ start_dns() {
 	[ "${use_tcp_node_resolve_dns}" = "1" ] && echolog "  * 请确认上游 DNS 支持 TCP 查询，如非直连地址，确保 TCP 代理打开，并且已经正确转发！"
 	[ "${use_udp_node_resolve_dns}" = "1" ] && echolog "  * 请确认上游 DNS 支持 UDP 查询并已使用 UDP 节点，如上游 DNS 非直连地址，确保 UDP 代理打开，并且已经正确转发！"
 
-	[ "$CHINADNS_NG" = "1" ] && [ -n "$(first_type chinadns-ng)" ] && {
+	[ "$DNS_SHUNT" = "chinadns-ng" ] && [ -n "$(first_type chinadns-ng)" ] && {
 		[ "$FILTER_PROXY_IPV6" = "1" ] && DNSMASQ_FILTER_PROXY_IPV6=0
 		[ -z "${china_ng_listen_port}" ] && local china_ng_listen_port=$(expr $dns_listen_port + 1)
 		local china_ng_listen="127.0.0.1#${china_ng_listen_port}"
@@ -1453,9 +1453,9 @@ acl_app() {
 			udp_proxy_mode=${udp_proxy_mode:-proxy}
 			filter_proxy_ipv6=${filter_proxy_ipv6:-0}
 			dnsmasq_filter_proxy_ipv6=${filter_proxy_ipv6}
+			dns_shunt=${dns_shunt:-dnsmasq}
 			dns_mode=${dns_mode:-dns2socks}
 			remote_dns=${remote_dns:-1.1.1.1}
-			chinadns_ng=${chinadns_ng:-0}
 			use_default_dns=${use_default_dns:-direct}
 			[ "$dns_mode" = "sing-box" ] && {
 				[ "$v2ray_dns_mode" = "doh" ] && remote_dns=${remote_dns_doh:-https://1.1.1.1/dns-query}
@@ -1491,7 +1491,7 @@ acl_app() {
 								eval node_${tcp_node}_$(echo -n "${remote_dns}" | md5sum | cut -d " " -f1)=${_dns_port}
 							}
 
-							[ "$chinadns_ng" = "1" ] && [ -n "$(first_type chinadns-ng)" ] && {
+							[ "$dns_shunt" = "chinadns-ng" ] && [ -n "$(first_type chinadns-ng)" ] && {
 								[ "$filter_proxy_ipv6" = "1" ] && dnsmasq_filter_proxy_ipv6=0
 								chinadns_port=$(expr $chinadns_port + 1)
 								_china_ng_listen="127.0.0.1#${chinadns_port}"
@@ -1766,10 +1766,11 @@ LOCALHOST_PROXY=$(config_t_get global localhost_proxy 1)
 	LOCALHOST_UDP_PROXY_MODE=$UDP_PROXY_MODE
 }
 CLIENT_PROXY=$(config_t_get global client_proxy 1)
+DNS_SHUNT=$(config_t_get global dns_shunt dnsmasq)
+[ -z "$(first_type $DNS_SHUNT)" ] && DNS_SHUNT="dnsmasq"
 DNS_MODE=$(config_t_get global dns_mode tcp)
 DNS_CACHE=0
 REMOTE_DNS=$(config_t_get global remote_dns 1.1.1.1:53 | sed 's/#/:/g' | sed -E 's/\:([^:]+)$/#\1/g')
-CHINADNS_NG=$(config_t_get global chinadns_ng 0)
 USE_DEFAULT_DNS=$(config_t_get global use_default_dns direct)
 FILTER_PROXY_IPV6=$(config_t_get global filter_proxy_ipv6 0)
 dns_listen_port=${DNS_PORT}

sing-box/Makefile

@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sing-box
-PKG_VERSION:=1.8.11
+PKG_VERSION:=1.8.12
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=d6c33792c694b817ac86c9baa5d73a8112deea341d4a36c83fe782efa8bf3548
+PKG_HASH:=802eb5e202ac1dd846b1f529b3df9e5d69452182fd5d70f7c8f2a819c9e86162
 
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=LICENSE