Skip to content

Commit 6962131

Browse files
mfechnermfechner
committed
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
1 parent 4a15a7c commit 6962131

File tree

9 files changed

+49
-39
lines changed

9 files changed

+49
-39
lines changed

‎devel/gitaly/distinfo‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
TIMESTAMP = 1750904315
2-
SHA256 (go/devel_gitaly/gitaly-v18.1.1/go.mod) = c0924eaae5b6c66c0e8d04e25e1dad85b88be0d33008524c3e6a9eca51311dcb
3-
SIZE (go/devel_gitaly/gitaly-v18.1.1/go.mod) = 13011
4-
SHA256 (go/devel_gitaly/gitaly-v18.1.1/gitaly-v18.1.1.tar.bz2) = 236e2019a33d359a62317a61a837658a1a8f110a19253e309ee3902793075e06
5-
SIZE (go/devel_gitaly/gitaly-v18.1.1/gitaly-v18.1.1.tar.bz2) = 4541238
6-
SHA256 (go/devel_gitaly/gitaly-v18.1.1/git-v2.49.0.tar.bz2) = 63678e3839f5af667b48cb9d0c37de4b249916dc19aae7c5ce83d07fb3146ecb
7-
SIZE (go/devel_gitaly/gitaly-v18.1.1/git-v2.49.0.tar.bz2) = 9079092
1+
TIMESTAMP = 1752120719
2+
SHA256 (go/devel_gitaly/gitaly-v18.1.2/go.mod) = c0924eaae5b6c66c0e8d04e25e1dad85b88be0d33008524c3e6a9eca51311dcb
3+
SIZE (go/devel_gitaly/gitaly-v18.1.2/go.mod) = 13011
4+
SHA256 (go/devel_gitaly/gitaly-v18.1.2/gitaly-v18.1.2.tar.bz2) = 8538f12c47dcb7ad3cd9c1bafe003d8e3f6fc2e26b10031f835af624d8c12c55
5+
SIZE (go/devel_gitaly/gitaly-v18.1.2/gitaly-v18.1.2.tar.bz2) = 4541124
6+
SHA256 (go/devel_gitaly/gitaly-v18.1.2/git-v2.49.0.tar.bz2) = 63678e3839f5af667b48cb9d0c37de4b249916dc19aae7c5ce83d07fb3146ecb
7+
SIZE (go/devel_gitaly/gitaly-v18.1.2/git-v2.49.0.tar.bz2) = 9079092

‎net/gitlab-agent/distinfo‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
TIMESTAMP = 1750904316
2-
SHA256 (go/net_gitlab-agent/gitlab-agent-v18.1.1/v18.1.1.mod) = 2739a9f4b5204729b51ad90bd66634bab4c4a4f2db5a8f3ec80c7eda733484db
3-
SIZE (go/net_gitlab-agent/gitlab-agent-v18.1.1/v18.1.1.mod) = 9688
4-
SHA256 (go/net_gitlab-agent/gitlab-agent-v18.1.1/v18.1.1.zip) = d2b86212d9b34d9b3552046d12e6f8478d69cbe107781b7aae37a19bda356fc9
5-
SIZE (go/net_gitlab-agent/gitlab-agent-v18.1.1/v18.1.1.zip) = 1672541
1+
TIMESTAMP = 1752120725
2+
SHA256 (go/net_gitlab-agent/gitlab-agent-v18.1.2/v18.1.2.mod) = 2739a9f4b5204729b51ad90bd66634bab4c4a4f2db5a8f3ec80c7eda733484db
3+
SIZE (go/net_gitlab-agent/gitlab-agent-v18.1.2/v18.1.2.mod) = 9688
4+
SHA256 (go/net_gitlab-agent/gitlab-agent-v18.1.2/v18.1.2.zip) = a96cd3e050611991f370b95c284ecb3e8b8d5f0a460988abde5b7ef8c25b8c51
5+
SIZE (go/net_gitlab-agent/gitlab-agent-v18.1.2/v18.1.2.zip) = 1672549

‎net/rubygem-gitlab-kas-grpc/distinfo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
TIMESTAMP = 1750904330
2-
SHA256 (rubygem/gitlab-kas-grpc-18.1.1.gem) = 3f837056b2761ca996ad0f298b8f56a03173c0439ae0042255ef57d01a6edbd9
3-
SIZE (rubygem/gitlab-kas-grpc-18.1.1.gem) = 10752
1+
TIMESTAMP = 1752120745
2+
SHA256 (rubygem/gitlab-kas-grpc-18.1.2.gem) = 4624830b22b0918570b73fd99a5a9464518b4715d0ef51a6343dc8d1b030bcd1
3+
SIZE (rubygem/gitlab-kas-grpc-18.1.2.gem) = 10752

‎www/gitlab-pages/distinfo‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
TIMESTAMP = 1750904318
2-
SHA256 (go/www_gitlab-pages/gitlab-pages-v18.1.1/go.mod) = a5b3bb24fd3351af28849dfc2bb09acd9d7f4d06e3f065776685482d0745e180
3-
SIZE (go/www_gitlab-pages/gitlab-pages-v18.1.1/go.mod) = 3435
4-
SHA256 (go/www_gitlab-pages/gitlab-pages-v18.1.1/gitlab-pages-v18.1.1.tar.bz2) = afd5131094c333f862f68c0377dc9121f7e19f0e8de419b59643dfcb21098059
5-
SIZE (go/www_gitlab-pages/gitlab-pages-v18.1.1/gitlab-pages-v18.1.1.tar.bz2) = 235705
1+
TIMESTAMP = 1752120731
2+
SHA256 (go/www_gitlab-pages/gitlab-pages-v18.1.2/go.mod) = a5b3bb24fd3351af28849dfc2bb09acd9d7f4d06e3f065776685482d0745e180
3+
SIZE (go/www_gitlab-pages/gitlab-pages-v18.1.2/go.mod) = 3435
4+
SHA256 (go/www_gitlab-pages/gitlab-pages-v18.1.2/gitlab-pages-v18.1.2.tar.bz2) = a069447d9af1c393331dd6a2f6a04dac0cd0ac7dfeb9ec1d37d461a4768c9607
5+
SIZE (go/www_gitlab-pages/gitlab-pages-v18.1.2/gitlab-pages-v18.1.2.tar.bz2) = 235679

‎www/gitlab-workhorse/distinfo‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
TIMESTAMP = 1750904330
2-
SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.1.1/go.mod) = ba6f1d47b9d8b718a588b1de93d521341655934b0d8038a32777a34d97168804
3-
SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.1.1/go.mod) = 9144
4-
SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.1.1/gitlab-foss-v18.1.1.tar.bz2) = f88fcf557bad4ed378c12b2cca9321e6014d4aae4426ddb6cde185a6ecb54d11
5-
SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.1.1/gitlab-foss-v18.1.1.tar.bz2) = 119445108
1+
TIMESTAMP = 1752120745
2+
SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.1.2/go.mod) = ba6f1d47b9d8b718a588b1de93d521341655934b0d8038a32777a34d97168804
3+
SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.1.2/go.mod) = 9144
4+
SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.1.2/gitlab-foss-v18.1.2.tar.bz2) = 4ddd03411d0e58ebaedce10aac0992c941f2170e9c8109ffd05e5f91cde834a0
5+
SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.1.2/gitlab-foss-v18.1.2.tar.bz2) = 119451022

‎www/gitlab/Makefile.common‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GITLAB_VERSION= 18.1.1
1+
GITLAB_VERSION= 18.1.2
22
GITLAB_PORTREVISION= 0
33

44
# Git version gitaly should use (from gitlab mirror)

‎www/gitlab/distinfo‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
TIMESTAMP = 1750904269
2-
SHA256 (gitlab-foss-v18.1.1.tar.bz2) = f88fcf557bad4ed378c12b2cca9321e6014d4aae4426ddb6cde185a6ecb54d11
3-
SIZE (gitlab-foss-v18.1.1.tar.bz2) = 119445108
4-
TIMESTAMP = 1750904310
5-
SHA256 (gitlab-v18.1.1-ee.tar.bz2) = e2b052cee4fff6330558b78ac6efd3619681b95b7dd949961267c1370aecdd21
6-
SIZE (gitlab-v18.1.1-ee.tar.bz2) = 134748693
1+
TIMESTAMP = 1752120708
2+
SHA256 (gitlab-foss-v18.1.2.tar.bz2) = 4ddd03411d0e58ebaedce10aac0992c941f2170e9c8109ffd05e5f91cde834a0
3+
SIZE (gitlab-foss-v18.1.2.tar.bz2) = 119451022
4+
TIMESTAMP = 1752120712
5+
SHA256 (gitlab-v18.1.2-ee.tar.bz2) = 491dfc7d35b76f93bce08ec3a144f38bddb2db694832b5738872d17ec5e60a1a
6+
SIZE (gitlab-v18.1.2-ee.tar.bz2) = 134768496

‎www/gitlab/files/patch-Gemfile‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
--- Gemfile.orig 2025-06-18 04:18:20 UTC
1+
--- Gemfile.orig 2025-07-09 01:48:55 UTC
22
+++ Gemfile
33
@@ -164,8 +164,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea
44
gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared
@@ -182,16 +182,21 @@
182182
gem 'octokit', '~> 9.0', feature_category: :importers
183183
# Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688
184184
gem 'faraday-multipart', '~> 1.0', feature_category: :importers
185-
@@ -646,7 +518,7 @@ gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :
185+
@@ -646,11 +518,11 @@ gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :
186186
gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :gitaly
187187

188188
# KAS GRPC protocol definitions
189189
-gem 'gitlab-kas-grpc', '~> 17.11.0', feature_category: :deployment_management
190190
+gem 'gitlab-kas-grpc', '~> 18.1.0', feature_category: :deployment_management
191191

192-
gem 'grpc', '~> 1.72.0', feature_category: :shared
192+
# Lock until 1.74.0 is available
193+
# https://gitlab.com/gitlab-com/gl-infra/production/-/issues/20067
194+
-gem 'grpc', '= 1.63.0', feature_category: :shared
195+
+gem 'grpc', '~> 1.63', feature_category: :shared
193196

194-
@@ -669,7 +541,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :
197+
gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
198+
199+
@@ -671,7 +543,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :
195200
gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :shared
196201

197202
# Countries list
@@ -200,7 +205,7 @@
200205

201206
gem 'retriable', '~> 3.1.2', feature_category: :shared
202207

203-
@@ -750,10 +622,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
208+
@@ -752,10 +624,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
204209

205210
gem 'duo_api', '~> 1.3', feature_category: :system_access
206211

‎www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
--- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2025-06-18 04:18:20 UTC
1+
--- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2025-07-09 01:48:55 UTC
22
+++ gems/gitlab-backup-cli/gitlab-backup-cli.gemspec
33
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
44
spec.add_dependency "activerecord", ">= 7"
@@ -9,7 +9,12 @@
99
spec.add_dependency "google-cloud-storage_transfer", "~> 1.2.0"
1010
spec.add_dependency "mutex_m", "~> 0.3"
1111
spec.add_dependency "pg", "~> 1.5.6"
12-
@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
12+
@@ -40,11 +40,11 @@ Gem::Specification.new do |spec|
13+
spec.add_dependency "concurrent-ruby", "~> 1.1"
14+
spec.add_dependency "faraday", "~> 2"
15+
spec.add_dependency "google-protobuf", "~> 3.25", ">= 3.25.3"
16+
- spec.add_dependency "grpc", "= 1.63.0"
17+
+ spec.add_dependency "grpc", "~> 1.63"
1318
spec.add_dependency "json", "~> 2.7"
1419
spec.add_dependency "jwt", "~> 2.5"
1520
spec.add_dependency "logger", "~> 1.5"

0 commit comments

Comments
 (0)