devel/gitaly: Update to 14.4.0

Is required for gitlab-ce 14.4.0.

4 files changed, 19 insertions, 23 deletions

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 12ab0cc9661a..2a1d8fe5e8ea 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gitaly
-DISTVERSION=	14.3.2
-PORTREVISION=	1
+DISTVERSION=	14.4.0
+PORTREVISION=	0
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -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.1.3.2<6.1.4:devel/rubygem-activesupport61 \
+		rubygem-activesupport61>=6.1.4.1<6.1.4.2:devel/rubygem-activesupport61 \
 		rubygem-rdoc>=6.3.2<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.21<0.22:devel/rubygem-gitlab-labkit \
+		rubygem-gitlab-labkit>=0.21.1<0.22:devel/rubygem-gitlab-labkit \
 		rubygem-licensee>=9.14.1<9.15:devel/rubygem-licensee \
 		rubygem-google-protobuf317>=3.17.3<3.18:devel/rubygem-google-protobuf317
 BUILD_DEPENDS=	gem:devel/ruby-gems \
@@ -45,12 +45,12 @@ MAKE_ENV+=	${GO_ENV}
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT=	52407ecfce7fc39b4f5f6db15cc6cb4e9a8c1f60
+GL_COMMIT=	7abdbce59731637552b86002fcbe8754b3d98623
 
 # for go dependencies
 USE_GITHUB=	nodefault
 # generated with: make gomod-vendor
-# 137dd
+# 138dd
 GH_TUPLE=	\
 		Azure:azure-pipeline-go:v0.2.3:azure_azure_pipeline_go/vendor/github.com/Azure/azure-pipeline-go \
 		Azure:azure-storage-blob-go:v0.13.0:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \
@@ -227,3 +227,4 @@ post-install:
 		s#${DATADIR_REL}/bin#@(,,555) ${DATADIR_REL}/bin#; ' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
+
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index ed5f4d04d0ec..98200b8edf7c 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1633159372
+TIMESTAMP = 1634895409
 SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e
 SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102
 SHA256 (Azure-azure-storage-blob-go-v0.13.0_GH0.tar.gz) = 6bf7145210331efa3f0417f6684cf764c22743cf23122048ec136600daebf443
@@ -267,8 +267,8 @@ SHA256 (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 7ce80a93d0fdbeb6760f97d6d166d11c215
 SIZE (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 8421
 SHA256 (gonum-gonum-v0.8.2_GH0.tar.gz) = a2aad1ac038d36d568939910f39eb0c58cae3c6f0b18df3ca74a8daa954d1663
 SIZE (gonum-gonum-v0.8.2_GH0.tar.gz) = 3226037
-SHA256 (gitlab-org-gitaly-52407ecfce7fc39b4f5f6db15cc6cb4e9a8c1f60_GL0.tar.gz) = 35ccd4d036e07ae9f780504525fc059012c9d091ec496abf29260de4ba37054c
-SIZE (gitlab-org-gitaly-52407ecfce7fc39b4f5f6db15cc6cb4e9a8c1f60_GL0.tar.gz) = 3672392
+SHA256 (gitlab-org-gitaly-7abdbce59731637552b86002fcbe8754b3d98623_GL0.tar.gz) = 2ea3095292b34a592d3b9df2f1d2edff12fed1a158b83769319d678d60776103
+SIZE (gitlab-org-gitaly-7abdbce59731637552b86002fcbe8754b3d98623_GL0.tar.gz) = 3704742
 SHA256 (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = a00e10d3dbe50e7c70b75c5fcf7d42a039a24c13b0b751a0339bb18261ac50af
 SIZE (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = 124516
 SHA256 (gitlab-org-labkit-397363e2404ac0276b1959373a1c1c2bc1610d67_GL0.tar.gz) = e48dae8ea183f946189a9ac7e4cbe4bc0fa583e6baafb0074a3463a879565ecb
diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile
index 3e742b7462d6..431fb6f0d04a 100644
--- a/devel/gitaly/files/patch-Makefile
+++ b/devel/gitaly/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2021-09-21 10:03:53 UTC
+--- Makefile.orig	2021-10-21 21:58:10 UTC
 +++ Makefile
-@@ -287,7 +287,7 @@ help:
+@@ -292,7 +292,7 @@ help:
  
  .PHONY: build
  ## Build Go binaries and install required Ruby Gems.
@@ -9,7 +9,7 @@
  	go install ${GO_LDFLAGS} -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $(call find_commands))
  	${Q}# We use version suffix for the gitaly-git2go binary to support compatibility contract between
  	${Q}# gitaly and gitaly-git2go during upgrade deployment.
-@@ -468,9 +468,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
+@@ -473,9 +473,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
-@@ -546,7 +544,7 @@ ${TOOLS_DIR}/protoc.zip: TOOL_VERSION = ${PROTOC_VERSI
+@@ -551,7 +549,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 2e700525ffc0..dadd748f9300 100644
--- a/devel/gitaly/files/patch-ruby_Gemfile
+++ b/devel/gitaly/files/patch-ruby_Gemfile
@@ -1,6 +1,6 @@
---- ruby/Gemfile.orig	2021-08-31 13:54:28 UTC
+--- ruby/Gemfile.orig	2021-10-21 21:58:10 UTC
 +++ ruby/Gemfile
-@@ -7,27 +7,16 @@ gem 'activesupport', '~> 6.1.3.2'
+@@ -7,7 +7,7 @@ gem 'activesupport', '~> 6.1.4.1'
  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
@@ -9,17 +9,13 @@
  gem 'sentry-raven', '~> 3.0', require: false
  gem 'faraday', '~> 1.0'
  gem 'rbtrace', require: false
- 
- # Labkit provides observability functionality
--gem 'gitlab-labkit', '~> 0.20.0'
-+gem 'gitlab-labkit', '~> 0.21.0'
- 
- # Detects the open source license the repository includes
+@@ -19,15 +19,5 @@ gem 'gitlab-labkit', '~> 0.21.1'
  # This version needs to be in sync with GitLab CE/EE
  gem 'licensee', '~> 9.14.1'
  
 -gem 'google-protobuf', '~> 3.17.0'
--
++gem 'google-protobuf', '~> 3.17.3'
+ 
 -group :development, :test do
 -  gem 'rubocop', '~> 0.69', require: false
 -  gem 'rspec', require: false
@@ -30,4 +26,3 @@
 -
 -  gem 'grpc-tools', '= 1.30.2'
 -end
-+gem 'google-protobuf', '~> 3.17.3'