devel/gitlab-shell: Update to 13.21.0

Required for gitlab-ce 14.3.

2 files changed, 45 insertions, 24 deletions

diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index 9572b7e7e548..ea74e153f5bf 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -1,7 +1,7 @@
 # Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
 
 PORTNAME=	gitlab-shell
-PORTVERSION=	13.19.1
+PORTVERSION=	13.21.0
 PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -10,14 +10,12 @@ COMMENT=	GitLab Shell handles git commands for GitLab
 
 LICENSE=	MIT
 
-USES=		gmake go:modules,no_targets
-MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
-ALL_TARGET=	build
+USES=		gmake go:modules
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-shell/tags
-GL_COMMIT=	757aa7c0e0b8733c75c744f188b0136c1fe1830f
+GL_COMMIT=	81e580997d07a7a9d3dddbd42cbb39f305c63b8b
 
 USERS=		git
 GROUPS=		git
@@ -27,14 +25,17 @@ GROUPS=		git
 # for go dependencies
 USE_GITHUB=	nodefault
 # generated with: make gomod-vendor
-# 66dd
+# 70dd
 GH_TUPLE=	\
 		DataDog:datadog-go:v4.4.0:datadog_datadog_go/vendor/github.com/DataDog/datadog-go \
 		DataDog:dd-trace-go:v1.30.0:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \
 		Microsoft:go-winio:v0.4.19:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
 		StackExchange:wmi:cbe66965904d:stackexchange_wmi/vendor/github.com/StackExchange/wmi \
+		aws:aws-sdk-go:v1.37.0:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
+		census-ecosystem:opencensus-go-exporter-stackdriver:v0.13.8:census_ecosystem_opencensus_go_exporter_stackdriver/vendor/contrib.go.opencensus.io/exporter/stackdriver \
 		census-instrumentation:opencensus-go:v0.23.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
+		census-instrumentation:opencensus-proto:v0.3.0:census_instrumentation_opencensus_proto/vendor/github.com/census-instrumentation/opencensus-proto \
 		cespare:xxhash:v2.1.1:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
 		client9:reopen:v1.0.0:client9_reopen/vendor/github.com/client9/reopen \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
@@ -44,7 +45,7 @@ GH_TUPLE=	\
 		gogo:protobuf:v1.3.2:gogo_protobuf/vendor/github.com/gogo/protobuf \
 		golang:appengine:v1.6.7:golang_appengine/vendor/google.golang.org/appengine \
 		golang:crypto:eec23a3978ad:golang_crypto/vendor/golang.org/x/crypto \
-		golang:groupcache:8c9f03a8e57e:golang_groupcache/vendor/github.com/golang/groupcache \
+		golang:groupcache:41bb18bfe9da:golang_groupcache/vendor/github.com/golang/groupcache \
 		golang:lint:83fdc39ff7b5:golang_lint/vendor/golang.org/x/lint \
 		golang:net:d523dce5a7f4:golang_net/vendor/golang.org/x/net \
 		golang:oauth2:5e61552d6c78:golang_oauth2/vendor/golang.org/x/oauth2 \
@@ -66,6 +67,7 @@ GH_TUPLE=	\
 		grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \
 		grpc:grpc-go:v1.37.0:grpc_grpc_go/vendor/google.golang.org/grpc \
 		hashicorp:yamux:a95892c5f864:hashicorp_yamux/vendor/github.com/hashicorp/yamux \
+		jmespath:go-jmespath:v0.4.0:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
 		lightstep:lightstep-tracer-common:a8dfcb80d3a7:lightstep_lightstep_tracer_common_gogo/vendor/github.com/lightstep/lightstep-tracer-common \
 		lightstep:lightstep-tracer-go:v0.24.0:lightstep_lightstep_tracer_go/vendor/github.com/lightstep/lightstep-tracer-go \
 		mattn:go-shellwords:v1.0.11:mattn_go_shellwords/vendor/github.com/mattn/go-shellwords \
@@ -75,7 +77,7 @@ GH_TUPLE=	\
 		opentracing:opentracing-go:v1.2.0:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \
 		otiai10:copy:v1.4.2:otiai10_copy/vendor/github.com/otiai10/copy \
 		philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \
-		pires:go-proxyproto:v0.5.0:pires_go_proxyproto/vendor/github.com/pires/go-proxyproto \
+		pires:go-proxyproto:v0.6.0:pires_go_proxyproto/vendor/github.com/pires/go-proxyproto \
 		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
 		prometheus:client_golang:v1.10.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
@@ -93,7 +95,19 @@ GH_TUPLE=	\
 		uber:jaeger-lib:v2.4.1:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib
 
 GL_TUPLE=	gitlab-org:gitaly:e078d5bd7c5eb37caa222faa15010ce6decc6aa6:gitlab_org_gitaly_v14/vendor/gitlab.com/gitlab-org/gitaly/v14 \
-		gitlab-org:labkit:b36f912635e66d2d043f57d0d2618fdc51002b87:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit
+		gitlab-org:labkit:dc97d99c35488e59727a3da089f764df901ba56f:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit
+
+_BUILD_DATE=	$$(date -u "+%Y-%m-%d-%H%M UTC")
+
+GO_BUILDFLAGS=	-tags="tracer_static,tracer_static_jaeger,continuous_profiler_stackdriver" \
+		-ldflags=" \
+		-X 'main.Version=v${PORTVERSION}' \
+		-X 'main.BuildTime=${_BUILD_DATE}'"
+GO_TARGET=	./cmd/gitlab-shell \
+		./cmd/gitlab-shell-authorized-keys-check \
+		./cmd/gitlab-shell-authorized-principals-check \
+		./cmd/gitlab-sshd \
+		./cmd/check
 
 VARLOGDIR=	/var/log/gitlab-shell
 
@@ -104,19 +118,18 @@ post-patch:
 	${CP} ${WRKSRC}/config.yml.sample ${WRKSRC}/config.yml
 	${REINPLACE_CMD} -e 's|VERSION_STRING :=.*|VERSION_STRING := v${PORTVERSION}|g' ${WRKSRC}/Makefile
 
-pre-build:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} build)
-
 pre-install:
 	${RM} -rf ${WRKSRC}/config.yml
-	#${RM} -rf ${WRKSRC}/go_build
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-.for x in .codeclimate.yml .gitignore .gitlab-ci.yml .ruby-version CHANGELOG CONTRIBUTING.md Gemfile Gemfile.lock LICENSE README.md VERSION config.yml.sample
+	${MKDIR} ${STAGEDIR}${DATADIR}/bin
+	${FIND} ${WRKSRC} -name '*.orig' -delete
+	(cd ${WRKDIR}/bin/ && ${COPYTREE_BIN} .  ${STAGEDIR}${DATADIR}/bin)
+.for x in CHANGELOG LICENSE README.md VERSION config.yml.sample
 	${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DATADIR}/
 .endfor
-.for x in bin spec support .gitlab
+.for x in support
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${x}
 	(cd ${WRKSRC}/${x} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${x})
 .endfor
diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo
index 11815c590590..3e0a93902f26 100644
--- a/devel/gitlab-shell/distinfo
+++ b/devel/gitlab-shell/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1628063863
+TIMESTAMP = 1632236619
 SHA256 (DataDog-datadog-go-v4.4.0_GH0.tar.gz) = ca4e63041f5e0a176f0affd7a59979255de116686479816a80ff067531f141dc
 SIZE (DataDog-datadog-go-v4.4.0_GH0.tar.gz) = 43175
 SHA256 (DataDog-dd-trace-go-v1.30.0_GH0.tar.gz) = a739f6c2c20cfa8ffe427451c9eeea3b369fd7bf1334507eef2b8d60088974a2
@@ -7,10 +7,16 @@ SHA256 (Microsoft-go-winio-v0.4.19_GH0.tar.gz) = aa80cb2aa45ffd97808c2365c554f83
 SIZE (Microsoft-go-winio-v0.4.19_GH0.tar.gz) = 87784
 SHA256 (StackExchange-wmi-cbe66965904d_GH0.tar.gz) = 14dbc4af6952acdb1b941d002cd36fd2299aa6b3144cbcbddbb032c47f816da5
 SIZE (StackExchange-wmi-cbe66965904d_GH0.tar.gz) = 11279
+SHA256 (aws-aws-sdk-go-v1.37.0_GH0.tar.gz) = d0bc2f98fe8ead35497d267ee9dc534ab26a5417bb5ca61ce63ca75e9a801b1d
+SIZE (aws-aws-sdk-go-v1.37.0_GH0.tar.gz) = 18127514
 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
+SHA256 (census-ecosystem-opencensus-go-exporter-stackdriver-v0.13.8_GH0.tar.gz) = 759ac647e059e4fddf4857bcac7b5a82a4a5c389a15dd67b74f647bb8dcf127e
+SIZE (census-ecosystem-opencensus-go-exporter-stackdriver-v0.13.8_GH0.tar.gz) = 90749
 SHA256 (census-instrumentation-opencensus-go-v0.23.0_GH0.tar.gz) = cc9dc0234de1baacf1855cf19615b381ca2f2adb83a2871e7a9b8b74e46818cf
 SIZE (census-instrumentation-opencensus-go-v0.23.0_GH0.tar.gz) = 176498
+SHA256 (census-instrumentation-opencensus-proto-v0.3.0_GH0.tar.gz) = b7e13f0b4259e80c3070b583c2f39e53153085a6918718b1c710caf7037572b0
+SIZE (census-instrumentation-opencensus-proto-v0.3.0_GH0.tar.gz) = 163404
 SHA256 (cespare-xxhash-v2.1.1_GH0.tar.gz) = 0ee31178d2c5a1249be4e26294a2f428008dc4e1ecbbfbe47f74e41026df1148
 SIZE (cespare-xxhash-v2.1.1_GH0.tar.gz) = 9292
 SHA256 (client9-reopen-v1.0.0_GH0.tar.gz) = 64829db9b9fd0dd94b2444c45a2cb6e926b79c3a2e589a75a5edc2ba488a7875
@@ -29,8 +35,8 @@ SHA256 (golang-appengine-v1.6.7_GH0.tar.gz) = c623d81235f7c9699e299b328191d81333
 SIZE (golang-appengine-v1.6.7_GH0.tar.gz) = 333007
 SHA256 (golang-crypto-eec23a3978ad_GH0.tar.gz) = bd882536660d6b65619c9d9b9334e9a5c55557613e56e1b485323a2293dfa2f8
 SIZE (golang-crypto-eec23a3978ad_GH0.tar.gz) = 1725798
-SHA256 (golang-groupcache-8c9f03a8e57e_GH0.tar.gz) = b92f918daa48048fd360f14d1a4aed6e70c1176ae6b00b0dc04094bb088e9865
-SIZE (golang-groupcache-8c9f03a8e57e_GH0.tar.gz) = 26047
+SHA256 (golang-groupcache-41bb18bfe9da_GH0.tar.gz) = 1e89795970d6593affdafe1d09dcf947681ca1ea82528e8e4fb9974a77f2e394
+SIZE (golang-groupcache-41bb18bfe9da_GH0.tar.gz) = 26101
 SHA256 (golang-lint-83fdc39ff7b5_GH0.tar.gz) = 5014077abbc075c3b4b459f7ad98cc1c28f2ae6bde906a9d8ed19d8c8b97987a
 SIZE (golang-lint-83fdc39ff7b5_GH0.tar.gz) = 31889
 SHA256 (golang-net-d523dce5a7f4_GH0.tar.gz) = 2845c6b37390b25a88a8a71e211e1ed9da8a1f6363baa275d6d30e8dd0d00a21
@@ -73,6 +79,8 @@ SHA256 (grpc-grpc-go-v1.37.0_GH0.tar.gz) = ab96e0de7416d1d26ea5c98417d21cd72b2c6
 SIZE (grpc-grpc-go-v1.37.0_GH0.tar.gz) = 1236791
 SHA256 (hashicorp-yamux-a95892c5f864_GH0.tar.gz) = 9468ab6cee06cee3e1883a99f5d763bd8d9111e13ce499c5f5f5a705a9979789
 SIZE (hashicorp-yamux-a95892c5f864_GH0.tar.gz) = 24397
+SHA256 (jmespath-go-jmespath-v0.4.0_GH0.tar.gz) = aa86d00b6836345eee196c13df2df084a18e0b1159935de9289f2ef6a7fe375d
+SIZE (jmespath-go-jmespath-v0.4.0_GH0.tar.gz) = 128861
 SHA256 (lightstep-lightstep-tracer-common-a8dfcb80d3a7_GH0.tar.gz) = 0403290c66b3dd109d0a726784b8b0a8583c5d19d35d12a0c2b89a434ed2d0c6
 SIZE (lightstep-lightstep-tracer-common-a8dfcb80d3a7_GH0.tar.gz) = 58493
 SHA256 (lightstep-lightstep-tracer-go-v0.24.0_GH0.tar.gz) = 794c5cea97c46ee5a9139c1b2770cbd81d4534ba4359a8b6b744566c4abfb15b
@@ -91,8 +99,8 @@ SHA256 (otiai10-copy-v1.4.2_GH0.tar.gz) = 59e4ba0897fa02d144ecd65b0205f7b9dfb355
 SIZE (otiai10-copy-v1.4.2_GH0.tar.gz) = 8395
 SHA256 (philhofer-fwd-v1.0.0_GH0.tar.gz) = 55736f48940198a11b7aeb4faba258459451994a8889ec003ce8d8d26ceca9ff
 SIZE (philhofer-fwd-v1.0.0_GH0.tar.gz) = 9221
-SHA256 (pires-go-proxyproto-v0.5.0_GH0.tar.gz) = d23df3a6b9eeed9c35b85ba558cdcd57a6867de37f481b2a6df727bebd9aa909
-SIZE (pires-go-proxyproto-v0.5.0_GH0.tar.gz) = 34787
+SHA256 (pires-go-proxyproto-v0.6.0_GH0.tar.gz) = 0f890b332f94097a5e8c0faab89d9c8550943a98a03e36e77371f942481ef54d
+SIZE (pires-go-proxyproto-v0.6.0_GH0.tar.gz) = 35455
 SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
 SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
@@ -123,9 +131,9 @@ SHA256 (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 7590acdefcbbf9553bd3415bc7e5
 SIZE (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 210139
 SHA256 (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = c178bcad325857dba29551c16f40707701adf6e3a9e01e1ca3e5edfc3c6de8bc
 SIZE (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = 38010
-SHA256 (gitlab-org-gitlab-shell-757aa7c0e0b8733c75c744f188b0136c1fe1830f_GL0.tar.gz) = d25d93d4ab3339d1400a61c3b83cdb1429dfa5efe3b3d5c4f0803b95bfab1059
-SIZE (gitlab-org-gitlab-shell-757aa7c0e0b8733c75c744f188b0136c1fe1830f_GL0.tar.gz) = 121849
+SHA256 (gitlab-org-gitlab-shell-81e580997d07a7a9d3dddbd42cbb39f305c63b8b_GL0.tar.gz) = d09f28271646c275a02a41253f7a2e594e8c6dfd8a1fc17442b48a1d700ca7f8
+SIZE (gitlab-org-gitlab-shell-81e580997d07a7a9d3dddbd42cbb39f305c63b8b_GL0.tar.gz) = 126597
 SHA256 (gitlab-org-gitaly-e078d5bd7c5eb37caa222faa15010ce6decc6aa6_GL0.tar.gz) = 31a6c86d809082126e11e98e050749932861297a3d21c8e4756b5618e06ac9fd
 SIZE (gitlab-org-gitaly-e078d5bd7c5eb37caa222faa15010ce6decc6aa6_GL0.tar.gz) = 3465551
-SHA256 (gitlab-org-labkit-b36f912635e66d2d043f57d0d2618fdc51002b87_GL0.tar.gz) = 8861cd94165ef55ac8985bc64738b1f828d9a0af1292141525dd607fdea72b4d
-SIZE (gitlab-org-labkit-b36f912635e66d2d043f57d0d2618fdc51002b87_GL0.tar.gz) = 167613
+SHA256 (gitlab-org-labkit-dc97d99c35488e59727a3da089f764df901ba56f_GL0.tar.gz) = a09b5d54461028864d8f2bed3d9e1bf8ec1c469131540747d169e87f83fdfa9c
+SIZE (gitlab-org-labkit-dc97d99c35488e59727a3da089f764df901ba56f_GL0.tar.gz) = 146889