devel/gitaly: update to 14.5.1

Required for gitlab 14.5

6 files changed, 49 insertions, 32 deletions

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index c381a0fcf779..46f4c51b8ea6 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gitaly
-DISTVERSION=	14.4.2
-PORTREVISION=	3
+DISTVERSION=	14.5.1
+PORTREVISION=	0
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -14,9 +14,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 # it fixes segfaults reported here: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259848
 
 # define dependencies that are required for build and run under MY_DEPENDS
-MY_DEPENDS=	git>=2.32.0:devel/git \
+MY_DEPENDS=	git>=2.33.0:devel/git \
 		rubygem-bundler>=2.1.4:sysutils/rubygem-bundler \
-		rubygem-rugged>=1.1<2:devel/rubygem-rugged \
+		rubygem-rugged>=1.2<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.4.1<6.1.4.2:devel/rubygem-activesupport61 \
@@ -49,7 +49,7 @@ MAKE_ENV+=	${GO_ENV}
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT=	00071e4ab87eaae7c4f68705613191046cd023be
+GL_COMMIT=	3da51560ddc36d06bc90c9e8ca20e5c5ed0160f9
 
 # for go dependencies
 USE_GITHUB=	nodefault
@@ -112,7 +112,7 @@ GH_TUPLE=	\
 		golang:oauth2:81ed05c6b58c:golang_oauth2/vendor/golang.org/x/oauth2 \
 		golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:sync:036812b2e83c:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:0981d6026fa6:golang_sys/vendor/golang.org/x/sys \
+		golang:sys:4dd72447c267:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \
 		golang:time:f8bda1e9f3ba:golang_time/vendor/golang.org/x/time \
 		golang:tools:v0.1.0:golang_tools/vendor/golang.org/x/tools \
@@ -147,7 +147,7 @@ GH_TUPLE=	\
 		kelseyhightower:envconfig:v1.3.0:kelseyhightower_envconfig/vendor/github.com/kelseyhightower/envconfig \
 		kevinburke:ssh_config:4977a11b4351:kevinburke_ssh_config/vendor/github.com/kevinburke/ssh_config \
 		lib:pq:v1.10.1:lib_pq/vendor/github.com/lib/pq \
-		libgit2:git2go:v31.4.12:libgit2_git2go_v31/vendor/github.com/libgit2/git2go/v31 \
+		libgit2:git2go:v32.0.5:libgit2_git2go_v32/vendor/github.com/libgit2/git2go/v32 \
 		lightstep:lightstep-tracer-common:a8dfcb80d3a7:lightstep_lightstep_tracer_common_gogo/vendor/github.com/lightstep/lightstep-tracer-common \
 		lightstep:lightstep-tracer-go:v0.24.0:lightstep_lightstep_tracer_go/vendor/github.com/lightstep/lightstep-tracer-go \
 		mattn:go-ieproxy:v0.0.1:mattn_go_ieproxy/vendor/github.com/mattn/go-ieproxy \
@@ -181,7 +181,6 @@ GH_TUPLE=	\
 		shurcooL:sanitized_anchor_name:v1.0.0:shurcool_sanitized_anchor_name/vendor/github.com/shurcooL/sanitized_anchor_name \
 		sirupsen:logrus:v1.8.1:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
 		ssgelm:cookiejarparser:v1.0.1:ssgelm_cookiejarparser/vendor/github.com/ssgelm/cookiejarparser \
-		stretchr:objx:v0.2.0:stretchr_objx/vendor/github.com/stretchr/objx \
 		stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \
 		tinylib:msgp:v1.1.2:tinylib_msgp/vendor/github.com/tinylib/msgp \
 		uber-go:atomic:v1.7.0:uber_go_atomic/vendor/go.uber.org/atomic \
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 5e1f074fde3f..c2760f8f1490 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1637063341
+TIMESTAMP = 1638528250
 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
@@ -111,8 +111,8 @@ SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06
 SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
 SHA256 (golang-sync-036812b2e83c_GH0.tar.gz) = 75ac8fc16bdceb2496c4a9cc98584b70c29032d91a9e57a624acb073e3232fda
 SIZE (golang-sync-036812b2e83c_GH0.tar.gz) = 18752
-SHA256 (golang-sys-0981d6026fa6_GH0.tar.gz) = 1027a8cd31706610f83425e844a1ea03309526ed499d5cab13ecf9f53d923eca
-SIZE (golang-sys-0981d6026fa6_GH0.tar.gz) = 1235549
+SHA256 (golang-sys-4dd72447c267_GH0.tar.gz) = 046e3dfe88c8788c03df268704fe3477de9354c56e364b87433935f35b415a36
+SIZE (golang-sys-4dd72447c267_GH0.tar.gz) = 1222385
 SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760
 SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095
 SHA256 (golang-time-f8bda1e9f3ba_GH0.tar.gz) = e068a34e54894c9c189ba2c2e5b7ea9116ed661f6a7c0d0e744d8e0066017ebb
@@ -181,8 +181,8 @@ SHA256 (kevinburke-ssh_config-4977a11b4351_GH0.tar.gz) = 568ea6be8d237ca16dcd03e
 SIZE (kevinburke-ssh_config-4977a11b4351_GH0.tar.gz) = 17407
 SHA256 (lib-pq-v1.10.1_GH0.tar.gz) = bbf8f9796747e3e8645175c4e4c12c39c05938b62f93386ac401bba2abfa6a91
 SIZE (lib-pq-v1.10.1_GH0.tar.gz) = 103789
-SHA256 (libgit2-git2go-v31.4.12_GH0.tar.gz) = 4425db097e682e62a1781a83f1eeb22b6106a7e5f3459742fda8de69466f8b1d
-SIZE (libgit2-git2go-v31.4.12_GH0.tar.gz) = 115471
+SHA256 (libgit2-git2go-v32.0.5_GH0.tar.gz) = 5acf64756d5cdc6706013ca985d8283848894a9e26e29bd472bf7cdd5f5539d8
+SIZE (libgit2-git2go-v32.0.5_GH0.tar.gz) = 128189
 SHA256 (lightstep-lightstep-tracer-common-a8dfcb80d3a7_GH0.tar.gz) = 0403290c66b3dd109d0a726784b8b0a8583c5d19d35d12a0c2b89a434ed2d0c6
 SIZE (lightstep-lightstep-tracer-common-a8dfcb80d3a7_GH0.tar.gz) = 58493
 SHA256 (lightstep-lightstep-tracer-go-v0.24.0_GH0.tar.gz) = 794c5cea97c46ee5a9139c1b2770cbd81d4534ba4359a8b6b744566c4abfb15b
@@ -249,8 +249,6 @@ SHA256 (sirupsen-logrus-v1.8.1_GH0.tar.gz) = e9492c08ac8f202b438ccfb992bf81b7860
 SIZE (sirupsen-logrus-v1.8.1_GH0.tar.gz) = 47161
 SHA256 (ssgelm-cookiejarparser-v1.0.1_GH0.tar.gz) = 8989734dc34c4cbd7841a98d96c4d9dbe3184be27f5b3a5d3a8e377d17a7f2f3
 SIZE (ssgelm-cookiejarparser-v1.0.1_GH0.tar.gz) = 3237
-SHA256 (stretchr-objx-v0.2.0_GH0.tar.gz) = be7dce02798cdc24cee6bd2d95bfcf6976b1521ef735349bf5e7dfe6d147746f
-SIZE (stretchr-objx-v0.2.0_GH0.tar.gz) = 79981
 SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5aa2beb58ef7a94530d7724b5739a8d6
 SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073
 SHA256 (tinylib-msgp-v1.1.2_GH0.tar.gz) = 9759dc9f45160ff1161d670d019f509d55e12b22dfc8a8e1ed71f4c358ee1a01
@@ -267,8 +265,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-00071e4ab87eaae7c4f68705613191046cd023be_GL0.tar.gz) = c847a4d2f5996a68fc3d58de4a5793932dd06e945f48141d4d773c0c1168e574
-SIZE (gitlab-org-gitaly-00071e4ab87eaae7c4f68705613191046cd023be_GL0.tar.gz) = 3704730
+SHA256 (gitlab-org-gitaly-3da51560ddc36d06bc90c9e8ca20e5c5ed0160f9_GL0.tar.gz) = f8648fd47a0e69350da38ad544996454adae759766cc3d14128aa404ac1d6353
+SIZE (gitlab-org-gitaly-3da51560ddc36d06bc90c9e8ca20e5c5ed0160f9_GL0.tar.gz) = 3719843
 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 431fb6f0d04a..b97c94b808e4 100644
--- a/devel/gitaly/files/patch-Makefile
+++ b/devel/gitaly/files/patch-Makefile
@@ -1,26 +1,24 @@
---- Makefile.orig	2021-10-21 21:58:10 UTC
+--- Makefile.orig	2021-11-19 08:14:34 UTC
 +++ Makefile
-@@ -292,7 +292,7 @@ help:
+@@ -282,7 +282,7 @@ help:
  
  .PHONY: build
  ## Build Go binaries and install required Ruby Gems.
 -build: ${SOURCE_DIR}/.ruby-bundle libgit2
 +build: ${SOURCE_DIR}/.ruby-bundle
- 	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.
-@@ -473,9 +473,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
+ 	${Q}# We used to install Gitaly binaries into the source directory by default when executing
+ 	${Q}# "make" or "make all", which has been changed in v14.5 to only build binaries into
+ 	${Q}# `_build/bin`. In order to quickly fail in case any source install still refers to these
+@@ -471,7 +471,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
--	${Q}cd ${GITALY_RUBY_DIR} && bundle config set --local deployment "${BUNDLE_DEPLOYMENT}"
--	${Q}cd ${GITALY_RUBY_DIR} && bundle config # for debugging
 -	${Q}cd ${GITALY_RUBY_DIR} && bundle install
 +	${Q}cd ${GITALY_RUBY_DIR} && rm -f Gemfile.lock && bundle install --local
  	${Q}touch $@
  
  ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE
-@@ -551,7 +549,7 @@ ${TOOLS_DIR}/protoc.zip: TOOL_VERSION = ${PROTOC_VERSI
+@@ -547,7 +547,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 eb82b8e37ad9..ae4d779912bb 100644
--- a/devel/gitaly/files/patch-ruby_Gemfile
+++ b/devel/gitaly/files/patch-ruby_Gemfile
@@ -1,6 +1,6 @@
---- ruby/Gemfile.orig   2021-11-08 12:56:42.000000000 +0100
-+++ ruby/Gemfile        2021-11-20 11:54:40.948647000 +0100
-@@ -7,7 +7,7 @@
+--- ruby/Gemfile.orig	2021-11-19 08:14:34 UTC
++++ ruby/Gemfile
+@@ -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,13 +9,13 @@
  gem 'sentry-raven', '~> 3.0', require: false
  gem 'faraday', '~> 1.0'
  gem 'rbtrace', require: false
-@@ -19,15 +19,5 @@
+@@ -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.19.0'
-
+ 
 -group :development, :test do
 -  gem 'rubocop', '~> 0.69', require: false
 -  gem 'rspec', require: false
diff --git a/devel/gitaly/files/patch-vendor_github.com_libgit2_git2go_v32_Build__bundled__static.go b/devel/gitaly/files/patch-vendor_github.com_libgit2_git2go_v32_Build__bundled__static.go
new file mode 100644
index 000000000000..3c1806d9ef64
--- /dev/null
+++ b/devel/gitaly/files/patch-vendor_github.com_libgit2_git2go_v32_Build__bundled__static.go
@@ -0,0 +1,11 @@
+--- vendor/github.com/libgit2/git2go/v32/Build_bundled_static.go.orig	2021-11-22 21:32:43 UTC
++++ vendor/github.com/libgit2/git2go/v32/Build_bundled_static.go
+@@ -10,7 +10,7 @@ package git
+ #cgo CFLAGS: -DLIBGIT2_STATIC
+ #include <git2.h>
+ 
+-#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 2 || LIBGIT2_VER_MINOR > 2
++#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 2 || LIBGIT2_VER_MINOR > 3
+ # error "Invalid libgit2 version; this git2go supports libgit2 between v1.2.0 and v1.2.0"
+ #endif
+ */
diff --git a/devel/gitaly/files/patch-vendor_github.com_libgit2_git2go_v32_Build__system__static.go b/devel/gitaly/files/patch-vendor_github.com_libgit2_git2go_v32_Build__system__static.go
new file mode 100644
index 000000000000..01938921051f
--- /dev/null
+++ b/devel/gitaly/files/patch-vendor_github.com_libgit2_git2go_v32_Build__system__static.go
@@ -0,0 +1,11 @@
+--- vendor/github.com/libgit2/git2go/v32/Build_system_static.go.orig	2021-11-22 21:35:07 UTC
++++ vendor/github.com/libgit2/git2go/v32/Build_system_static.go
+@@ -8,7 +8,7 @@ package git
+ #cgo CFLAGS: -DLIBGIT2_STATIC
+ #include <git2.h>
+ 
+-#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 2 || LIBGIT2_VER_MINOR > 2
++#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 2 || LIBGIT2_VER_MINOR > 3
+ # error "Invalid libgit2 version; this git2go supports libgit2 between v1.2.0 and v1.2.0"
+ #endif
+ */