From ae592638bc857544fe065199f67c169399c64411 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 26 Aug 2021 21:52:40 +0800 Subject: [PATCH] xray-core: fix build under go 1.17 Signed-off-by: Tianling Shen --- .../100-Update-x-sys-to-support-go-1.17.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 net/xray-core/patches/100-Update-x-sys-to-support-go-1.17.patch diff --git a/net/xray-core/patches/100-Update-x-sys-to-support-go-1.17.patch b/net/xray-core/patches/100-Update-x-sys-to-support-go-1.17.patch new file mode 100644 index 00000000000000..ffed0b4b06992f --- /dev/null +++ b/net/xray-core/patches/100-Update-x-sys-to-support-go-1.17.patch @@ -0,0 +1,35 @@ +From 671dd29265a0b16e7073987ca4624d208141b9a9 Mon Sep 17 00:00:00 2001 +From: Alexey Palazhchenko +Date: Fri, 20 Aug 2021 13:08:51 +0300 +Subject: [PATCH] Update x/sys to support go 1.17 + +See: https://github.com/golang/go/issues/46763 +--- + go.mod | 2 +- + go.sum | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +--- a/go.mod ++++ b/go.mod +@@ -20,7 +20,7 @@ require ( + golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 + golang.org/x/net v0.0.0-20210330230544-e57232859fb2 + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c +- golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44 ++ golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c + google.golang.org/grpc v1.36.1 + google.golang.org/protobuf v1.26.0 + h12.io/socks v1.0.2 +--- a/go.sum ++++ b/go.sum +@@ -242,8 +242,9 @@ golang.org/x/sys v0.0.0-20200930185726-f + golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20201231184435-2d18734c6014/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44 h1:Bli41pIlzTzf3KEY06n+xnzK/BESIg2ze4Pgfh/aI8c= + golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c h1:Lyn7+CqXIiC+LOR9aHD6jDK+hPcmAuCfuXztd1v4w1Q= ++golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=