Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 1 Jun 2020 14:24:54 +0000 (UTC)
From:      Fukang Chen <loader@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r537487 - in head/net/v2ray: . files
Message-ID:  <202006011424.051EOsaO025965@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: loader
Date: Mon Jun  1 14:24:53 2020
New Revision: 537487
URL: https://svnweb.freebsd.org/changeset/ports/537487

Log:
  net/v2ray: Update to 4.23.2
  
  - Add REQUIRE: LOGIN to the rc script
  - Switch to the default test target defined in Mk/go.mk
  
  Changelog:
  
      https://github.com/v2ray/v2ray-core/compare/v4.20.0...v4.23.2
  
  PR:		246894
  Submitted by:	Yanhui Shen <shen.elf@gmail.com> (maintainer)
  Reviewed by:	koobs
  Approved by:	koobs (ports, mentor)
  Differential Revision:	https://reviews.freebsd.org/D25087

Modified:
  head/net/v2ray/Makefile
  head/net/v2ray/distinfo
  head/net/v2ray/files/v2ray.in

Modified: head/net/v2ray/Makefile
==============================================================================
--- head/net/v2ray/Makefile	Mon Jun  1 14:20:33 2020	(r537486)
+++ head/net/v2ray/Makefile	Mon Jun  1 14:24:53 2020	(r537487)
@@ -2,7 +2,7 @@
 
 PORTNAME=	v2ray
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.20.0
+DISTVERSION=	4.23.2
 CATEGORIES=	net
 
 MAINTAINER=	shen.elf@gmail.com
@@ -17,23 +17,26 @@ USE_RC_SUBR=	v2ray
 
 GH_ACCOUNT=	v2ray
 GH_PROJECT=	v2ray-core
-GH_TUPLE=	golang:crypto:193df9c0f06f:golang_crypto/vendor/golang.org/x/crypto \
+GH_TUPLE=	golang:crypto:c2843e01d9a2:golang_crypto/vendor/golang.org/x/crypto \
 		golang:mock:v1.2.0:golang_mock/vendor/github.com/golang/mock \
-		golang:net:65e2d4e15006:golang_net/vendor/golang.org/x/net \
-		golang:protobuf:c823c79ea157:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sync:1d60e4601c6f:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:49385e6e1522:golang_sys/vendor/golang.org/x/sys \
+		golang:net:d8887717615a:golang_net/vendor/golang.org/x/net \
+		golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:sync:112230192c58:golang_sync/vendor/golang.org/x/sync \
+		golang:sys:d0b11bdaac8a:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \
 		google:go-cmp:v0.2.0:google_go_cmp/vendor/github.com/google/go-cmp \
 		google:go-genproto:11092d34479b:google_go_genproto/vendor/google.golang.org/genproto \
-		google:starlark-go:1174b2613e82:google_starlark_go/vendor/go.starlark.net \
-		grpc:grpc-go:v1.18.0:grpc_grpc_go/vendor/google.golang.org/grpc \
+		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.24.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
+		miekg:dns:v1.1.4:miekg_dns/vendor/github.com/miekg/dns \
+		refraction-networking:utls:43c36d3c1f57:refraction_networking_utls/vendor/github.com/refraction-networking/utls
 
 GO_BUILDFLAGS=	-ldflags='-s -w'
 GO_TARGET=	./main:v2ray \
 		./infra/control/main:v2ctl
+GO_TESTFLAGS=	-p 1 -tags json -timeout 30m
 
 USERS=		v2ray
 GROUPS=		v2ray
@@ -49,9 +52,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/release/config/vpoint_vmess_freedom.json ${STAGEDIR}${ETCDIR}/vpoint_vmess_freedom.json
 	${INSTALL_DATA} ${WRKSRC}/release/config/geoip.dat ${STAGEDIR}${DATADIR}/geoip.dat
 	${INSTALL_DATA} ${WRKSRC}/release/config/geosite.dat ${STAGEDIR}${DATADIR}/geosite.dat
-
-do-test:
-	@cd ${GO_WRKSRC} && \
-	${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} test -p 1 -tags json -v -timeout 30m ./...
 
 .include <bsd.port.mk>

Modified: head/net/v2ray/distinfo
==============================================================================
--- head/net/v2ray/distinfo	Mon Jun  1 14:20:33 2020	(r537486)
+++ head/net/v2ray/distinfo	Mon Jun  1 14:24:53 2020	(r537487)
@@ -1,29 +1,33 @@
-TIMESTAMP = 1563040894
-SHA256 (v2ray-v2ray-core-v4.20.0_GH0.tar.gz) = 579a7098b8f6cc68c3f94c5453fa274299f8b072736f364654298bd4cf57d24e
-SIZE (v2ray-v2ray-core-v4.20.0_GH0.tar.gz) = 6943858
-SHA256 (golang-crypto-193df9c0f06f_GH0.tar.gz) = 9bb154cf1a19f5073b3b75f6854562a30c7457b2e2b0d456c39bbc47d799c39e
-SIZE (golang-crypto-193df9c0f06f_GH0.tar.gz) = 1646699
+TIMESTAMP = 1590932415
+SHA256 (v2ray-v2ray-core-v4.23.2_GH0.tar.gz) = c4c6d290859d1701fa6198bc7d2f657671ddfb4652356efdc454f48429736f66
+SIZE (v2ray-v2ray-core-v4.23.2_GH0.tar.gz) = 6878290
+SHA256 (golang-crypto-c2843e01d9a2_GH0.tar.gz) = a4d91350f176b2ef99084cd71f990ecee5f549efed72ef59a5b9e425a00d454a
+SIZE (golang-crypto-c2843e01d9a2_GH0.tar.gz) = 1650817
 SHA256 (golang-mock-v1.2.0_GH0.tar.gz) = b7278e2d81b4ea2b849da7a20aedafd627748e188b2118bb536b8a2e3b95a821
 SIZE (golang-mock-v1.2.0_GH0.tar.gz) = 46488
-SHA256 (golang-net-65e2d4e15006_GH0.tar.gz) = 855876f41d4affc4295cbffd43561a173f75b6f3dd4099e864cb0c287236287a
-SIZE (golang-net-65e2d4e15006_GH0.tar.gz) = 962569
-SHA256 (golang-protobuf-c823c79ea157_GH0.tar.gz) = ebcd65a5530637b64b93dc8e9644011ffa9bdb8e3b0aa75198d0af871c078006
-SIZE (golang-protobuf-c823c79ea157_GH0.tar.gz) = 329185
-SHA256 (golang-sync-1d60e4601c6f_GH0.tar.gz) = e03c0637f9813516a244e075b234792e58df3a31457c3f7c29a5e32950b1ab33
-SIZE (golang-sync-1d60e4601c6f_GH0.tar.gz) = 16319
-SHA256 (golang-sys-49385e6e1522_GH0.tar.gz) = 346932455425020a633390b7b123cd4851f63cbd86ac26be3aad732727579a26
-SIZE (golang-sys-49385e6e1522_GH0.tar.gz) = 1032798
+SHA256 (golang-net-d8887717615a_GH0.tar.gz) = 275e6ecfc70b51e05127339c58d0ded3db9b74bf8be869d32c4e731b154af71d
+SIZE (golang-net-d8887717615a_GH0.tar.gz) = 974014
+SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65
+SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285
+SHA256 (golang-sync-112230192c58_GH0.tar.gz) = 6d98880ea18369550cb12d7011df8e4b21c5b7588268a412b863b5c9d2fa0313
+SIZE (golang-sync-112230192c58_GH0.tar.gz) = 16832
+SHA256 (golang-sys-d0b11bdaac8a_GH0.tar.gz) = e7e3f36dd307e908e59dbda3864ff74f9a5d7f0fdd4d88af630e092beb7d270c
+SIZE (golang-sys-d0b11bdaac8a_GH0.tar.gz) = 1243049
 SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb
 SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619
 SHA256 (google-go-cmp-v0.2.0_GH0.tar.gz) = 3c4e5aca9a707eb19f5ef54b13171f3d36466f4cab73918d111bd93c88b62eed
 SIZE (google-go-cmp-v0.2.0_GH0.tar.gz) = 57862
 SHA256 (google-go-genproto-11092d34479b_GH0.tar.gz) = b853fb93631852becc8f2d915fa036e396521a194177d6dd91682ca7d70efc87
 SIZE (google-go-genproto-11092d34479b_GH0.tar.gz) = 2222157
-SHA256 (grpc-grpc-go-v1.18.0_GH0.tar.gz) = 078b44a673860ffda7a366f9e6a05415eb5126b54bd6cde921f2403283f95a1f
-SIZE (grpc-grpc-go-v1.18.0_GH0.tar.gz) = 589845
-SHA256 (miekg-dns-v1.1.4_GH0.tar.gz) = eb5a2460ed75938dc4268bb80f0c65179b81792864abad3b4be1d4f1d6d52f1d
-SIZE (miekg-dns-v1.1.4_GH0.tar.gz) = 3882057
+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.24.0_GH0.tar.gz) = b8ac419ef6eb434e54e3900f0489bdda2f18d604e3f8c074b8ae75e6c106872b
+SIZE (grpc-grpc-go-v1.24.0_GH0.tar.gz) = 755074
 SHA256 (h12w-socks-v1.0.0_GH0.tar.gz) = 338e331b4859fee7656ced8ed8546f803da7f4bc5c9504b6e2ece3e71e6297e5
 SIZE (h12w-socks-v1.0.0_GH0.tar.gz) = 11603
-SHA256 (google-starlark-go-1174b2613e82_GH0.tar.gz) = 7e4ba6eabe1fd9df8b03b06211176f65151842d969378975ce02c80073ed4185
-SIZE (google-starlark-go-1174b2613e82_GH0.tar.gz) = 207473
+SHA256 (miekg-dns-v1.1.4_GH0.tar.gz) = eb5a2460ed75938dc4268bb80f0c65179b81792864abad3b4be1d4f1d6d52f1d
+SIZE (miekg-dns-v1.1.4_GH0.tar.gz) = 3882057
+SHA256 (refraction-networking-utls-43c36d3c1f57_GH0.tar.gz) = ad3d597fc9d3d57637de5085a59b07dda87faca0ff2ef70d50df6b4065d801b3
+SIZE (refraction-networking-utls-43c36d3c1f57_GH0.tar.gz) = 526322

Modified: head/net/v2ray/files/v2ray.in
==============================================================================
--- head/net/v2ray/files/v2ray.in	Mon Jun  1 14:20:33 2020	(r537486)
+++ head/net/v2ray/files/v2ray.in	Mon Jun  1 14:24:53 2020	(r537487)
@@ -4,6 +4,7 @@
 #
 
 # PROVIDE: v2ray
+# REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 # Add these lines to /etc/rc.conf.local or /etc/rc.conf to enable `v2ray':



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006011424.051EOsaO025965>