OSDN Git Service

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