OSDN Git Service

v2rayA: backport upstream fix to build with go 1.18
authorTianling Shen <cnsztl@immortalwrt.org>
Sat, 26 Mar 2022 13:43:44 +0000 (21:43 +0800)
committerTianling Shen <cnsztl@immortalwrt.org>
Sat, 26 Mar 2022 13:43:44 +0000 (21:43 +0800)
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
v2raya/patches/040-fix-panic-in-go-1.18.patch [new file with mode: 0644]

diff --git a/v2raya/patches/040-fix-panic-in-go-1.18.patch b/v2raya/patches/040-fix-panic-in-go-1.18.patch
new file mode 100644 (file)
index 0000000..a13e1ab
--- /dev/null
@@ -0,0 +1,36 @@
+From eb210b5e634b65838b50387891ad837590fb2b4e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E9=AB=98=E6=B8=90=E7=A6=BB?= <admin@gaojianli.me>
+Date: Tue, 22 Mar 2022 15:28:50 +0800
+Subject: [PATCH] fix: panic in go 1.18 (#462)
+
+---
+ go.mod | 2 +-
+ go.sum | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/go.mod b/go.mod
+index 8627a09d..9a239804 100644
+--- a/go.mod
++++ b/go.mod
+@@ -50,7 +50,7 @@ require (
+       github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
+       github.com/mattn/go-isatty v0.0.12 // indirect
+       github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
+-      github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
++      github.com/modern-go/reflect2 v1.0.2 // indirect
+       github.com/pelletier/go-toml v1.2.0 // indirect
+       github.com/pires/go-proxyproto v0.6.1 // indirect
+       github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+diff --git a/go.sum b/go.sum
+index 8aa379de..e07329bf 100644
+--- a/go.sum
++++ b/go.sum
+@@ -145,6 +145,8 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OH
+ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
+ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
++github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
++github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
+ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
+ github.com/muhammadmuzzammil1998/jsonc v0.0.0-20201229145248-615b0916ca38 h1:0FrBxrkJ0hVembTb/e4EU5Ml6vLcOusAqymmYISg5Uo=