git: 23953a07624c - main - www/gitlab: security and patch update to 18.6.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 11 Dec 2025 05:05:35 UTC
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=23953a07624c5925406d169990095885d3ede897
commit 23953a07624c5925406d169990095885d3ede897
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2025-12-11 04:44:24 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2025-12-11 05:05:32 +0000
www/gitlab: security and patch update to 18.6.2
Changes: https://about.gitlab.com/releases/2025/12/10/patch-release-gitlab-18-6-2-released/
Security: c6c9306e-d645-11f0-8ce2-2cf05da270f3
---
devel/gitaly/distinfo | 26 +++++++++++-----------
net/gitlab-agent/distinfo | 10 ++++-----
textproc/rubygem-gitlab-glfm-markdown/Makefile | 8 +++----
.../rubygem-gitlab-glfm-markdown/Makefile.crates | 2 +-
textproc/rubygem-gitlab-glfm-markdown/distinfo | 10 ++++-----
www/gitlab-pages/distinfo | 10 ++++-----
www/gitlab-workhorse/distinfo | 10 ++++-----
www/gitlab/Makefile | 2 +-
www/gitlab/Makefile.common | 2 +-
www/gitlab/distinfo | 12 +++++-----
www/gitlab/files/patch-Gemfile | 4 ++--
11 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index d111abd305d4..06d03e76085c 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1764508114
-SHA256 (go/devel_gitaly/gitaly-v18.6.1/go.mod) = 1aace7ab09969668d9aad9416851833a2ec122442b060ce133e60d1d7c9b0252
-SIZE (go/devel_gitaly/gitaly-v18.6.1/go.mod) = 14044
-SHA256 (go/devel_gitaly/gitaly-v18.6.1/gitaly-v18.6.1.tar.bz2) = 598192b4c0ea1f323ff085db5ff02e507d698456fdf5333e562f0360a319abbc
-SIZE (go/devel_gitaly/gitaly-v18.6.1/gitaly-v18.6.1.tar.bz2) = 4656878
-SHA256 (go/devel_gitaly/gitaly-v18.6.1/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
-SIZE (go/devel_gitaly/gitaly-v18.6.1/git-v2.50.0.tar.bz2) = 9249878
-SHA256 (go/devel_gitaly/gitaly-v18.6.1/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = d3397b210ca156ed84ff69b3a7f6316c5026bd05d11455f23d8335473dceaf1b
-SIZE (go/devel_gitaly/gitaly-v18.6.1/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = 11822923
-SHA256 (go/devel_gitaly/gitaly-v18.6.1/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 01a4069b15e9262151b3b97f989d4939ba8966bd5269875add2a34806817c01a
-SIZE (go/devel_gitaly/gitaly-v18.6.1/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 11745131
-SHA256 (go/devel_gitaly/gitaly-v18.6.1/8309.patch) = 44a7f527e23f818b0c7080ac6f8a56b14f6711b3feca5dd1f59e39557a7e8bce
-SIZE (go/devel_gitaly/gitaly-v18.6.1/8309.patch) = 1287
+TIMESTAMP = 1765426153
+SHA256 (go/devel_gitaly/gitaly-v18.6.2/go.mod) = 1aace7ab09969668d9aad9416851833a2ec122442b060ce133e60d1d7c9b0252
+SIZE (go/devel_gitaly/gitaly-v18.6.2/go.mod) = 14044
+SHA256 (go/devel_gitaly/gitaly-v18.6.2/gitaly-v18.6.2.tar.bz2) = 856ccaefcd634fa08e9f801c6a0cfc80446b9d57ecd263bdc0f316650f3412cb
+SIZE (go/devel_gitaly/gitaly-v18.6.2/gitaly-v18.6.2.tar.bz2) = 4657307
+SHA256 (go/devel_gitaly/gitaly-v18.6.2/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
+SIZE (go/devel_gitaly/gitaly-v18.6.2/git-v2.50.0.tar.bz2) = 9249878
+SHA256 (go/devel_gitaly/gitaly-v18.6.2/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = d3397b210ca156ed84ff69b3a7f6316c5026bd05d11455f23d8335473dceaf1b
+SIZE (go/devel_gitaly/gitaly-v18.6.2/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = 11822923
+SHA256 (go/devel_gitaly/gitaly-v18.6.2/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 01a4069b15e9262151b3b97f989d4939ba8966bd5269875add2a34806817c01a
+SIZE (go/devel_gitaly/gitaly-v18.6.2/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 11745131
+SHA256 (go/devel_gitaly/gitaly-v18.6.2/8309.patch) = 44a7f527e23f818b0c7080ac6f8a56b14f6711b3feca5dd1f59e39557a7e8bce
+SIZE (go/devel_gitaly/gitaly-v18.6.2/8309.patch) = 1287
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index 9264b441b489..8cf7a86602da 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1764220554
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.6.1/v18.6.1.mod) = 70aa1942f288770a76e933b4f648185d795b0ad148162c1bdf91c13c0c122526
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.6.1/v18.6.1.mod) = 9944
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.6.1/v18.6.1.zip) = bd3e864462912f0b7f1807f03147b026ce967a505d9931ef52d9627008e9e233
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.6.1/v18.6.1.zip) = 1917078
+TIMESTAMP = 1765426154
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.6.2/v18.6.2.mod) = 70aa1942f288770a76e933b4f648185d795b0ad148162c1bdf91c13c0c122526
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.6.2/v18.6.2.mod) = 9944
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.6.2/v18.6.2.zip) = a500e7d7947660c1e5edfc44fef91295e747dad6a1868a2abd85da98db433388
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.6.2/v18.6.2.zip) = 1917086
diff --git a/textproc/rubygem-gitlab-glfm-markdown/Makefile b/textproc/rubygem-gitlab-glfm-markdown/Makefile
index dc5639b48de9..9b069953f1b8 100644
--- a/textproc/rubygem-gitlab-glfm-markdown/Makefile
+++ b/textproc/rubygem-gitlab-glfm-markdown/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-glfm-markdown
-PORTVERSION= 0.0.38
+PORTVERSION= 0.0.39
CATEGORIES= textproc rubygems
MASTER_SITES= RG
@@ -18,8 +18,8 @@ USES= cargo gem gmake llvm:build
GEMFILES:= ${DISTNAME}.gem
DISTFILES+= ${DISTNAME}.gem
GEMS_SKIP_SUBDIR= 1
-CARGO_VENDOR_DIR= ${WRKSRC}/ext/glfm_markdown/cargo-crates
-CARGO_CARGOTOML= ${WRKSRC}/ext/glfm_markdown/Cargo.toml
+CARGO_VENDOR_DIR= ${WRKSRC}/ext/gitlab_glfm_markdown/cargo-crates
+CARGO_CARGOTOML= ${WRKSRC}/ext/gitlab_glfm_markdown/Cargo.toml
CARGO_BUILD= no
CARGO_INSTALL= no
GEM_ENV+= MAKE=gmake
@@ -27,6 +27,6 @@ GEM_ENV+= MAKE=gmake
# update the crates file with: make cargo-crates > Makefile.crates
post-install:
- @${ECHO_CMD} "${GEM_LIB_DIR}/ext/glfm_markdown/Cargo.lock" >> ${TMPPLIST}
+ @${ECHO_CMD} "${GEM_LIB_DIR}/ext/gitlab_glfm_markdown/Cargo.lock" >> ${TMPPLIST}
.include <bsd.port.mk>
diff --git a/textproc/rubygem-gitlab-glfm-markdown/Makefile.crates b/textproc/rubygem-gitlab-glfm-markdown/Makefile.crates
index 65ccdf9eef64..23d3c73268ef 100644
--- a/textproc/rubygem-gitlab-glfm-markdown/Makefile.crates
+++ b/textproc/rubygem-gitlab-glfm-markdown/Makefile.crates
@@ -22,7 +22,7 @@ CARGO_CRATES= adler2-2.0.1 \
clap_derive-4.4.7 \
clap_lex-0.6.0 \
colorchoice-1.0.4 \
- comrak-0.46.0 \
+ comrak-0.48.0 \
crc32fast-1.4.2 \
deranged-0.4.0 \
either-1.15.0 \
diff --git a/textproc/rubygem-gitlab-glfm-markdown/distinfo b/textproc/rubygem-gitlab-glfm-markdown/distinfo
index 6a26dde63f6f..79743c2848b9 100644
--- a/textproc/rubygem-gitlab-glfm-markdown/distinfo
+++ b/textproc/rubygem-gitlab-glfm-markdown/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1763010757
-SHA256 (gitlab-glfm-markdown-0.0.38.gem) = 8e57dd9283d655a40f6120dac0728f1d088900228977c139e3c969c756f40bc6
-SIZE (gitlab-glfm-markdown-0.0.38.gem) = 23040
+TIMESTAMP = 1765426185
+SHA256 (gitlab-glfm-markdown-0.0.39.gem) = a7d7d237203ebe290c2519b742c2c536ee94401a038ad63f043db9f4166fa0c7
+SIZE (gitlab-glfm-markdown-0.0.39.gem) = 23552
SHA256 (rust/crates/adler2-2.0.1.crate) = 320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa
SIZE (rust/crates/adler2-2.0.1.crate) = 13366
SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
@@ -49,8 +49,8 @@ SHA256 (rust/crates/clap_lex-0.6.0.crate) = 702fc72eb24e5a1e48ce58027a675bc24edd
SIZE (rust/crates/clap_lex-0.6.0.crate) = 12272
SHA256 (rust/crates/colorchoice-1.0.4.crate) = b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75
SIZE (rust/crates/colorchoice-1.0.4.crate) = 8196
-SHA256 (rust/crates/comrak-0.46.0.crate) = dc151d9c800c4fadd542c949b84c1dae6d1b424315ebcfd154e611d4f7910a97
-SIZE (rust/crates/comrak-0.46.0.crate) = 223946
+SHA256 (rust/crates/comrak-0.48.0.crate) = 48bf2260aceee247c6c5639f5751dc635211895066d782d2a28fb87f2e0d5613
+SIZE (rust/crates/comrak-0.48.0.crate) = 227493
SHA256 (rust/crates/crc32fast-1.4.2.crate) = a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3
SIZE (rust/crates/crc32fast-1.4.2.crate) = 38491
SHA256 (rust/crates/deranged-0.4.0.crate) = 9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index 6b4d712631f2..cbd198b7fcea 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1764220556
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.6.1/go.mod) = 01a4fafec3c597505de06cc4dc76a706e78e461b21562113750dfec75e9458c2
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.6.1/go.mod) = 3416
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.6.1/gitlab-pages-v18.6.1.tar.bz2) = 8c4823f800fa497ed170035bdd384b4ccece0c2ece38d2bc8c54b45243268e25
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.6.1/gitlab-pages-v18.6.1.tar.bz2) = 237391
+TIMESTAMP = 1765426161
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.6.2/go.mod) = 01a4fafec3c597505de06cc4dc76a706e78e461b21562113750dfec75e9458c2
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.6.2/go.mod) = 3416
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.6.2/gitlab-pages-v18.6.2.tar.bz2) = c639c05bd79199fbd93cc2a9385c33cff461581aca20cdba3ff2b89a49879b7f
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.6.2/gitlab-pages-v18.6.2.tar.bz2) = 237023
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 82201c1779fd..276c884ff68b 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1764220573
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.6.1/go.mod) = 11c339bb0fbbc0ad18e7e636a2f3cd686ea3425805f0ed0db5f629008a1d6952
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.6.1/go.mod) = 9356
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.6.1/gitlab-foss-v18.6.1.tar.bz2) = d85d6d824089cc12016fa8d3a5037cd254dff3c1e8ad477e6a1153851161e1a0
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.6.1/gitlab-foss-v18.6.1.tar.bz2) = 126836032
+TIMESTAMP = 1765426180
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.6.2/go.mod) = 11c339bb0fbbc0ad18e7e636a2f3cd686ea3425805f0ed0db5f629008a1d6952
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.6.2/go.mod) = 9356
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.6.2/gitlab-foss-v18.6.2.tar.bz2) = 6e0ee01b940be896e256ced4d312967101e489556a9ac30d3c413a8986272c4e
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.6.2/gitlab-foss-v18.6.2.tar.bz2) = 126869309
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 3a98c3b4a734..68ffe59a3f87 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -163,7 +163,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-rouge-gitlab>=4.6.1<4.7:textproc/rubygem-rouge-gitlab \
rubygem-truncato>=0.7.13<0.8.0:textproc/rubygem-truncato \
rubygem-nokogiri>=1.18.10<2:textproc/rubygem-nokogiri \
- rubygem-gitlab-glfm-markdown>=0.0.38<0.1:textproc/rubygem-gitlab-glfm-markdown \
+ rubygem-gitlab-glfm-markdown>=0.0.39<0.1:textproc/rubygem-gitlab-glfm-markdown \
rubygem-tanuki_emoji>=0.13<1:graphics/rubygem-tanuki_emoji \
rubygem-unicode-emoji>=4.0.4<5:devel/rubygem-unicode-emoji \
rubygem-icalendar-gitlab>=2.10.3<2.11:devel/rubygem-icalendar-gitlab \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 85156f73a42d..0b3200a8fbe3 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,4 +1,4 @@
-GITLAB_VERSION= 18.6.1
+GITLAB_VERSION= 18.6.2
GITLAB_PORTREVISION= 3 # decrease this only if GITLAB_KAS_GRPC_VERSION is upgraded
# Git version gitaly should use (from gitlab mirror)
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index 63867e3852b9..ca63e8700ceb 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1764220477
-SHA256 (gitlab-foss-v18.6.1.tar.bz2) = d85d6d824089cc12016fa8d3a5037cd254dff3c1e8ad477e6a1153851161e1a0
-SIZE (gitlab-foss-v18.6.1.tar.bz2) = 126836032
-TIMESTAMP = 1764220540
-SHA256 (gitlab-v18.6.1-ee.tar.bz2) = d26f8ce1949e9283ce6766e46798752a448c78055f47d82d6433fcf27aaacd6d
-SIZE (gitlab-v18.6.1-ee.tar.bz2) = 143698518
+TIMESTAMP = 1765426102
+SHA256 (gitlab-foss-v18.6.2.tar.bz2) = 6e0ee01b940be896e256ced4d312967101e489556a9ac30d3c413a8986272c4e
+SIZE (gitlab-foss-v18.6.2.tar.bz2) = 126869309
+TIMESTAMP = 1765426143
+SHA256 (gitlab-v18.6.2-ee.tar.bz2) = 7c53ea1b62d8061c1f7c125e390398b709cd9a325cbf2c23e35b736a48736db4
+SIZE (gitlab-v18.6.2-ee.tar.bz2) = 143720563
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index cfe5cabc50e5..b2222c8a2f81 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig 2025-11-19 16:58:17 UTC
+--- Gemfile.orig 2025-12-10 01:46:48 UTC
+++ Gemfile
@@ -169,7 +169,7 @@ gem 'graphql', '2.5.11', feature_category: :api
@@ -154,7 +154,7 @@
- # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
- gem 'derailed_benchmarks', require: false, feature_category: :shared
-
-- gem 'gitlab_quality-test_tooling', '~> 2.26.0', require: false, feature_category: :tooling
+- gem 'gitlab_quality-test_tooling', '~> 3.1.0', require: false, feature_category: :tooling
-end
-
gem 'octokit', '~> 9.0', feature_category: :importers