Update to 8.18.0 which is required for gitlab-ce 12.6.0.

2 files changed, 37 insertions, 32 deletions

diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index acb3ab4771c5..84d0f18cf011 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-workhorse
-PORTVERSION=	8.14.1
+PORTVERSION=	8.18.0
 CATEGORIES=	www
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -20,7 +20,7 @@ MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-workhorse/tags
-GL_COMMIT=	01bfb916e54cb25154db69f3b4d5481b7b77f16f
+GL_COMMIT=	9a9a83e7f92ceea5fb0e1542d604171c58615e28
 
 # for go dependencies
 USE_GITHUB=	nodefault
@@ -37,12 +37,13 @@ GH_TUPLE=	\
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		dgrijalva:jwt-go:v3.2.0:dgrijalva_jwt_go/vendor/github.com/dgrijalva/jwt-go \
 		getsentry:raven-go:v0.1.2:getsentry_raven_go/vendor/github.com/getsentry/raven-go \
-		golang:crypto:20be4c3c3ed5:golang_crypto/vendor/golang.org/x/crypto \
+		go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
+		golang:crypto:4def268fd1a4:golang_crypto/vendor/golang.org/x/crypto \
 		golang:gddo:af0f2af80721:golang_gddo/vendor/github.com/golang/gddo \
-		golang:lint:06c8688daad7:golang_lint/vendor/golang.org/x/lint \
+		golang:lint:d0100b6bd8b3:golang_lint/vendor/golang.org/x/lint \
 		golang:net:d28f0bde5980:golang_net/vendor/golang.org/x/net \
-		golang:protobuf:v1.3.1:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sys:953cdadca894:golang_sys/vendor/golang.org/x/sys \
+		golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:sys:fde4db37ae7a:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \
 		golang:tools:6e04913cbbac:golang_tools/vendor/golang.org/x/tools \
 		gomodule:redigo:v2.0.0:gomodule_redigo/vendor/github.com/gomodule/redigo \
@@ -50,7 +51,7 @@ GH_TUPLE=	\
 		gorilla:websocket:v1.4.0:gorilla_websocket/vendor/github.com/gorilla/websocket \
 		grpc-ecosystem:go-grpc-middleware:v1.0.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
 		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.16.0:grpc_grpc_go/vendor/google.golang.org/grpc \
+		grpc:grpc-go:v1.24.0:grpc_grpc_go/vendor/google.golang.org/grpc \
 		jfbus:httprs:b0af8319bb15:jfbus_httprs/vendor/github.com/jfbus/httprs \
 		jpillora:backoff:8eab2debe79d:jpillora_backoff/vendor/github.com/jpillora/backoff \
 		konsorten:go-windows-terminal-sequences:v1.0.2:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
@@ -60,7 +61,7 @@ GH_TUPLE=	\
 		mitchellh:reflectwalk:v1.0.0:mitchellh_reflectwalk/vendor/github.com/mitchellh/reflectwalk \
 		opentracing:opentracing-go:v1.0.2:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \
 		philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \
-		pkg:errors:v0.8.0:pkg_errors/vendor/github.com/pkg/errors \
+		pkg:errors:v0.8.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.0.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
 		prometheus:client_model:fd36f4220a90:prometheus_client_model/vendor/github.com/prometheus/client_model \
@@ -69,14 +70,16 @@ GH_TUPLE=	\
 		rafaeljusto:redigomock:257e089e14a1:rafaeljusto_redigomock/vendor/github.com/rafaeljusto/redigomock \
 		sebest:xff:6c115e0ffa35:sebest_xff/vendor/github.com/sebest/xff \
 		sirupsen:logrus:v1.3.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
-		stretchr:testify:v1.3.0:stretchr_testify/vendor/github.com/stretchr/testify \
+		stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify \
 		tinylib:msgp:v1.1.0:tinylib_msgp/vendor/github.com/tinylib/msgp \
 		uber:jaeger-client-go:v2.15.0:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \
 		uber:jaeger-lib:v1.5.0:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib
 
 GL_TUPLE=	\
-		gitlab-org:gitaly:a8e2980b1ffe1a728ab13032dc81f90f4b990a03:gitlab_org_gitaly/vendor/gitlab.com/gitlab-org/gitaly \
-		gitlab-org:labkit:905271af7abbfaa1d3549f46ac0394c50cef9b28:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit
+		gitlab-org:gitaly:acc6be5a2cba43e4a39d05a7c995062fb9279ee6:gitlab_org_gitaly/vendor/gitlab.com/gitlab-org/gitaly \
+		gitlab-org:labkit:3253d7975ca73714779c0a1fc95a27fb678071b6:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit
+		# Mirrors for the following packages are not currently known, please look them up and handle these tuples manually:
+		#	::v0.0.1-2019.2.2:group_name/vendor/honnef.co/go/tools
 
 PLIST_FILES=	bin/gitlab-workhorse \
 		bin/gitlab-zip-cat \
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 5a6363a56d00..f80ee7881247 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1574879989
+TIMESTAMP = 1576924432
 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
 SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84
@@ -19,18 +19,20 @@ SHA256 (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 197465ef53219f3aeb1a6940b70e16d288
 SIZE (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 36960
 SHA256 (getsentry-raven-go-v0.1.2_GH0.tar.gz) = fe603da75a8284273f253a8524d456cd6293fb47508d907f830153ed9af98cb5
 SIZE (getsentry-raven-go-v0.1.2_GH0.tar.gz) = 19314
-SHA256 (golang-crypto-20be4c3c3ed5_GH0.tar.gz) = bc78136186ecd1683395d9094a7b973cb01675529131ac59f484e2716609de6f
-SIZE (golang-crypto-20be4c3c3ed5_GH0.tar.gz) = 1690016
+SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff
+SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656
+SHA256 (golang-crypto-4def268fd1a4_GH0.tar.gz) = eaf2ba9df95911f41a340478d1fbb540d7bc21939e4688273995dabf58e8c7b0
+SIZE (golang-crypto-4def268fd1a4_GH0.tar.gz) = 1693117
 SHA256 (golang-gddo-af0f2af80721_GH0.tar.gz) = a37eabe7bf2035e51718154b821f2aed6a384e4b7365e9a62463047e0872e24d
 SIZE (golang-gddo-af0f2af80721_GH0.tar.gz) = 2256821
-SHA256 (golang-lint-06c8688daad7_GH0.tar.gz) = 8f3a13b90cd1425d890288d2ac81a4c24278b7cb85f2e7adf96ee7d918bb4648
-SIZE (golang-lint-06c8688daad7_GH0.tar.gz) = 31924
+SHA256 (golang-lint-d0100b6bd8b3_GH0.tar.gz) = eb3e977d978529ddc4140e8bede5b741e8f4cd46f89735d17b213556e27d5e85
+SIZE (golang-lint-d0100b6bd8b3_GH0.tar.gz) = 32920
 SHA256 (golang-net-d28f0bde5980_GH0.tar.gz) = 40f4d37b315f4a6867ab5beadf4d73f93b9c1d777b48ec66d59f953a4a19acb4
 SIZE (golang-net-d28f0bde5980_GH0.tar.gz) = 1097062
-SHA256 (golang-protobuf-v1.3.1_GH0.tar.gz) = 3f3a6123054a9847093c119895f1660612f301fe95358f3a6a1a33fd0933e6cf
-SIZE (golang-protobuf-v1.3.1_GH0.tar.gz) = 310884
-SHA256 (golang-sys-953cdadca894_GH0.tar.gz) = fb56f244784dac7e7f66fc0ff9f5ff6adbd49ccb8f3625285e6e39254b64c12f
-SIZE (golang-sys-953cdadca894_GH0.tar.gz) = 1353286
+SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65
+SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285
+SHA256 (golang-sys-fde4db37ae7a_GH0.tar.gz) = b6aab4e92d5d8fe85ca0dd229bfb75c91290951a3bf3b95087459e5a4eae86a4
+SIZE (golang-sys-fde4db37ae7a_GH0.tar.gz) = 1455218
 SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb
 SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619
 SHA256 (golang-tools-6e04913cbbac_GH0.tar.gz) = 76c1e182745c99749e4b6b46cf8486244ab2aa9be689f41d827d67a4221977c1
@@ -45,8 +47,8 @@ SHA256 (grpc-ecosystem-go-grpc-middleware-v1.0.0_GH0.tar.gz) = e9178768b55709d2f
 SIZE (grpc-ecosystem-go-grpc-middleware-v1.0.0_GH0.tar.gz) = 97266
 SHA256 (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = eba66530952a126ab869205bdb909af607bfd9eb09f00207b62eb29140258aa9
 SIZE (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = 24760
-SHA256 (grpc-grpc-go-v1.16.0_GH0.tar.gz) = 771230b79dc89753e860b35870ec245b19248b538f0de3fe45d818281739167a
-SIZE (grpc-grpc-go-v1.16.0_GH0.tar.gz) = 545087
+SHA256 (grpc-grpc-go-v1.24.0_GH0.tar.gz) = b8ac419ef6eb434e54e3900f0489bdda2f18d604e3f8c074b8ae75e6c106872b
+SIZE (grpc-grpc-go-v1.24.0_GH0.tar.gz) = 755074
 SHA256 (jfbus-httprs-b0af8319bb15_GH0.tar.gz) = c186a0bc869db44948da673132f29d9147d54a2b55a65ca16ce2c9cd616e3639
 SIZE (jfbus-httprs-b0af8319bb15_GH0.tar.gz) = 5926
 SHA256 (jpillora-backoff-8eab2debe79d_GH0.tar.gz) = 53b3dcecf460fa4a1f21e90b486397056e661a72da15347eaa49618a0559b3f0
@@ -65,8 +67,8 @@ SHA256 (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = fe3606493ab322c3ae9922b7
 SIZE (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = 24067
 SHA256 (philhofer-fwd-v1.0.0_GH0.tar.gz) = 55736f48940198a11b7aeb4faba258459451994a8889ec003ce8d8d26ceca9ff
 SIZE (philhofer-fwd-v1.0.0_GH0.tar.gz) = 9221
-SHA256 (pkg-errors-v0.8.0_GH0.tar.gz) = bacf6c58e490911398cee61742ddc6a90c560733e4c9dcb3d867b17a894c9dd5
-SIZE (pkg-errors-v0.8.0_GH0.tar.gz) = 11344
+SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356
+SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009
 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
 SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
 SHA256 (prometheus-client_golang-v1.0.0_GH0.tar.gz) = afee7b61a77342cc24ea55e284d08688267efca1843e529a51799fe52c5ee662
@@ -83,17 +85,17 @@ SHA256 (sebest-xff-6c115e0ffa35_GH0.tar.gz) = e39b98f5b0622d8d6599ca14011b4e1483
 SIZE (sebest-xff-6c115e0ffa35_GH0.tar.gz) = 4000
 SHA256 (sirupsen-logrus-v1.3.0_GH0.tar.gz) = f80cfa34148c4e25c4d3030edb1fd9878d666eca7e900f1aaf0d87c67ecabe51
 SIZE (sirupsen-logrus-v1.3.0_GH0.tar.gz) = 38452
-SHA256 (stretchr-testify-v1.3.0_GH0.tar.gz) = 0cd9c199a72b8d80621624b37c0ed5ac724352d458506a31dfa86710551e7fc5
-SIZE (stretchr-testify-v1.3.0_GH0.tar.gz) = 102859
+SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698
+SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085
 SHA256 (tinylib-msgp-v1.1.0_GH0.tar.gz) = 30ac583b725d84aee147c26d1bc31e8770a3911e8437461cda0e53fb69c54570
 SIZE (tinylib-msgp-v1.1.0_GH0.tar.gz) = 77923
 SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137df072e2c1f7b15feb69a8ef8963804c44c94
 SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460
 SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3
 SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655
-SHA256 (gitlab-org-gitlab-workhorse-01bfb916e54cb25154db69f3b4d5481b7b77f16f_GL0.tar.gz) = 13fa8898de880fb525660857cc31157a9ab6ad7f05c46a9b115ebb237fd3d91c
-SIZE (gitlab-org-gitlab-workhorse-01bfb916e54cb25154db69f3b4d5481b7b77f16f_GL0.tar.gz) = 202259
-SHA256 (gitlab-org-gitaly-a8e2980b1ffe1a728ab13032dc81f90f4b990a03_GL0.tar.gz) = 230b9d7f8df10fa6c32c8143d04e8822d2d1a3dd1ca2f0942d3a66f674964a37
-SIZE (gitlab-org-gitaly-a8e2980b1ffe1a728ab13032dc81f90f4b990a03_GL0.tar.gz) = 2262713
-SHA256 (gitlab-org-labkit-905271af7abbfaa1d3549f46ac0394c50cef9b28_GL0.tar.gz) = c3830ed2d37c1e5025ec0af68a0768c046c1813f8ac7ec6fc6edb7d589d451b7
-SIZE (gitlab-org-labkit-905271af7abbfaa1d3549f46ac0394c50cef9b28_GL0.tar.gz) = 2504238
+SHA256 (gitlab-org-gitlab-workhorse-9a9a83e7f92ceea5fb0e1542d604171c58615e28_GL0.tar.gz) = 1cb9a43f73861c68384798782cb62098863f1ac98e9a8696320dbd7223d0e42e
+SIZE (gitlab-org-gitlab-workhorse-9a9a83e7f92ceea5fb0e1542d604171c58615e28_GL0.tar.gz) = 206700
+SHA256 (gitlab-org-gitaly-acc6be5a2cba43e4a39d05a7c995062fb9279ee6_GL0.tar.gz) = 40decb68620c061cadba556f836ef8efc953372b32903fd90825bb88fa79e943
+SIZE (gitlab-org-gitaly-acc6be5a2cba43e4a39d05a7c995062fb9279ee6_GL0.tar.gz) = 2800331
+SHA256 (gitlab-org-labkit-3253d7975ca73714779c0a1fc95a27fb678071b6_GL0.tar.gz) = aa9fd1639498d41852acb1c894af5507009de15586a21413307a6832f68e6c3c
+SIZE (gitlab-org-labkit-3253d7975ca73714779c0a1fc95a27fb678071b6_GL0.tar.gz) = 2660149