Update to 13.10.1 which is required for gitlab-ce 13.10.

4 files changed, 71 insertions, 59 deletions

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 1ac4f4e15fea..654bad37c80e 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD$
+# $FreeBSD: head/devel/gitaly/Makefile 568749 2021-03-18 16:32:56Z mfechner $
 
 PORTNAME=	gitaly
-DISTVERSION=	13.9.4
-PORTREVISION=	1
+DISTVERSION=	13.10.1
+PORTREVISION=	0
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 # define dependencies that are required for build and run under MY_DEPENDS
 MY_DEPENDS=	git>=2.29:devel/git \
 		rubygem-bundler>=2.1.4:sysutils/rubygem-bundler \
-		rubygem-rugged>=1.0.1<1.1:devel/rubygem-rugged \
+		rubygem-rugged>=1.1<2:devel/rubygem-rugged \
 		rubygem-github-linguist>=7.12.1<8:textproc/rubygem-github-linguist \
 		rubygem-gitlab-markup>=1.7.1<1.8.0:textproc/rubygem-gitlab-markup \
 		rubygem-activesupport60>=6.0.3.4<6.0.4:devel/rubygem-activesupport60 \
@@ -25,7 +25,7 @@ MY_DEPENDS=	git>=2.29:devel/git \
 		rubygem-sentry-raven>=3.0<4:devel/rubygem-sentry-raven \
 		rubygem-faraday>=1.0.1<2:www/rubygem-faraday \
 		rubygem-rbtrace>=0.4.14:devel/rubygem-rbtrace \
-		rubygem-gitlab-labkit>=0.15.0<0.16:devel/rubygem-gitlab-labkit \
+		rubygem-gitlab-labkit>=0.16.1<0.17:devel/rubygem-gitlab-labkit \
 		rubygem-licensee>=9.14.1<9.15:devel/rubygem-licensee \
 		rubygem-google-protobuf314>=3.12.0<3.15:devel/rubygem-google-protobuf314
 BUILD_DEPENDS=	gem:devel/ruby-gems \
@@ -39,20 +39,22 @@ USES=		gmake go:modules,no_targets pkgconfig
 USE_RUBY=	yes
 
 MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
+# make sure to pass go build options into make process
+MAKE_ENV+=	${GO_ENV}
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT=	901c12240782be3bd2677197b73e4ab20ff9f7ea
+GL_COMMIT=	bb27a5a3b1085a191e9fcc66a50c3d71cde24237
 
 # for go dependencies
 USE_GITHUB=	nodefault
 # generated with: make gomod-vendor
-# 83dd
+# 85dd
 GH_TUPLE=	\
 		DataDog:dd-trace-go:v1.7.0:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \
-		alexbrainman:sspi:4729b3d4d858:alexbrainman_sspi/vendor/github.com/alexbrainman/sspi \
-		avast:retry-go:v2.4.2:avast_retry_go/vendor/github.com/avast/retry-go \
+		alexbrainman:sspi:909beea2cc74:alexbrainman_sspi/vendor/github.com/alexbrainman/sspi \
+		avast:retry-go:v3.0.0:avast_retry_go/vendor/github.com/avast/retry-go \
 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
 		census-instrumentation:opencensus-go:v0.22.2:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
 		client9:reopen:v1.0.0:client9_reopen/vendor/github.com/client9/reopen \
@@ -64,23 +66,24 @@ GH_TUPLE=	\
 		docker:go-units:v0.4.0:docker_go_units/vendor/github.com/docker/go-units \
 		dpotapov:go-spnego:c2c609116ad0:dpotapov_go_spnego/vendor/github.com/dpotapov/go-spnego \
 		getsentry:sentry-go:v0.7.0:getsentry_sentry_go/vendor/github.com/getsentry/sentry-go \
-		git-lfs:git-lfs:9ea4eed5b112:git_lfs_git_lfs/vendor/github.com/git-lfs/git-lfs \
-		git-lfs:gitobj:v2.0.0:git_lfs_gitobj_v2/vendor/github.com/git-lfs/gitobj/v2 \
+		git-lfs:git-lfs:2e1d981afbe3:git_lfs_git_lfs/vendor/github.com/git-lfs/git-lfs \
+		git-lfs:gitobj:v2.0.1:git_lfs_gitobj_v2/vendor/github.com/git-lfs/gitobj/v2 \
 		git-lfs:go-netrc:e0e9ca483a18:git_lfs_go_netrc/vendor/github.com/git-lfs/go-netrc \
-		git-lfs:go-ntlm:c5056e7fa066:git_lfs_go_ntlm/vendor/github.com/git-lfs/go-ntlm \
 		git-lfs:wildmatch:v1.0.4:git_lfs_wildmatch/vendor/github.com/git-lfs/wildmatch \
 		go-gorp:gorp:v1.7.2:go_gorp_gorp/vendor/gopkg.in/gorp.v1 \
-		go-yaml:yaml:9f266ea9e77c:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
+		go-yaml:yaml:9f266ea9e77c:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
+		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
 		godbus:dbus:v5.0.3:godbus_dbus_v5/vendor/github.com/godbus/dbus/v5 \
 		gogo:protobuf:v1.3.1:gogo_protobuf/vendor/github.com/gogo/protobuf \
 		golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \
-		golang:crypto:5c72a883971a:golang_crypto/vendor/golang.org/x/crypto \
+		golang:crypto:be400aefbc4c:golang_crypto/vendor/golang.org/x/crypto \
+		golang:exp:e8c3332aa8e5:golang_exp/vendor/golang.org/x/exp \
 		golang:groupcache:215e87163ea7:golang_groupcache/vendor/github.com/golang/groupcache \
-		golang:net:62affa334b73:golang_net/vendor/golang.org/x/net \
+		golang:net:5f4716e94777:golang_net/vendor/golang.org/x/net \
 		golang:oauth2:bf48bf16ab8d:golang_oauth2/vendor/golang.org/x/oauth2 \
 		golang:protobuf:v1.3.3:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:sync:6e8e738ad208:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:e3ed0017c211:golang_sys/vendor/golang.org/x/sys \
+		golang:sys:ed752295db88:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \
 		google:go-cmp:v0.4.0:google_go_cmp/vendor/github.com/google/go-cmp \
 		google:go-genproto:7949de9c1215:google_go_genproto/vendor/google.golang.org/genproto \
@@ -101,7 +104,7 @@ GH_TUPLE=	\
 		jcmturner:rpc:v0.0.2:jcmturner_rpc/vendor/gopkg.in/jcmturner/rpc.v0 \
 		kelseyhightower:envconfig:v1.3.0:kelseyhightower_envconfig/vendor/github.com/kelseyhightower/envconfig \
 		lib:pq:v1.2.0:lib_pq/vendor/github.com/lib/pq \
-		libgit2:git2go:v30.0.18:libgit2_git2go_v30/vendor/github.com/libgit2/git2go/v30 \
+		libgit2:git2go:v31.4.12:libgit2_git2go_v31/vendor/github.com/libgit2/git2go/v31 \
 		lightstep:lightstep-tracer-go:v0.15.6:lightstep_lightstep_tracer_go/vendor/github.com/lightstep/lightstep-tracer-go \
 		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		mattn:go-runewidth:v0.0.4:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
@@ -111,6 +114,7 @@ GH_TUPLE=	\
 		olekukonko:ts:78ecb04241c0:olekukonko_ts/vendor/github.com/olekukonko/ts \
 		opencontainers:runtime-spec:v1.0.2:opencontainers_runtime_spec/vendor/github.com/opencontainers/runtime-spec \
 		opentracing:opentracing-go:v1.2.0:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \
+		otiai10:curr:v1.0.0:otiai10_curr/vendor/github.com/otiai10/curr \
 		pelletier:go-toml:v1.8.1:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
 		philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \
 		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 44cf3c49c53a..ec01cd091080 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,10 +1,10 @@
-TIMESTAMP = 1616015295
+TIMESTAMP = 1617222766
 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84
 SIZE (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = 3321111
-SHA256 (alexbrainman-sspi-4729b3d4d858_GH0.tar.gz) = 757930d82a7fca04d46d1c69ac27361ef2dadcb9fabbb3bf3a5ed785ebfc4e27
-SIZE (alexbrainman-sspi-4729b3d4d858_GH0.tar.gz) = 15857
-SHA256 (avast-retry-go-v2.4.2_GH0.tar.gz) = 9ed430a4e0c24740db16ba2696422d2d2b07b5e11ea4bcd9a2dde4b58c5a2b50
-SIZE (avast-retry-go-v2.4.2_GH0.tar.gz) = 7225
+SHA256 (alexbrainman-sspi-909beea2cc74_GH0.tar.gz) = 50b452d12987d884f45c85bd2de8ea7076cd54f6f2c8b612a1d4c1704e52b5df
+SIZE (alexbrainman-sspi-909beea2cc74_GH0.tar.gz) = 21761
+SHA256 (avast-retry-go-v3.0.0_GH0.tar.gz) = 29c23aa245946c95616bc067341c09befa27a386d5bda8d9cadb96fd5e4742ee
+SIZE (avast-retry-go-v3.0.0_GH0.tar.gz) = 9540
 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
 SHA256 (census-instrumentation-opencensus-go-v0.22.2_GH0.tar.gz) = 0aa930142b669d7c47e2b8343f6adc9f03414a9c45763c5f746de95231d6ad6d
@@ -27,40 +27,42 @@ SHA256 (dpotapov-go-spnego-c2c609116ad0_GH0.tar.gz) = 8093037eed2321f7496b3f66a3
 SIZE (dpotapov-go-spnego-c2c609116ad0_GH0.tar.gz) = 4294
 SHA256 (getsentry-sentry-go-v0.7.0_GH0.tar.gz) = b5e7432442928e4b03f61d4cb97e5d0b815e6c8618fbf34aa6275aab2218b27e
 SIZE (getsentry-sentry-go-v0.7.0_GH0.tar.gz) = 89499
-SHA256 (git-lfs-git-lfs-9ea4eed5b112_GH0.tar.gz) = 0801cb7867005791509ce7e01cb1680ec5faa48e966135110ac559d4403e8a16
-SIZE (git-lfs-git-lfs-9ea4eed5b112_GH0.tar.gz) = 2848559
-SHA256 (git-lfs-gitobj-v2.0.0_GH0.tar.gz) = 77ff7ff8afa525e3ce5d99a9006755a2817f25ae6c6eeb1279b36b6513828792
-SIZE (git-lfs-gitobj-v2.0.0_GH0.tar.gz) = 95953
+SHA256 (git-lfs-git-lfs-2e1d981afbe3_GH0.tar.gz) = ac86befae8b958b79c460ca45e5982e87d472c071710b37b97743f27d4ac0b1c
+SIZE (git-lfs-git-lfs-2e1d981afbe3_GH0.tar.gz) = 2871805
+SHA256 (git-lfs-gitobj-v2.0.1_GH0.tar.gz) = 67ef655aff54198e8d51699cd247e3def990e85548e5055ceb4a5d8a101a96cd
+SIZE (git-lfs-gitobj-v2.0.1_GH0.tar.gz) = 96072
 SHA256 (git-lfs-go-netrc-e0e9ca483a18_GH0.tar.gz) = f42d0b92162e3b104d79ec86281c7c1f16a40b0a9ae4d311003fe4c0bce03e89
 SIZE (git-lfs-go-netrc-e0e9ca483a18_GH0.tar.gz) = 8477
-SHA256 (git-lfs-go-ntlm-c5056e7fa066_GH0.tar.gz) = 256d2e1af8c1613004a60e87ea2035c14aa585d91ecc41ed938f51a331ee42c2
-SIZE (git-lfs-go-ntlm-c5056e7fa066_GH0.tar.gz) = 32949
 SHA256 (git-lfs-wildmatch-v1.0.4_GH0.tar.gz) = 03fb70141dfa9064aefd59e51df396fbc1a5b9fb7b44997414c0a216aafb62c0
 SIZE (git-lfs-wildmatch-v1.0.4_GH0.tar.gz) = 9580
 SHA256 (go-gorp-gorp-v1.7.2_GH0.tar.gz) = 63488c583d4bf25eb03f8224eef5934158da81650063a96b53ff4f50b9ff5409
 SIZE (go-gorp-gorp-v1.7.2_GH0.tar.gz) = 36726
 SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04
 SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898
+SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0
+SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209
 SHA256 (godbus-dbus-v5.0.3_GH0.tar.gz) = 49d27bde2861f5e5ab4195fddc5f38f25324aac3b32b3cc03e712cca3d2b75fa
 SIZE (godbus-dbus-v5.0.3_GH0.tar.gz) = 63630
 SHA256 (gogo-protobuf-v1.3.1_GH0.tar.gz) = 5184f06decd681fcc82f6583976111faf87189c0c2f8063b34ac2ea9ed997236
 SIZE (gogo-protobuf-v1.3.1_GH0.tar.gz) = 2038188
 SHA256 (golang-appengine-v1.6.5_GH0.tar.gz) = 4e7df5d4ec2dda0f59f26925b36a087843fd1a165adb938712068376bf791316
 SIZE (golang-appengine-v1.6.5_GH0.tar.gz) = 332903
-SHA256 (golang-crypto-5c72a883971a_GH0.tar.gz) = 2b8df0754ba64c95786bc5fe2071cadf4757f754e774f5985d725c1aaa6cb3d8
-SIZE (golang-crypto-5c72a883971a_GH0.tar.gz) = 1732429
+SHA256 (golang-crypto-be400aefbc4c_GH0.tar.gz) = 52f3f5dc88c5ab7428a9bed403127266d1b5fc90af6a4f6685f98259bb7b7452
+SIZE (golang-crypto-be400aefbc4c_GH0.tar.gz) = 1722808
+SHA256 (golang-exp-e8c3332aa8e5_GH0.tar.gz) = 02d36b798456326f37ca4bebc8824c0eafe650ae9b0fc2673a034d7c3add5422
+SIZE (golang-exp-e8c3332aa8e5_GH0.tar.gz) = 1513507
 SHA256 (golang-groupcache-215e87163ea7_GH0.tar.gz) = 500b097a42fb5c0cd516f1bb56e9c745ba6c1c910b4dc7296aea2b9120ee5e70
 SIZE (golang-groupcache-215e87163ea7_GH0.tar.gz) = 26040
-SHA256 (golang-net-62affa334b73_GH0.tar.gz) = abc8bc764836181f0b510d48efcfbaaf9ad8858f799b23e4bbc6fa73291ffd23
-SIZE (golang-net-62affa334b73_GH0.tar.gz) = 1179195
+SHA256 (golang-net-5f4716e94777_GH0.tar.gz) = 987ec0774e8480615daf0664cd9c9ec9eb25cf6e553e32ae38697515629714b6
+SIZE (golang-net-5f4716e94777_GH0.tar.gz) = 1251426
 SHA256 (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 28b3a51a8bd90beb5952d1080218ea238127edfe9455ad48921989619ff918a8
 SIZE (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 47016
 SHA256 (golang-protobuf-v1.3.3_GH0.tar.gz) = b3a1440808d6ed4dc0d194c482de029f6c116b1de7f7a3bf927324d965ff3853
 SIZE (golang-protobuf-v1.3.3_GH0.tar.gz) = 315377
 SHA256 (golang-sync-6e8e738ad208_GH0.tar.gz) = 011eb5dc95a0ede8be5d68edde93be5af1b88d7fc098d0f74c6f7560beb378f0
 SIZE (golang-sync-6e8e738ad208_GH0.tar.gz) = 17288
-SHA256 (golang-sys-e3ed0017c211_GH0.tar.gz) = 93c78dbd2d42098a1d6cbe483c5564d59d5a6eff470295aba1a1f6adf495d5e1
-SIZE (golang-sys-e3ed0017c211_GH0.tar.gz) = 1068415
+SHA256 (golang-sys-ed752295db88_GH0.tar.gz) = 0d6424cced930a084d419bdba3b05f08a2dbc1d534f81b4bebcb7ae73d9de427
+SIZE (golang-sys-ed752295db88_GH0.tar.gz) = 1085924
 SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185
 SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332
 SHA256 (google-go-cmp-v0.4.0_GH0.tar.gz) = 97964b47aa6dc61007f9e1b1ad67812f0a8a2380072a59daebac7bc0cdcf740a
@@ -101,8 +103,8 @@ SHA256 (kelseyhightower-envconfig-v1.3.0_GH0.tar.gz) = 3556a0d014ba778b78955e8ec
 SIZE (kelseyhightower-envconfig-v1.3.0_GH0.tar.gz) = 12408
 SHA256 (lib-pq-v1.2.0_GH0.tar.gz) = 052e9ce4472eda212e5034fd0298fcf254c22925b1d596b1d043a7a60fe4672e
 SIZE (lib-pq-v1.2.0_GH0.tar.gz) = 96083
-SHA256 (libgit2-git2go-v30.0.18_GH0.tar.gz) = d0fa2ebc485751d30d06d01b22e3f66e74faf3a122311c2ebbd16f4fa8306829
-SIZE (libgit2-git2go-v30.0.18_GH0.tar.gz) = 92811
+SHA256 (libgit2-git2go-v31.4.12_GH0.tar.gz) = 4425db097e682e62a1781a83f1eeb22b6106a7e5f3459742fda8de69466f8b1d
+SIZE (libgit2-git2go-v31.4.12_GH0.tar.gz) = 115471
 SHA256 (lightstep-lightstep-tracer-go-v0.15.6_GH0.tar.gz) = b3c3245404b05ea7d030591c1862a807cc0801ce561553b8b7682cb0e198fb14
 SIZE (lightstep-lightstep-tracer-go-v0.15.6_GH0.tar.gz) = 194986
 SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
@@ -121,6 +123,8 @@ SHA256 (opencontainers-runtime-spec-v1.0.2_GH0.tar.gz) = 0933a1ba6e418fe020993e8
 SIZE (opencontainers-runtime-spec-v1.0.2_GH0.tar.gz) = 71840
 SHA256 (opentracing-opentracing-go-v1.2.0_GH0.tar.gz) = cb32b383422a9aae11d260657d52a3789bd799802881b9ced3ee82c370be6f76
 SIZE (opentracing-opentracing-go-v1.2.0_GH0.tar.gz) = 35914
+SHA256 (otiai10-curr-v1.0.0_GH0.tar.gz) = 4db2a3563b84d3888758cd426473cfcfd0f9f5938a78342d140e9424a7ecdf33
+SIZE (otiai10-curr-v1.0.0_GH0.tar.gz) = 2464
 SHA256 (pelletier-go-toml-v1.8.1_GH0.tar.gz) = 837b8407fb401deff36961ce32498a1145c5ef4bad0b0060a25e632c14621941
 SIZE (pelletier-go-toml-v1.8.1_GH0.tar.gz) = 98819
 SHA256 (philhofer-fwd-v1.0.0_GH0.tar.gz) = 55736f48940198a11b7aeb4faba258459451994a8889ec003ce8d8d26ceca9ff
@@ -157,8 +161,8 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137
 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-gitaly-901c12240782be3bd2677197b73e4ab20ff9f7ea_GL0.tar.gz) = 4ab037cd8454303e7a8d2f2189e2afb67fd50b3a86435420b53938255b91f560
-SIZE (gitlab-org-gitaly-901c12240782be3bd2677197b73e4ab20ff9f7ea_GL0.tar.gz) = 3353678
+SHA256 (gitlab-org-gitaly-bb27a5a3b1085a191e9fcc66a50c3d71cde24237_GL0.tar.gz) = 2e76557a78228444b2598b8e01194af5f42be763e3c40f22fda6205ea93a2aa9
+SIZE (gitlab-org-gitaly-bb27a5a3b1085a191e9fcc66a50c3d71cde24237_GL0.tar.gz) = 3395696
 SHA256 (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = f2fdaf95afc348cbfe1b4445b5031bc67d2e808e4525db3dfb3a9e27c9adddf3
 SIZE (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 89583
 SHA256 (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 7fb33d071f1731691125807188be8faba6100a43fa66ad9064d204b56642fbfd
diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile
index cd06faaed098..a4245bea4471 100644
--- a/devel/gitaly/files/patch-Makefile
+++ b/devel/gitaly/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2021-02-19 09:28:00 UTC
+--- Makefile.orig	2021-03-17 18:58:25 UTC
 +++ Makefile
-@@ -49,7 +49,7 @@ GOLANGCI_LINT_OPTIONS ?=
+@@ -51,7 +51,7 @@ GOLANGCI_LINT_OPTIONS ?=
  GOLANGCI_LINT_CONFIG  ?= ${SOURCE_DIR}/.golangci.yml
  
  # Build information
@@ -9,7 +9,7 @@
  GITALY_PACKAGE  := gitlab.com/gitlab-org/gitaly
  BUILD_TIME      := $(shell date +"%Y%m%d.%H%M%S")
  GITALY_VERSION  := $(shell git describe --match v* 2>/dev/null | sed 's/^v//' || cat ${SOURCE_DIR}/VERSION 2>/dev/null || echo unknown)
-@@ -174,7 +174,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR}
+@@ -190,7 +190,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR}
  all: install
  
  .PHONY: build
@@ -18,7 +18,7 @@
  	go install ${GO_LDFLAGS} -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $(call find_commands))
  
  .PHONY: install
-@@ -212,7 +212,7 @@ assemble-ruby:
+@@ -228,7 +228,7 @@ assemble-ruby:
  .PHONY: binaries
  binaries: assemble
  	${Q}if [ ${ARCH} != 'x86_64' ]; then echo Incorrect architecture for build: ${ARCH}; exit 1; fi
@@ -27,7 +27,7 @@
  
  .PHONY: prepare-tests
  prepare-tests: git libgit2 prepare-test-repos ${SOURCE_DIR}/.ruby-bundle
-@@ -374,8 +374,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
+@@ -381,8 +381,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
  # step. Both Omnibus and CNG assume it is in the Gitaly root, not in
  # _build. Hence the '../' in front.
  ${SOURCE_DIR}/.ruby-bundle: ${GITALY_RUBY_DIR}/Gemfile.lock ${GITALY_RUBY_DIR}/Gemfile
@@ -37,24 +37,21 @@
  	${Q}touch $@
  
  ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE
-@@ -405,17 +404,17 @@ ${BUILD_DIR}/tools: | ${BUILD_DIR}
- # jobs of a CI pipeline, we start depending on its hash. Like this, we only
- # rebuild if the Makefile actually has changed contents.
- ${BUILD_DIR}/Makefile.sha256: Makefile | ${BUILD_DIR}
--	${Q}sha256sum -c $@ >/dev/null 2>&1 || >$@ sha256sum Makefile
-+	${Q}sha256 -c $@ >/dev/null 2>&1 || >$@ sha256 Makefile
+@@ -445,7 +444,7 @@ ${GIT_INSTALL_DIR}/bin/git: ${DEPENDENCY_DIR}/git.vers
+ else
+ ${DEPENDENCY_DIR}/git_full_bins.tgz: ${DEPENDENCY_DIR}/git.version
+ 	curl -o $@.tmp --silent --show-error -L ${GIT_BINARIES_URL}
+-	${Q}printf '${GIT_BINARIES_HASH}  $@.tmp' | sha256sum -c -
++	${Q}printf '${GIT_BINARIES_HASH}  $@.tmp' | sha256 -c -
+ 	${Q}mv $@.tmp $@
  
- ${BUILD_DIR}/protoc.zip: ${BUILD_DIR}/Makefile.sha256
+ ${GIT_INSTALL_DIR}/bin/git: ${DEPENDENCY_DIR}/git_full_bins.tgz
+@@ -458,7 +457,7 @@ ${TOOLS_DIR}/protoc.zip: TOOL_VERSION = ${PROTOC_VERSI
+ ${TOOLS_DIR}/protoc.zip: ${TOOLS_DIR}/protoc.version
  	${Q}if [ -z "${PROTOC_URL}" ]; then echo "Cannot generate protos on unsupported platform ${OS}" && exit 1; fi
  	curl -o $@.tmp --silent --show-error -L ${PROTOC_URL}
 -	${Q}printf '${PROTOC_HASH}  $@.tmp' | sha256sum -c -
 +	${Q}printf '${PROTOC_HASH}  $@.tmp' | sha256 -c -
  	${Q}mv $@.tmp $@
  
- ${BUILD_DIR}/git_full_bins.tgz: ${BUILD_DIR}/Makefile.sha256
- 	curl -o $@.tmp --silent --show-error -L ${GIT_BINARIES_URL}
--	${Q}printf '${GIT_BINARIES_HASH}  $@.tmp' | sha256sum -c -
-+	${Q}printf '${GIT_BINARIES_HASH}  $@.tmp' | sha256 -c -
- 	${Q}mv $@.tmp $@
- 
- ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a: ${BUILD_DIR}/Makefile.sha256
+ ${PROTOC}: ${TOOLS_DIR}/protoc.zip
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile
index e4410cff23c2..1edec7ee3614 100644
--- a/devel/gitaly/files/patch-ruby_Gemfile
+++ b/devel/gitaly/files/patch-ruby_Gemfile
@@ -1,6 +1,13 @@
---- ruby/Gemfile.orig	2021-03-04 13:36:33 UTC
+--- ruby/Gemfile.orig	2021-03-17 18:58:25 UTC
 +++ ruby/Gemfile
-@@ -19,15 +19,5 @@ gem 'gitlab-labkit', '~> 0.15.0'
+@@ -13,21 +13,11 @@ gem 'faraday', '~> 1.0'
+ gem 'rbtrace', require: false
+ 
+ # Labkit provides observability functionality
+-gem 'gitlab-labkit', '~> 0.15.0'
++gem 'gitlab-labkit', '~> 0.16.1'
+ 
+ # Detects the open source license the repository includes
  # This version needs to be in sync with GitLab CE/EE
  gem 'licensee', '~> 9.14.1'