update 2025-05-09 00:28:33

luci-app-passwall/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
-PKG_VERSION:=25.5.2
+PKG_VERSION:=25.5.8
 PKG_RELEASE:=1
 
 PKG_CONFIG_DEPENDS:= \

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

@@ -180,8 +180,17 @@ listen %s
 ]], port, port))
 	end
 
+	local count_M, count_B = 1, 1
 	for i, o in ipairs(listens[port]) do
-		local remark = o.server_remark
+		local remark = o.server_remark or ""
+		-- 防止重名导致无法运行
+		if tostring(o.backup) ~= "1" then
+			remark = "M" .. count_M .. "-" .. remark
+			count_M = count_M + 1
+		else
+			remark = "B" .. count_B .. "-" .. remark
+			count_B = count_B + 1
+		end
 		local server = o.server_address .. ":" .. o.server_port
 		local server_conf = "server {{remark}} {{server}} weight {{weight}} {{resolvers}} check inter {{inter}} rise 1 fall 3 {{backup}}"
 		server_conf = server_conf:gsub("{{remark}}", remark)
@@ -193,7 +202,7 @@ listen %s
 		end
 		server_conf = server_conf:gsub("{{resolvers}}", resolvers)
 		server_conf = server_conf:gsub("{{inter}}", tonumber(health_check_inter) .. "s")
-		server_conf = server_conf:gsub("{{backup}}",  o.backup == "1" and "backup" or "")
+		server_conf = server_conf:gsub("{{backup}}", tostring(o.backup) == "1" and "backup" or "")
 
 		f_out:write("	" .. server_conf .. "\n")
 

natflow/Makefile

@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=natflow
-PKG_VERSION:=20250505
+PKG_VERSION:=20250508
 
 PKG_SOURCE_URL:=https://codeload.github.com/ptpt52/natflow/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=33b58db109fef50282b15cde028a397ff6dbf940d7c26f6418eec511796efebd
+PKG_HASH:=3379bc94881921ccbec11b1ad127defe5e5814fd36c1e44ca69663b6b5d1d2f8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_MAINTAINER:=Chen Minqiang <ptpt52@gmail.com>