From 6f5434b08795507372acfc2e442e9ae4b2efca7d Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Wed, 28 Apr 2021 20:48:01 +0200 Subject: [PATCH 1/6] glibc: update to latest 2.33 HEAD (bug 27744) 3f5080aedd nptl: Do not build nptl/tst-pthread-gdb-attach as PIE 36783141cf nptl: Check for compatible GDB in nptl/tst-pthread-gdb-attach ea299b62e8 nptl_db: Support different libpthread/ld.so load orders (bug 27744) 162df872f0 x86: tst-cpu-features-supports.c: Update AMX check Signed-off-by: Hans Dedecker --- toolchain/glibc/common.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk index 549778a440..16f03c3c29 100644 --- a/toolchain/glibc/common.mk +++ b/toolchain/glibc/common.mk @@ -12,8 +12,8 @@ PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=12ff80b312c11b0284df7a1c5cb9be6418f85228 -PKG_MIRROR_HASH:=84b7715886320794f9787976b20c868f5d6967e0ab08e6c821a8d42103c0721b +PKG_SOURCE_VERSION:=3f5080aedd164c1f92a53552dd3e0b82ac6d2bd3 +PKG_MIRROR_HASH:=93b1f5dad3deeca05c4a897aa553f0f4423cde68c5640cc333166dc78d112bf4 PKG_SOURCE_URL:=https://sourceware.org/git/glibc.git PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz From 705dd5588881aef65a58003775cf3a309e1b057f Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sun, 2 May 2021 21:10:08 +0800 Subject: [PATCH 2/6] sunxi: nanopi-r1s-h5: remove non-existent usb node (cherry picked from commit b8ec04670118870f6e8cc5e46ca0158fd29c5f51) Signed-off-by: AmadeusGhost --- ...nxi-h5-add-support-for-nanopi-r1s-h5.patch | 20 ++--------------- ...nxi-h5-add-support-for-nanopi-r1s-h5.patch | 22 +++---------------- 2 files changed, 5 insertions(+), 37 deletions(-) diff --git a/package/boot/uboot-sunxi/patches/252-sunxi-h5-add-support-for-nanopi-r1s-h5.patch b/package/boot/uboot-sunxi/patches/252-sunxi-h5-add-support-for-nanopi-r1s-h5.patch index 59be3208a4..6d46c5473c 100644 --- a/package/boot/uboot-sunxi/patches/252-sunxi-h5-add-support-for-nanopi-r1s-h5.patch +++ b/package/boot/uboot-sunxi/patches/252-sunxi-h5-add-support-for-nanopi-r1s-h5.patch @@ -10,7 +10,7 @@ sun50i-h5-orangepi-prime.dtb \ --- /dev/null +++ b/arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts -@@ -0,0 +1,204 @@ +@@ -0,0 +1,188 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2021 AmadeusGhost @@ -31,7 +31,7 @@ + + aliases { + ethernet0 = &emac; -+ i2c0 = &i2c0; ++ ethernet1 = &rtl8189etv; + serial0 = &uart0; + }; + @@ -120,10 +120,6 @@ + cpu-supply = <&vdd_cpux>; +}; + -+&ehci0 { -+ status = "okay"; -+}; -+ +&ehci1 { + status = "okay"; +}; @@ -132,10 +128,6 @@ + status = "okay"; +}; + -+&ehci3 { -+ status = "okay"; -+}; -+ +&emac { + pinctrl-names = "default"; + pinctrl-0 = <&emac_rgmii_pins>; @@ -182,10 +174,6 @@ + }; +}; + -+&ohci0 { -+ status = "okay"; -+}; -+ +&ohci1 { + status = "okay"; +}; @@ -194,10 +182,6 @@ + status = "okay"; +}; + -+&ohci3 { -+ status = "okay"; -+}; -+ +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>; diff --git a/target/linux/sunxi/patches-4.19/103-sunxi-h5-add-support-for-nanopi-r1s-h5.patch b/target/linux/sunxi/patches-4.19/103-sunxi-h5-add-support-for-nanopi-r1s-h5.patch index d624240d9a..694f6adc83 100644 --- a/target/linux/sunxi/patches-4.19/103-sunxi-h5-add-support-for-nanopi-r1s-h5.patch +++ b/target/linux/sunxi/patches-4.19/103-sunxi-h5-add-support-for-nanopi-r1s-h5.patch @@ -10,7 +10,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus.dtb --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts -@@ -0,0 +1,217 @@ +@@ -0,0 +1,201 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2021 AmadeusGhost @@ -32,7 +32,7 @@ + + aliases { + ethernet0 = &emac; -+ i2c0 = &i2c0; ++ ethernet1 = &rtl8189etv; + serial0 = &uart0; + + led-boot = &led_sys; @@ -126,10 +126,6 @@ + cpu-supply = <&vdd_cpux>; +}; + -+&ehci0 { -+ status = "okay"; -+}; -+ +&ehci1 { + status = "okay"; + @@ -137,7 +133,7 @@ + compatible = "realtek,rtl8153"; + reg = <1>; + -+ realtek,led-data = <0x87>; ++ realtek,led-data = <0x78>; + }; +}; + @@ -145,10 +141,6 @@ + status = "okay"; +}; + -+&ehci3 { -+ status = "okay"; -+}; -+ +&emac { + pinctrl-names = "default"; + pinctrl-0 = <&emac_rgmii_pins>; @@ -195,10 +187,6 @@ + }; +}; + -+&ohci0 { -+ status = "okay"; -+}; -+ +&ohci1 { + status = "okay"; +}; @@ -207,10 +195,6 @@ + status = "okay"; +}; + -+&ohci3 { -+ status = "okay"; -+}; -+ +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>; From df1bfb1a6eb17532200bc709115245a83c2222d8 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sun, 2 May 2021 21:20:16 +0800 Subject: [PATCH 3/6] sunxi: nanopi-r1s-h5: simplify mac address generation path Idea was from eb85ab9 ("rockchip: use alternative CID path") Signed-off-by: AmadeusGhost --- target/linux/sunxi/base-files/etc/board.d/02_network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/sunxi/base-files/etc/board.d/02_network b/target/linux/sunxi/base-files/etc/board.d/02_network index 81c4d6a486..7020b5f29a 100755 --- a/target/linux/sunxi/base-files/etc/board.d/02_network +++ b/target/linux/sunxi/base-files/etc/board.d/02_network @@ -33,7 +33,7 @@ sunxi_setup_interfaces() nanopi_generate_mac() { - local sd_hash=$(sha256sum /sys/devices/platform/soc/1c0f000.mmc/mmc_host/mmc0/mmc0:*/cid) + local sd_hash=$(sha256sum /sys/class/block/mmcblk0/device/cid) local mac_base=$(macaddr_canonicalize "$(echo "${sd_hash}" | dd bs=1 count=12 2>/dev/null)") echo "$(macaddr_unsetbit_mc "$(macaddr_setbit_la "${mac_base}")")" } From 703b0e04f63b542d599521c9ad845dd5d0140f06 Mon Sep 17 00:00:00 2001 From: greekstreet Date: Sat, 1 May 2021 16:46:46 +0800 Subject: [PATCH 4/6] luci-app-ssr-plus: make it compatible with procps-ng-ps Signed-off-by: Tianling Shen --- .../lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index 5a327bec59..a690454727 100755 --- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -44,6 +44,7 @@ CRON_FILE=/etc/crontabs/root EXTRA_COMMANDS='reset' EXTRA_HELP=" reset Reset to default settings" #extra_command "reset" "Reset to default settings" +PS="/bin/busybox ps" uci_get_by_name() { local ret=$(uci get $NAME.$1.$2 2>/dev/null) @@ -840,13 +841,13 @@ stop() { iptables -X SSR-SERVER-RULE 2>/dev/null fi if [ -z "$switch_server" ]; then - ps -w | grep -v "grep" | grep ssr-switch | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & + $PS -w | grep -v "grep" | grep ssr-switch | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & rm -f /var/lock/ssr-switch.lock killall -q -9 kcptun-client fi - ps -w | grep -v "grep" | grep ssr-monitor | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & - ps -w | grep -v "grep" | grep "sleep 0000" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & - ps -w | grep -v "grep" | grep "$TMP_PATH" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & + $PS -w | grep -v "grep" | grep ssr-monitor | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & + $PS -w | grep -v "grep" | grep "sleep 0000" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & + $PS -w | grep -v "grep" | grep "$TMP_PATH" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & killall -q -9 v2ray-plugin obfs-local xray-plugin rm -f /var/lock/ssr-monitor.lock if [ -f "/var/dnsmasq.d/dnsmasq-ssrplus.conf" ]; then From f75fc2554f653df21bb93723341c3f3d7d7e3062 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 3 May 2021 03:26:24 +0800 Subject: [PATCH 5/6] luci-app-ssr-plus: correct protocol place for ss Signed-off-by: Tianling Shen --- .../root/usr/share/shadowsocksr/gen_config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua index 2ec2b01dfb..4ab0dd4df9 100644 --- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua +++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua @@ -224,7 +224,6 @@ local ss = { local_address = "0.0.0.0", local_port = tonumber(local_port), mode = (proto == "tcp,udp") and "tcp_and_udp" or proto .. "_only", - protocol = socks_port, password = server.password, method = server.encrypt_method_ss, timeout = tonumber(server.timeout), @@ -241,6 +240,7 @@ end function config:handleIndex(index) local switch = { ss = function() + ss.protocol = socks_port if server.plugin and server.plugin ~= "none" then ss.plugin = server.plugin ss.plugin_opts = server.plugin_opts or nil From a47038d83f902d48c800073c8b696b8fb81ecfca Mon Sep 17 00:00:00 2001 From: kuma Date: Thu, 29 Apr 2021 21:18:56 +0800 Subject: [PATCH 6/6] luci-app-ssr-plus: bug fixes Signed-off-by: Tianling Shen --- .../luasrc/view/shadowsocksr/ssrurl.htm | 10 +++++----- .../root/usr/share/shadowsocksr/subscribe.lua | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm b/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm index cd6ea84c5e..106312812b 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm +++ b/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm @@ -310,7 +310,7 @@ function import_ssr_url(btn, urlname, sid) { document.getElementsByName('cbid.shadowsocksr.' + sid + '.server')[0].value = serverPart[0]; document.getElementsByName('cbid.shadowsocksr.' + sid + '.server_port')[0].value = port; document.getElementsByName('cbid.shadowsocksr.' + sid + '.vmess_id')[0].value = uuid; - document.getElementsByName('cbid.shadowsocksr.' + sid + '.transport')[0].value = queryParam.type || "tcp"; + document.getElementsByName('cbid.shadowsocksr.' + sid + '.transport')[0].value = queryParam.type ? (queryParam.type == "http" ? "h2" : queryParam.type) : "tcp"; document.getElementsByName('cbid.shadowsocksr.' + sid + '.transport')[0].dispatchEvent(event); document.getElementsByName('cbid.shadowsocksr.' + sid + '.vless_encryption')[0].value = queryParam.encryption || "none"; if (queryParam.security == "tls") { @@ -321,7 +321,7 @@ function import_ssr_url(btn, urlname, sid) { switch (queryParam.type) { case "ws": document.getElementsByName('cbid.shadowsocksr.' + sid + '.ws_host')[0].value = queryParam.host; - document.getElementsByName('cbid.shadowsocksr.' + sid + '.ws_path')[0].value = queryParam.path; + document.getElementsByName('cbid.shadowsocksr.' + sid + '.ws_path')[0].value = queryParam.path || "/"; break; case "kcp": document.getElementsByName('cbid.shadowsocksr.' + sid + '.kcp_guise')[0].value = queryParam.headerType || "none"; @@ -329,13 +329,13 @@ function import_ssr_url(btn, urlname, sid) { document.getElementsByName('cbid.shadowsocksr.' + sid + '.seed')[0].value = queryParam.seed; break; case "http": - document.getElementsByName('cbid.shadowsocksr.' + sid + '.h2_host')[0].value = queryParam.host; - document.getElementsByName('cbid.shadowsocksr.' + sid + '.h2_path')[0].value = queryParam.path; + document.getElementsByName('cbid.shadowsocksr.' + sid + '.h2_host')[0].value = queryParam.host || serverPart[0]; + document.getElementsByName('cbid.shadowsocksr.' + sid + '.h2_path')[0].value = queryParam.path || "/"; break; case "quic": document.getElementsByName('cbid.shadowsocksr.' + sid + '.quic_guise')[0].value = queryParam.headerType || "none"; document.getElementsByName('cbid.shadowsocksr.' + sid + '.quic_guise')[0].dispatchEvent(event); - document.getElementsByName('cbid.shadowsocksr.' + sid + '.quic_security')[0].value = queryParam.quicSecurity; + document.getElementsByName('cbid.shadowsocksr.' + sid + '.quic_security')[0].value = queryParam.quicSecurity || "none"; document.getElementsByName('cbid.shadowsocksr.' + sid + '.quic_key')[0].value = queryParam.key; break; default: diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua index 52d0ce7f97..bdafd05d36 100755 --- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua +++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua @@ -280,7 +280,7 @@ local function processData(szType, content) result.server_port = query[1] result.vmess_id = uuid result.vless_encryption = params.encryption or "none" - result.transport = params.type or "tcp" + result.transport = params.type and (params.type == 'http' and 'h2' or params.type) or "tcp" if not params.type or params.type == "tcp" then if params.security == "xtls" then result.xtls = "1"