git: 8eab7ad64fa7 - 2026Q3 - www/gitlab: security and patch update to 19.3.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 18 Sep 2026 06:58:40 UTC
The branch 2026Q3 has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8eab7ad64fa790181d8df4ccc564fceeb0b8fefb
commit 8eab7ad64fa790181d8df4ccc564fceeb0b8fefb
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2026-09-13 06:52:08 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2026-09-18 06:16:41 +0000
www/gitlab: security and patch update to 19.3.2
Changes: https://docs.gitlab.com/releases/patches/patch-release-gitlab-19-3-2-released/?nav=19.3.2
Security: 7fd351d1-af26-11f1-a883-2cf05da270f3
(cherry picked from commit 50de46a1645735ef10053158dd9dd77a25bab6e6)
---
devel/gitaly/distinfo | 26 +++++++++++++-------------
net/gitlab-agent/Makefile | 15 +++++++++++++--
net/gitlab-agent/distinfo | 10 +++++-----
textproc/gitlab-elasticsearch-indexer/Makefile | 15 +++++++++++++--
textproc/gitlab-elasticsearch-indexer/distinfo | 10 +++++-----
www/gitlab-pages/distinfo | 10 +++++-----
www/gitlab-workhorse/distinfo | 10 +++++-----
www/gitlab/Makefile | 4 ++--
www/gitlab/Makefile.common | 2 +-
www/gitlab/distinfo | 12 ++++++------
www/gitlab/files/patch-Gemfile | 6 +++---
11 files changed, 71 insertions(+), 49 deletions(-)
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index dc7c62b0414d..eaebdabc192a 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1787892848
-SHA256 (go/devel_gitaly/gitaly-v19.3.1/go.mod) = 57c23a627d6bb436cdfc2c94adc3cff52fe52d29a1419552b141499ccafa0757
-SIZE (go/devel_gitaly/gitaly-v19.3.1/go.mod) = 12012
-SHA256 (go/devel_gitaly/gitaly-v19.3.1/gitaly-v19.3.1.tar.bz2) = a7d99581fcb4fa1761bf4eaba44da7f3f442c6a200ea4f3db8119cfc141dfd47
-SIZE (go/devel_gitaly/gitaly-v19.3.1/gitaly-v19.3.1.tar.bz2) = 4916535
-SHA256 (go/devel_gitaly/gitaly-v19.3.1/git-v2.54.0.tar.bz2) = 0afe27f0b087c18613b7b6ddf2cae48d39ee808ca63e5496622845b180ff8595
-SIZE (go/devel_gitaly/gitaly-v19.3.1/git-v2.54.0.tar.bz2) = 9512039
-SHA256 (go/devel_gitaly/gitaly-v19.3.1/gitlab-org-git-1ea786d14a1bb47399ce7b5f1e5885d65139b35f_GL0.tar.gz) = 5486c260dd1063d4b346e1717d1e1249463c58a79c9e283daba5b6c3b52f243b
-SIZE (go/devel_gitaly/gitaly-v19.3.1/gitlab-org-git-1ea786d14a1bb47399ce7b5f1e5885d65139b35f_GL0.tar.gz) = 12170085
-SHA256 (go/devel_gitaly/gitaly-v19.3.1/gitlab-org-git-02bb39c5cbca65a4817854477cc3e1c31ea28c49_GL0.tar.gz) = f6f9d74ab9f4f290a28fb131c2b44f664bb7b0476c3ad6cbad3a8b73fe48995b
-SIZE (go/devel_gitaly/gitaly-v19.3.1/gitlab-org-git-02bb39c5cbca65a4817854477cc3e1c31ea28c49_GL0.tar.gz) = 12168183
-SHA256 (go/devel_gitaly/gitaly-v19.3.1/gitlab-org-git-259367dc2d128a4e0dc4b6d0f67ee9711bde8cc2_GL0.tar.gz) = 79a206d2b174839b368c35068ac3bfa4a7e5d4d17617b3046e8ea6df47ff3165
-SIZE (go/devel_gitaly/gitaly-v19.3.1/gitlab-org-git-259367dc2d128a4e0dc4b6d0f67ee9711bde8cc2_GL0.tar.gz) = 12193033
+TIMESTAMP = 1789273516
+SHA256 (go/devel_gitaly/gitaly-v19.3.2/go.mod) = 57c23a627d6bb436cdfc2c94adc3cff52fe52d29a1419552b141499ccafa0757
+SIZE (go/devel_gitaly/gitaly-v19.3.2/go.mod) = 12012
+SHA256 (go/devel_gitaly/gitaly-v19.3.2/gitaly-v19.3.2.tar.bz2) = e73bfb6a6d59f21732b891aa3d77f4de4fcad7c60c8d46fc8a118390def5dc75
+SIZE (go/devel_gitaly/gitaly-v19.3.2/gitaly-v19.3.2.tar.bz2) = 4922879
+SHA256 (go/devel_gitaly/gitaly-v19.3.2/git-v2.54.0.tar.bz2) = 0afe27f0b087c18613b7b6ddf2cae48d39ee808ca63e5496622845b180ff8595
+SIZE (go/devel_gitaly/gitaly-v19.3.2/git-v2.54.0.tar.bz2) = 9512039
+SHA256 (go/devel_gitaly/gitaly-v19.3.2/gitlab-org-git-1ea786d14a1bb47399ce7b5f1e5885d65139b35f_GL0.tar.gz) = 5486c260dd1063d4b346e1717d1e1249463c58a79c9e283daba5b6c3b52f243b
+SIZE (go/devel_gitaly/gitaly-v19.3.2/gitlab-org-git-1ea786d14a1bb47399ce7b5f1e5885d65139b35f_GL0.tar.gz) = 12170085
+SHA256 (go/devel_gitaly/gitaly-v19.3.2/gitlab-org-git-02bb39c5cbca65a4817854477cc3e1c31ea28c49_GL0.tar.gz) = f6f9d74ab9f4f290a28fb131c2b44f664bb7b0476c3ad6cbad3a8b73fe48995b
+SIZE (go/devel_gitaly/gitaly-v19.3.2/gitlab-org-git-02bb39c5cbca65a4817854477cc3e1c31ea28c49_GL0.tar.gz) = 12168183
+SHA256 (go/devel_gitaly/gitaly-v19.3.2/gitlab-org-git-259367dc2d128a4e0dc4b6d0f67ee9711bde8cc2_GL0.tar.gz) = 79a206d2b174839b368c35068ac3bfa4a7e5d4d17617b3046e8ea6df47ff3165
+SIZE (go/devel_gitaly/gitaly-v19.3.2/gitlab-org-git-259367dc2d128a4e0dc4b6d0f67ee9711bde8cc2_GL0.tar.gz) = 12193033
diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile
index e1c0e669b7d3..2a7f3d6c3c99 100644
--- a/net/gitlab-agent/Makefile
+++ b/net/gitlab-agent/Makefile
@@ -17,8 +17,7 @@ BUILD_DEPENDS= git>=0:devel/git \
USES= go:modules
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org/cluster-integration
-# this branch removes the replace line in go.mod which breaks the way FreeBSD ports build go packages
-GO_MOD_DIST= https://gitlab.com/mfechner/gitlab-agent/-/raw/19-3-stable/
+GO_MOD_DIST= gitlab
GO_MODULE= gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v19
_BUILD_DATE= $$(date -u "+%Y-%m-%d-%H%M UTC")
@@ -31,6 +30,18 @@ GO_BUILDFLAGS= -tags="tracer_static,tracer_static_jaeger" \
PLIST_FILES= bin/kas
+# The go.mod has a local path replace (pkg/autoflow). The framework's
+# go-post-fetch hook runs "go mod download all" from the distdir, where only
+# the bare go.mod has been fetched, and resolves that local path relative to
+# it. Extract the subtree from the main tarball first (this runs before
+# go-post-fetch).
+post-fetch:
+ @${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
+ cd ${DISTDIR}/${DIST_SUBDIR} && \
+ ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}.tar.bz2 \
+ --strip-components 1 --no-same-owner --no-same-permissions \
+ ${DISTNAME}/pkg/autoflow
+
do-install:
${INSTALL_PROGRAM} ${WRKDIR}/bin/kas ${STAGEDIR}${PREFIX}/bin/kas
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index d3fb605e2940..3cc3b6a55c9c 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1787892851
-SHA256 (go/net_gitlab-agent/gitlab-agent-v19.3.1/go.mod) = ad3af3e94bcd02f22395420edf293510aa715bc72f5302cb984caa45508af920
-SIZE (go/net_gitlab-agent/gitlab-agent-v19.3.1/go.mod) = 11792
-SHA256 (go/net_gitlab-agent/gitlab-agent-v19.3.1/gitlab-agent-v19.3.1.tar.bz2) = 17dee2a6403e2c5e707889cc0b7a66ca178eacab976f13296fb5ae525ac0fb2d
-SIZE (go/net_gitlab-agent/gitlab-agent-v19.3.1/gitlab-agent-v19.3.1.tar.bz2) = 1516569
+TIMESTAMP = 1789283910
+SHA256 (go/net_gitlab-agent/gitlab-agent-v19.3.2/go.mod) = a5228c29551d453c27ad1e93c1d4571e97b9097e9c64e8b842b45d8b411e264f
+SIZE (go/net_gitlab-agent/gitlab-agent-v19.3.2/go.mod) = 11871
+SHA256 (go/net_gitlab-agent/gitlab-agent-v19.3.2/gitlab-agent-v19.3.2.tar.bz2) = a591a69b84c2d995244f46981b47460cbcc4496c2d41022058deb32703c90f69
+SIZE (go/net_gitlab-agent/gitlab-agent-v19.3.2/gitlab-agent-v19.3.2.tar.bz2) = 1516805
diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile
index 93a2e33ebb18..a5a1216a723b 100644
--- a/textproc/gitlab-elasticsearch-indexer/Makefile
+++ b/textproc/gitlab-elasticsearch-indexer/Makefile
@@ -1,6 +1,5 @@
PORTNAME= gitlab-elasticsearch-indexer
-PORTVERSION= 5.14.8
-PORTREVISION= 4
+PORTVERSION= 5.14.13
DISTVERSIONPREFIX= v
CATEGORIES= textproc
@@ -33,6 +32,18 @@ MAKE_ENV+= ${GO_ENV}
PLIST_FILES= bin/${PORTNAME}
+# Since 5.14.13 the go/icu dependency is vendored via a local path replace
+# (third_party/icu). The framework's go-post-fetch hook runs "go mod download
+# all" from the distdir, where only the bare go.mod has been fetched, and
+# resolves that local path relative to it. Extract the subtree from the main
+# tarball first (this runs before go-post-fetch).
+post-fetch:
+ @${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
+ cd ${DISTDIR}/${DIST_SUBDIR} && \
+ ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}.tar.bz2 \
+ --strip-components 1 --no-same-owner --no-same-permissions \
+ ${DISTNAME}/third_party/icu
+
post-patch:
${REINPLACE_CMD} -e '/libparser-download/d' ${WRKSRC}/Makefile
diff --git a/textproc/gitlab-elasticsearch-indexer/distinfo b/textproc/gitlab-elasticsearch-indexer/distinfo
index 1debd9320266..c461ca054eb8 100644
--- a/textproc/gitlab-elasticsearch-indexer/distinfo
+++ b/textproc/gitlab-elasticsearch-indexer/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1779382033
-SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.14.8/go.mod) = faa47265c198c31faef1efa2c2ff44dee0d30006e7ba4d7928554a4e4b7c5e66
-SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.14.8/go.mod) = 5840
-SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.14.8/gitlab-elasticsearch-indexer-v5.14.8.tar.bz2) = f83aec79caa01a97f93da68535234f162553cbc3999e3a0b118fb4d8328d34f6
-SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.14.8/gitlab-elasticsearch-indexer-v5.14.8.tar.bz2) = 135044
+TIMESTAMP = 1789279438
+SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.14.13/go.mod) = 0d66a3c0cba12ec917ae39c28af6110586d2ba754dcc9aa1e029dbbbfffa8515
+SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.14.13/go.mod) = 6048
+SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.14.13/gitlab-elasticsearch-indexer-v5.14.13.tar.bz2) = 8c00688e0e979463e37d9812c085a6184211ee34e3f76bda650e65d5ca3b90e9
+SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.14.13/gitlab-elasticsearch-indexer-v5.14.13.tar.bz2) = 148016
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index eff770c0a489..39d086e75099 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1787892852
-SHA256 (go/www_gitlab-pages/gitlab-pages-v19.3.1/go.mod) = ed34e139916026ce77c6512c6f175e8ed1eed976b680b388b2e2af7ac11ee2bd
-SIZE (go/www_gitlab-pages/gitlab-pages-v19.3.1/go.mod) = 3902
-SHA256 (go/www_gitlab-pages/gitlab-pages-v19.3.1/gitlab-pages-v19.3.1.tar.bz2) = 866c9506c2fe46e00349ec0fa08111c2f1ad960ce2858ad86a31eb96a19199d0
-SIZE (go/www_gitlab-pages/gitlab-pages-v19.3.1/gitlab-pages-v19.3.1.tar.bz2) = 229233
+TIMESTAMP = 1789273560
+SHA256 (go/www_gitlab-pages/gitlab-pages-v19.3.2/go.mod) = ed34e139916026ce77c6512c6f175e8ed1eed976b680b388b2e2af7ac11ee2bd
+SIZE (go/www_gitlab-pages/gitlab-pages-v19.3.2/go.mod) = 3902
+SHA256 (go/www_gitlab-pages/gitlab-pages-v19.3.2/gitlab-pages-v19.3.2.tar.bz2) = 06cc97802868e79eb4080b9ae7c3cc20f9ac3c32d444a361f59bd93936aedac3
+SIZE (go/www_gitlab-pages/gitlab-pages-v19.3.2/gitlab-pages-v19.3.2.tar.bz2) = 229207
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 5e690ea632d2..300acf506695 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1787892867
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v19.3.1/go.mod) = 5f4792dff2ce88a9cc5ff84ec2da216dd1868580537ed007c4ae6a5f97ee685a
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v19.3.1/go.mod) = 12713
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v19.3.1/gitlab-foss-v19.3.1.tar.bz2) = 4b35312d5a9ef51aaf73a137f0a1419b976496a859ac61c92299e038ec432eba
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v19.3.1/gitlab-foss-v19.3.1.tar.bz2) = 144493439
+TIMESTAMP = 1789276563
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v19.3.2/go.mod) = 5f4792dff2ce88a9cc5ff84ec2da216dd1868580537ed007c4ae6a5f97ee685a
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v19.3.2/go.mod) = 12713
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v19.3.2/gitlab-foss-v19.3.2.tar.bz2) = 1458d25ee8f5a572ce275b417c787235c222e60660ff6188b386cd2baca4acc6
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v19.3.2/gitlab-foss-v19.3.2.tar.bz2) = 144475652
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index d0ea53ed834d..ea160e094578 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -30,7 +30,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
# rubygem-freezolite is required by bundled gem auto_freeze
# rubygem-erb-gitlab 6.0.4 (listed in lockfile, maybe bundled dep)
MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
- gitlab-elasticsearch-indexer>=5.14.7:textproc/gitlab-elasticsearch-indexer \
+ gitlab-elasticsearch-indexer>=5.14.13:textproc/gitlab-elasticsearch-indexer \
gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \
gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \
gitlab-shell>=14.56.1:devel/gitlab-shell \
@@ -106,7 +106,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-grape-path-helpers>=2.1.0<2.2:devel/rubygem-grape-path-helpers \
rubygem-gitlab-grape-openapi>=0.3.0<0.4:devel/rubygem-gitlab-grape-openapi \
rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \
- rubygem-graphql>=2.6.3<2.6.4:devel/rubygem-graphql \
+ rubygem-graphql>=2.6.10<2.7:devel/rubygem-graphql \
rubygem-apollo_upload_server>=2.1.8<2.2:net/rubygem-apollo_upload_server \
rubygem-ffaker>=2.25.0<3:devel/rubygem-ffaker \
rubygem-hashie-gitlab>=5.0.0<5.1:devel/rubygem-hashie-gitlab \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 0a62e87f8549..742e7b066d87 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,4 +1,4 @@
-GITLAB_VERSION= 19.3.1
+GITLAB_VERSION= 19.3.2
GITLAB_PORTREVISION= 2 # 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 089f0e688854..0c89f390591c 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1787892779
-SHA256 (gitlab-foss-v19.3.1.tar.bz2) = 4b35312d5a9ef51aaf73a137f0a1419b976496a859ac61c92299e038ec432eba
-SIZE (gitlab-foss-v19.3.1.tar.bz2) = 144493439
-TIMESTAMP = 1787892840
-SHA256 (gitlab-v19.3.1-ee.tar.bz2) = c78be5d7aa001c7bf6c3c06af355f22323c289c37617a8b00668d290b2eb45af
-SIZE (gitlab-v19.3.1-ee.tar.bz2) = 168292032
+TIMESTAMP = 1789276545
+SHA256 (gitlab-foss-v19.3.2.tar.bz2) = 1458d25ee8f5a572ce275b417c787235c222e60660ff6188b386cd2baca4acc6
+SIZE (gitlab-foss-v19.3.2.tar.bz2) = 144475652
+TIMESTAMP = 1789276546
+SHA256 (gitlab-v19.3.2-ee.tar.bz2) = 5bd88deb1abe6e739e89acb79a954aa2e72c5b9ca0336587595b847cc53b519e
+SIZE (gitlab-v19.3.2-ee.tar.bz2) = 168342105
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 2c20f51a15b3..9719a9ae78a0 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,9 +1,9 @@
---- Gemfile.orig 2026-08-20 01:18:43 UTC
+--- Gemfile.orig 2026-09-10 08:22:14 UTC
+++ Gemfile
-@@ -173,7 +173,7 @@ gem 'graphql', '2.6.3', feature_category: :api
+@@ -173,7 +173,7 @@ gem 'graphql', '~> 2.6.10', feature_category: :api
# GraphQL API
- gem 'graphql', '2.6.3', feature_category: :api
+ gem 'graphql', '~> 2.6.10', feature_category: :api
-gem 'graphql-docs', '~> 5.2.0', group: [:development, :test], feature_category: :api
+#gem 'graphql-docs', '~> 5.2.0', group: [:development, :test], feature_category: :api
gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api