Merge Mainline

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

package/devel/valgrind/patches/130-mips_fix_soft_float.patch

@@ -0,0 +1,68 @@
+Disable the valgrind helpers which use MIPS floating point operations 
+when floating point support is deactivated in the toolchain.
+
+The fix from this commit is not sufficient any more:
+https://sourceware.org/git/?p=valgrind.git;a=commitdiff;h=869fcf2f6739f17b4eff36ec68f8dca826c8afeb
+
+This fixes the following error message when compiling with a GCC 10 MIPS BE 32:
+---------------------------------------------------------
+../VEX/priv/guest_mips_helpers.c: In function 'mips_dirtyhelper_calculate_FCSR_fp32':
+../VEX/priv/guest_mips_helpers.c:640:10: error: the register '$f21' cannot be clobbered in 'asm' for the current target
+  640 |          ASM_VOLATILE_UNARY32_DOUBLE(round.w.d)
+      |          ^
+---------------------------------------------------------
+
+--- a/VEX/priv/guest_mips_helpers.c
++++ b/VEX/priv/guest_mips_helpers.c
+@@ -617,6 +617,7 @@ extern UInt mips_dirtyhelper_calculate_F
+                                                    flt_op inst )
+ {
+    UInt ret = 0;
++#ifndef __mips_soft_float
+ #if defined(__mips__)
+    VexGuestMIPS32State* guest_state = (VexGuestMIPS32State*)gs;
+    UInt loFsVal, hiFsVal, loFtVal, hiFtVal;
+@@ -699,6 +700,7 @@ extern UInt mips_dirtyhelper_calculate_F
+          break;
+    }
+ #endif
++#endif
+    return ret;
+ }
+ 
+@@ -708,6 +710,7 @@ extern UInt mips_dirtyhelper_calculate_F
+                                                    flt_op inst )
+ {
+    UInt ret = 0;
++#ifndef __mips_soft_float
+ #if defined(__mips__) && ((__mips == 64) ||                                  \
+                           (defined(__mips_isa_rev) && (__mips_isa_rev >= 2)))
+ #if defined(VGA_mips32)
+@@ -860,6 +863,7 @@ extern UInt mips_dirtyhelper_calculate_F
+          break;
+    }
+ #endif
++#endif
+    return ret;
+ }
+ 
+--- a/coregrind/m_machine.c
++++ b/coregrind/m_machine.c
+@@ -1828,6 +1828,7 @@ Bool VG_(machine_get_hwcaps)( void )
+            we are using alternative way to determine FP mode */
+         ULong result = 0;
+ 
++#ifndef __mips_soft_float
+         if (!VG_MINIMAL_SETJMP(env_unsup_insn)) {
+            __asm__ volatile (
+               ".set push\n\t"
+@@ -1845,6 +1846,9 @@ Bool VG_(machine_get_hwcaps)( void )
+ 
+            fpmode = (result != 0x3FF0000000000000ull);
+         }
++#else
++	fpmode = 0;
++#endif
+      }
+ 
+      if (fpmode != 0)

package/lean/luci-app-ssr-plus/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-ssr-plus
 PKG_VERSION:=183
-PKG_RELEASE:=9
+PKG_RELEASE:=10
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun \

package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua

@@ -512,17 +512,15 @@ o = s:option(Flag, "tls_sessionTicket", translate("Session Ticket"))
 o:depends({type = "trojan", tls = true})
 o.default = "0"
 
--- [[ Trojan TLS ]]--
+-- [[ uTLS ]]--
 o = s:option(ListValue, "fingerprint", translate("Finger Print"))
 o:value("disable", translate("disable"))
 o:value("firefox", translate("firefox"))
 o:value("chrome", translate("chrome"))
-if is_finded("xray") then
-	o:value("safari", translate("safari"))
-	o:value("randomized", translate("random"))
-end
+o:value("safari", translate("safari"))
+o:value("randomized", translate("randomized"))
 o:depends({type = "v2ray", tls = true})
-o.default = "firefox"
+o.default = "disable"
 
 o = s:option(Value, "tls_host", translate("TLS Host"))
 o.datatype = "hostname"

package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr

@@ -26,7 +26,6 @@ server_config_file=
 shunt_dns_config_file=
 tmp_local_port=
 ARG_UDP=
-ARG_OTA=
 dns_port="5335"            #dns port
 tmp_dns_port="300"         #dns2socks temporary port
 tmp_udp_port="301"         #udp temporary port
@@ -340,9 +339,7 @@ start_udp() {
 	ss | ssr)
 		gen_config_file $UDP_RELAY_SERVER $type 2 $tmp_udp_port
 		ss_program="$(first_type ${type}local ${type}-redir)"
-		[ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] &&
-			local ss_extra_arg="--protocol redir -u" || local ss_extra_arg="-U"
-		ln_start_bin $ss_program ${type}-redir -c $udp_config_file $ss_extra_arg
+		ln_start_bin $ss_program ${type}-redir -c $udp_config_file
 		echolog "UDP TPROXY Relay:$(get_name $type) Started!"
 		;;
 	v2ray)
@@ -384,8 +381,7 @@ start_shunt() {
 	ss | ssr)
 		gen_config_file $SHUNT_SERVER $type 3 $tmp_shunt_port
 		ss_program="$(first_type ${type}local ${type}-redir)"
-		[ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] && local ss_extra_arg="--protocol redir"
-		ln_start_bin $ss_program ${type}-redir -c $shunt_config_file $ss_extra_arg
+		ln_start_bin $ss_program ${type}-redir -c $shunt_config_file
 		if [ -n "$tmp_local_port" ]; then
 			local tmp_port=$tmp_local_port
 		else
@@ -471,9 +467,7 @@ start_local() {
 	ss | ssr)
 		gen_config_file $LOCAL_SERVER $type 4 $local_port
 		ss_program="$(first_type ${type}local ${type}-local)"
-		[ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] &&
-			local ss_extra_arg="-U" || local ss_extra_arg="-u"
-		ln_start_bin $ss_program ${type}-local -c $local_config_file $ss_extra_arg
+		ln_start_bin $ss_program ${type}-local -c $local_config_file
 		echolog "Global_Socks5:$(get_name $type) Started!"
 		;;
 	v2ray)
@@ -534,13 +528,8 @@ Start_Run() {
 	ss | ssr)
 		gen_config_file $GLOBAL_SERVER $type 1 $tcp_port
 		ss_program="$(first_type ${type}local ${type}-redir)"
-		[ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] &&
-			{
-				local ss_extra_arg="--protocol redir"
-				case ${ARG_OTA} in '-u') ARG_OTA='-U' ;; esac
-			}
 		for i in $(seq 1 $threads); do
-			ln_start_bin "$ss_program" ${type}-redir -c $tcp_config_file $ARG_OTA $ss_extra_arg
+			ln_start_bin "$ss_program" ${type}-redir -c $tcp_config_file
 		done
 		echolog "Main node:$(get_name $type) $threads Threads Started!"
 		;;
@@ -605,16 +594,13 @@ load_config() {
 		mode="tcp,udp"
 		tcp_config_file=$TMP_PATH/tcp-udp-ssr-retcp.json
 		ARG_UDP="-u"
-		ARG_OTA="-u"
 		UDP_RELAY_SERVER=$GLOBAL_SERVER
 		;;
 	*)
 		mode="udp"
 		udp_config_file=$TMP_PATH/udp-only-ssr-reudp.json
 		ARG_UDP="-U"
-		ARG_OTA="-U"
 		start_udp
-		ARG_OTA=""
 		mode="tcp"
 		;;
 	esac

package/lean/luci-app-ssr-plus/root/etc/ssrplus/china_ssr.txt

@@ -1725,7 +1725,6 @@
 59.172.0.0/15
 59.174.0.0/15
 59.191.0.0/17
-59.191.240.0/20
 59.192.0.0/10
 60.0.0.0/13
 60.8.0.0/15
@@ -3977,7 +3976,6 @@
 103.146.124.0/23
 103.146.126.0/23
 103.146.138.0/23
-103.146.147.0/24
 103.146.230.0/23
 103.146.236.0/23
 103.146.252.0/23
@@ -4132,6 +4130,15 @@
 103.163.46.0/23
 103.163.74.0/23
 103.163.180.0/23
+103.164.4.0/23
+103.164.32.0/23
+103.164.40.0/23
+103.164.42.0/23
+103.164.64.0/23
+103.164.76.0/23
+103.164.178.0/23
+103.164.226.0/23
+103.165.44.0/23
 103.192.0.0/22
 103.192.4.0/22
 103.192.8.0/22
@@ -4411,7 +4418,6 @@
 103.205.252.0/22
 103.206.0.0/22
 103.206.44.0/22
-103.206.108.0/22
 103.206.148.0/22
 103.207.48.0/22
 103.207.104.0/22
@@ -6201,6 +6207,7 @@
 157.156.0.0/16
 157.255.0.0/16
 158.79.0.0/16
+159.27.0.0/16
 159.75.0.0/16
 159.226.0.0/16
 160.19.208.0/22
@@ -6267,6 +6274,7 @@
 163.177.0.0/16
 163.179.0.0/16
 163.204.0.0/16
+163.228.0.0/16
 164.52.0.0/17
 166.111.0.0/16
 167.139.0.0/16

package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua

@@ -124,7 +124,7 @@ local Xray = {
 				allowInsecure = (server.insecure == "1") and true or nil,
 				serverName = server.tls_host
 			} or nil,
-			xtlsSettings = (server.xtls == '1' and (server.insecure == "1" or server.tls_host or server.fingerprint)) and {
+			xtlsSettings = (server.xtls == '1' and (server.insecure == "1" or server.tls_host)) and {
 				-- xtls
 				allowInsecure = (server.insecure == "1") and true or nil,
 				serverName = server.tls_host
@@ -223,6 +223,7 @@ local ss = {
 	server_port = tonumber(server.server_port),
 	local_address = "0.0.0.0",
 	local_port = tonumber(local_port),
+	mode = (proto == "tcp,udp") and "tcp_and_udp" or proto .. "_only",
 	password = server.password,
 	method = server.encrypt_method_ss,
 	timeout = tonumber(server.timeout),

package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gfw2ipset.sh

@@ -18,7 +18,7 @@ case "$(uci_get_by_type global netflix_server nil)" in
 nil)
 	rm -f $TMP_DNSMASQ_PATH/netflix_forward.conf
 	;;
-$(uci_get_by_type global global_server nil) | same)
+$(uci_get_by_type global global_server nil) | $switch_server | same)
 	netflix $dns_port
 	;;
 *)

package/network/services/umdns/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=umdns
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/mdnsd.git
 PKG_SOURCE_PROTO:=git

package/network/services/umdns/files/umdns.json

@@ -1,34 +1,43 @@
 {
 	"whitelist": [
-		"read",
-		"write",
-		"writev",
-		"open",
-		"close",
-		"time",
-		"brk",
-		"ioctl",
-		"uname",
 		"bind",
+		"brk",
+		"clock_gettime",
+		"close",
 		"connect",
+		"epoll_create",
+		"epoll_create1",
+		"epoll_ctl",
+		"epoll_pwait",
+		"epoll_wait",
+		"exit",
+		"exit_group",
+		"fcntl",
+		"fcntl64",
+		"fstat",
 		"getsockname",
+		"ioctl",
+		"open",
+		"openat",
+		"pipe",
+		"pipe2",
+		"poll",
+		"ppoll",
+		"read",
+		"recvfrom",
 		"recvmsg",
+		"rt_sigaction",
+		"rt_sigprocmask",
+		"rt_sigreturn",
 		"sendmsg",
 		"sendto",
 		"setsockopt",
-		"socket",
-		"poll",
-		"fcntl64",
-		"fstat",
-		"epoll_create",
-		"epoll_ctl",
-		"epoll_wait",
-		"rt_sigaction",
 		"sigreturn",
-		"rt_sigreturn",
-		"exit_group",
-		"exit",
-		"clock_gettime"
+		"socket",
+		"time",
+		"uname",
+		"write",
+		"writev"
 	],
 	"policy": 1
 }

toolchain/gcc/Config.version

@@ -14,7 +14,7 @@ config GCC_VERSION
 	string
 	default "7.5.0"		if GCC_VERSION_7
 	default "9.3.0"		if GCC_VERSION_9
-	default "10.2.0"	if GCC_VERSION_10
+	default "10.3.0"	if GCC_VERSION_10
 	default "8.4.0"
 
 config GCC_USE_IREMAP

toolchain/gcc/common.mk

@@ -40,8 +40,8 @@ ifeq ($(PKG_VERSION),9.3.0)
   PKG_HASH:=71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
 endif
 
-ifeq ($(PKG_VERSION),10.2.0)
-  PKG_HASH:=b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c
+ifeq ($(PKG_VERSION),10.3.0)
+  PKG_HASH:=64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344
 endif
 
 PATCH_DIR=../patches/$(GCC_VERSION)

toolchain/gcc/patches/10.3.0/910-mbsd_multi.patch

@@ -102,7 +102,7 @@ Date:   Tue Jul 31 00:52:27 2007 +0000
  Assume normal C execution environment.
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
-@@ -1657,6 +1657,9 @@ fguess-branch-probability
+@@ -1660,6 +1660,9 @@ fguess-branch-probability
  Common Report Var(flag_guess_branch_prob) Optimization
  Enable guessing of branch probabilities.
  
@@ -114,7 +114,7 @@ Date:   Tue Jul 31 00:52:27 2007 +0000
  ; On SVR4 targets, it also controls whether or not to emit a
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -8169,6 +8169,17 @@ This option is only supported for C and
+@@ -8171,6 +8171,17 @@ This option is only supported for C and
  @option{-Wall} and by @option{-Wpedantic}, which can be disabled with
  @option{-Wno-pointer-sign}.
  
@@ -134,7 +134,7 @@ Date:   Tue Jul 31 00:52:27 2007 +0000
  @opindex Wno-stack-protector
 --- a/gcc/opts.c
 +++ b/gcc/opts.c
-@@ -2308,6 +2308,9 @@ common_handle_option (struct gcc_options
+@@ -2318,6 +2318,9 @@ common_handle_option (struct gcc_options
        /* Currently handled in a prescan.  */
        break;