From 96444b8f9ca50f0b1f32f666e19870ef929e5a25 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 31 Oct 2021 09:03:02 +0800
Subject: [PATCH] update-10.31

---
 .../root/etc/init.d/packages                              | 8 ++++----
 .../root/etc/uci-defaults/luci-gpsysupgrade               | 1 +
 .../luasrc/view/shadowsocksr/server_list.htm              | 2 +-
 luci-app-ssr-plus/root/etc/init.d/shadowsocksr            | 5 +++--
 .../root/usr/share/shadowsocksr/gen_config.lua            | 2 +-
 my-default-settings/Makefile                              | 1 -
 6 files changed, 10 insertions(+), 9 deletions(-)
 rename my-default-settings/files/packages.init => luci-app-gpsysupgrade/root/etc/init.d/packages (84%)

diff --git a/my-default-settings/files/packages.init b/luci-app-gpsysupgrade/root/etc/init.d/packages
similarity index 84%
rename from my-default-settings/files/packages.init
rename to luci-app-gpsysupgrade/root/etc/init.d/packages
index 853daf8d7..def5462d4 100644
--- a/my-default-settings/files/packages.init
+++ b/luci-app-gpsysupgrade/root/etc/init.d/packages
@@ -33,7 +33,7 @@ fi
 			while :; do
 			opkg update | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1
 				if [ "$?" == "0" ]; then
-					def="$(opkg list-upgradable | cut -f 1 -d ' ' | grep -vE 'opkg|luci-lib-fs|firewall|base-files|luci-base|busybox|nginx-|dnsmasq-full|coremark|miniupnpd|luci-mod-network|luci-mod-status|luci-mod-system')"
+					def="$(opkg list-upgradable | cut -f 1 -d ' ' | grep -vE 'opkg|luci-lib-fs|firewall|base-files|luci-base|busybox|^?nginx($|-)|dnsmasq-full|coremark|miniupnpd|luci-mod-network|luci-mod-status|luci-mod-system')"
 					if [ ! -f /etc/inited ]; then
 						insed="$(cat $BKOPKG/user_installed.opkg)"
 					fi
@@ -41,9 +41,9 @@ fi
 					if [ "$upopkg" != " " ]; then
 							for ipk in $upopkg; do
 								while :; do
-									opkg install --force-overwrite --force-checksum --force-depends $ipk | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1 >/dev/null 2>&1 || true
+									opkg install --force-overwrite --force-checksum --force-depends $ipk 2>&1 | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1 || true
 									if [[ $ipk == luci-app-* ]]; then
-										opkg install --force-overwrite --force-checksum luci-i18n-"$(echo $ipk | cut -d - -f 3-4)"-zh-cn | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1 >/dev/null 2>&1 || true
+										opkg install --force-overwrite --force-checksum luci-i18n-"$(echo $ipk | cut -d - -f 3-4)"-zh-cn 2>&1 | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1 || true
 									fi
 									[[ "$(opkg list-installed | grep $ipk)" ]] && {
 										break
@@ -61,7 +61,7 @@ fi
 					fi
 					[[ -f $BKOPKG/failed.txt &&  -f /etc/inited ]] && {
 						for ipk in $(cat $BKOPKG/failed.txt); do
-							opkg install --force-overwrite --force-checksum --force-depends $ipk | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1 >/dev/null 2>&1 || true
+							opkg install --force-overwrite --force-checksum --force-depends $ipk 2>&1 | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1 || true
 							[[ "$(opkg list-installed | grep $ipk)" ]] && {
 								sed -i '/$ipk/d' $BKOPKG/failed.txt
 							}
diff --git a/luci-app-gpsysupgrade/root/etc/uci-defaults/luci-gpsysupgrade b/luci-app-gpsysupgrade/root/etc/uci-defaults/luci-gpsysupgrade
index b8d0fdb48..247d31e7f 100644
--- a/luci-app-gpsysupgrade/root/etc/uci-defaults/luci-gpsysupgrade
+++ b/luci-app-gpsysupgrade/root/etc/uci-defaults/luci-gpsysupgrade
@@ -1 +1,2 @@
+chmod +x /etc/init.d/packages >/dev/null 2>&1
 rm -rf /tmp/luci-modulecache /tmp/luci-indexcache*
diff --git a/luci-app-ssr-plus/luasrc/view/shadowsocksr/server_list.htm b/luci-app-ssr-plus/luasrc/view/shadowsocksr/server_list.htm
index a59e36dcb..259cb7fff 100644
--- a/luci-app-ssr-plus/luasrc/view/shadowsocksr/server_list.htm
+++ b/luci-app-ssr-plus/luasrc/view/shadowsocksr/server_list.htm
@@ -55,7 +55,7 @@
 			thread()
 		}
 	})
-	
+
 	function cbi_row_drop(fromId, toId, store, isToBottom) {
 		var fromNode = document.getElementById(fromId);
 		var toNode = document.getElementById(toId);
diff --git a/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
index ffa01a860..ef72038a4 100755
--- a/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
+++ b/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
@@ -326,7 +326,7 @@ gen_config_file() { #server1 type2 code3 local_port4 socks_port5 threads5
 			lua /usr/share/shadowsocksr/gen_config.lua $1 redir $4 $5 >$config_file
 			;;
 		3)
-			lua /usr/share/shadowsocksr/gen_config.lua $1 redir $4 $5 >$config_file
+			lua /usr/share/shadowsocksr/gen_config.lua $1 redir $4 >$config_file
 			lua /usr/share/shadowsocksr/gen_config.lua $1 socks $tmp_port >$shunt_dns_config_file
 			;;
 		4)
@@ -564,7 +564,8 @@ Start_Run() {
 		echolog "Main node:$($(first_type $type) --version 2>&1 | head -1) , $threads Threads Started!"
 		;;
 	naiveproxy)
-		gen_config_file $GLOBAL_SERVER $type 1 $tcp_port
+		[ "$(uci_get_by_type global threads 0)" == "0" ] && threads=1
+		gen_config_file $GLOBAL_SERVER $type 1 $tcp_port $threads
 		ln_start_bin $(first_type naive) naive $tcp_config_file
 		echolog "Main node:$($(first_type naive) --version 2>&1 | head -1) , $threads Threads Started!"
 		;;
diff --git a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
index e60b69c37..246ba4a06 100755
--- a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
+++ b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
@@ -221,7 +221,7 @@ local trojan = {
 local naiveproxy = {
 	proxy = (server.username and server.password and server.server and server.server_port) and "https://" .. server.username .. ":" .. server.password .. "@" .. server.server .. ":" .. server.server_port,
 	listen = (proto == "redir") and "redir" .. "://0.0.0.0:" .. tonumber(local_port) or "socks" .. "://0.0.0.0:" .. tonumber(local_port),
-	concurrency = (socks_port ~= "0") and tonumber(socks_port) or "1"
+	["insecure-concurrency"] = (socks_port ~= "0") and tonumber(socks_port) or "1"
 }
 local ss = {
 	server = (server.kcp_enable == "1") and "127.0.0.1" or server.server,
diff --git a/my-default-settings/Makefile b/my-default-settings/Makefile
index 98fee0f4c..76d3f00a7 100644
--- a/my-default-settings/Makefile
+++ b/my-default-settings/Makefile
@@ -38,7 +38,6 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DATA) ./files/wifi-init.sh $(1)/lib/wifi/wifi-init.sh
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/wifi-init.init $(1)/etc/init.d/wifi-init
-	$(INSTALL_BIN) ./files/packages.init $(1)/etc/init.d/packages
 	$(INSTALL_DIR) $(1)/etc/profile.d
 	$(INSTALL_BIN) ./files/sysinfo.sh $(1)/etc/profile.d/sysinfo.sh
 	$(INSTALL_DIR) $(1)/sbin