diff --git a/dnsproxy/Makefile b/dnsproxy/Makefile index 03c52139d..8824d2aff 100644 --- a/dnsproxy/Makefile +++ b/dnsproxy/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsproxy -PKG_VERSION:=0.65.0 +PKG_VERSION:=0.65.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=12720de6f1540aee7d3c08b6b32e602d05126a8c55f251bbb94d379306608241 +PKG_HASH:=7c863404075daf76f1c6b291cc473670cbc45651af8f409e488c10a47fb73117 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=Apache-2.0 diff --git a/luci-app-natter2/Makefile b/luci-app-natter2/Makefile index 0a63966df..e7d3ebe96 100755 --- a/luci-app-natter2/Makefile +++ b/luci-app-natter2/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-natter2 PKG_VERSION:=1.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 -LUCI_TITLE:=LuCI Support for Natter v2.0.0-rc1 +LUCI_TITLE:=LuCI Support for Natter v2.0.0-rc2 LUCI_PKGARCH:=all LUCI_DEPENDS:=+natter2 diff --git a/luci-app-natter2/luasrc/model/cbi/natter2/base.lua b/luci-app-natter2/luasrc/model/cbi/natter2/base.lua index 938509e55..088d16fb1 100755 --- a/luci-app-natter2/luasrc/model/cbi/natter2/base.lua +++ b/luci-app-natter2/luasrc/model/cbi/natter2/base.lua @@ -22,8 +22,6 @@ if check_file("/tmp/natter2_nat_type") then nat_check = s:option (Button, "nat_check", translate("Check NAT Status"), translate("") .. "

" .. natter_nat_type_tcp .. "

" .. natter_nat_type_udp) else nat_check = s:option (Button, "nat_check", translate("Check NAT Status"), translate("Tips") - .. [[
]] .. translate("Recommended to accept high UDP ports in system firewall") - .. [[
]] .. translate("Turn off transparent proxies to ensure detection accuracy") .. [[
]] .. translate("After clicking Exec button, please wait for the luci to refresh")) end diff --git a/luci-app-natter2/luasrc/model/cbi/natter2/instances.lua b/luci-app-natter2/luasrc/model/cbi/natter2/instances.lua index fa053646b..01d4b51f4 100755 --- a/luci-app-natter2/luasrc/model/cbi/natter2/instances.lua +++ b/luci-app-natter2/luasrc/model/cbi/natter2/instances.lua @@ -1,11 +1,11 @@ -m = Map("natter2",translate("Instances Settings"), +m = Map("natter2", translate("Instances Settings"), translate("") .. [[]] .. translate("Instructions") .. [[]]) -m.redirect=luci.dispatcher.build_url("admin","network","natter2") +m.redirect = luci.dispatcher.build_url("admin", "network", "natter2") -s = m:section(NamedSection,arg[1],"instances","") +s = m:section(NamedSection, arg[1], "instances", "") s.addremove = false s.dynamic = false @@ -13,18 +13,18 @@ local function check_binary(e) return luci.sys.exec('which "%s" 2> /dev/null' % e) ~= "" and true or false end -enable_instance = s:option(Flag,"enable_instance",translate("Enable")) +enable_instance = s:option(Flag, "enable_instance", translate("Enable")) local e = luci.sys.exec("cut -d '-' -f1 /proc/sys/kernel/random/uuid 2> /dev/null") -id = s:option(Value,"id",translate("ID")) +id = s:option(Value, "id", translate("ID")) id.default = e -remark = s:option(Value,"remark",translate("Remark")) +remark = s:option(Value, "remark", translate("Remark")) remark.rmempty=false -protocol = s:option(ListValue,"protocol",translate("Protocol")) -protocol:value('tcp',translate("TCP")) -protocol:value('udp',translate("UDP")) +protocol = s:option(ListValue, "protocol", translate("Protocol")) +protocol:value('tcp', translate("TCP")) +protocol:value('udp', translate("UDP")) protocol.default = 'tcp' enable_stun_server = s:option(Flag, "enable_stun_server", translate("Enable Stun Server"), translate("Using customized STUN server")) @@ -37,11 +37,11 @@ keepalive_server = s:option(Value, "keepalive_server", translate("Keepalive Serv keepalive_server.rmempty = true keepalive_server:depends({enable_keepalive_server = "1"}) -interval = s:option(Value,"interval",translate("Interval (Seconds)"),translate("The number of seconds between keepalive")) +interval = s:option(Value, "interval", translate("Interval (Seconds)"), translate("The number of seconds between keepalive")) interval.default = 15 interval.datatype = "uinteger" -enable_bonding = s:option(Flag,"enable_bonding",translate("Enable Bonding Options")) +enable_bonding = s:option(Flag, "enable_bonding", translate("Enable Bonding Options"), translate("Usually there is no need to enable binding")) enable_bonding.rmempty = true bonding_interface = s:option(Value, "bonding_interface", translate("Bonding Interface")) bonding_interface.rmempty = true @@ -53,25 +53,25 @@ bonding_port.rmempty = true bonding_port.default = '0' bonding_port:depends({enable_bonding = "1"}) -enable_forwarding = s:option(Flag,"enable_forwarding",translate("Enable Forwarding Options"),translate("Forwarding to internal devices")) +enable_forwarding = s:option(Flag, "enable_forwarding", translate("Enable Forwarding Options"), translate("Forwarding to internal devices")) -forwarding_method = s:option(ListValue,"forwarding_method",translate("Forwarding Method"), +forwarding_method = s:option(ListValue, "forwarding_method", translate("Forwarding Method"), translate("") .. [[]] .. translate("Instructions for forwarding method") .. [[]]) -forwarding_method:value('socket',translate("socket (Integrated)")) +forwarding_method:value('socket', translate("socket (Not Recommended)")) if check_binary("iptables") then - forwarding_method:value('iptables',translate("iptables (Kernel)")) + forwarding_method:value('iptables', translate("iptables (Recommended)")) end if check_binary("nftables") then - forwarding_method:value('nftables',translate("nftables (Kernel)")) + forwarding_method:value('nftables', translate("nftables (Recommended)")) end if check_binary("socat") then - forwarding_method:value('socat',translate("socat")) + forwarding_method:value('socat', translate("socat")) end if check_binary("gost") then - forwarding_method:value('gost',translate("gost")) + forwarding_method:value('gost', translate("gost")) end forwarding_method.default = 'socket' forwarding_method:depends({enable_forwarding = "1"}) @@ -88,24 +88,24 @@ target_port = s:option(Value, "target_port", translate("Target Port")) target_port.datatype = "port" target_port:depends({enable_forwarding = "1"}) -enable_forwarding_retry = s:option(Flag,"enable_forwarding_retry",translate("Enable Forwarding Retry"),translate("Retry until the target port is open")) +enable_forwarding_retry = s:option(Flag, "enable_forwarding_retry", translate("Enable Forwarding Retry"), translate("Retry until the target port is open")) enable_forwarding_retry:depends({enable_forwarding = "1"}) enable_forwarding_retry.default = 1 enable_forwarding_retry.rmempty = false -enable_quit = s:option(Flag,"enable_quit",translate("Enable Quit"),translate("Exit immediately when the mapping address changes")) +enable_quit = s:option(Flag, "enable_quit", translate("Enable Quit"), translate("Exit immediately when the mapping address changes")) enable_quit.default = "0" -delay = s:option(Value,"delay",translate("Start delay (Seconds)"),translate("Time to wait before starting this instance")) +delay = s:option(Value,"delay", translate("Start delay (Seconds)"), translate("Time to wait before starting this instance")) delay.default = 0 delay.datatype = "uinteger" delay.rmempty = false -log_level = s:option(ListValue,"log_level",translate("Log Level")) -log_level:value('normal',translate("Normal")) -log_level:value('verbose',translate("Verbose")) +log_level = s:option(ListValue, "log_level", translate("Log Level")) +log_level:value('normal', translate("Normal")) +log_level:value('verbose', translate("Verbose")) -enable_notify = s:option(Flag,"enable_notify",translate("Enable Notify Script")) +enable_notify = s:option(Flag,"enable_notify", translate("Enable Notify Script")) enable_notify.rmempty = false notify_path = s:option(Value, "notify_path", translate("Notify Script Path"), translate("") diff --git a/luci-app-natter2/luasrc/model/cbi/natter2/log.lua b/luci-app-natter2/luasrc/model/cbi/natter2/log.lua index 14e27ccb6..24eecdf7e 100755 --- a/luci-app-natter2/luasrc/model/cbi/natter2/log.lua +++ b/luci-app-natter2/luasrc/model/cbi/natter2/log.lua @@ -1,5 +1,6 @@ -log=SimpleForm("natter2") -log.reset=false -log.submit=false +log = SimpleForm("natter2") +log.reset = false +log.submit = false log:append(Template("natter2/natter_log")) + return log diff --git a/luci-app-natter2/po/zh-cn/natter2.po b/luci-app-natter2/po/zh-cn/natter2.po index b18f9e57a..0d85afbe8 100755 --- a/luci-app-natter2/po/zh-cn/natter2.po +++ b/luci-app-natter2/po/zh-cn/natter2.po @@ -85,14 +85,14 @@ msgstr "转发方式" msgid "Instructions for forwarding method" msgstr "转发方式说明" -msgid "socket (Integrated)" -msgstr "Socket（内置）" +msgid "socket (Not Recommended)" +msgstr "Socket（内置, 不推荐）" -msgid "iptables (Kernel)" -msgstr "iptables（内核级）" +msgid "iptables (Recommended)" +msgstr "iptables（防火墙, 推荐）" -msgid "nftables (Kernel)" -msgstr "nftables（内核级 新版）" +msgid "nftables (Recommended)" +msgstr "nftables（防火墙, 推荐）" msgid "Target Address" msgstr "目标地址" @@ -145,11 +145,5 @@ msgstr "使用自定义的保活服务器" msgid "Tips" msgstr "提示" -msgid "Recommended to accept high UDP ports in system firewall" -msgstr "建议在防火墙中放行高位 UDP 端口" - -msgid "Turn off transparent proxies to ensure detection accuracy" -msgstr "关闭透明代理以确保检测准确性" - msgid "After clicking Exec button, please wait for the luci to refresh" msgstr "点击执行后，请耐心等待页面自动刷新" diff --git a/luci-app-natter2/po/zh_Hans/natter2.po b/luci-app-natter2/po/zh_Hans/natter2.po index b18f9e57a..0d85afbe8 100755 --- a/luci-app-natter2/po/zh_Hans/natter2.po +++ b/luci-app-natter2/po/zh_Hans/natter2.po @@ -85,14 +85,14 @@ msgstr "转发方式" msgid "Instructions for forwarding method" msgstr "转发方式说明" -msgid "socket (Integrated)" -msgstr "Socket（内置）" +msgid "socket (Not Recommended)" +msgstr "Socket（内置, 不推荐）" -msgid "iptables (Kernel)" -msgstr "iptables（内核级）" +msgid "iptables (Recommended)" +msgstr "iptables（防火墙, 推荐）" -msgid "nftables (Kernel)" -msgstr "nftables（内核级 新版）" +msgid "nftables (Recommended)" +msgstr "nftables（防火墙, 推荐）" msgid "Target Address" msgstr "目标地址" @@ -145,11 +145,5 @@ msgstr "使用自定义的保活服务器" msgid "Tips" msgstr "提示" -msgid "Recommended to accept high UDP ports in system firewall" -msgstr "建议在防火墙中放行高位 UDP 端口" - -msgid "Turn off transparent proxies to ensure detection accuracy" -msgstr "关闭透明代理以确保检测准确性" - msgid "After clicking Exec button, please wait for the luci to refresh" msgstr "点击执行后，请耐心等待页面自动刷新" diff --git a/natter2/Makefile b/natter2/Makefile index 2d7831c68..d3d197aac 100755 --- a/natter2/Makefile +++ b/natter2/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=natter2 -PKG_VERSION=2.0.0-rc1 +PKG_VERSION=2.0.0-rc2 PKG_RELEASE:=$(AUTORELEASE) -PKG_SOURCE_VERSION:=ba7385de8edf869486f01b724780497939eccd24 +PKG_SOURCE_VERSION:=6e1c66db06e1bb746e55288da1b9fb012bf701b5 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz