🐤 Sync 2026-10-03 17:31:57

luci-app-passwall2/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall2
 PKG_VERSION:=26.10.1
-PKG_RELEASE:=134
+PKG_RELEASE:=135
 PKG_PO_VERSION:=$(PKG_VERSION)
 
 PKG_CONFIG_DEPENDS:= \

luci-app-passwall2/luasrc/passwall2/api.lua

@@ -215,7 +215,7 @@ end
 function exec_call(cmd)
 	math.randomseed(os.time())
 	local tag = "\x01__RC__" .. tostring(math.random(100000, 999999)) .. "\x01"
-	local f = io.popen('(' .. cmd .. '); printf "\\n' .. tag .. '%d" "$?"')
+	local f = io.popen('(' .. cmd .. ') 2>&1; printf "\\n' .. tag .. '%d" "$?"')
 	local out = f:read("*a") or ""
 	f:close()
 	local rc = out:match(tag .. "(%d+)%s*$")

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

@@ -55,10 +55,9 @@ function geo_convert_srs(var)
 	if not fs.access(output_srs_file) and bin then
 		local cmd = string.format("%q -type %q -action convert -input %q -list %q -output %q -lowmem=true",
 			bin, prefix, geo_path, rule_name, output_srs_file)
-		sys.call(cmd)
-		local status = fs.access(output_srs_file) and "success." or "failed!"
-		if status == "failed!" then
-			api.log(0, string.format("  - %s:%s convert to srs %s", prefix, rule_name, status))
+		local code, out = api.exec_call(cmd)
+		if code ~= 0 or not fs.access(output_srs_file) then
+			api.log(0, string.format("  - %s:%s convert to srs %s [%s]", prefix, rule_name, "failed!", out))
 		end
 	end
 end

luci-app-passwall2/root/usr/share/passwall2/nftables.sh

@@ -1025,7 +1025,3 @@ start)
 	;;
 *) ;;
 esac
-
-reload_service() {
-	restart
-}