Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 4 Oct 2023 15:52:16 GMT
From:      Matthias Fechner <mfechner@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 85e1fab6b4b4 - main - www/gitlab-ce: major upgrade to 16.4.0
Message-ID:  <202310041552.394FqGmQ037133@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=85e1fab6b4b4cbf82f7efb14fdf7011651c3bddd

commit 85e1fab6b4b4cbf82f7efb14fdf7011651c3bddd
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2023-09-24 09:25:36 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2023-10-04 15:50:55 +0000

    www/gitlab-ce: major upgrade to 16.4.0
    
    Changelog:
    https://about.gitlab.com/releases/2023/09/22/gitlab-16-4-released/
---
 devel/gitaly/Makefile                              | 17 +----
 devel/gitaly/distinfo                              | 12 ++--
 devel/gitaly/files/patch-Makefile                  | 25 --------
 devel/gitaly/files/patch-config.toml.example       | 10 +--
 devel/gitlab-shell/Makefile                        |  3 +-
 devel/gitlab-shell/distinfo                        | 10 +--
 www/gitlab-ce/Makefile                             | 72 +++++++++++-----------
 www/gitlab-ce/distinfo                             |  6 +-
 www/gitlab-ce/files/patch-Gemfile                  | 65 +++++++++----------
 .../files/patch-config_database.yml.postgresql     | 18 ++++--
 .../files/patch-config_initializers_1__settings.rb |  4 +-
 www/gitlab-ce/pkg-message                          |  4 +-
 www/gitlab-pages/Makefile                          |  2 +-
 www/gitlab-pages/distinfo                          | 10 +--
 www/gitlab-workhorse/Makefile                      |  2 +-
 www/gitlab-workhorse/distinfo                      | 10 +--
 16 files changed, 111 insertions(+), 159 deletions(-)

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 271949401ec1..46db254d8467 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitaly
-DISTVERSION=	16.3.5
+DISTVERSION=	16.4.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
@@ -19,8 +19,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git
 BUILD_DEPENDS=	bash>0:shells/bash \
 		${LOCALBASE}/bin/cmake:devel/cmake-core \
 		${MY_DEPENDS}
-RUN_DEPENDS=	${MY_DEPENDS} \
-		gitlab-shell>=14.17.0:devel/gitlab-shell
+RUN_DEPENDS=	${MY_DEPENDS}
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
 		libhttp_parser.so:www/http-parser
 
@@ -35,13 +34,6 @@ MAKE_ENV+=	${GO_ENV}
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 
-USE_GITHUB=	nodefault
-# Check used version here: https://gitlab.com/gitlab-org/gitaly/-/blob/v16.3.1/Makefile#L181
-# We use here a patched version that is including some patches already merged into 1.7 branch which fixes problems with FreeBSD 14
-# https://github.com/libgit2/libgit2/commit/251408cfd4ff8112efaa5c82ec81c9574c4bf022
-# https://github.com/libgit2/libgit2/commit/213d35ea6d69598693b7f4b5b737aa98c91ba98e
-GH_TUPLE=	mfechner:libgit2:3bd8f66803c056325d5835d1fbc0c2db2ef89d06:build_deps_libgit2_source
-
 # for go dependencies
 # Gitlab hosts there dependencies on their own platform and not on go-proxy
 # so we download the required go.mod file from gitlab
@@ -61,11 +53,6 @@ go-post-fetch:
 		${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all)
 # ---------------------------
 
-post-extract:
-	${MKDIR} ${WRKSRC}/_build/deps/libgit2
-	@${RM} -r ${WORKSRC}/_build/deps/libgit2/source
-	@${RLN} ${WRKSRC_build_deps_libgit2_source} ${WRKSRC}/_build/deps/libgit2/source
-
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example
 	${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 7bc962385e5e..44c990213364 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1695958229
-SHA256 (go/devel_gitaly/gitaly-v16.3.5/go.mod) = 90b3743fb25526e4b77aeca1a9b00d0a99c5288da835d80bf29121fb2a211db2
-SIZE (go/devel_gitaly/gitaly-v16.3.5/go.mod) = 10532
-SHA256 (go/devel_gitaly/gitaly-v16.3.5/mfechner-libgit2-3bd8f66803c056325d5835d1fbc0c2db2ef89d06_GH0.tar.gz) = a86257b2563d588c3080cf8845c9bd812f52a45ca375862a05a5b9c45e7d7ddd
-SIZE (go/devel_gitaly/gitaly-v16.3.5/mfechner-libgit2-3bd8f66803c056325d5835d1fbc0c2db2ef89d06_GH0.tar.gz) = 5883130
-SHA256 (go/devel_gitaly/gitaly-v16.3.5/gitaly-v16.3.5.tar.bz2) = f7ce644d65b1ade76c99b0495a0d0c726245b266280524e4280ecb54bfaec1b7
-SIZE (go/devel_gitaly/gitaly-v16.3.5/gitaly-v16.3.5.tar.bz2) = 2461324
+TIMESTAMP = 1695542667
+SHA256 (go/devel_gitaly/gitaly-v16.4.0/go.mod) = 297ad42064334fe0bdeb8b428bffb4d36edffa43233dfa9c33a24c39d5d3c2f3
+SIZE (go/devel_gitaly/gitaly-v16.4.0/go.mod) = 10499
+SHA256 (go/devel_gitaly/gitaly-v16.4.0/gitaly-v16.4.0.tar.bz2) = b799fd9627dbc5f7bd8f8841c5b22591880f47bb7e99d040749fb45276bf3cad
+SIZE (go/devel_gitaly/gitaly-v16.4.0/gitaly-v16.4.0.tar.bz2) = 2450967
diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile
deleted file mode 100644
index b9ed01951a7f..000000000000
--- a/devel/gitaly/files/patch-Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.orig	2023-08-21 09:20:49 UTC
-+++ Makefile
-@@ -628,16 +628,16 @@ ${DEPENDENCY_DIR}/protoc.version: dependency-version |
- 	${Q}[ x"$$(cat "$@" 2>/dev/null)" = x"${PROTOC_VERSION} ${PROTOC_BUILD_OPTIONS}" ] || >$@ echo -n "${PROTOC_VERSION} ${PROTOC_BUILD_OPTIONS}"
- 
- ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a: ${DEPENDENCY_DIR}/libgit2.version
--	${Q}${GIT} -c init.defaultBranch=master init ${GIT_QUIET} ${LIBGIT2_SOURCE_DIR}
--	${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" config remote.origin.url ${LIBGIT2_REPO_URL}
--	${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" config remote.origin.tagOpt --no-tags
--	${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" fetch --depth 1 ${GIT_QUIET} origin ${LIBGIT2_VERSION}
--	${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" checkout ${GIT_QUIET} --detach FETCH_HEAD
-+	#${Q}${GIT} -c init.defaultBranch=master init ${GIT_QUIET} ${LIBGIT2_SOURCE_DIR}
-+	#${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" config remote.origin.url ${LIBGIT2_REPO_URL}
-+	#${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" config remote.origin.tagOpt --no-tags
-+	#${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" fetch --depth 1 ${GIT_QUIET} origin ${LIBGIT2_VERSION}
-+	#${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" checkout ${GIT_QUIET} --detach FETCH_HEAD
- 	${Q}rm -rf ${LIBGIT2_BUILD_DIR}
- 	${Q}mkdir -p ${LIBGIT2_BUILD_DIR}
- 	${Q}cd ${LIBGIT2_BUILD_DIR} && cmake ${LIBGIT2_SOURCE_DIR} ${LIBGIT2_BUILD_OPTIONS}
- 	${Q}CMAKE_BUILD_PARALLEL_LEVEL=$(shell nproc) cmake --build ${LIBGIT2_BUILD_DIR} --target install
--	go install -a github.com/libgit2/git2go/${GIT2GO_VERSION}
-+	#go install -a github.com/libgit2/git2go/${GIT2GO_VERSION}
- 
- # This target is responsible for checking out Git sources. In theory, we'd only
- # need to depend on the source directory. But given that the source directory
diff --git a/devel/gitaly/files/patch-config.toml.example b/devel/gitaly/files/patch-config.toml.example
index 6b6db835cd9f..96757cb8bbc4 100644
--- a/devel/gitaly/files/patch-config.toml.example
+++ b/devel/gitaly/files/patch-config.toml.example
@@ -1,4 +1,4 @@
---- config.toml.example.orig	2023-08-21 09:20:49 UTC
+--- config.toml.example.orig	2023-09-21 08:51:45 UTC
 +++ config.toml.example
 @@ -2,10 +2,10 @@
  # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and
@@ -56,12 +56,8 @@
  # format = "json"
  # # Optional: Set log level to only log entries with that severity or above
  # # One of, in order: debug, info, warn, errror, fatal, panic
-@@ -72,14 +72,14 @@ dir = "/home/git/gitlab/log"
- 
- [gitlab-shell]
- # The directory where gitlab-shell is installed
--dir = "/home/git/gitlab-shell"
-+dir = "%%PREFIX%%/share/gitlab-shell"
+@@ -71,11 +71,11 @@ dir = "/home/git/gitlab/log"
+ # grpc_latency_buckets = [0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 300.0, 1500.0]
  
  [hooks]
 -custom_hooks_dir = "/home/git/custom_hooks"
diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index f754f6c0193d..1a3e0df5b3a8 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gitlab-shell
-PORTVERSION=	14.26.0
-PORTREVISION=	1
+PORTVERSION=	14.28.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo
index 0b617d9297b5..65883998ebb8 100644
--- a/devel/gitlab-shell/distinfo
+++ b/devel/gitlab-shell/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1693643697
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.26.0/go.mod) = 8ef118a7179202ed0a6f2fd52e53c29fef23b668421f086e19b7f965c884c317
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.26.0/go.mod) = 4705
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.26.0/gitlab-shell-v14.26.0.tar.bz2) = a2e75107010f8ef90d6695c11a2cf2a726de6ecfbf4c69262a36f33f96028da1
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.26.0/gitlab-shell-v14.26.0.tar.bz2) = 132666
+TIMESTAMP = 1695535027
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.28.0/go.mod) = 2292bfa79e6f9f98d5b482bd81b2dfe6bc95076d046085359a0f9019b306f462
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.28.0/go.mod) = 4767
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.28.0/gitlab-shell-v14.28.0.tar.bz2) = cfb56533b26d55e99ee807c50fbb09c170f62522b0a58ef7652747ab645b3dcc
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.28.0/gitlab-shell-v14.28.0.tar.bz2) = 140420
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 813e17c652ab..efec0bb3feaf 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-ce
-PORTVERSION=	16.3.5
+PORTVERSION=	16.4.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www devel
 
@@ -20,10 +20,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 MY_DEPENDS=	git>=2.41.0:devel/git \
 	gitaly>=${PORTVERSION}:devel/gitaly \
 	gitlab-elasticsearch-indexer>=4.3.10:textproc/gitlab-elasticsearch-indexer \
-	gitlab-agent>=16.3.0:net/gitlab-agent \
-	gitlab-metrics-exporter>0:devel/gitlab-metrics-exporter \
+	gitlab-agent>=16.4.0:net/gitlab-agent \
 	gitlab-pages>=${PORTVERSION}:www/gitlab-pages \
-	gitlab-shell>=14.26.0:devel/gitlab-shell \
+	gitlab-shell>=14.28.0:devel/gitlab-shell \
 	gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \
 	redis>=6.2.11:databases/redis \
 	yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \
@@ -33,13 +32,14 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-net-pop>=0:mail/rubygem-net-pop \
 	rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \
 	rubygem-rails70>=7.0.6<7.1:www/rubygem-rails70 \
+	rubygem-vite_rails-rails70>=0:devel/rubygem-vite_rails-rails70 \
 	rubygem-bootsnap>=1.16.0<1.17:devel/rubygem-bootsnap \
 	rubygem-openssl>=3.0<4:security/rubygem-openssl \
 	rubygem-ipaddr>=1.2.5<1.3:net/rubygem-ipaddr \
 	rubygem-responders-rails70>=3.0<4.0:www/rubygem-responders-rails70 \
 	rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \
-	rubygem-view_component-rails70>=3.2.0<3.3:devel/rubygem-view_component-rails70 \
-	rubygem-pg>=1.5.3<1.6:databases/rubygem-pg \
+	rubygem-view_component-rails70>=3.5.0<3.6:devel/rubygem-view_component-rails70 \
+	rubygem-pg>=1.5.4<1.6:databases/rubygem-pg \
 	rubygem-neighbor>=0.2.3<0.3:databases/rubygem-neighbor \
 	rubygem-rugged>=1.6<2:devel/rubygem-rugged \
 	rubygem-grape-path-helpers>=1.7.1<1.8:devel/rubygem-grape-path-helpers \
@@ -50,7 +50,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-bcrypt>=3.1.14<3.2:security/rubygem-bcrypt \
 	rubygem-doorkeeper-rails70>=5.6.6<6:security/rubygem-doorkeeper-rails70 \
 	rubygem-doorkeeper-openid_connect>=1.8.7<2:security/rubygem-doorkeeper-openid_connect \
-	rubygem-rexml>=3.2.5<3.3:textproc/rubygem-rexml \
+	rubygem-rexml>=3.2.6<3.3:textproc/rubygem-rexml \
 	rubygem-ruby-saml>=1.15.0<1.16:security/rubygem-ruby-saml \
 	rubygem-omniauth>=2.1.0<3:security/rubygem-omniauth \
 	rubygem-omniauth-auth0>=3.1.0<3.2.0:net/rubygem-omniauth-auth0 \
@@ -72,24 +72,24 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-gssapi>=1.3.1<1.4:security/rubygem-gssapi \
 	rubygem-recaptcha>=5.12<6.0:devel/rubygem-recaptcha \
 	rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \
-	rubygem-invisible_captcha>=2.0.0<2.1.0:graphics/rubygem-invisible_captcha \
+	rubygem-invisible_captcha>=2.1.0<2.2.0:graphics/rubygem-invisible_captcha \
 	rubygem-devise-two-factor40-rails70>=4.0.2<4.1:security/rubygem-devise-two-factor40-rails70 \
 	rubygem-rqrcode-rails3>=0.1.7<0.2.0:www/rubygem-rqrcode-rails3 \
-	rubygem-validates_hostname>=1.0.11<1.1.0:dns/rubygem-validates_hostname \
+	rubygem-validates_hostname>=1.0.13<1.1.0:dns/rubygem-validates_hostname \
 	rubygem-rubyzip>=2.3.2<2.4:archivers/rubygem-rubyzip \
 	rubygem-acme-client>=2.0.9<3:security/rubygem-acme-client \
 	rubygem-browser>=5.3.1<5.4:www/rubygem-browser \
 	rubygem-ohai17>=17.9<18:sysutils/rubygem-ohai17 \
-	rubygem-gpgme>=2.0.22<2.1.0:security/rubygem-gpgme \
+	rubygem-gpgme>=2.0.23<2.1.0:security/rubygem-gpgme \
 	rubygem-gitlab_omniauth-ldap>=2.2.0<2.3.0:net/rubygem-gitlab_omniauth-ldap \
 	rubygem-net-ldap017>=0.17.1<0.18:net/rubygem-net-ldap017 \
 	rubygem-grape17>=1.7.0<1.8:devel/rubygem-grape17 \
 	rubygem-grape-entity>=0.10.0<0.11.0,1:devel/rubygem-grape-entity \
-	rubygem-rack-cors>=1.1.1<1.2.0:www/rubygem-rack-cors \
+	rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \
 	rubygem-grape-swagger>=1.6.1<1.7:devel/rubygem-grape-swagger \
 	rubygem-grape-swagger-entity>=0.5.1<0.6:devel/rubygem-grape-swagger-entity \
-	rubygem-graphql>=1.13.12<1.14:devel/rubygem-graphql \
-	rubygem-graphiql-rails>=1.8<2:devel/rubygem-graphiql-rails \
+	rubygem-graphql>=1.13.19<1.14:devel/rubygem-graphql \
+	rubygem-graphiql-rails>=1.8.0<1.9:devel/rubygem-graphiql-rails \
 	rubygem-apollo_upload_server>=2.1.0<2.2:net/rubygem-apollo_upload_server \
 	rubygem-graphql-docs>=2.1.0<2.2.0:devel/rubygem-graphql-docs \
 	rubygem-graphlient>=0.5.0<0.6:devel/rubygem-graphlient \
@@ -116,18 +116,17 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-google-apis-serviceusage_v1>=0.28.0<0.29:devel/rubygem-google-apis-serviceusage_v1 \
 	rubygem-google-apis-sqladmin_v1beta4_041>=0.41.0<0.42:devel/rubygem-google-apis-sqladmin_v1beta4_041 \
 	rubygem-google-apis-androidpublisher_v3034>=0.34.0<0.35:devel/rubygem-google-apis-androidpublisher_v3034 \
-	rubygem-unf>=0.1.4<0.2.0:textproc/rubygem-unf \
 	rubygem-seed-fu>=2.3.7<2.4.0:databases/rubygem-seed-fu \
 	rubygem-elasticsearch-model713>=7.2<8:textproc/rubygem-elasticsearch-model713 \
 	rubygem-elasticsearch-rails>=7.2<8:textproc/rubygem-elasticsearch-rails \
 	rubygem-elasticsearch-api713>=7.13.3<7.13.4:textproc/rubygem-elasticsearch-api713 \
-	rubygem-aws-sdk-core>=3.180.3<4:devel/rubygem-aws-sdk-core \
+	rubygem-aws-sdk-core>=3.181.1<4:devel/rubygem-aws-sdk-core \
 	rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \
-	rubygem-aws-sdk-s3>=1.132.1<2:devel/rubygem-aws-sdk-s3 \
+	rubygem-aws-sdk-s3>=1.134.0<2:devel/rubygem-aws-sdk-s3 \
 	rubygem-faraday_middleware-aws-sigv403>=0.3.0<0.4:devel/rubygem-faraday_middleware-aws-sigv403 \
 	rubygem-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \
 	rubygem-html-pipeline>=2.14.3<2.15:textproc/rubygem-html-pipeline \
-	rubygem-deckar01-task_list>=2.3.2<2.4:www/rubygem-deckar01-task_list \
+	rubygem-deckar01-task_list>=2.3.3<2.4:www/rubygem-deckar01-task_list \
 	rubygem-gitlab-markup>=1.9.0<1.10.0:textproc/rubygem-gitlab-markup \
 	rubygem-commonmarker>=0.23.10<0.24:textproc/rubygem-commonmarker \
 	rubygem-kramdown23>=2.3.1<2.4:textproc/rubygem-kramdown23 \
@@ -148,7 +147,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-diff_match_patch>=0.1.0<0.2.0:textproc/rubygem-diff_match_patch \
 	rubygem-rack22>=2.2.8,3<2.3,3:www/rubygem-rack22 \
 	rubygem-rack-timeout>=0.6.3<0.7:www/rubygem-rack-timeout \
-	rubygem-puma>=6.3<7:www/rubygem-puma \
+	rubygem-puma>=6.3.1<7:www/rubygem-puma \
 	rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \
 	rubygem-state_machines-activerecord08>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord08 \
 	rubygem-acts-as-taggable-on>=9.0<10:www/rubygem-acts-as-taggable-on \
@@ -156,10 +155,10 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-sidekiq-cron18>=1.8.0<1.9:devel/rubygem-sidekiq-cron18 \
 	rubygem-redis-namespace19>=1.9.0<1.10.0:databases/rubygem-redis-namespace19 \
 	rubygem-fugit>=1.8.1<1.9:devel/rubygem-fugit \
-	rubygem-httparty020>=0.20.0<0.21:www/rubygem-httparty020 \
+	rubygem-httparty>=0.21.0<0.22:www/rubygem-httparty \
 	rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \
 	rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \
-	rubygem-re2>=1.7.0<1.8.0:devel/rubygem-re2 \
+	rubygem-re2>=2.0.0<2.0.1:devel/rubygem-re2 \
 	rubygem-semver_dialects12>=1.2.1<1.3:devel/rubygem-semver_dialects12 \
 	rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \
 	rubygem-js_regex>=3.8<4.0:textproc/rubygem-js_regex \
@@ -177,21 +176,21 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-kubeclient>=4.11.0<4.12.0:www/rubygem-kubeclient \
 	rubygem-ruby-openai37>=3.7<4:www/rubygem-ruby-openai37 \
 	rubygem-circuitbox>=2.0.0<2.1:www/rubygem-circuitbox \
-	rubygem-sanitize>=6.0<7:textproc/rubygem-sanitize \
+	rubygem-sanitize60>=6.0.2<6.1:textproc/rubygem-sanitize60 \
 	rubygem-babosa>=2.0<3:textproc/rubygem-babosa \
 	rubygem-loofah>=2.21.3<2.22:textproc/rubygem-loofah \
-	rubygem-licensee>=9.15<10:devel/rubygem-licensee \
+	rubygem-licensee>=9.16<10:devel/rubygem-licensee \
 	rubygem-charlock_holmes>=0.7.7<0.8.0:textproc/rubygem-charlock_holmes \
 	rubygem-ruby-magic>=0.6<1:devel/rubygem-ruby-magic \
-	rubygem-fast_blank>=0:devel/rubygem-fast_blank \
+	rubygem-fast_blank>=1.0.1<1.1:devel/rubygem-fast_blank \
 	rubygem-gitlab-chronic>=0.10.5<0.11.0:devel/rubygem-gitlab-chronic \
-	rubygem-gitlab_chronic_duration>=0.10.6.2<0.10.7:devel/rubygem-gitlab_chronic_duration \
-	rubygem-rack-proxy>=0.7.6<0.8.0:www/rubygem-rack-proxy \
+	rubygem-gitlab_chronic_duration>=0.11<1:devel/rubygem-gitlab_chronic_duration \
+	rubygem-rack-proxy>=0.7.7<0.8.0:www/rubygem-rack-proxy \
 	rubygem-sassc-rails-rails70>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails70 \
 	rubygem-autoprefixer-rails1025>=10.2.5.1<10.2.6:textproc/rubygem-autoprefixer-rails1025 \
 	rubygem-terser>=1.0.2:textproc/rubygem-terser \
 	rubygem-addressable>=2.8<3:www/rubygem-addressable \
-	rubygem-tanuki_emoji>=0.6<1:graphics/rubygem-tanuki_emoji \
+	rubygem-tanuki_emoji>=0.7<1:graphics/rubygem-tanuki_emoji \
 	rubygem-gon-rails70>=6.4.0<6.5:www/rubygem-gon-rails70 \
 	rubygem-request_store>=1.5.1<2.0:devel/rubygem-request_store \
 	rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \
@@ -205,7 +204,6 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-premailer-rails110-rails70>=1.10.3<1.11:mail/rubygem-premailer-rails110-rails70 \
 	rubygem-gitlab-labkit>=0.34.0<0.35:devel/rubygem-gitlab-labkit \
 	rubygem-thrift>=0.16.0:devel/rubygem-thrift \
-	rubygem-ruby_parser>=3.20<4.0:devel/rubygem-ruby_parser \
 	rubygem-rails-i18n-rails70>=7.0<8:devel/rubygem-rails-i18n-rails70 \
 	rubygem-gettext_i18n_rails111>=1.11.0<1.12.0:devel/rubygem-gettext_i18n_rails111 \
 	rubygem-gettext_i18n_rails_js-rails70>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails70 \
@@ -214,12 +212,12 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-peek-rails70>=1.1.0<2.0:devel/rubygem-peek-rails70 \
 	rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \
 	rubygem-webrick>=1.8.1<1.9:www/rubygem-webrick \
-	rubygem-prometheus-client-mmap>=0.27<0.28:devel/rubygem-prometheus-client-mmap \
+	rubygem-prometheus-client-mmap>=0.28<0.29:devel/rubygem-prometheus-client-mmap \
 	rubygem-warning>=1.3.0<1.4:devel/rubygem-warning \
 	rubygem-license_finder>=7.0.0<8:devel/rubygem-license_finder \
-	rubygem-gitlab-dangerfiles>=3.13.0<3.14:devel/rubygem-gitlab-dangerfiles \
+	rubygem-gitlab-dangerfiles>=4.0.0<4.1:devel/rubygem-gitlab-dangerfiles \
 	rubygem-rspec>=3.0<4:devel/rubygem-rspec \
-	rubygem-octokit5>=4.20<6.0:net/rubygem-octokit5 \
+	rubygem-octokit6>=6.0<7:net/rubygem-octokit6 \
 	rubygem-gitlab-mail_room>=0.0.23<0.1.0:mail/rubygem-gitlab-mail_room \
 	rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \
 	rubygem-html2text>=0:textproc/rubygem-html2text \
@@ -235,16 +233,16 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-net-ntp>0:net/rubygem-net-ntp \
 	rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \
 	rubygem-spamcheck>=1.3.0<1.4:net/rubygem-spamcheck \
-	rubygem-gitaly>=16.2.0.pre.rc4<16.3.0:net/rubygem-gitaly \
+	rubygem-gitaly>=16.3.0.rc1<16.4.0:net/rubygem-gitaly \
 	rubygem-kas-grpc>=0.2.0,1<0.3.0,1:net/rubygem-kas-grpc \
 	rubygem-grpc>=1.55.0<2:net/rubygem-grpc \
-	rubygem-google-protobuf323>=3.23.4<4:devel/rubygem-google-protobuf323 \
+	rubygem-google-protobuf>=3.24.3<4:devel/rubygem-google-protobuf \
 	rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \
-	rubygem-flipper025>=0.25.0<0.26:devel/rubygem-flipper025 \
-	rubygem-flipper-active_record-rails70>=0.25.0<0.26:databases/rubygem-flipper-active_record-rails70 \
-	rubygem-flipper-active_support_cache_store-rails70>=0.25.0<0.26:devel/rubygem-flipper-active_support_cache_store-rails70 \
+	rubygem-flipper026>=0.26.2<0.27:devel/rubygem-flipper026 \
+	rubygem-flipper-active_record-rails70>=0.26.2<0.27:databases/rubygem-flipper-active_record-rails70 \
+	rubygem-flipper-active_support_cache_store-rails70>=0.26.2<0.27:devel/rubygem-flipper-active_support_cache_store-rails70 \
 	rubygem-unleash>=3.2.2<3.3:devel/rubygem-unleash \
-	rubygem-gitlab-experiment>=0.7.0<0.8:devel/rubygem-gitlab-experiment \
+	rubygem-gitlab-experiment>=0.8.0<0.9:devel/rubygem-gitlab-experiment \
 	rubygem-lograge-rails70>=0.11.2<1.0:www/rubygem-lograge-rails70 \
 	rubygem-grape_logging>=1.8<2.0:devel/rubygem-grape_logging \
 	rubygem-gitlab-net-dns>=0.9.2<0.10:dns/rubygem-gitlab-net-dns \
@@ -252,7 +250,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-retriable>=3.1.2<3.2.0:devel/rubygem-retriable \
 	rubygem-lru_redux>0:devel/rubygem-lru_redux \
 	rubygem-mail>=2.8.1<2.8.2,2:mail/rubygem-mail \
-	rubygem-lockbox>=1.1.1<1.2:security/rubygem-lockbox \
+	rubygem-lockbox>=1.3.0<1.4:security/rubygem-lockbox \
 	rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \
 	rubygem-jsonb_accessor>=1.3.10<1.4:www/rubygem-jsonb_accessor \
 	rubygem-json>=2.6.3<3:devel/rubygem-json \
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index f5193d15a714..b1bdcafef6ab 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695958128
-SHA256 (gitlab-foss-v16.3.5.tar.bz2) = c84906ef3a4a44e7c3e0a4bea407673647347b5b9d00263ee6ea53f75d29692e
-SIZE (gitlab-foss-v16.3.5.tar.bz2) = 91305629
+TIMESTAMP = 1695534531
+SHA256 (gitlab-foss-v16.4.0.tar.bz2) = 87c14776bc7a22dbba53d2a25256aad2cb031e578014445cc4e298b39eb9caa2
+SIZE (gitlab-foss-v16.4.0.tar.bz2) = 96949969
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index 2ae8a42038e2..6689126ecf28 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,6 +1,6 @@
---- Gemfile.orig	2023-08-21 09:25:45 UTC
+--- Gemfile.orig	2023-09-21 08:56:19 UTC
 +++ Gemfile
-@@ -46,7 +46,7 @@ gem 'neighbor', '~> 0.2.3'
+@@ -48,7 +48,7 @@ gem 'neighbor', '~> 0.2.3'
  gem 'rugged', '~> 1.6'
  gem 'grape-path-helpers', '~> 1.7.1'
  
@@ -9,7 +9,7 @@
  gem 'marginalia', '~> 1.11.1'
  
  # Authorization
-@@ -66,8 +66,8 @@ gem 'omniauth-azure-activedirectory-v2', '~> 2.0'
+@@ -68,8 +68,8 @@ gem 'omniauth-azure-activedirectory-v2', '~> 2.0'
  gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md
  gem 'omniauth-dingtalk-oauth2', '~> 1.0'
  gem 'omniauth-alicloud', '~> 2.0.1'
@@ -20,7 +20,7 @@
  gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md
  gem 'omniauth-google-oauth2', '~> 1.1'
  gem 'omniauth-oauth2-generic', '~> 0.2.2'
-@@ -78,7 +78,7 @@ gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/o
+@@ -80,7 +80,7 @@ gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/o
  gem 'omniauth_openid_connect', '~> 0.6.1'
  # Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem.
  # See https://docs.gitlab.com/ee/development/emails.html#rationale.
@@ -29,7 +29,7 @@
  gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md
  gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
  gem 'rack-oauth2', '~> 1.21.3'
-@@ -166,7 +166,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/a
+@@ -168,7 +168,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/a
  
  # for Google storage
  gem 'google-cloud-storage', '~> 1.44.0'
@@ -38,19 +38,19 @@
  gem 'google-apis-compute_v1', '~> 0.57.0'
  gem 'google-apis-container_v1', '~> 0.43.0'
  gem 'google-apis-container_v1beta1', '~> 0.43.0'
-@@ -187,9 +187,9 @@ gem 'seed-fu', '~> 2.3.7'
+@@ -186,9 +186,9 @@ gem 'seed-fu', '~> 2.3.7'
  gem 'elasticsearch-model', '~> 7.2'
  gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation'
  gem 'elasticsearch-api',   '7.13.3'
--gem 'aws-sdk-core', '~> 3.180.3'
-+gem 'aws-sdk-core', '~> 3.180'
+-gem 'aws-sdk-core', '~> 3.181.1'
++gem 'aws-sdk-core', '~> 3.181'
  gem 'aws-sdk-cloudformation', '~> 1'
--gem 'aws-sdk-s3', '~> 1.132.1'
-+gem 'aws-sdk-s3', '~> 1.132'
+-gem 'aws-sdk-s3', '~> 1.134.0'
++gem 'aws-sdk-s3', '~> 1.134'
  gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
  gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections
  
-@@ -289,7 +289,7 @@ gem 'slack-messenger', '~> 2.3.4'
+@@ -288,7 +288,7 @@ gem 'slack-messenger', '~> 2.3.4'
  gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat'
  
  # Asana integration
@@ -59,7 +59,7 @@
  
  # FogBugz integration
  gem 'ruby-fogbugz', '~> 0.3.0'
-@@ -385,78 +385,10 @@ gem 'prometheus-client-mmap', '~> 0.27', require: 'pro
+@@ -381,118 +381,15 @@ gem 'prometheus-client-mmap', '~> 0.28', require: 'pro
  
  gem 'warning', '~> 1.3.0'
  
@@ -125,7 +125,7 @@
 -end
 -
  group :development, :test, :danger do
-   gem 'gitlab-dangerfiles', '~> 3.13.0', require: false
+   gem 'gitlab-dangerfiles', '~> 4.0.0', require: false
  end
  
 -group :development, :test, :coverage do
@@ -138,27 +138,30 @@
  # Gems required in omnibus-gitlab pipeline
  group :development, :test, :omnibus do
    gem 'license_finder', '~> 7.0', require: false
-@@ -468,37 +400,8 @@ group :development, :test, :monorepo do
-   gem 'rspec_flaky', path: 'gems/rspec_flaky'
  end
  
+-# Gems required in various pipelines
+-group :development, :test, :monorepo do
+-  gem 'gitlab-rspec', path: 'gems/gitlab-rspec'
+-  gem 'rspec_flaky', path: 'gems/rspec_flaky'
+-end
+-
 -group :test do
 -  gem 'fuubar', '~> 2.2.0'
 -  gem 'rspec-retry', '~> 0.6.2'
 -  gem 'rspec_profiling', '~> 0.0.6'
 -  gem 'rspec-benchmark', '~> 0.6.0'
 -  gem 'rspec-parameterized', '~> 1.0', require: false
-+gem 'octokit', '>= 4.15'
- 
+-
 -  gem 'capybara', '~> 3.39', '>= 3.39.2'
 -  gem 'capybara-screenshot', '~> 1.0.26'
--  gem 'selenium-webdriver', '= 4.11.0'
+-  gem 'selenium-webdriver', '= 4.12.0'
 -
 -  gem 'graphlyte', '~> 1.0.0'
 -
 -  gem 'shoulda-matchers', '~> 5.1.0', require: false
 -  gem 'email_spec', '~> 2.2.0'
--  gem 'webmock', '~> 3.18.1'
+-  gem 'webmock', '~> 3.19.1'
 -  gem 'rails-controller-testing'
 -  gem 'concurrent-ruby', '~> 1.1'
 -  gem 'test-prof', '~> 1.2.2'
@@ -169,32 +172,22 @@
 -  # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
 -  gem 'derailed_benchmarks', require: false
 -
--  gem 'gitlab_quality-test_tooling', '~> 0.9.3', require: false
+-  gem 'gitlab_quality-test_tooling', '~> 1.0.0', require: false
 -end
 -
--gem 'octokit', '~> 4.15'
--
- gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room'
+ gem 'octokit', '~> 6.0'
  
- gem 'email_reply_trimmer', '~> 0.1'
-@@ -534,14 +437,14 @@ gem 'gitaly', '~> 16.2.0-rc4'
+ gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room'
+@@ -530,7 +427,7 @@ gem 'gitaly', '~> 16.3.0-rc1'
  # KAS GRPC protocol definitions
  gem 'kas-grpc', '~> 0.2.0'
  
 -gem 'grpc', '~> 1.55.0'
 +gem 'grpc', '~> 1.55'
  
- gem 'google-protobuf', '~> 3.23', '>= 3.23.4'
- 
- gem 'toml-rb', '~> 2.2.0'
+ gem 'google-protobuf', '~> 3.24', '>= 3.24.3'
  
- # Feature toggles
--gem 'flipper', '~> 0.25.0'
-+gem 'flipper', '>= 0.25.0'
- gem 'flipper-active_record', '~> 0.25.0'
- gem 'flipper-active_support_cache_store', '~> 0.25.0'
- gem 'unleash', '~> 3.2.2'
-@@ -555,7 +458,7 @@ gem 'grape_logging', '~> 1.8'
+@@ -551,7 +448,7 @@ gem 'grape_logging', '~> 1.8'
  gem 'gitlab-net-dns', '~> 0.9.2'
  
  # Countries list
@@ -203,7 +196,7 @@
  
  gem 'retriable', '~> 3.1.2'
  
-@@ -628,3 +531,9 @@ gem 'net-protocol', '~> 0.1.3'
+@@ -624,3 +521,9 @@ gem 'net-protocol', '~> 0.1.3'
  gem 'net-http', '= 0.1.1'
  
  gem 'duo_api', '~> 1.3'
diff --git a/www/gitlab-ce/files/patch-config_database.yml.postgresql b/www/gitlab-ce/files/patch-config_database.yml.postgresql
index 775a4dd2ff27..c0b66431bfeb 100644
--- a/www/gitlab-ce/files/patch-config_database.yml.postgresql
+++ b/www/gitlab-ce/files/patch-config_database.yml.postgresql
@@ -1,4 +1,4 @@
---- config/database.yml.postgresql.orig	2023-05-18 16:48:55 UTC
+--- config/database.yml.postgresql.orig	2023-09-21 08:56:19 UTC
 +++ config/database.yml.postgresql
 @@ -26,13 +26,6 @@ production:
      username: git
@@ -42,8 +42,8 @@
  
  # Warning: The database defined as "test" will be erased and
  # re-generated from your development database when you run "rake".
-@@ -117,13 +96,6 @@ test: &test
-     prepared_statements: false
+@@ -119,19 +98,3 @@ test: &test
+     reaping_frequency: nil
      variables:
        statement_timeout: 15s
 -  geo:
@@ -53,6 +53,12 @@
 -    username: postgres
 -    password:
 -    host: localhost
-   embedding:
-     adapter: postgresql
-     encoding: unicode
+-    reaping_frequency: nil
+-  embedding:
+-    adapter: postgresql
+-    encoding: unicode
+-    database: gitlabhq_embedding_test
+-    username: postgres
+-    password:
+-    host: localhost
+-    reaping_frequency: nil
diff --git a/www/gitlab-ce/files/patch-config_initializers_1__settings.rb b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb
index 21f09d5a97e4..9260864dbcce 100644
--- a/www/gitlab-ce/files/patch-config_initializers_1__settings.rb
+++ b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb
@@ -1,6 +1,6 @@
---- config/initializers/1_settings.rb.orig	2023-05-18 16:48:55 UTC
+--- config/initializers/1_settings.rb.orig	2023-09-21 08:56:19 UTC
 +++ config/initializers/1_settings.rb
-@@ -203,11 +203,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi
+@@ -207,11 +207,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi
  Settings.gitlab['user'] ||= 'git'
  # External configuration may cause the ssh user to differ from the GitLab user
  Settings.gitlab['ssh_user'] ||= Settings.gitlab.user
diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message
index 7e2b60894f18..a3344fb637eb 100644
--- a/www/gitlab-ce/pkg-message
+++ b/www/gitlab-ce/pkg-message
@@ -6,7 +6,7 @@ Gitlab was installed successfully.
 You now need to set up the various components of Gitlab, so please
 follow the instructions in the guide at:
 
-https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/16.3-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/16.4-freebsd.md
 EOM
   type: install
 }
@@ -20,7 +20,7 @@ EOM
 If you just installed an major upgrade of GitLab, for example you
 switched from 14.5.x to 14.6.x, please follow the instructions in the guide at:
 
-https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/16.1-16.3-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/16.3-16.4-freebsd.md
 
 If you just installed an minor upgrade of GitLab please follow
 the instructions in the guide at:
diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
index fe29f813d069..dd475e461ade 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-pages
-PORTVERSION=	16.3.5
+PORTVERSION=	16.4.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES+=	https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index 6649cc20f978..54727bd41478 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1695958278
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.3.5/go.mod) = 7a4011638a58161a910eab69a49314def0475881a5257382da5c57fd429d0783
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.3.5/go.mod) = 2987
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.3.5/gitlab-pages-v16.3.5.tar.bz2) = 9ab7da4e5a60a16a69bc11da8da77fa466803a86af545fb6471d68aadbff0486
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.3.5/gitlab-pages-v16.3.5.tar.bz2) = 193368
+TIMESTAMP = 1695539785
+SHA256 (go/www_gitlab-pages/gitlab-pages-v16.4.0/go.mod) = 7c187a27bbe120e94adb41fb30ee7e5e0a5432bbae20db191a5e1deec02fc920
+SIZE (go/www_gitlab-pages/gitlab-pages-v16.4.0/go.mod) = 2957
+SHA256 (go/www_gitlab-pages/gitlab-pages-v16.4.0/gitlab-pages-v16.4.0.tar.bz2) = e8afe1b7e6da13fd3ddb7d67e388dbfdc128832b1c41c4688ab97dbcd9de0b9b
+SIZE (go/www_gitlab-pages/gitlab-pages-v16.4.0/gitlab-pages-v16.4.0.tar.bz2) = 190443
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index aea142eecc7c..f6c648749473 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-workhorse
-PORTVERSION=	16.3.5
+PORTVERSION=	16.4.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index b37b0ecdc012..318e65a240d2 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1695958201
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.3.5/go.mod) = 72d012b5c2c9d6d7f18273a2b347976bc6aa2619349419b7360a7b75d5247fef
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.3.5/go.mod) = 6561
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.3.5/gitlab-foss-v16.3.5.tar.bz2) = c84906ef3a4a44e7c3e0a4bea407673647347b5b9d00263ee6ea53f75d29692e
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.3.5/gitlab-foss-v16.3.5.tar.bz2) = 91305629
+TIMESTAMP = 1695539869
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.4.0/go.mod) = 6dbac21e68f49d022a392749e180c5297fee0f401dd9a96c86c8c1e1ae4165a1
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.4.0/go.mod) = 6691
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.4.0/gitlab-foss-v16.4.0.tar.bz2) = 87c14776bc7a22dbba53d2a25256aad2cb031e578014445cc4e298b39eb9caa2
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.4.0/gitlab-foss-v16.4.0.tar.bz2) = 96949969



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310041552.394FqGmQ037133>