diff --git a/apfree-wifidog/Makefile b/apfree-wifidog/Makefile index 9e8d2079e..26bc9b235 100644 --- a/apfree-wifidog/Makefile +++ b/apfree-wifidog/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apfree-wifidog PKG_VERSION:=master -PKG_RELEASE:=27 +PKG_RELEASE:=28 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/liudf0716/apfree-wifidog.git -PKG_SOURCE_VERSION:=9a7dc8cad95c70aaf705e8e0a0d87d52f662b416 +PKG_SOURCE_VERSION:=e97cffe3b0a65a1f7d5082ca30d8db36b82efcd3 PKG_MIRROR_HASH:=skip PKG_MAINTAINER:=Dengfeng Liu diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua index 1d5b0a569..6e1cb5100 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -313,9 +313,11 @@ o.default = "223.5.5.5" o:value("223.5.5.5") o:value("223.6.6.6") o:value("119.29.29.29") +o:value("180.76.76.76") o:value("180.184.1.1") o:value("180.184.2.2") o:value("114.114.114.114") +o:value("114.114.115.115") o:depends("direct_dns_mode", "udp") o = s:taboption("DNS", Value, "direct_dns_tcp", translate("Direct DNS")) @@ -325,6 +327,8 @@ o:value("223.5.5.5") o:value("223.6.6.6") o:value("180.184.1.1") o:value("180.184.2.2") +o:value("114.114.114.114") +o:value("114.114.115.115") o:depends("direct_dns_mode", "tcp") o = s:taboption("DNS", Value, "direct_dns_dot", translate("Direct DNS DoT")) @@ -333,6 +337,8 @@ o:value("tls://dot.pub@1.12.12.12") o:value("tls://dot.pub@120.53.53.53") o:value("tls://dot.360.cn@36.99.170.86") o:value("tls://dot.360.cn@101.198.191.4") +o:value("tls://dns.alidns.com@223.5.5.5") +o:value("tls://dns.alidns.com@223.6.6.6") o:value("tls://dns.alidns.com@2400:3200::1") o:value("tls://dns.alidns.com@2400:3200:baba::1") o.validate = chinadns_dot_validate diff --git a/luci-app-vnt/root/etc/init.d/vnt b/luci-app-vnt/root/etc/init.d/vnt index 3a6f89512..a086b1091 100644 --- a/luci-app-vnt/root/etc/init.d/vnt +++ b/luci-app-vnt/root/etc/init.d/vnt @@ -434,7 +434,7 @@ start_vnts() { if [ ! -z "$white_Token" ] ; then if [[ "$(grep "list white_Token" /etc/config/vnt | awk '{print $3}' | wc -l ) " -eq 1 ]]; then - procd_append_param command --white-token "$white_Tokenr" + procd_append_param command --white-token "$white_Token" else for white_Tokens in $(cat /etc/config/vnt | grep 'list white_Token' | awk -F 'list white_Token' '{print $2}' | sed "s/'/\n/g" | tr -d " ' "); do procd_append_param command --white-token "$white_Tokens" diff --git a/v2ray-core/Makefile b/v2ray-core/Makefile index b8f1859b0..667540825 100644 --- a/v2ray-core/Makefile +++ b/v2ray-core/Makefile @@ -5,8 +5,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray-core -PKG_VERSION:=5.16.1 -PKG_RELEASE:=91 +PKG_VERSION:=5.17.1 +PKG_RELEASE:=92 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)?