diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile index b5e82569d..f118549eb 100644 --- a/luci-app-ssr-plus/Makefile +++ b/luci-app-ssr-plus/Makefile @@ -4,7 +4,7 @@ LUCI_TITLE:=luci-app-ssr-plus LUCI_PKGARCH:=all PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=193 -PKG_RELEASE:=26 +PKG_RELEASE:=27 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \ diff --git a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua index 1fd8e775b..d830624b2 100644 --- a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua +++ b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua @@ -197,7 +197,7 @@ if is_finded("chinadns-ng") then o:depends("pdnsd_enable", "6") o = s:option(Value, "chinadns_forward", translate("Domestic DNS Server")) - o:value("", translate("Disable ChinaDNS-NG")) + o:value("none", translate("Disable ChinaDNS-NG")) o:value("wan", translate("Use DNS from WAN")) o:value("wan_114", translate("Use DNS from WAN and 114DNS")) o:value("114.114.114.114:53", translate("Nanjing Xinfeng 114DNS (114.114.114.114)")) @@ -212,7 +212,7 @@ if is_finded("chinadns-ng") then o.description = translate("Custom DNS Server format as IP:PORT (default: disabled)") o.validate = function(self, value, section) if (section and value) then - if value == "wan" or value == "wan_114" then + if value == "none" or value == "wan" or value == "wan_114" then return value end diff --git a/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index 75113f356..0c6f69612 100755 --- a/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -589,7 +589,7 @@ get_host_ip() { [ -n "$ip" ] || ip="" local chinadns="$(uci_get_by_type global chinadns_forward)" - if [ -n "$chinadns" ] && [ "$ip" != "$host" ]; then + if [ -n "$chinadns" ] && [ "$chinadns" != "none" ] && [ "$ip" != "$host" ]; then grep -q "$host" "$TMP_DNSMASQ_PATH/chinadns_fixed_server.conf" 2>"/dev/null" || \ echo -e "address=/$host/$ip" >> "$TMP_DNSMASQ_PATH/chinadns_fixed_server.conf" fi @@ -954,7 +954,7 @@ start_dns() { if [ "$run_mode" = "router" ]; then local chinadns="$(uci_get_by_type global chinadns_forward)" - if [ -n "$chinadns" ]; then + if [ -n "$chinadns" ] && [ "$chinadns" != "none" ]; then local wandns="$(ifstatus wan | jsonfilter -e '@["dns-server"][0]' || echo "119.29.29.29")" case "$chinadns" in "wan") chinadns="$wandns" ;; diff --git a/luci-app-ssr-plus/root/usr/bin/ssr-monitor b/luci-app-ssr-plus/root/usr/bin/ssr-monitor index d9732d259..608a4f38f 100755 --- a/luci-app-ssr-plus/root/usr/bin/ssr-monitor +++ b/luci-app-ssr-plus/root/usr/bin/ssr-monitor @@ -208,18 +208,20 @@ while [ "1" == "1" ]; do #死循环 fi #chinadns-ng(china) if [ "$(uci -q get "dhcp.@dnsmasq[0]._unused_ssrp_changed")" = "1" ]; then - icount=$(ps_list | grep $TMP_BIN_PATH/chinadns-ng | grep -v grep | wc -l) - if [ "$icount" -lt 1 ]; then #如果进程挂掉就重启它 - logger -t "$NAME" "chinadns-ng tunnel error.restart!" - echolog "chinadns-ng tunnel error.restart!" - chinadns=$(uci_get_by_type global chinadns_forward) - wandns="$(ifstatus wan | jsonfilter -e '@["dns-server"][0]' || echo "119.29.29.29")" - case "$chinadns" in - "wan") chinadns="$wandns" ;; - ""|"wan_114") chinadns="$wandns,114.114.114.114" ;; - esac - kill -9 $(ps_list | grep $TMP_BIN_PATH/chinadns-ng | grep -v grep | awk '{print $1}') >/dev/null 2>&1 - ln_start_bin $(first_type chinadns-ng) chinadns-ng -l $china_dns_port -4 china -p 3 -c ${chinadns/:/#} -t 127.0.0.1#$dns_port -N -f -r + chinadns=$(uci_get_by_type global chinadns_forward) + if [ -n "$chinadns" ] && [ "$chinadns" != "none" ]; then + icount=$(ps_list | grep $TMP_BIN_PATH/chinadns-ng | grep -v grep | wc -l) + if [ "$icount" -lt 1 ]; then #如果进程挂掉就重启它 + logger -t "$NAME" "chinadns-ng tunnel error.restart!" + echolog "chinadns-ng tunnel error.restart!" + wandns="$(ifstatus wan | jsonfilter -e '@["dns-server"][0]' || echo "119.29.29.29")" + case "$chinadns" in + "wan") chinadns="$wandns" ;; + ""|"wan_114") chinadns="$wandns,114.114.114.114" ;; + esac + kill -9 $(ps_list | grep $TMP_BIN_PATH/chinadns-ng | grep -v grep | awk '{print $1}') >/dev/null 2>&1 + ln_start_bin $(first_type chinadns-ng) chinadns-ng -l $china_dns_port -4 china -p 3 -c ${chinadns/:/#} -t 127.0.0.1#$dns_port -N -f -r + fi fi fi done diff --git a/naiveproxy/Makefile b/naiveproxy/Makefile index 11b324a22..af239edb9 100644 --- a/naiveproxy/Makefile +++ b/naiveproxy/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=naiveproxy -PKG_VERSION:=148.0.7778.96 -PKG_RELEASE:=5 +PKG_VERSION:=149.0.7827.114 +PKG_RELEASE:=1 ARCH_PREBUILT:=$(ARCH_PACKAGES) diff --git a/natflow/Makefile b/natflow/Makefile index dcaa5ffc8..6c5653f19 100644 --- a/natflow/Makefile +++ b/natflow/Makefile @@ -10,12 +10,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=natflow PKG_VERSION:=20260531 -PKG_RELEASE:=13 +PKG_RELEASE:=14 PKG_SOURCE:=$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/ptpt52/natflow.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=15621bcb65719e12dc30c36cae15545e00f4fd6e +PKG_SOURCE_VERSION:=9bc88d11177ab9c85e62532f2f07ef0d40fb2b55 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Chen Minqiang PKG_LICENSE:=GPL-2.0