devel/gitaly: Update to 13.12.0.

Required for gitlab-ce 13.12.

5 files changed, 40 insertions, 48 deletions

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 7a6c5560a050..1d92ef4693bd 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitaly
-DISTVERSION=	13.11.4
+DISTVERSION=	13.12.0
 PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -19,13 +19,13 @@ MY_DEPENDS=	git>=2.31.1:devel/git \
 		rubygem-rdoc>=6.1<7.0:devel/rubygem-rdoc \
 		rubygem-gitlab-gollum-lib>=4.2.7.10.gitlab.1<4.2.8:www/rubygem-gitlab-gollum-lib \
 		rubygem-gitlab-gollum-rugged_adapter>=0.4.4.4.gitlab.1<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \
-		rubygem-grpc130>=1.30.2<1.31:net/rubygem-grpc130 \
+		rubygem-grpc>=1.30.2<2:net/rubygem-grpc \
 		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.16.2<0.17:devel/rubygem-gitlab-labkit \
+		rubygem-gitlab-labkit>=0.16.2<0.18:devel/rubygem-gitlab-labkit \
 		rubygem-licensee>=9.14.1<9.15:devel/rubygem-licensee \
-		rubygem-google-protobuf314>=3.14.0<3.15:devel/rubygem-google-protobuf314
+		rubygem-google-protobuf315>=3.15.5<3.16:devel/rubygem-google-protobuf315
 BUILD_DEPENDS=	gem:devel/ruby-gems \
 		bash>0:shells/bash \
 		${MY_DEPENDS}
@@ -43,7 +43,7 @@ MAKE_ENV+=	${GO_ENV}
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT=	aa388adb235751f446f3ed9ec54a46e65d8e3901
+GL_COMMIT=	bc0e6dd857ea2a2c3cfdcca10448e5da93ed2aad
 
 # for go dependencies
 USE_GITHUB=	nodefault
@@ -74,11 +74,11 @@ GH_TUPLE=	\
 		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:be400aefbc4c:golang_crypto/vendor/golang.org/x/crypto \
+		golang:crypto:83a5a9bb288b: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:lint:fdd1cda4f05f:golang_lint/vendor/golang.org/x/lint \
-		golang:net:5f4716e94777:golang_net/vendor/golang.org/x/net \
+		golang:net:e18ecbb05110: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 \
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 5481808b33fa..3838a5b2479d 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1621231236
+TIMESTAMP = 1621967080
 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-909beea2cc74_GH0.tar.gz) = 50b452d12987d884f45c85bd2de8ea7076cd54f6f2c8b612a1d4c1704e52b5df
@@ -47,16 +47,16 @@ SHA256 (gogo-protobuf-v1.3.1_GH0.tar.gz) = 5184f06decd681fcc82f6583976111faf8718
 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-be400aefbc4c_GH0.tar.gz) = 52f3f5dc88c5ab7428a9bed403127266d1b5fc90af6a4f6685f98259bb7b7452
-SIZE (golang-crypto-be400aefbc4c_GH0.tar.gz) = 1722808
+SHA256 (golang-crypto-83a5a9bb288b_GH0.tar.gz) = c6aa1fc9104536c3335135c9c0bf5a9c2ee3cedc05a937a24cee93aa21a72d80
+SIZE (golang-crypto-83a5a9bb288b_GH0.tar.gz) = 1726653
 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-lint-fdd1cda4f05f_GH0.tar.gz) = d02215cdf7a8c9e1874406b0414f3799e13e235ed4de142f837f68aa69d6fd55
 SIZE (golang-lint-fdd1cda4f05f_GH0.tar.gz) = 31573
-SHA256 (golang-net-5f4716e94777_GH0.tar.gz) = 987ec0774e8480615daf0664cd9c9ec9eb25cf6e553e32ae38697515629714b6
-SIZE (golang-net-5f4716e94777_GH0.tar.gz) = 1251426
+SHA256 (golang-net-e18ecbb05110_GH0.tar.gz) = c30374f6fd34c6b77d53224aa3ba7458e3773d7e6e4fa16d88fb05c7d05e0e89
+SIZE (golang-net-e18ecbb05110_GH0.tar.gz) = 1253124
 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
@@ -169,8 +169,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-aa388adb235751f446f3ed9ec54a46e65d8e3901_GL0.tar.gz) = c1ce691df65d130c4df83cf315c926d2e4b3970f863780f03ad2c40ce246fc16
-SIZE (gitlab-org-gitaly-aa388adb235751f446f3ed9ec54a46e65d8e3901_GL0.tar.gz) = 3459954
+SHA256 (gitlab-org-gitaly-bc0e6dd857ea2a2c3cfdcca10448e5da93ed2aad_GL0.tar.gz) = b3601f0c82e4cdb5264f035162e138eace145522335131f6ac816eee1eda5ec0
+SIZE (gitlab-org-gitaly-bc0e6dd857ea2a2c3cfdcca10448e5da93ed2aad_GL0.tar.gz) = 3462729
 SHA256 (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 7f5b214e4bd2b72231462c3a153d9b416caab331a1a25a3ca5cd44b02ab9eb15
 SIZE (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 89693
 SHA256 (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 0ac619ab0bfcbda29f80f0955e86c7ffa1adaa20c96ed546f53fb837633f5d90
diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile
index ab17a26152bc..d5cc9398943c 100644
--- a/devel/gitaly/files/patch-Makefile
+++ b/devel/gitaly/files/patch-Makefile
@@ -1,7 +1,7 @@
---- Makefile.orig	2021-04-22 21:08:06 UTC
+--- Makefile.orig	2021-05-19 15:38:40 UTC
 +++ Makefile
-@@ -197,7 +197,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR}
- all: install
+@@ -184,7 +184,7 @@ export CGO_LDFLAGS_ALLOW          = -D_THREAD_SAFE
+ all: build
  
  .PHONY: build
 -build: ${SOURCE_DIR}/.ruby-bundle libgit2
@@ -9,16 +9,7 @@
  	go install ${GO_LDFLAGS} -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $(call find_commands))
  
  .PHONY: install
-@@ -235,7 +235,7 @@ assemble-ruby:
- .PHONY: binaries
- binaries: assemble
- 	${Q}if [ ${ARCH} != 'x86_64' ]; then echo Incorrect architecture for build: ${ARCH}; exit 1; fi
--	${Q}cd ${ASSEMBLY_ROOT} && sha256sum bin/* | tee checksums.sha256.txt
-+	${Q}cd ${ASSEMBLY_ROOT} && sha256 bin/* | tee checksums.sha256.txt
- 
- .PHONY: prepare-tests
- prepare-tests: git libgit2 prepare-test-repos ${SOURCE_DIR}/.ruby-bundle
-@@ -388,9 +388,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
+@@ -343,9 +343,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
@@ -29,16 +20,7 @@
  	${Q}touch $@
  
  ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE
-@@ -457,7 +455,7 @@ endif
- 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 $@
- 
- ${GIT_INSTALL_DIR}/bin/git: ${DEPENDENCY_DIR}/git_full_bins.tgz
-@@ -470,7 +468,7 @@ ${TOOLS_DIR}/protoc.zip: TOOL_VERSION = ${PROTOC_VERSI
+@@ -413,7 +411,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}
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile
index 86bfa219997c..46873e14b855 100644
--- a/devel/gitaly/files/patch-ruby_Gemfile
+++ b/devel/gitaly/files/patch-ruby_Gemfile
@@ -1,8 +1,25 @@
---- ruby/Gemfile.orig	2021-04-22 21:08:06 UTC
+--- ruby/Gemfile.orig	2021-05-21 13:15:32 UTC
 +++ ruby/Gemfile
-@@ -21,13 +21,3 @@ gem 'licensee', '~> 9.14.1'
+@@ -7,27 +7,17 @@ gem 'activesupport', '~> 6.0.3.6'
+ gem 'rdoc', '~> 6.0'
+ gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false
+ gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false
+-gem 'grpc', '~> 1.30.2'
++gem 'grpc', '~> 1.30'
+ gem 'sentry-raven', '~> 3.0', require: false
+ gem 'faraday', '~> 1.0'
+ gem 'rbtrace', require: false
  
- gem 'google-protobuf', '~> 3.14.0'
+ # Labkit provides observability functionality
+-gem 'gitlab-labkit', '~> 0.16.2'
++gem 'gitlab-labkit', '~> 0.17.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'
+ 
+-gem 'google-protobuf', '~> 3.14.0'
++gem 'google-protobuf', '~> 3.15.5'
  
 -group :development, :test do
 -  gem 'rubocop', '~> 0.69', require: false
diff --git a/devel/gitaly/pkg-plist b/devel/gitaly/pkg-plist
index a4779acae4d5..313507a62eda 100644
--- a/devel/gitaly/pkg-plist
+++ b/devel/gitaly/pkg-plist
@@ -9,7 +9,6 @@
 %%DATADIR%%/ruby/git-hooks/reference-transaction
 %%DATADIR%%/ruby/git-hooks/update
 %%DATADIR%%/ruby/lib/gitaly_server.rb
-%%DATADIR%%/ruby/lib/gitaly_server/blob_service.rb
 %%DATADIR%%/ruby/lib/gitaly_server/client.rb
 %%DATADIR%%/ruby/lib/gitaly_server/conflicts_service.rb
 %%DATADIR%%/ruby/lib/gitaly_server/exception_sanitizer_interceptor.rb
@@ -39,8 +38,6 @@
 %%DATADIR%%/ruby/lib/gitlab/git/gitlab_projects.rb
 %%DATADIR%%/ruby/lib/gitlab/git/hook.rb
 %%DATADIR%%/ruby/lib/gitlab/git/hooks_service.rb
-%%DATADIR%%/ruby/lib/gitlab/git/index.rb
-%%DATADIR%%/ruby/lib/gitlab/git/lfs_changes.rb
 %%DATADIR%%/ruby/lib/gitlab/git/operation_service.rb
 %%DATADIR%%/ruby/lib/gitlab/git/path_helper.rb
 %%DATADIR%%/ruby/lib/gitlab/git/popen.rb
@@ -50,13 +47,11 @@
 %%DATADIR%%/ruby/lib/gitlab/git/remote_repository.rb
 %%DATADIR%%/ruby/lib/gitlab/git/repository.rb
 %%DATADIR%%/ruby/lib/gitlab/git/repository_mirroring.rb
-%%DATADIR%%/ruby/lib/gitlab/git/rev_list.rb
 %%DATADIR%%/ruby/lib/gitlab/git/ssh_auth.rb
 %%DATADIR%%/ruby/lib/gitlab/git/submodule.rb
 %%DATADIR%%/ruby/lib/gitlab/git/tag.rb
 %%DATADIR%%/ruby/lib/gitlab/git/user.rb
 %%DATADIR%%/ruby/lib/gitlab/git/wiki.rb
-%%DATADIR%%/ruby/lib/gitlab/git/wiki_file.rb
 %%DATADIR%%/ruby/lib/gitlab/git/wiki_page.rb
 %%DATADIR%%/ruby/lib/gitlab/git/wiki_page_version.rb
 %%DATADIR%%/ruby/lib/gitlab/git/worktree.rb
@@ -127,8 +122,6 @@
 %%DATADIR%%/ruby/spec/lib/gitlab/git/commit_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/gitlab_projects_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/hook_spec.rb
-%%DATADIR%%/ruby/spec/lib/gitlab/git/index_spec.rb
-%%DATADIR%%/ruby/spec/lib/gitlab/git/lfs_changes_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/popen_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/push_options_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/remote_mirror_spec.rb
@@ -136,7 +129,6 @@
 %%DATADIR%%/ruby/spec/lib/gitlab/git/remote_repository_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/repository_mirroring_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/repository_spec.rb
-%%DATADIR%%/ruby/spec/lib/gitlab/git/rev_list_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/ssh_auth_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/submodule_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/testdata/certs/gitalycert.pem
@@ -161,6 +153,7 @@
 %%DATADIR%%/ruby/spec/test_repo_helper.rb
 @(,,755) %%DATADIR%%/ruby/git-hooks/gitlab-shell-hook
 @(,,555) %%DATADIR%%/bin/gitaly
+@(,,555) %%DATADIR%%/bin/gitaly-backup
 @(,,555) %%DATADIR%%/bin/gitaly-blackbox
 @(,,555) %%DATADIR%%/bin/gitaly-debug
 @(,,555) %%DATADIR%%/bin/gitaly-git2go