devel/gitaly: Update version 15.2.5=>15.3.4

Approved by:	mfechner (By private mail)
Relnotes: https://gitlab.com/gitlab-org/gitaly/-/tags/v15.3.4
Sponsored by:	Bounce Experts

4 files changed, 38 insertions, 51 deletions

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index eb02f4ae17f3..4002b9409b28 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	gitaly
-DISTVERSION=	15.2.5
+DISTVERSION=	15.3.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	0
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -32,7 +31,7 @@ MY_DEPENDS=	git>=2.36.1:devel/git \
 		rubygem-gitlab-labkit>=0.23.0<1:devel/rubygem-gitlab-labkit \
 		rubygem-licensee>=9.14.1<9.15:devel/rubygem-licensee \
 		rubygem-google-protobuf319>=3.19.0<3.20:devel/rubygem-google-protobuf319 \
-		rubygem-gitlab-license_finder>=6.14.2.1<7:devel/rubygem-gitlab-license_finder
+		rubygem-license_finder>=7.0<8:devel/rubygem-license_finder
 BUILD_DEPENDS=	gem:devel/ruby-gems \
 		bash>0:shells/bash \
 		${MY_DEPENDS}
@@ -52,7 +51,7 @@ MAKE_ENV+=	${GO_ENV}
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT=	ecbedf428ae11e173a3ad1e137c322a5f685c0de
+GL_COMMIT=	32daa20c2ee21928898610d83a9175027d3918dc
 
 # for go dependencies
 # Gitlab hosts there dependencies on their own platform and not on go-proxy
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 4cb0cb0b3bf0..d547fa5f4208 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1664554552
-SHA256 (go/devel_gitaly/gitlab-org-gitaly-ecbedf428ae11e173a3ad1e137c322a5f685c0de_GL0/go.mod) = dc003dfe788c03dfd145369d4d81321f1306df51dac7289a6491dc84e25b2bbc
-SIZE (go/devel_gitaly/gitlab-org-gitaly-ecbedf428ae11e173a3ad1e137c322a5f685c0de_GL0/go.mod) = 9144
-SHA256 (go/devel_gitaly/gitlab-org-gitaly-ecbedf428ae11e173a3ad1e137c322a5f685c0de_GL0/gitlab-org-gitaly-ecbedf428ae11e173a3ad1e137c322a5f685c0de_GL0.tar.gz) = fe8390203edd2a3623f6169620ecc880071a0e2a3b701332b027bf67a2909cd2
-SIZE (go/devel_gitaly/gitlab-org-gitaly-ecbedf428ae11e173a3ad1e137c322a5f685c0de_GL0/gitlab-org-gitaly-ecbedf428ae11e173a3ad1e137c322a5f685c0de_GL0.tar.gz) = 4002513
+TIMESTAMP = 1664809578
+SHA256 (go/devel_gitaly/gitlab-org-gitaly-32daa20c2ee21928898610d83a9175027d3918dc_GL0/go.mod) = e547e998f8e1823a832be3cde4f10db7d67f6c8f987282e565eca784a9b2437f
+SIZE (go/devel_gitaly/gitlab-org-gitaly-32daa20c2ee21928898610d83a9175027d3918dc_GL0/go.mod) = 9215
+SHA256 (go/devel_gitaly/gitlab-org-gitaly-32daa20c2ee21928898610d83a9175027d3918dc_GL0/gitlab-org-gitaly-32daa20c2ee21928898610d83a9175027d3918dc_GL0.tar.gz) = 938d48c783373a00a567849614344942a2e6a66c80e6b954e52f593edf6fdd02
+SIZE (go/devel_gitaly/gitlab-org-gitaly-32daa20c2ee21928898610d83a9175027d3918dc_GL0/gitlab-org-gitaly-32daa20c2ee21928898610d83a9175027d3918dc_GL0.tar.gz) = 4023787
diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile
index 5394a42fc0b5..c4f1ccb1a5f7 100644
--- a/devel/gitaly/files/patch-Makefile
+++ b/devel/gitaly/files/patch-Makefile
@@ -1,15 +1,6 @@
---- Makefile.orig	2022-07-21 13:59:14 UTC
+--- Makefile.orig	2022-09-29 08:34:44 UTC
 +++ Makefile
-@@ -247,7 +247,7 @@ TEST_REPO_GIT     := ${TEST_REPO_DIR}/gitlab-git-test.
- BENCHMARK_REPO    := ${TEST_REPO_DIR}/benchmark.git
- 
- # All executables provided by Gitaly.
--GITALY_EXECUTABLES        = $(addprefix ${BUILD_DIR}/bin/,$(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print)) gitaly-git2go-v14)
-+GITALY_EXECUTABLES        = $(addprefix ${BUILD_DIR}/bin/,$(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print)) )
- # All executables packed inside the Gitaly binary.
- GITALY_PACKED_EXECUTABLES = $(filter %gitaly-hooks %gitaly-git2go-v15 %gitaly-ssh %gitaly-lfs-smudge, ${GITALY_EXECUTABLES})
- # Find all Go source files.
-@@ -533,7 +533,6 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
+@@ -547,7 +547,6 @@ ${SOURCE_DIR}/.ruby-bundle: ${GITALY_RUBY_DIR}/Gemfile
  # 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
@@ -17,7 +8,7 @@
  	${Q}touch $@
  
  ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE
-@@ -584,7 +583,7 @@ ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BU
+@@ -598,7 +597,7 @@ ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BU
  	@ # This fallback is unique but non-deterministic, making it sufficient to avoid generating the
  	@ # GNU build-id from the empty string and causing guaranteed collisions.
  	${Q}GO_BUILD_ID=$$(go tool buildid "$<" || openssl rand -hex 32) && \
@@ -26,26 +17,11 @@
  	if test "${OS}" = "Linux"; then \
  		go run "${SOURCE_DIR}"/tools/replace-buildid \
  			-input "$<" -input-build-id "${TEMPORARY_BUILD_ID}" \
-@@ -597,22 +596,11 @@ ${BUILD_DIR}/intermediate/gitaly:            GO_BUILD_
- ${BUILD_DIR}/intermediate/gitaly:            ${GITALY_PACKED_EXECUTABLES}
+@@ -624,7 +623,6 @@ ${BUILD_DIR}/intermediate/gitaly-git2go:     GO_BUILD_
+ ${BUILD_DIR}/intermediate/gitaly:            remove-legacy-go-mod ${GITALY_PACKED_EXECUTABLES}
  ${BUILD_DIR}/intermediate/praefect:          GO_BUILD_TAGS = ${SERVER_BUILD_TAGS}
- ${BUILD_DIR}/intermediate/gitaly-git2go-v15: GO_BUILD_TAGS = ${GIT2GO_BUILD_TAGS}
--${BUILD_DIR}/intermediate/gitaly-git2go-v15: libgit2
- ${BUILD_DIR}/intermediate/%: .FORCE
+ ${BUILD_DIR}/intermediate/gitaly-git2go:     GO_BUILD_TAGS = ${GIT2GO_BUILD_TAGS}
+-${BUILD_DIR}/intermediate/gitaly-git2go:     libgit2
+ ${BUILD_DIR}/intermediate/%:                 clear-go-build-cache-if-needed .FORCE
  	@ # We're building intermediate binaries first which contain a fixed build ID
  	@ # of "TEMP_GITALY_BUILD_ID". In the final binary we replace this build ID with
- 	@ # the computed build ID for this binary.
- 	${Q}go build -o "$@" -ldflags '-B 0x${TEMPORARY_BUILD_ID} ${GO_LDFLAGS}' -tags "${GO_BUILD_TAGS}" $(addprefix ${SOURCE_DIR}/cmd/,$(@F))
--
--# This target is required for backwards compatibility during zero-downtime
--# upgrades and can be removed when v15.0 has been released.
--${BUILD_DIR}/intermediate/gitaly-git2go-v14: GO_BUILD_TAGS = ${GIT2GO_BUILD_TAGS}
--${BUILD_DIR}/intermediate/gitaly-git2go-v14: libgit2
--${BUILD_DIR}/intermediate/gitaly-git2go-v14: .FORCE
--	@ # gitaly-git2go-v14  pulls directly from a commit sha so that the gitaly-git2go-v14
--	@ # binary can continue to be installed for the sake of zero downtime
--	@ # upgrades.
--	${Q}GOBIN="$(dir $@)" go install -ldflags '-B 0x${TEMPORARY_BUILD_ID} ${GO_LDFLAGS}' -tags "${GO_BUILD_TAGS}" "gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14@c7c7c936c302ab435a0a56fbc19cfbd9bea0c835"
- 
- # This is a build hack to avoid excessive rebuilding of targets. Instead of
- # depending on the Makefile, we start to depend on tool versions as defined in
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile
index cacfa5d52e14..cfa481cf9de2 100644
--- a/devel/gitaly/files/patch-ruby_Gemfile
+++ b/devel/gitaly/files/patch-ruby_Gemfile
@@ -1,23 +1,29 @@
---- ruby/Gemfile.orig	2022-07-21 13:59:14 UTC
+--- ruby/Gemfile.orig	2022-09-29 08:34:44 UTC
 +++ ruby/Gemfile
-@@ -1,9 +1,9 @@
+@@ -1,15 +1,15 @@ gem 'rugged', '~> 1.2'
  source 'https://rubygems.org'
  
  gem 'rugged', '~> 1.2'
 -gem 'github-linguist', '~> 7.20.0', require: 'linguist'
 -gem 'gitlab-markup', '~> 1.7.1'
--gem 'activesupport', '~> 6.1.4.7'
-+gem 'github-linguist', '~> 7.20', require: 'linguist'
+-gem 'activesupport', '~> 6.1.6.1'
++gem 'github-linguist', '~> 7.23.0', require: 'linguist'
 +gem 'gitlab-markup', '~> 1.8.0'
-+gem 'activesupport', '~> 6.1.4'
++gem 'activesupport', '~> 6.1.6'
  gem 'rdoc', '~> 6.0'
  gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false
  gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false
-@@ -20,17 +20,6 @@ gem 'gitlab-labkit', '~> 0.23'
- gem 'licensee', '~> 9.14.1'
+ gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools
+ gem 'sentry-raven', '~> 3.0', require: false
+-gem 'faraday', '~> 1.0'
++gem 'faraday', '~> 1.10.2'
+ gem 'rbtrace', require: false
+ 
+ # Labkit provides observability functionality
+@@ -21,21 +21,10 @@ gem 'google-protobuf', '~> 3.21.0'
+ 
+ gem 'google-protobuf', '~> 3.21.0'
  
- gem 'google-protobuf', '~> 3.19.0'
--
 -group :development, :test do
 -  gem 'rubocop', '~> 0.69', require: false
 -  gem 'rspec', require: false
@@ -28,6 +34,12 @@
 -
 -  gem 'grpc-tools', '~> 1.42.0'
 -end
- 
+-
  # Gems required in omnibus-gitlab pipeline
  group :development, :test, :omnibus do
+   # Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is
+   # resolved. For details, check discussion in
+   # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74881
+-  gem 'gitlab-license_finder', require: false
++  gem 'license_finder', require: false
+ end