Attachment 219146 Details for Bug 250672 – patch

[patch] patch

v2ray-4.31.0.patch (text/plain), 11.89 KB, created by Fukang Chen on 2020-10-27 13:25:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fukang Chen

Created: 2020-10-27 13:25:25 UTC

Size: 11.89 KB

patch

obsolete

>Index: net/v2ray/Makefile
>===================================================================
>--- net/v2ray/Makefile	(revision 553325)
>+++ net/v2ray/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	v2ray
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	4.25.0
>+DISTVERSION=	4.31.0
> CATEGORIES=	net
> 
> MAINTAINER=	shen.elf@gmail.com
>@@ -17,25 +17,37 @@
> 
> GH_ACCOUNT=	v2ray
> GH_PROJECT=	v2ray-core
>-GH_TUPLE=	dgryski:go-metro:280f6062b5bc:dgryski_go_metro/vendor/github.com/dgryski/go-metro \
>-		golang:crypto:8986dd9e96cf:golang_crypto/vendor/golang.org/x/crypto \
>-		golang:mock:v1.2.0:golang_mock/vendor/github.com/golang/mock \
>-		golang:net:eb5bcb51f2a3:golang_net/vendor/golang.org/x/net \
>+GH_TUPLE=	\
>+		cheekybits:genny:v1.0.0:cheekybits_genny/vendor/github.com/cheekybits/genny \
>+		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
>+		dgryski:go-metro:85c65e2d0165:dgryski_go_metro/vendor/github.com/dgryski/go-metro \
>+		ebfe:bcrypt_pbkdf:3c8d2dcb253a:ebfe_bcrypt_pbkdf/vendor/github.com/ebfe/bcrypt_pbkdf \
>+		go-yaml:yaml:9f266ea9e77c:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
>+		golang:crypto:7f63de1d35b0:golang_crypto/vendor/golang.org/x/crypto \
>+		golang:mock:v1.4.4:golang_mock/vendor/github.com/golang/mock \
>+		golang:net:a7d1128ccaa0:golang_net/vendor/golang.org/x/net \
> 		golang:protobuf:v1.4.2:golang_protobuf/vendor/github.com/golang/protobuf \
>-		golang:sync:112230192c58:golang_sync/vendor/golang.org/x/sync \
>-		golang:sys:97732733099d:golang_sys/vendor/golang.org/x/sys \
>-		golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \
>+		golang:sync:30421366ff76:golang_sync/vendor/golang.org/x/sync \
>+		golang:sys:ac719f4daadf:golang_sys/vendor/golang.org/x/sys \
>+		golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \
> 		golang:xerrors:9bdfabe68543:golang_xerrors/vendor/golang.org/x/xerrors \
>-		google:go-cmp:v0.4.0:google_go_cmp/vendor/github.com/google/go-cmp \
>+		google:go-cmp:v0.5.2:google_go_cmp/vendor/github.com/google/go-cmp \
> 		google:go-genproto:cb27e3aa2013:google_go_genproto/vendor/google.golang.org/genproto \
>-		google:starlark-go:979af19b165c:google_starlark_go/vendor/go.starlark.net \
>-		gorilla:websocket:v1.4.1:gorilla_websocket/vendor/github.com/gorilla/websocket \
>-		grpc:grpc-go:v1.27.0:grpc_grpc_go/vendor/google.golang.org/grpc \
>-		h12w:socks:v1.0.0:h12w_socks/vendor/h12.io/socks \
>-		miekg:dns:v1.1.4:miekg_dns/vendor/github.com/miekg/dns \
>-		protocolbuffers:protobuf-go:v1.24.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
>-		refraction-networking:utls:43c36d3c1f57:refraction_networking_utls/vendor/github.com/refraction-networking/utls \
>-		seiflotfy:cuckoofilter:56093a4d3841:seiflotfy_cuckoofilter/vendor/github.com/seiflotfy/cuckoofilter
>+		google:starlark-go:227f4aabceb5:google_starlark_go/vendor/go.starlark.net \
>+		gorilla:websocket:v1.4.2:gorilla_websocket/vendor/github.com/gorilla/websocket \
>+		grpc:grpc-go:v1.32.0:grpc_grpc_go/vendor/google.golang.org/grpc \
>+		h12w:socks:v1.0.1:h12w_socks/vendor/h12.io/socks \
>+		lucas-clemente:quic-go:v0.18.1:lucas_clemente_quic_go/vendor/github.com/lucas-clemente/quic-go \
>+		marten-seemann:qtls-go1-15:v0.1.0:marten_seemann_qtls_go1_15/vendor/github.com/marten-seemann/qtls-go1-15 \
>+		marten-seemann:qtls:v0.10.0:marten_seemann_qtls/vendor/github.com/marten-seemann/qtls \
>+		miekg:dns:v1.1.31:miekg_dns/vendor/github.com/miekg/dns \
>+		pires:go-proxyproto:v0.2.0:pires_go_proxyproto/vendor/github.com/pires/go-proxyproto \
>+		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
>+		protocolbuffers:protobuf-go:v1.25.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
>+		seiflotfy:cuckoofilter:56093a4d3841:seiflotfy_cuckoofilter/vendor/github.com/seiflotfy/cuckoofilter \
>+		stretchr:testify:v1.6.1:stretchr_testify/vendor/github.com/stretchr/testify \
>+		xiaokangwang:VSign:dc1c86b73fbf:xiaokangwang_vsign/vendor/github.com/xiaokangwang/VSign \
>+		xtls:Go:d42c13c57942:xtls_go/vendor/github.com/xtls/go
> 
> GO_BUILDFLAGS=	-ldflags='-s -w'
> GO_TARGET=	./main:v2ray \
>Index: net/v2ray/distinfo
>===================================================================
>--- net/v2ray/distinfo	(revision 553325)
>+++ net/v2ray/distinfo	(working copy)
>@@ -1,41 +1,63 @@
>-TIMESTAMP = 1592892394
>-SHA256 (v2ray-v2ray-core-v4.25.0_GH0.tar.gz) = 1cb380dcbc57657f257eb60fbd411b268113f4229e9946e92a21689c2016bb85
>-SIZE (v2ray-v2ray-core-v4.25.0_GH0.tar.gz) = 6909694
>-SHA256 (dgryski-go-metro-280f6062b5bc_GH0.tar.gz) = 0fb7cdcc1a83d1a41e4c3f5722537a56684b340e659639c1e690f89a556ded88
>-SIZE (dgryski-go-metro-280f6062b5bc_GH0.tar.gz) = 4393
>-SHA256 (golang-crypto-8986dd9e96cf_GH0.tar.gz) = 3adc3e198c937ccd3e7af027b7faa27e048ec7f1ac92df77ff2a5a904f46be16
>-SIZE (golang-crypto-8986dd9e96cf_GH0.tar.gz) = 1709140
>-SHA256 (golang-mock-v1.2.0_GH0.tar.gz) = b7278e2d81b4ea2b849da7a20aedafd627748e188b2118bb536b8a2e3b95a821
>-SIZE (golang-mock-v1.2.0_GH0.tar.gz) = 46488
>-SHA256 (golang-net-eb5bcb51f2a3_GH0.tar.gz) = 191dd6c41872d0afa48ad594314ec60455fab7c98a2aca88ed0df28c32062348
>-SIZE (golang-net-eb5bcb51f2a3_GH0.tar.gz) = 976944
>+TIMESTAMP = 1603712676
>+SHA256 (v2ray-v2ray-core-v4.31.0_GH0.tar.gz) = 4e475c700863320b92689cb36ef993133e9c799375bbfc4a2811da2283c3673f
>+SIZE (v2ray-v2ray-core-v4.31.0_GH0.tar.gz) = 7676986
>+SHA256 (cheekybits-genny-v1.0.0_GH0.tar.gz) = 6982bf513333fb3ee3e6e0633500a3800fb6a3d6beb9e6c6084a96c85a49dd73
>+SIZE (cheekybits-genny-v1.0.0_GH0.tar.gz) = 15585
>+SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
>+SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
>+SHA256 (dgryski-go-metro-85c65e2d0165_GH0.tar.gz) = 069a3ea10b4a1f709911616de03d039b6af0d791769e409b8037850c2c07f4e7
>+SIZE (dgryski-go-metro-85c65e2d0165_GH0.tar.gz) = 4470
>+SHA256 (ebfe-bcrypt_pbkdf-3c8d2dcb253a_GH0.tar.gz) = d1ec68ddb19f4b096748622e87e3526de3b000977d779ac40ab4f6bf953d11db
>+SIZE (ebfe-bcrypt_pbkdf-3c8d2dcb253a_GH0.tar.gz) = 15161
>+SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04
>+SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898
>+SHA256 (golang-crypto-7f63de1d35b0_GH0.tar.gz) = 2d1bcc81ecd06b9d92ede3fc186c9d81cafa2aecba920d61981f2a0ec6153da3
>+SIZE (golang-crypto-7f63de1d35b0_GH0.tar.gz) = 1732554
>+SHA256 (golang-mock-v1.4.4_GH0.tar.gz) = a3e25a2c234f82f6685e143681e223462bd1cc0098375a48dc042e227f2cd677
>+SIZE (golang-mock-v1.4.4_GH0.tar.gz) = 55141
>+SHA256 (golang-net-a7d1128ccaa0_GH0.tar.gz) = 4bed33fe7ea1e5ce005798c033fa18bddaa12fe5b6848bbe144e34c41c4b168f
>+SIZE (golang-net-a7d1128ccaa0_GH0.tar.gz) = 1177106
> SHA256 (golang-protobuf-v1.4.2_GH0.tar.gz) = a1e486b3ed6f502c43e10cb28bde4e8f020a420ef9958d3fbe61801492c07c87
> SIZE (golang-protobuf-v1.4.2_GH0.tar.gz) = 171778
>-SHA256 (golang-sync-112230192c58_GH0.tar.gz) = 6d98880ea18369550cb12d7011df8e4b21c5b7588268a412b863b5c9d2fa0313
>-SIZE (golang-sync-112230192c58_GH0.tar.gz) = 16832
>-SHA256 (golang-sys-97732733099d_GH0.tar.gz) = 8d60fa6ab0c2b099f2c7d6f8c0a5df177c5c524183a2a38e0e8d2d18cde53532
>-SIZE (golang-sys-97732733099d_GH0.tar.gz) = 1350239
>-SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb
>-SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619
>+SHA256 (golang-sync-30421366ff76_GH0.tar.gz) = 435965428b55bc910395404a5abf21c3ca550187332f91b7eeabe0749fe4aa48
>+SIZE (golang-sync-30421366ff76_GH0.tar.gz) = 18966
>+SHA256 (golang-sys-ac719f4daadf_GH0.tar.gz) = f554cf1e6eb92e0bdcd5d67eb8b7a522befebe38253f31a69d937db6641f5566
>+SIZE (golang-sys-ac719f4daadf_GH0.tar.gz) = 1066751
>+SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185
>+SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332
> SHA256 (golang-xerrors-9bdfabe68543_GH0.tar.gz) = 54bb4d99e6cba2e3e5331d064f46640cc01a0e630ee6a684ae810bd94a7e4eb7
> SIZE (golang-xerrors-9bdfabe68543_GH0.tar.gz) = 13657
>-SHA256 (google-go-cmp-v0.4.0_GH0.tar.gz) = 97964b47aa6dc61007f9e1b1ad67812f0a8a2380072a59daebac7bc0cdcf740a
>-SIZE (google-go-cmp-v0.4.0_GH0.tar.gz) = 81600
>+SHA256 (google-go-cmp-v0.5.2_GH0.tar.gz) = 76e0c4238e7fec1490ef2c8b4719a024ade7f4b8778965acb888566535ee9dd5
>+SIZE (google-go-cmp-v0.5.2_GH0.tar.gz) = 99769
> SHA256 (google-go-genproto-cb27e3aa2013_GH0.tar.gz) = 1f0c3be40b17772975c71b54ca512ee681f7db384ebc43c8adb24f1ab44d2d0e
> SIZE (google-go-genproto-cb27e3aa2013_GH0.tar.gz) = 9293098
>-SHA256 (google-starlark-go-979af19b165c_GH0.tar.gz) = 91c252c926ee0bd267c4f1617ae9d44a9f08eea026d547798a8aacd860cbc44d
>-SIZE (google-starlark-go-979af19b165c_GH0.tar.gz) = 220073
>-SHA256 (gorilla-websocket-v1.4.1_GH0.tar.gz) = 9e5bd337d58a978bf4072767252ddb394b53e2b459697633794abd96e8eb3fa6
>-SIZE (gorilla-websocket-v1.4.1_GH0.tar.gz) = 54218
>-SHA256 (grpc-grpc-go-v1.27.0_GH0.tar.gz) = 53082da10cb09b2cb850ed3c0a41ed13e61fdcbff24fb43c473f8427d1c6dcbf
>-SIZE (grpc-grpc-go-v1.27.0_GH0.tar.gz) = 825961
>-SHA256 (h12w-socks-v1.0.0_GH0.tar.gz) = 338e331b4859fee7656ced8ed8546f803da7f4bc5c9504b6e2ece3e71e6297e5
>-SIZE (h12w-socks-v1.0.0_GH0.tar.gz) = 11603
>-SHA256 (miekg-dns-v1.1.4_GH0.tar.gz) = eb5a2460ed75938dc4268bb80f0c65179b81792864abad3b4be1d4f1d6d52f1d
>-SIZE (miekg-dns-v1.1.4_GH0.tar.gz) = 3882057
>-SHA256 (protocolbuffers-protobuf-go-v1.24.0_GH0.tar.gz) = 318e54ee12d09e9c76fc11cf85f6297360e6444b74a6a7882450501bb952ba56
>-SIZE (protocolbuffers-protobuf-go-v1.24.0_GH0.tar.gz) = 1227640
>-SHA256 (refraction-networking-utls-43c36d3c1f57_GH0.tar.gz) = ad3d597fc9d3d57637de5085a59b07dda87faca0ff2ef70d50df6b4065d801b3
>-SIZE (refraction-networking-utls-43c36d3c1f57_GH0.tar.gz) = 526322
>+SHA256 (google-starlark-go-227f4aabceb5_GH0.tar.gz) = c11c043840857073f8d5bc115a961e8fd544d64ee347365d2cdfea0febccd07a
>+SIZE (google-starlark-go-227f4aabceb5_GH0.tar.gz) = 233267
>+SHA256 (gorilla-websocket-v1.4.2_GH0.tar.gz) = 91937a36bc9e0da3c895c73d4cb74b2cdb1aff54ab21b0d0724000e7b5b85b84
>+SIZE (gorilla-websocket-v1.4.2_GH0.tar.gz) = 54101
>+SHA256 (grpc-grpc-go-v1.32.0_GH0.tar.gz) = 47a991a1d561738839e74803e350a276b4b753ae4af329091cb35ad2a117dcb2
>+SIZE (grpc-grpc-go-v1.32.0_GH0.tar.gz) = 1053458
>+SHA256 (h12w-socks-v1.0.1_GH0.tar.gz) = 2d780e44c4dd94f83e554d04421bd270ca71b75702a13315b3811134e0a2e55d
>+SIZE (h12w-socks-v1.0.1_GH0.tar.gz) = 14645
>+SHA256 (lucas-clemente-quic-go-v0.18.1_GH0.tar.gz) = cf0f0e9c2e36907d9d11fe8b35f66ba90f45da1651b00891136b25cf027ee7f4
>+SIZE (lucas-clemente-quic-go-v0.18.1_GH0.tar.gz) = 488949
>+SHA256 (marten-seemann-qtls-go1-15-v0.1.0_GH0.tar.gz) = df68f63d09c62c901f417669fa7b55e506f8ce7b57c8b9646f62e6dc0e13ae60
>+SIZE (marten-seemann-qtls-go1-15-v0.1.0_GH0.tar.gz) = 413517
>+SHA256 (marten-seemann-qtls-v0.10.0_GH0.tar.gz) = b852f137be07c4e26c12b3225a13012fe879226210efa40b084e85a9ce726a84
>+SIZE (marten-seemann-qtls-v0.10.0_GH0.tar.gz) = 403869
>+SHA256 (miekg-dns-v1.1.31_GH0.tar.gz) = f40eb494b6b14ba8796a3d561861bb7510031f29e780cfce0319419b1423776b
>+SIZE (miekg-dns-v1.1.31_GH0.tar.gz) = 188593
>+SHA256 (pires-go-proxyproto-v0.2.0_GH0.tar.gz) = ca428bfb1edd3f1ef99897039d51da2b09ca2a1dfb00663faec49b3d9d2cfa2a
>+SIZE (pires-go-proxyproto-v0.2.0_GH0.tar.gz) = 28409
>+SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
>+SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
>+SHA256 (protocolbuffers-protobuf-go-v1.25.0_GH0.tar.gz) = c1c04d6e36c0d0fb6f3374197f9025d7e6df13f38a974098be020617c00fbaf2
>+SIZE (protocolbuffers-protobuf-go-v1.25.0_GH0.tar.gz) = 1258804
> SHA256 (seiflotfy-cuckoofilter-56093a4d3841_GH0.tar.gz) = b24e059ab76c3b1608175b3bc86995453d22d7c91edf1ef083d0e88683c7e7b3
> SIZE (seiflotfy-cuckoofilter-56093a4d3841_GH0.tar.gz) = 4956
>+SHA256 (stretchr-testify-v1.6.1_GH0.tar.gz) = 40fd7204ab72ca9d8759f1cc3604dd17f556a0f9177f6fc05dd0cad9f06e708f
>+SIZE (stretchr-testify-v1.6.1_GH0.tar.gz) = 84215
>+SHA256 (xiaokangwang-VSign-dc1c86b73fbf_GH0.tar.gz) = 28e8bf8ad02b160a2f8f58ede7bb26ed146cbe20cf3abac5dbabc6cd4e7ac9e8
>+SIZE (xiaokangwang-VSign-dc1c86b73fbf_GH0.tar.gz) = 8618
>+SHA256 (xtls-Go-d42c13c57942_GH0.tar.gz) = 35c3bae351e07d2eea1e569f5e6e9945ce769f973ef1726592dc7e2b206e1fab
>+SIZE (xtls-Go-d42c13c57942_GH0.tar.gz) = 79975

Actions: View | Diff

Attachments on bug 250672: 219146 | 220055