summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/gitaly/distinfo14
-rw-r--r--net/gitlab-agent/distinfo10
-rw-r--r--net/rubygem-gitaly/Makefile2
-rw-r--r--net/rubygem-gitaly/distinfo6
-rw-r--r--net/rubygem-gitlab-kas-grpc/distinfo6
-rw-r--r--www/gitlab-pages/distinfo10
-rw-r--r--www/gitlab-workhorse/distinfo10
-rw-r--r--www/gitlab/Makefile.common2
-rw-r--r--www/gitlab/distinfo12
-rw-r--r--www/gitlab/files/patch-Gemfile10
10 files changed, 43 insertions, 39 deletions
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 326621df2ba3..2c74706e907f 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1752679148
-SHA256 (go/devel_gitaly/gitaly-v18.2.0/go.mod) = ec7c02d0d63b1125e6446a6c2ada6fc2efa12d332da58b7c9c9cd56103cc51ed
-SIZE (go/devel_gitaly/gitaly-v18.2.0/go.mod) = 13011
-SHA256 (go/devel_gitaly/gitaly-v18.2.0/gitaly-v18.2.0.tar.bz2) = 8d1543f363464030eb72c83d6d32f6020e7c912de95fb3a33659995d20598d0f
-SIZE (go/devel_gitaly/gitaly-v18.2.0/gitaly-v18.2.0.tar.bz2) = 4543392
-SHA256 (go/devel_gitaly/gitaly-v18.2.0/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
-SIZE (go/devel_gitaly/gitaly-v18.2.0/git-v2.50.0.tar.bz2) = 9249878
+TIMESTAMP = 1753327146
+SHA256 (go/devel_gitaly/gitaly-v18.2.1/go.mod) = ec7c02d0d63b1125e6446a6c2ada6fc2efa12d332da58b7c9c9cd56103cc51ed
+SIZE (go/devel_gitaly/gitaly-v18.2.1/go.mod) = 13011
+SHA256 (go/devel_gitaly/gitaly-v18.2.1/gitaly-v18.2.1.tar.bz2) = 3144eba5edd72e66e0f7b3fb8b3fb1d2d6dc6cb5bc45fadd284980401535840d
+SIZE (go/devel_gitaly/gitaly-v18.2.1/gitaly-v18.2.1.tar.bz2) = 4543282
+SHA256 (go/devel_gitaly/gitaly-v18.2.1/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
+SIZE (go/devel_gitaly/gitaly-v18.2.1/git-v2.50.0.tar.bz2) = 9249878
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index 9edabb89baeb..b57e09ee5cb9 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1752677035
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.2.0/v18.2.0.mod) = 4772214d0f7667ed5a2f465d728888c258c09e89afb5e4b0e6e5a087b77057fd
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.2.0/v18.2.0.mod) = 9809
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.2.0/v18.2.0.zip) = 23e76612b7c0694ef093e71826bb94386f7f18531f9ffb4122a4e823bb48af94
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.2.0/v18.2.0.zip) = 1707851
+TIMESTAMP = 1753327147
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.2.1/v18.2.1.mod) = 4772214d0f7667ed5a2f465d728888c258c09e89afb5e4b0e6e5a087b77057fd
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.2.1/v18.2.1.mod) = 9809
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.2.1/v18.2.1.zip) = 7ab07ce329dd3e34591233ee00192068064752f61b577f2bfed86c285576cc0f
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.2.1/v18.2.1.zip) = 1708969
diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile
index 0b4ff68cc031..b0dad500647d 100644
--- a/net/rubygem-gitaly/Makefile
+++ b/net/rubygem-gitaly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitaly
-PORTVERSION= 18.1.0
+PORTVERSION= 18.2.1
CATEGORIES= net rubygems
MASTER_SITES= RG
diff --git a/net/rubygem-gitaly/distinfo b/net/rubygem-gitaly/distinfo
index ebbf3d3cdf11..7796ac38fe37 100644
--- a/net/rubygem-gitaly/distinfo
+++ b/net/rubygem-gitaly/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1750222113
-SHA256 (rubygem/gitaly-18.1.0.gem) = 80f8dd89005ad5788a7af07f101484c1b1dad423e90cc0405daaa85c27d1b7fc
-SIZE (rubygem/gitaly-18.1.0.gem) = 53248
+TIMESTAMP = 1753336806
+SHA256 (rubygem/gitaly-18.2.1.gem) = 7409135d7dbc29ec8021e694420963e1da86dcc45252065fce813c19cb5c9bb3
+SIZE (rubygem/gitaly-18.2.1.gem) = 53248
diff --git a/net/rubygem-gitlab-kas-grpc/distinfo b/net/rubygem-gitlab-kas-grpc/distinfo
index e3643c1df22c..3787efb94b44 100644
--- a/net/rubygem-gitlab-kas-grpc/distinfo
+++ b/net/rubygem-gitlab-kas-grpc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1752677055
-SHA256 (rubygem/gitlab-kas-grpc-18.2.0.gem) = c14314fdcac6ef12794f6293979d0e2fcbcb01bb55fb04ee37e10d4337a99b6e
-SIZE (rubygem/gitlab-kas-grpc-18.2.0.gem) = 10752
+TIMESTAMP = 1753327162
+SHA256 (rubygem/gitlab-kas-grpc-18.2.1.gem) = 971519aaaf9b34097c9a919312361c9686997fab22e09cfb50d951ed5ab245e2
+SIZE (rubygem/gitlab-kas-grpc-18.2.1.gem) = 10752
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index ea3024c9d6d7..63b3fe32f1c1 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1752677038
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.2.0/go.mod) = fabce2d66cf34e44e541a57220574dbef2778f98afa0e86272882385608871f1
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.2.0/go.mod) = 3435
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.2.0/gitlab-pages-v18.2.0.tar.bz2) = 39ac8c911693ce0549c8da818577ae78b193ed6f1d27b48abddc92c446989ed7
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.2.0/gitlab-pages-v18.2.0.tar.bz2) = 236137
+TIMESTAMP = 1753327149
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.2.1/go.mod) = fabce2d66cf34e44e541a57220574dbef2778f98afa0e86272882385608871f1
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.2.1/go.mod) = 3435
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.2.1/gitlab-pages-v18.2.1.tar.bz2) = 3c174591200800c22d1eb654d09235db6aeb63313eab6a50c3e2ec0aa41d0fac
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.2.1/gitlab-pages-v18.2.1.tar.bz2) = 236018
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 04b929e44a9d..6e64f5266cd7 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1752677054
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.2.0/go.mod) = 188c374b005aba0ee613477584379e4f1f3344b4f68d33274c9aac043c95f448
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.2.0/go.mod) = 9293
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.2.0/gitlab-foss-v18.2.0.tar.bz2) = 23a1309fb73f19ccfc3100611e1149a3405563862d697829e9cf0080c9487565
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.2.0/gitlab-foss-v18.2.0.tar.bz2) = 121280838
+TIMESTAMP = 1753327162
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.2.1/go.mod) = dbd6a92d66a1a0a418aab39bf166a48ea5a4c892fe69fe19b12b347ea74936db
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.2.1/go.mod) = 9384
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.2.1/gitlab-foss-v18.2.1.tar.bz2) = 47df0d49390cf5fb28af71ee99608d826158399c3a164ec64b41aec9c04a0207
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.2.1/gitlab-foss-v18.2.1.tar.bz2) = 121288065
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 5b26abcfe873..a2e98918f414 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,4 +1,4 @@
-GITLAB_VERSION= 18.2.0
+GITLAB_VERSION= 18.2.1
GITLAB_PORTREVISION= 0
# Git version gitaly should use (from gitlab mirror)
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index df7dca2e03fe..67a668af820f 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1752677001
-SHA256 (gitlab-foss-v18.2.0.tar.bz2) = 23a1309fb73f19ccfc3100611e1149a3405563862d697829e9cf0080c9487565
-SIZE (gitlab-foss-v18.2.0.tar.bz2) = 121280838
-TIMESTAMP = 1752677001
-SHA256 (gitlab-v18.2.0-ee.tar.bz2) = 867f7292eec847e786a56c7fb15c7d8139993e3e29e2e7dd0bc9f580167470e9
-SIZE (gitlab-v18.2.0-ee.tar.bz2) = 136600640
+TIMESTAMP = 1753327140
+SHA256 (gitlab-foss-v18.2.1.tar.bz2) = 47df0d49390cf5fb28af71ee99608d826158399c3a164ec64b41aec9c04a0207
+SIZE (gitlab-foss-v18.2.1.tar.bz2) = 121288065
+TIMESTAMP = 1753327140
+SHA256 (gitlab-v18.2.1-ee.tar.bz2) = f1cb7cb49ae20a3ddec3ca36bff457550a7b9383dd8b3ff42cd7104fac0c2bd7
+SIZE (gitlab-v18.2.1-ee.tar.bz2) = 136599618
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 12b4438204ba..f57ee976650d 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig 2025-07-16 11:39:10 UTC
+--- Gemfile.orig 2025-07-22 11:41:34 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,8 +182,12 @@
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
-@@ -639,11 +511,11 @@ gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :
- gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :gitaly
+@@ -636,14 +508,14 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside
+ gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
+
+ # Gitaly GRPC protocol definitions
+-gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :gitaly
++gem 'gitaly', '~> 18.1', feature_category: :gitaly
# KAS GRPC protocol definitions
-gem 'gitlab-kas-grpc', '~> 18.1.0', feature_category: :deployment_management