update 2025-01-17 00:24:40

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

@@ -179,7 +179,7 @@ restart()
 
 del_cru()
 {   
-    echo -e '#!/bin/sh \n\nSTART=99\nstart(){\necho "Service autotimesetrun started! " >> $LOG\n' > $TT
+    echo -e '#!/bin/sh /etc/rc.common\n\nSTART=99\nstart(){\necho "Service autotimesetrun started! " >> $LOG\n' > $TT
     sed -i '/timesethandler/d' $CR >/dev/null 2>&1
 }
 

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

@@ -1,5 +1,5 @@
 local api = require "luci.passwall.api"
-local uci = require "luci.model.uci".cursor()
+local uci = api.uci
 local appname = "passwall"
 local has_ss = api.is_finded("ss-redir")
 local has_ss_rust = api.is_finded("sslocal")

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

@@ -1,5 +1,5 @@
 local api = require "luci.passwall.api"
-local uci = require "luci.model.uci".cursor()
+local uci = api.uci
 local appname = "passwall"
 
 m = Map(appname)

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

@@ -58,8 +58,7 @@ for index, value in ipairs({"stop", "start", "restart"}) do
 end
 
 -- [[ Forwarding Settings ]]--
-s = m:section(TypedSection, "global_forwarding",
-			  translate("Forwarding Settings"))
+s = m:section(TypedSection, "global_forwarding", translate("Forwarding Settings"))
 s.anonymous = true
 s.addremove = false
 
@@ -124,13 +123,16 @@ if (os.execute("lsmod | grep -i REDIRECT >/dev/null") == 0 and os.execute("lsmod
 	o:value("redirect", "REDIRECT")
 	o:value("tproxy", "TPROXY")
 	o:depends("ipv6_tproxy", false)
+	o.remove = function(self, section)
+		-- 禁止在隐藏时删除
+	end
 
 	o = s:option(ListValue, "_tcp_proxy_way", translate("TCP Proxy Way"))
 	o.default = "tproxy"
 	o:value("tproxy", "TPROXY")
 	o:depends("ipv6_tproxy", true)
 	o.write = function(self, section, value)
-		return self.map:set(section, "tcp_proxy_way", value)
+		self.map:set(section, "tcp_proxy_way", value)
 	end
 
 	if os.execute("lsmod | grep -i ip6table_mangle >/dev/null") == 0 or os.execute("lsmod | grep -i nft_tproxy >/dev/null") == 0 then
@@ -219,6 +221,7 @@ if has_xray then
 	o = s_xray_noise:option(ListValue, "type", translate("Type"))
 	o:value("rand", "rand")
 	o:value("str", "str")
+	o:value("hex", "hex")
 	o:value("base64", "base64")
 
 	o = s_xray_noise:option(Value, "packet", translate("Packet"))

natflow/Makefile

@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=natflow
-PKG_VERSION:=20250115
+PKG_VERSION:=20250116
 
 PKG_SOURCE_URL:=https://codeload.github.com/ptpt52/natflow/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=b8bdf0f97134f098e8e80ff38ff10d85032c262a74949e8c77c7b9dee9f6bdeb
+PKG_HASH:=86ffeb9ef0c15ca2f043a3b980eecf4f60d3421583b34cb95f3bfe3c0fbd3c50
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_MAINTAINER:=Chen Minqiang <ptpt52@gmail.com>