git: a6d118538f29 - 2025Q3 - www/gitlab: security and patch update to 18.1.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 10 Jul 2025 14:26:17 UTC
The branch 2025Q3 has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a6d118538f2928d50802e9778190842b77e711ee
commit a6d118538f2928d50802e9778190842b77e711ee
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2025-07-10 04:54:29 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2025-07-10 14:26:09 +0000
www/gitlab: security and patch update to 18.1.2
Changes: https://about.gitlab.com/releases/2025/07/09/patch-release-gitlab-18-1-2-released/
Security: 20823cc0-5d45-11f0-966e-2cf05da270f3
(cherry picked from commit 6962131cd928e4801aabadcfeba3da4f2ea8df65)
---
devel/gitaly/distinfo | 14 +++++++-------
net/gitlab-agent/distinfo | 10 +++++-----
net/rubygem-gitlab-kas-grpc/distinfo | 6 +++---
www/gitlab-pages/distinfo | 10 +++++-----
www/gitlab-workhorse/distinfo | 10 +++++-----
www/gitlab/Makefile.common | 2 +-
www/gitlab/distinfo | 12 ++++++------
www/gitlab/files/patch-Gemfile | 15 ++++++++++-----
...patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec | 9 +++++++--
9 files changed, 49 insertions(+), 39 deletions(-)
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index e3ab94cea4a9..ccf599dc21c3 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1750904315
-SHA256 (go/devel_gitaly/gitaly-v18.1.1/go.mod) = c0924eaae5b6c66c0e8d04e25e1dad85b88be0d33008524c3e6a9eca51311dcb
-SIZE (go/devel_gitaly/gitaly-v18.1.1/go.mod) = 13011
-SHA256 (go/devel_gitaly/gitaly-v18.1.1/gitaly-v18.1.1.tar.bz2) = 236e2019a33d359a62317a61a837658a1a8f110a19253e309ee3902793075e06
-SIZE (go/devel_gitaly/gitaly-v18.1.1/gitaly-v18.1.1.tar.bz2) = 4541238
-SHA256 (go/devel_gitaly/gitaly-v18.1.1/git-v2.49.0.tar.bz2) = 63678e3839f5af667b48cb9d0c37de4b249916dc19aae7c5ce83d07fb3146ecb
-SIZE (go/devel_gitaly/gitaly-v18.1.1/git-v2.49.0.tar.bz2) = 9079092
+TIMESTAMP = 1752120719
+SHA256 (go/devel_gitaly/gitaly-v18.1.2/go.mod) = c0924eaae5b6c66c0e8d04e25e1dad85b88be0d33008524c3e6a9eca51311dcb
+SIZE (go/devel_gitaly/gitaly-v18.1.2/go.mod) = 13011
+SHA256 (go/devel_gitaly/gitaly-v18.1.2/gitaly-v18.1.2.tar.bz2) = 8538f12c47dcb7ad3cd9c1bafe003d8e3f6fc2e26b10031f835af624d8c12c55
+SIZE (go/devel_gitaly/gitaly-v18.1.2/gitaly-v18.1.2.tar.bz2) = 4541124
+SHA256 (go/devel_gitaly/gitaly-v18.1.2/git-v2.49.0.tar.bz2) = 63678e3839f5af667b48cb9d0c37de4b249916dc19aae7c5ce83d07fb3146ecb
+SIZE (go/devel_gitaly/gitaly-v18.1.2/git-v2.49.0.tar.bz2) = 9079092
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index a148c6f84400..8edb80da5733 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1750904316
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.1.1/v18.1.1.mod) = 2739a9f4b5204729b51ad90bd66634bab4c4a4f2db5a8f3ec80c7eda733484db
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.1.1/v18.1.1.mod) = 9688
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.1.1/v18.1.1.zip) = d2b86212d9b34d9b3552046d12e6f8478d69cbe107781b7aae37a19bda356fc9
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.1.1/v18.1.1.zip) = 1672541
+TIMESTAMP = 1752120725
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.1.2/v18.1.2.mod) = 2739a9f4b5204729b51ad90bd66634bab4c4a4f2db5a8f3ec80c7eda733484db
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.1.2/v18.1.2.mod) = 9688
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.1.2/v18.1.2.zip) = a96cd3e050611991f370b95c284ecb3e8b8d5f0a460988abde5b7ef8c25b8c51
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.1.2/v18.1.2.zip) = 1672549
diff --git a/net/rubygem-gitlab-kas-grpc/distinfo b/net/rubygem-gitlab-kas-grpc/distinfo
index b6307ec1097d..68d91d8cd5df 100644
--- a/net/rubygem-gitlab-kas-grpc/distinfo
+++ b/net/rubygem-gitlab-kas-grpc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1750904330
-SHA256 (rubygem/gitlab-kas-grpc-18.1.1.gem) = 3f837056b2761ca996ad0f298b8f56a03173c0439ae0042255ef57d01a6edbd9
-SIZE (rubygem/gitlab-kas-grpc-18.1.1.gem) = 10752
+TIMESTAMP = 1752120745
+SHA256 (rubygem/gitlab-kas-grpc-18.1.2.gem) = 4624830b22b0918570b73fd99a5a9464518b4715d0ef51a6343dc8d1b030bcd1
+SIZE (rubygem/gitlab-kas-grpc-18.1.2.gem) = 10752
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index ceedef560ee2..1de09c0be7d8 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1750904318
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.1.1/go.mod) = a5b3bb24fd3351af28849dfc2bb09acd9d7f4d06e3f065776685482d0745e180
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.1.1/go.mod) = 3435
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.1.1/gitlab-pages-v18.1.1.tar.bz2) = afd5131094c333f862f68c0377dc9121f7e19f0e8de419b59643dfcb21098059
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.1.1/gitlab-pages-v18.1.1.tar.bz2) = 235705
+TIMESTAMP = 1752120731
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.1.2/go.mod) = a5b3bb24fd3351af28849dfc2bb09acd9d7f4d06e3f065776685482d0745e180
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.1.2/go.mod) = 3435
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.1.2/gitlab-pages-v18.1.2.tar.bz2) = a069447d9af1c393331dd6a2f6a04dac0cd0ac7dfeb9ec1d37d461a4768c9607
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.1.2/gitlab-pages-v18.1.2.tar.bz2) = 235679
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 44012915453a..8ef8a977be19 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1750904330
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.1.1/go.mod) = ba6f1d47b9d8b718a588b1de93d521341655934b0d8038a32777a34d97168804
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.1.1/go.mod) = 9144
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.1.1/gitlab-foss-v18.1.1.tar.bz2) = f88fcf557bad4ed378c12b2cca9321e6014d4aae4426ddb6cde185a6ecb54d11
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.1.1/gitlab-foss-v18.1.1.tar.bz2) = 119445108
+TIMESTAMP = 1752120745
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.1.2/go.mod) = ba6f1d47b9d8b718a588b1de93d521341655934b0d8038a32777a34d97168804
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.1.2/go.mod) = 9144
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.1.2/gitlab-foss-v18.1.2.tar.bz2) = 4ddd03411d0e58ebaedce10aac0992c941f2170e9c8109ffd05e5f91cde834a0
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.1.2/gitlab-foss-v18.1.2.tar.bz2) = 119451022
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 864063c1365a..ff68c32fb6f9 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,4 +1,4 @@
-GITLAB_VERSION= 18.1.1
+GITLAB_VERSION= 18.1.2
GITLAB_PORTREVISION= 0
# Git version gitaly should use (from gitlab mirror)
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index f3d977a2ab27..33b5475934e2 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1750904269
-SHA256 (gitlab-foss-v18.1.1.tar.bz2) = f88fcf557bad4ed378c12b2cca9321e6014d4aae4426ddb6cde185a6ecb54d11
-SIZE (gitlab-foss-v18.1.1.tar.bz2) = 119445108
-TIMESTAMP = 1750904310
-SHA256 (gitlab-v18.1.1-ee.tar.bz2) = e2b052cee4fff6330558b78ac6efd3619681b95b7dd949961267c1370aecdd21
-SIZE (gitlab-v18.1.1-ee.tar.bz2) = 134748693
+TIMESTAMP = 1752120708
+SHA256 (gitlab-foss-v18.1.2.tar.bz2) = 4ddd03411d0e58ebaedce10aac0992c941f2170e9c8109ffd05e5f91cde834a0
+SIZE (gitlab-foss-v18.1.2.tar.bz2) = 119451022
+TIMESTAMP = 1752120712
+SHA256 (gitlab-v18.1.2-ee.tar.bz2) = 491dfc7d35b76f93bce08ec3a144f38bddb2db694832b5738872d17ec5e60a1a
+SIZE (gitlab-v18.1.2-ee.tar.bz2) = 134768496
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 704da6697d22..b1f8737fef56 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig 2025-06-18 04:18:20 UTC
+--- Gemfile.orig 2025-07-09 01:48:55 UTC
+++ Gemfile
@@ -164,8 +164,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea
gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared
@@ -182,16 +182,21 @@
gem 'octokit', '~> 9.0', feature_category: :importers
# Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688
gem 'faraday-multipart', '~> 1.0', feature_category: :importers
-@@ -646,7 +518,7 @@ gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :
+@@ -646,11 +518,11 @@ gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :
gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :gitaly
# KAS GRPC protocol definitions
-gem 'gitlab-kas-grpc', '~> 17.11.0', feature_category: :deployment_management
+gem 'gitlab-kas-grpc', '~> 18.1.0', feature_category: :deployment_management
- gem 'grpc', '~> 1.72.0', feature_category: :shared
+ # Lock until 1.74.0 is available
+ # https://gitlab.com/gitlab-com/gl-infra/production/-/issues/20067
+-gem 'grpc', '= 1.63.0', feature_category: :shared
++gem 'grpc', '~> 1.63', feature_category: :shared
-@@ -669,7 +541,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :
+ gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
+
+@@ -671,7 +543,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :
gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :shared
# Countries list
@@ -200,7 +205,7 @@
gem 'retriable', '~> 3.1.2', feature_category: :shared
-@@ -750,10 +622,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
+@@ -752,10 +624,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
gem 'duo_api', '~> 1.3', feature_category: :system_access
diff --git a/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec b/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec
index cf08a9593f99..8912856cee2b 100644
--- a/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec
+++ b/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec
@@ -1,4 +1,4 @@
---- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2025-06-18 04:18:20 UTC
+--- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2025-07-09 01:48:55 UTC
+++ gems/gitlab-backup-cli/gitlab-backup-cli.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "activerecord", ">= 7"
@@ -9,7 +9,12 @@
spec.add_dependency "google-cloud-storage_transfer", "~> 1.2.0"
spec.add_dependency "mutex_m", "~> 0.3"
spec.add_dependency "pg", "~> 1.5.6"
-@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
+@@ -40,11 +40,11 @@ Gem::Specification.new do |spec|
+ spec.add_dependency "concurrent-ruby", "~> 1.1"
+ spec.add_dependency "faraday", "~> 2"
+ spec.add_dependency "google-protobuf", "~> 3.25", ">= 3.25.3"
+- spec.add_dependency "grpc", "= 1.63.0"
++ spec.add_dependency "grpc", "~> 1.63"
spec.add_dependency "json", "~> 2.7"
spec.add_dependency "jwt", "~> 2.5"
spec.add_dependency "logger", "~> 1.5"