From c53d6901edba95dc2c5dca14d3c1cb03566a649b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 2 May 2022 23:44:59 +0800 Subject: [PATCH] update 05-02 23:44:59 --- .../cloudflarespeedtest.sh | 10 ++-- miniupnpd/Makefile | 5 +- v2ray-core/Makefile | 2 +- v2ray-plugin/Makefile | 2 +- v2ray-plugin/patches/010-go-1.18.patch | 47 ------------------- 5 files changed, 11 insertions(+), 55 deletions(-) delete mode 100644 v2ray-plugin/patches/010-go-1.18.patch diff --git a/luci-app-cloudflarespeedtest/root/usr/bin/cloudflarespeedtest/cloudflarespeedtest.sh b/luci-app-cloudflarespeedtest/root/usr/bin/cloudflarespeedtest/cloudflarespeedtest.sh index 36b7787b8..99d7a28f1 100755 --- a/luci-app-cloudflarespeedtest/root/usr/bin/cloudflarespeedtest/cloudflarespeedtest.sh +++ b/luci-app-cloudflarespeedtest/root/usr/bin/cloudflarespeedtest/cloudflarespeedtest.sh @@ -29,7 +29,7 @@ function read_config(){ get_servers_config "ssr_services" "ssr_enabled" "passwall_enabled" "passwall_services" "passwall2_enabled" "passwall2_services" "bypass_enabled" "bypass_services" "vssr_enabled" "vssr_services" "DNS_enabled" } -function speed_test(){ +function speed_test(){ rm -rf $LOG_FILE @@ -126,11 +126,8 @@ function ip_replace(){ [[ -z "${bestip}" ]] && echo "CloudflareST 测速结果 IP 数量为 0，跳过下面步骤..." && exit 0 alidns_ip - ssr_best_ip - vssr_best_ip - bypass_best_ip passwall_best_ip passwall2_best_ip @@ -210,6 +207,7 @@ function ssr_best_ip(){ elif [ $proxy_mode == "gfw" ] ;then uci set shadowsocksr.@global[0].run_mode="${ssr_original_run_mode}" fi + uci commit shadowsocksr /etc/init.d/shadowsocksr restart 2 >/dev/null echolog "ssr重启完成" fi @@ -234,6 +232,7 @@ function vssr_best_ip(){ elif [ $proxy_mode == "gfw" ] ;then uci set vssr.@global[0].run_mode="${vssr_original_run_mode}" fi + uci commit vssr /etc/init.d/vssr restart 2 >/dev/null echolog "Vssr重启完成" fi @@ -258,6 +257,7 @@ function bypass_best_ip(){ elif [ $proxy_mode == "gfw" ] ;then uci set bypass.@global[0].run_mode="${bypass_original_run_mode}" fi + uci commit bypass /etc/init.d/bypass restart 2 >/dev/null echolog "Bypass重启完成" fi @@ -280,4 +280,4 @@ if [ "$1" ] ;then [ $1 == "test" ] && speed_test [ $1 == "replace" ] && ip_replace exit -fi \ No newline at end of file +fi diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile index c88a6aa78..7952ff471 100644 --- a/miniupnpd/Makefile +++ b/miniupnpd/Makefile @@ -11,7 +11,10 @@ PKG_NAME:=miniupnpd PKG_VERSION:=2.0.20170421 PKG_RELEASE:=3 -PKG_SOURCE_URL:=http://miniupnp.free.fr/files +# Content-Encoding conflict, can refer to this [issue](https://github.com/miniupnp/miniupnp/issues/605) +# so switch mirror repo to http://miniupnp.tuxfamily.org +# PKG_SOURCE_URL:=http://miniupnp.free.fr/files +PKG_SOURCE_URL:=http://miniupnp.tuxfamily.org/files PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_HASH:=skip diff --git a/v2ray-core/Makefile b/v2ray-core/Makefile index c88d39d7e..7c1f5055c 100644 --- a/v2ray-core/Makefile +++ b/v2ray-core/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray-core -PKG_VERSION:=5.0.4 +PKG_VERSION:=5.0.5 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/v2ray-plugin/Makefile b/v2ray-plugin/Makefile index ffe6cabf7..04da12194 100644 --- a/v2ray-plugin/Makefile +++ b/v2ray-plugin/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray-plugin -PKG_VERSION:=5.0.3 +PKG_VERSION:=5.0.4 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/v2ray-plugin/patches/010-go-1.18.patch b/v2ray-plugin/patches/010-go-1.18.patch deleted file mode 100644 index c0a9c1614..000000000 --- a/v2ray-plugin/patches/010-go-1.18.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/go.mod -+++ b/go.mod -@@ -13,9 +13,10 @@ require ( - github.com/fsnotify/fsnotify v1.4.9 // indirect - github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect - github.com/gorilla/websocket v1.4.2 // indirect -- github.com/lucas-clemente/quic-go v0.24.0 // indirect -- github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect -- github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect -+ github.com/lucas-clemente/quic-go v0.26.0 // indirect -+ github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect -+ github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect -+ github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect - github.com/nxadm/tail v1.4.8 // indirect - github.com/onsi/ginkgo v1.16.4 // indirect - github.com/pires/go-proxyproto v0.6.1 // indirect ---- a/go.sum -+++ b/go.sum -@@ -205,8 +205,9 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv - github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= - github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= - github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= --github.com/lucas-clemente/quic-go v0.24.0 h1:ToR7SIIEdrgOhgVTHvPgdVRJfgVy+N0wQAagH7L4d5g= - github.com/lucas-clemente/quic-go v0.24.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0= -+github.com/lucas-clemente/quic-go v0.26.0 h1:ALBQXr9UJ8A1LyzvceX4jd9QFsHvlI0RR6BkV16o00A= -+github.com/lucas-clemente/quic-go v0.26.0/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI= - github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc= - github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg= - github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= -@@ -214,10 +215,15 @@ github.com/magiconair/properties v1.8.1/ - github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= - github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= - github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= --github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco= - github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= --github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk= -+github.com/marten-seemann/qtls-go1-16 v0.1.5 h1:o9JrYPPco/Nukd/HpOHMHZoBDXQqoNtUCmny98/1uqQ= -+github.com/marten-seemann/qtls-go1-16 v0.1.5/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= - github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= -+github.com/marten-seemann/qtls-go1-17 v0.1.1 h1:DQjHPq+aOzUeh9/lixAGunn6rIOQyWChPSI4+hgW7jc= -+github.com/marten-seemann/qtls-go1-17 v0.1.1/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s= -+github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI= -+github.com/marten-seemann/qtls-go1-18 v0.1.1 h1:qp7p7XXUFL7fpBvSS1sWD+uSqPvzNQK43DH+/qEkj0Y= -+github.com/marten-seemann/qtls-go1-18 v0.1.1/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4= - github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= - github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= - github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=