update 2026-08-14 00:51:05

dae/Makefile

@@ -10,7 +10,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9b40cd67c1c6a799f28ee9879d43f7f5b527683f
+PKG_SOURCE_VERSION:=e31cf617518ac7f3658084e9ec2035e3b53dc08a
 PKG_SOURCE_URL:=https://github.com/olicesx/dae.git
 PKG_MIRROR_HASH:=skip
 

luci-app-passwall/luasrc/model/cbi/passwall/server/user_config.lua

@@ -19,6 +19,19 @@ s.dynamic = false
 o = s:option(Value, "username", translate("Username"))
 o.datatype = "and(uciname,maxlength(24))"
 o.rmempty = false
+function o.validate(self, value, section)
+	local exists = false
+	m.uci:foreach("passwall_server", "user", function(s)
+		if s[".name"] ~= section and s.username == value then
+			exists = true
+			return false
+		end
+	end)
+	if exists then
+		return nil, translate("This username already exists.")
+	end
+	return value
+end
 
 o = s:option(Value, "password",  translate("Password"))
 o.rmempty = false

luci-app-passwall/luasrc/passwall/util_hysteria2.lua

@@ -9,7 +9,7 @@ function gen_config_server(node)
 	if node.users and #node.users > 0 then
 		users = {}
 		for i, v in ipairs(node.users) do
-			local user = uci:get_all("passwall2_server", v) or {}
+			local user = uci:get_all("passwall_server", v) or {}
 			if user[".type"] == "user" then
 				users[user.username] = user.password
 			end

luci-app-passwall/luasrc/passwall/util_shadowsocks.lua

@@ -6,7 +6,7 @@ local jsonc = api.jsonc
 function gen_config_server(node)
 	local user = nil
 	if node.user then
-		user = uci:get_all("passwall2_server", node.user)
+		user = uci:get_all("passwall_server", node.user)
 	end
 	local config = {}
 	config.server_port = tonumber(node.port)

luci-app-passwall/luasrc/passwall/util_sing-box.lua

@@ -771,7 +771,7 @@ function gen_config_server(node)
 	if node.users and #node.users > 0 then
 		users = {}
 		for i, v in ipairs(node.users) do
-			local user = uci:get_all("passwall2_server", v) or {}
+			local user = uci:get_all("passwall_server", v) or {}
 			if user[".type"] == "user" then
 				local u = {}
 				if node.protocol == "mixed" or node.protocol == "socks" or node.protocol == "http" or node.protocol == "naive" then

luci-app-passwall/luasrc/passwall/util_xray.lua

@@ -493,7 +493,7 @@ function gen_config_server(node)
 	if node.users and #node.users > 0 then
 		users = {}
 		for i, v in ipairs(node.users) do
-			local user = uci:get_all("passwall2_server", v) or {}
+			local user = uci:get_all("passwall_server", v) or {}
 			if user[".type"] == "user" then
 				local u = {}
 				if node.protocol == "socks" or node.protocol == "http" then

luci-app-passwall/po/zh-cn/passwall.po

@@ -1520,8 +1520,8 @@ msgstr "匿名"
 msgid "User Password"
 msgstr "账号密码"
 
-msgid "Username and Password must be used together!"
-msgstr "账号和密码必须同时使用！"
+msgid "This username already exists."
+msgstr "该用户名已存在。"
 
 msgid "Node Number"
 msgstr "节点数量"

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

@@ -332,7 +332,7 @@ run_socks() {
 	[ -n "$config_file" ] && [ -z "$(echo ${config_file} | grep $TMP_PATH)" ] && config_file=$TMP_PATH/$config_file
 	[ -n "$http_port" ] || http_port=0
 	[ -n "$http_config_file" ] && [ -z "$(echo ${http_config_file} | grep $TMP_PATH)" ] && http_config_file=$TMP_PATH/$http_config_file
-	if [ -n "$log_file" ] && [ -z "$(echo ${log_file} | grep $TMP_PATH)" ]; then
+	if [ -n "$log_file" ] && [ "$log_file" != "/dev/null" ] && [ -z "$(echo ${log_file} | grep $TMP_PATH)" ]; then
 		log_file=$TMP_PATH/$log_file
 	else
 		log_file="/dev/null"
@@ -535,7 +535,7 @@ run_redir() {
 	eval_set_val "$@"
 	local tcp_node_socks_flag tcp_node_http_flag
 	[ -n "$config_file" ] && [ -z "$(echo ${config_file} | grep $TMP_PATH)" ] && config_file=${GLOBAL_ACL_PATH}/${config_file}
-	if [ -n "$log_file" ] && [ -z "$(echo ${log_file} | grep $TMP_PATH)" ]; then
+	if [ -n "$log_file" ] && [ "$log_file" != "/dev/null" ] && [ -z "$(echo ${log_file} | grep $TMP_PATH)" ]; then
 		log_file=${GLOBAL_ACL_PATH}/${log_file}
 	else
 		log_file="/dev/null"
@@ -2055,6 +2055,7 @@ get_config() {
 			DNSMASQ_CONF_DIR="/tmp/dnsmasq.d"
 		fi
 	fi
+	[ -d "$DNSMASQ_CONF_DIR" ] || mkdir -p "$DNSMASQ_CONF_DIR"
 	set_cache_var GLOBAL_DNSMASQ_CONF ${DNSMASQ_CONF_DIR}/dnsmasq-${CONFIG}.conf
 	set_cache_var GLOBAL_DNSMASQ_CONF_PATH ${GLOBAL_ACL_PATH}/dnsmasq.d
 

luci-app-passwall/root/usr/share/passwall/helper_dnsmasq.lua

@@ -789,9 +789,11 @@ function add_rule(var)
 		end
 		if #conf_lines > 0 then
 			local conf_out = io.open(DNSMASQ_CONF_FILE, "a")
-			conf_out:write(table.concat(conf_lines, "\n"))
-			conf_out:write("\n")
-			conf_out:close()
+			if conf_out then
+				conf_out:write(table.concat(conf_lines, "\n"))
+				conf_out:write("\n")
+				conf_out:close()
+			end
 		end
 	end
 

v2ray-geodata/Makefile

@@ -21,13 +21,13 @@ define Download/geoip
   HASH:=c67bd077eb102cec74fab759b73d17f99275f56af10a87c14d9fd983508f5ce1
 endef
 
-GEOSITE_VER:=20260812055957
+GEOSITE_VER:=20260813115850
 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
 define Download/geosite
   URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
   URL_FILE:=dlc.dat
   FILE:=$(GEOSITE_FILE)
-  HASH:=c2388340f01a772484882e4e2c7a0e05d4cf21a0c22dba5d5b78c3359348630b
+  HASH:=b9a7877c99b2ab7580366d764e345789d6bbb8cb02579266346ada6e48070222
 endef
 
 GEOSITE_IRAN_VER:=202608100039