www/gitlab-ce: major update to 15.10.1

Changelog:
https://about.gitlab.com/releases/2023/03/22/gitlab-15-10-released/
https://about.gitlab.com/releases/2023/03/30/security-release-gitlab-15-10-1-released/
(cherry picked from commit b5a874168ae078116b48f335b35967b31ff29be6)

4 files changed, 14 insertions, 14 deletions

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 1d0c6c49fc71..ccbaac3695d4 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitaly
-DISTVERSION=	15.9.4
+DISTVERSION=	15.10.1
 PORTREVISION=	0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
@@ -27,7 +27,7 @@ MY_DEPENDS=	git>=2.39.2:devel/git \
 		rubygem-gitaly>=15.5.0<15.10:net/rubygem-gitaly \
 		rubygem-gitlab-labkit>=0.31<1:devel/rubygem-gitlab-labkit \
 		rubygem-licensee>=9.15<10:devel/rubygem-licensee \
-		rubygem-google-protobuf>=3.21.12<3.22:devel/rubygem-google-protobuf \
+		rubygem-google-protobuf>=3.22.2<3.23:devel/rubygem-google-protobuf \
 		rubygem-nokogiri>=1.14.1<1.15:textproc/rubygem-nokogiri \
 		rubygem-license_finder>=7.0<8:devel/rubygem-license_finder \
 		rubygem-redis4>=4.8.0<5:databases/rubygem-redis4
@@ -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=	c05835906e40380ebf9290e420b877bca37bf7f2
+GL_COMMIT=	267edbe4a3f5416d75b5f0213bbcee9012f7797d
 
 # 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 dfef61d35658..7a9b5c250d35 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1680514334
-SHA256 (go/devel_gitaly/gitlab-org-gitaly-c05835906e40380ebf9290e420b877bca37bf7f2_GL0/go.mod) = 605d47badb908e81ce1f6f50b9946a215c2600e2423f10239aa0885c92413a90
-SIZE (go/devel_gitaly/gitlab-org-gitaly-c05835906e40380ebf9290e420b877bca37bf7f2_GL0/go.mod) = 10219
-SHA256 (go/devel_gitaly/gitlab-org-gitaly-c05835906e40380ebf9290e420b877bca37bf7f2_GL0/gitlab-org-gitaly-c05835906e40380ebf9290e420b877bca37bf7f2_GL0.tar.gz) = ec7d4174fdc6a865edf8b2b9eb924b407c167b6bab02fb438c9674edf2bd7dd7
-SIZE (go/devel_gitaly/gitlab-org-gitaly-c05835906e40380ebf9290e420b877bca37bf7f2_GL0/gitlab-org-gitaly-c05835906e40380ebf9290e420b877bca37bf7f2_GL0.tar.gz) = 3061484
+TIMESTAMP = 1681104389
+SHA256 (go/devel_gitaly/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0/go.mod) = f9e62b5491c17780d343f8de6921e04e1012858cd7ad6de24a77d38e6d941235
+SIZE (go/devel_gitaly/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0/go.mod) = 10320
+SHA256 (go/devel_gitaly/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0.tar.gz) = dfc2a54be503458235d45fe771de0402203ea81af176fd3786aadfdf21f499b1
+SIZE (go/devel_gitaly/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0.tar.gz) = 3096478
diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile
index 5a2ec4e65496..326cc55a9afd 100644
--- a/devel/gitaly/files/patch-Makefile
+++ b/devel/gitaly/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2023-02-21 16:36:17 UTC
+--- Makefile.orig	2023-03-30 13:24:44 UTC
 +++ Makefile
-@@ -546,7 +546,6 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
+@@ -563,7 +563,6 @@ 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.
  ${RUBY_BUNDLE_FILE}: ${GITALY_RUBY_DIR}/Gemfile.lock ${GITALY_RUBY_DIR}/Gemfile
@@ -8,7 +8,7 @@
  	${Q}touch $@
  
  ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE
-@@ -587,7 +586,7 @@ ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BU
+@@ -604,7 +603,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) && \
@@ -17,7 +17,7 @@
  	if test "${OS}" = "Linux"; then \
  		go run "${SOURCE_DIR}"/tools/replace-buildid \
  			-input "$<" -input-build-id "${TEMPORARY_BUILD_ID}" \
-@@ -613,7 +612,6 @@ ${BUILD_DIR}/intermediate/gitaly:            GO_BUILD_
+@@ -630,7 +629,6 @@ ${BUILD_DIR}/intermediate/gitaly:            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:     GO_BUILD_TAGS = ${GIT2GO_BUILD_TAGS}
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile
index 40f422023aa7..f363f6758027 100644
--- a/devel/gitaly/files/patch-ruby_Gemfile
+++ b/devel/gitaly/files/patch-ruby_Gemfile
@@ -1,4 +1,4 @@
---- ruby/Gemfile.orig	2023-02-21 16:36:17 UTC
+--- ruby/Gemfile.orig	2023-03-30 13:24:44 UTC
 +++ ruby/Gemfile
 @@ -1,7 +1,7 @@
  source 'https://rubygems.org'
@@ -17,7 +17,7 @@
 +gem 'gitaly', '~> 15.5'
  
  # Labkit provides observability functionality
- gem 'gitlab-labkit', '~> 0.31'
+ gem 'gitlab-labkit', '~> 0.31', '>= 0.31.1'
 @@ -26,18 +26,10 @@ gem 'nokogiri', '~> 1.14'
  # dependency and can thus be removed when the version constraint is gone.
  gem 'redis', '~> 4.8.0'