devel/gitaly: Udpate to 14.1.0

Required for gitlab 14.1.

5 files changed, 17 insertions, 40 deletions

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 55cf4a3dd2cd..84b6b45a340e 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitaly
-DISTVERSION=	14.0.5
+DISTVERSION=	14.1.0
 PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -15,7 +15,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 		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-activesupport61>=6.0.3.6<6.2:devel/rubygem-activesupport61 \
+		rubygem-activesupport61>=6.1.3.2<6.2:devel/rubygem-activesupport61 \
 		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 \
@@ -23,7 +23,7 @@ MY_DEPENDS=	git>=2.32.0: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.18<0.19:devel/rubygem-gitlab-labkit \
+		rubygem-gitlab-labkit>=0.20<0.21:devel/rubygem-gitlab-labkit \
 		rubygem-licensee>=9.14.1<9.15:devel/rubygem-licensee \
 		rubygem-google-protobuf>=3.17.3<3.18:devel/rubygem-google-protobuf
 BUILD_DEPENDS=	gem:devel/ruby-gems \
@@ -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=	9adacd9933b211ca82452fe9b7eb565820c5417b
+GL_COMMIT=	11ceaf6b6204634021c70ed510e2805f9633bb14
 
 # for go dependencies
 USE_GITHUB=	nodefault
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index ffa77518965a..fd55894b4323 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1625901926
+TIMESTAMP = 1627071975
 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
@@ -185,8 +185,8 @@ 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-gitaly-9adacd9933b211ca82452fe9b7eb565820c5417b_GL0.tar.gz) = 3f79fc2c173f6f0a8411b6904aaef24912276d7fa88bf2434ea7cb95081ca043
-SIZE (gitlab-org-gitaly-9adacd9933b211ca82452fe9b7eb565820c5417b_GL0.tar.gz) = 3528548
+SHA256 (gitlab-org-gitaly-11ceaf6b6204634021c70ed510e2805f9633bb14_GL0.tar.gz) = b71749cd0e36976cb77c72bc7857706f742be154de605b1e0edb8daf8da5c38b
+SIZE (gitlab-org-gitaly-11ceaf6b6204634021c70ed510e2805f9633bb14_GL0.tar.gz) = 3577870
 SHA256 (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 7f5b214e4bd2b72231462c3a153d9b416caab331a1a25a3ca5cd44b02ab9eb15
 SIZE (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 89693
 SHA256 (gitlab-org-labkit-bdc29f9e957c46d7b0a4747a4662879c7189bf08_GL0.tar.gz) = 89f9ff3689f9338379e62abda71c678e6ff1a65f7d67392c284941678dc90c7e
diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile
index 6728d7cbad0d..f7b0f1366353 100644
--- a/devel/gitaly/files/patch-Makefile
+++ b/devel/gitaly/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2021-06-17 15:17:56 UTC
+--- Makefile.orig	2021-07-21 11:54:58 UTC
 +++ Makefile
-@@ -198,7 +198,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR}
+@@ -200,7 +200,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR}
  all: install
  
  .PHONY: build
@@ -9,7 +9,7 @@
  	go install ${GO_LDFLAGS} -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $(call find_commands))
  	# We use version suffix for the gitaly-git2go binary to support compatibility contract between
  	# gitaly and gitaly-git2go during upgrade deployment.
-@@ -370,9 +370,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
+@@ -373,9 +373,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
@@ -20,7 +20,7 @@
  	${Q}touch $@
  
  ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE
-@@ -440,7 +438,7 @@ ${TOOLS_DIR}/protoc.zip: TOOL_VERSION = ${PROTOC_VERSI
+@@ -443,7 +441,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-go.sum b/devel/gitaly/files/patch-go.sum
deleted file mode 100644
index 3cde5ac680ff..000000000000
--- a/devel/gitaly/files/patch-go.sum
+++ /dev/null
@@ -1,13 +0,0 @@
---- go.sum.orig	2021-06-22 05:39:34 UTC
-+++ go.sum
-@@ -1092,9 +1092,7 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMe
- google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
- google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
- google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
--gopkg.in/DataDog/dd-trace-go.v1 v1.7.0/go.mod h1:DVp8HmDh8PuTu2Z0fVVlBsyWaC++fzwVCaGWylTe3tg=
--gopkg.in/DataDog/dd-trace-go.v1 v1.31.0 h1:ouY+DNlRTckk63TNh468tPWBC21qBZPniVQXQs0iq10=
--gopkg.in/DataDog/dd-trace-go.v1 v1.31.0/go.mod h1:SnKViq44dv/0gjl9RpkP0Y2G3BJSRkp6eYdCSu39iI8=
-+gopkg.in/DataDog/dd-trace-go.v1 v1.30.0 h1:yJJrDYzAlUsDPpAVBjv4VFnXKTbgvaJFTX0646xDPi4=
- gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
- gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
- gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile
index e70d313bfb2a..189679801611 100644
--- a/devel/gitaly/files/patch-ruby_Gemfile
+++ b/devel/gitaly/files/patch-ruby_Gemfile
@@ -1,11 +1,6 @@
---- ruby/Gemfile.orig	2021-06-21 15:49:22 UTC
+--- ruby/Gemfile.orig	2021-07-21 11:54:58 UTC
 +++ ruby/Gemfile
-@@ -3,31 +3,21 @@ source 'https://rubygems.org'
- gem 'rugged', '~> 1.1'
- gem 'github-linguist', '~> 7.12', require: 'linguist'
- gem 'gitlab-markup', '~> 1.7.1'
--gem 'activesupport', '~> 6.0.3.6'
-+gem 'activesupport', '~> 6.1.3.2'
+@@ -7,7 +7,7 @@ gem 'activesupport', '~> 6.1.3.2'
  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
@@ -14,18 +9,12 @@
  gem 'sentry-raven', '~> 3.0', require: false
  gem 'faraday', '~> 1.0'
  gem 'rbtrace', require: false
- 
- # Labkit provides observability functionality
--gem 'gitlab-labkit', '~> 0.17.1'
-+gem 'gitlab-labkit', '~> 0.18.0'
- 
- # Detects the open source license the repository includes
+@@ -19,15 +19,4 @@ gem 'gitlab-labkit', '~> 0.20.0'
  # 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.17.1'
- 
+-gem 'google-protobuf', '~> 3.17.0'
+-
 -group :development, :test do
 -  gem 'rubocop', '~> 0.69', require: false
 -  gem 'rspec', require: false
@@ -36,3 +25,4 @@
 -
 -  gem 'grpc-tools', '= 1.30.2'
 -end
++gem 'google-protobuf', '~> 3.17.3'