Date: Thu, 19 Dec 2024 06:18:55 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: e3df914e9a7c - main - www/gitlab: major upgrade to 17.7.0 Message-ID: <202412190618.4BJ6ItmN066582@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=e3df914e9a7ce9bfcbdb32248033e9d25b209351 commit e3df914e9a7ce9bfcbdb32248033e9d25b209351 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2024-12-18 19:41:30 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2024-12-19 06:18:03 +0000 www/gitlab: major upgrade to 17.7.0 Changes: https://gitlab.com/gitlab-org/gitlab/-/blob/master/CHANGELOG.md --- devel/gitaly/distinfo | 14 +++--- devel/gitaly/files/patch-Makefile | 31 +------------ net/gitlab-agent/Makefile | 2 +- net/gitlab-agent/distinfo | 10 ++--- net/rubygem-gitaly/Makefile | 2 +- net/rubygem-gitaly/distinfo | 6 +-- net/rubygem-gitlab-kas-grpc/distinfo | 6 +-- www/gitlab-pages/distinfo | 10 ++--- www/gitlab-workhorse/distinfo | 10 ++--- www/gitlab/Makefile | 51 +++++++++++----------- www/gitlab/Makefile.common | 2 +- www/gitlab/distinfo | 12 ++--- www/gitlab/files/patch-Gemfile | 22 +++++----- www/gitlab/files/patch-config_gitlab.yml.example | 10 ++--- ...ret__detection_gitlab-secret__detection.gemspec | 11 +++++ www/gitlab/pkg-message | 4 +- 16 files changed, 95 insertions(+), 108 deletions(-) diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index d800b2722034..499bc8da7d16 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1733908702 -SHA256 (go/devel_gitaly/gitaly-v17.6.2/go.mod) = 9d7f2283ada2f6ff1013802fa6f15bf29bc3f664bd4bd9d2dd35e871e9a17f3a -SIZE (go/devel_gitaly/gitaly-v17.6.2/go.mod) = 12116 -SHA256 (go/devel_gitaly/gitaly-v17.6.2/gitaly-v17.6.2.tar.bz2) = 5aa2053d151ddd0e053e7a87d4e34fbbafab5257fd17c4242649903d3ff36ec6 -SIZE (go/devel_gitaly/gitaly-v17.6.2/gitaly-v17.6.2.tar.bz2) = 4355961 -SHA256 (go/devel_gitaly/gitaly-v17.6.2/git-v2.47.0.tar.bz2) = bda955065ff46d04f980a25858b45352e49de18f04d8dd319b6a681c55ee4529 -SIZE (go/devel_gitaly/gitaly-v17.6.2/git-v2.47.0.tar.bz2) = 8892022 +TIMESTAMP = 1734503882 +SHA256 (go/devel_gitaly/gitaly-v17.7.0/go.mod) = 5a8d1e7ee46a968384ecaff70d49b53b2f7dd86c3add65c61c128a2337ad3005 +SIZE (go/devel_gitaly/gitaly-v17.7.0/go.mod) = 12088 +SHA256 (go/devel_gitaly/gitaly-v17.7.0/gitaly-v17.7.0.tar.bz2) = caec91b96e354449327c9b50f555bd5588052d59bc0dfb0b089fa11daca4eacc +SIZE (go/devel_gitaly/gitaly-v17.7.0/gitaly-v17.7.0.tar.bz2) = 4382000 +SHA256 (go/devel_gitaly/gitaly-v17.7.0/git-v2.47.0.tar.bz2) = bda955065ff46d04f980a25858b45352e49de18f04d8dd319b6a681c55ee4529 +SIZE (go/devel_gitaly/gitaly-v17.7.0/git-v2.47.0.tar.bz2) = 8892022 diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile index bc989e29e16f..ec9e517a978c 100644 --- a/devel/gitaly/files/patch-Makefile +++ b/devel/gitaly/files/patch-Makefile @@ -1,33 +1,6 @@ ---- Makefile.orig 2024-10-16 07:53:22 UTC +--- Makefile.orig 2024-12-18 06:52:41 UTC +++ Makefile -@@ -216,8 +216,7 @@ BUILD_GEM_NAME ?= gitaly - BUILD_GEM_NAME ?= gitaly - - # Git binaries that are eventually embedded into the Gitaly binary. --GIT_PACKED_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.46, ${GIT_EXECUTABLES})) \ -- $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.47, ${GIT_EXECUTABLES})) -+GIT_PACKED_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.47, ${GIT_EXECUTABLES})) - - # All executables provided by Gitaly. - GITALY_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/,$(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print))) -@@ -306,14 +305,14 @@ install: build - - .PHONY: build-bundled-git - ## Build bundled Git binaries. --build-bundled-git: build-bundled-git-v2.46 build-bundled-git-v2.47 -+build-bundled-git: build-bundled-git-v2.47 - build-bundled-git-v2.46: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.46,${GIT_EXECUTABLES}) - build-bundled-git-v2.47: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.47,${GIT_EXECUTABLES}) - - .PHONY: install-bundled-git - ## Install bundled Git binaries. The target directory can be modified by - ## setting PREFIX and DESTDIR. --install-bundled-git: install-bundled-git-v2.46 install-bundled-git-v2.47 -+install-bundled-git: install-bundled-git-v2.47 - install-bundled-git-v2.46: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.46,${GIT_EXECUTABLES}) - install-bundled-git-v2.47: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.47,${GIT_EXECUTABLES}) - -@@ -614,12 +613,12 @@ ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/gi +@@ -606,12 +606,12 @@ ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/gi # otherwise try to rebuild all targets depending on it whenever we build # something else. We thus depend on the Makefile instead. ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/git-%.version diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile index 98083f8f61cd..9442fc9d92d4 100644 --- a/net/gitlab-agent/Makefile +++ b/net/gitlab-agent/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT BUILD_DEPENDS= git>=0:devel/git \ golangci-lint>=0:devel/golangci-lint -USES= go:modules,1.22 +USES= go:modules,1.23 GO_MODULE= gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v17 _BUILD_DATE= $$(date -u "+%Y-%m-%d-%H%M UTC") diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index 1c226131f242..df2404b2ea17 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1733908704 -SHA256 (go/net_gitlab-agent/gitlab-agent-v17.6.2/v17.6.2.mod) = 57da1bdc356a3b942c8f39431e6a077f4a471b45df4e51ae32df881f85a4a0e9 -SIZE (go/net_gitlab-agent/gitlab-agent-v17.6.2/v17.6.2.mod) = 8625 -SHA256 (go/net_gitlab-agent/gitlab-agent-v17.6.2/v17.6.2.zip) = 2672147330f27e607cc01f02fadfa39006f20de5598b81d4591bbbf2cc5af326 -SIZE (go/net_gitlab-agent/gitlab-agent-v17.6.2/v17.6.2.zip) = 1432300 +TIMESTAMP = 1734503957 +SHA256 (go/net_gitlab-agent/gitlab-agent-v17.7.0/v17.7.0.mod) = 6a4e12fd0ac5ae463cf0e2871d1ed8abb25ff93a08474998057db5946b065588 +SIZE (go/net_gitlab-agent/gitlab-agent-v17.7.0/v17.7.0.mod) = 10151 +SHA256 (go/net_gitlab-agent/gitlab-agent-v17.7.0/v17.7.0.zip) = 4ed99c543c19662223b057cd238bd14fe19c952d64d8784f49f7275241e78797 +SIZE (go/net_gitlab-agent/gitlab-agent-v17.7.0/v17.7.0.zip) = 1508934 diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile index ee2d09a22601..e46474d90d59 100644 --- a/net/rubygem-gitaly/Makefile +++ b/net/rubygem-gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -PORTVERSION= 17.6.0 +PORTVERSION= 17.7.0 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-gitaly/distinfo b/net/rubygem-gitaly/distinfo index d4ea1ad083c0..b10a79759c58 100644 --- a/net/rubygem-gitaly/distinfo +++ b/net/rubygem-gitaly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1732167687 -SHA256 (rubygem/gitaly-17.6.0.gem) = c0b1f37b6d7b9e3e519ec1769a9aae1d43dc5ad7beef99875d24829bac2f3cb6 -SIZE (rubygem/gitaly-17.6.0.gem) = 49152 +TIMESTAMP = 1734505981 +SHA256 (rubygem/gitaly-17.7.0.gem) = 71b0062985eb22a4ffa69976b5e5aeea43023dd32ff88af082fc2f42cfbdfe3a +SIZE (rubygem/gitaly-17.7.0.gem) = 49664 diff --git a/net/rubygem-gitlab-kas-grpc/distinfo b/net/rubygem-gitlab-kas-grpc/distinfo index 5cfe18e41e2d..15c28f4332e2 100644 --- a/net/rubygem-gitlab-kas-grpc/distinfo +++ b/net/rubygem-gitlab-kas-grpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1733908768 -SHA256 (rubygem/gitlab-kas-grpc-17.6.2.gem) = cf057d6c9ac2cfdbd59de9af95adeeb74be3996d4babfb5fb67397dd8a976887 -SIZE (rubygem/gitlab-kas-grpc-17.6.2.gem) = 8704 +TIMESTAMP = 1734504026 +SHA256 (rubygem/gitlab-kas-grpc-17.7.0.gem) = 3960e514672c22e7efad533140255acd59b0a32e22cc270af124361173400600 +SIZE (rubygem/gitlab-kas-grpc-17.7.0.gem) = 9216 diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index e80511259d0f..cb04c9f4bcd9 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1733908707 -SHA256 (go/www_gitlab-pages/gitlab-pages-v17.6.2/go.mod) = d9507d787e0977a0477afb67a577972dd0efd3b277a813119a074f58b3999d5c -SIZE (go/www_gitlab-pages/gitlab-pages-v17.6.2/go.mod) = 3462 -SHA256 (go/www_gitlab-pages/gitlab-pages-v17.6.2/gitlab-pages-v17.6.2.tar.bz2) = 6b50109a5cbb66b86d80a3d331891da48e85b5ec7cf8c438fffd857e3e433fd1 -SIZE (go/www_gitlab-pages/gitlab-pages-v17.6.2/gitlab-pages-v17.6.2.tar.bz2) = 231166 +TIMESTAMP = 1734503968 +SHA256 (go/www_gitlab-pages/gitlab-pages-v17.7.0/go.mod) = 2f517dfd05ae0e005e3e1bcc69bbf1ab6ac3adf46d27fe7b98aa1f9182252ae1 +SIZE (go/www_gitlab-pages/gitlab-pages-v17.7.0/go.mod) = 3464 +SHA256 (go/www_gitlab-pages/gitlab-pages-v17.7.0/gitlab-pages-v17.7.0.tar.bz2) = 5d9e6d3bf90f89690215e4390ea602e5e9a305aa7d4d831a6f25536d747ba92b +SIZE (go/www_gitlab-pages/gitlab-pages-v17.7.0/gitlab-pages-v17.7.0.tar.bz2) = 231468 diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index df6414bd03d6..720fc7aea39c 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1733908767 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.6.2/go.mod) = 3dda3d577bce0181f6b43c0b0cad430c198c7353b2b6dc57292b0be04138d99b -SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.6.2/go.mod) = 8007 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.6.2/gitlab-foss-v17.6.2.tar.bz2) = c9a13f7933962f0d951e761a837380145eb460c9514c6b91b38a4ff8d6b90be8 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.6.2/gitlab-foss-v17.6.2.tar.bz2) = 125264269 +TIMESTAMP = 1734504026 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.7.0/go.mod) = 03b555d2da65c1c14ef3d801265566f4a3d349b1b1045313e77f5786389c7b33 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.7.0/go.mod) = 7995 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.7.0/gitlab-foss-v17.7.0.tar.bz2) = d03aa7375078fe8251821e54daf737e82941e63715073960e3514ca2cb9b0f9b +SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.7.0/gitlab-foss-v17.7.0.tar.bz2) = 128346762 diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 5dabdca6a6a2..21bda951eb42 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -27,8 +27,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # mail/rubygem-net-smtp is required as ruby 3.1 removed it # textproc/rubygem-psych3 is required as ruby 3.1 applied an update to psych 4.0 which has breaking changes # mail/rubygem-net-pop is required as ruby 3.1 removed it -MY_DEPENDS= git>=2.41.0:devel/git \ - gitaly>=${GITLAB_VERSION}:devel/gitaly \ +MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ gitlab-elasticsearch-indexer>=5.4.0:textproc/gitlab-elasticsearch-indexer \ gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \ gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \ @@ -42,7 +41,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-net-smtp>=0:mail/rubygem-net-smtp \ rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \ rubygem-net-pop>=0:mail/rubygem-net-pop \ - rubygem-rails70>=7.0.8.4<7.1:www/rubygem-rails70 \ + rubygem-rails70>=7.0.8.6<7.1:www/rubygem-rails70 \ rubygem-bootsnap>=1.18.3<1.19:devel/rubygem-bootsnap \ rubygem-ffi>=1.17<2:devel/rubygem-ffi \ rubygem-openssl>=3.2.0<4:security/rubygem-openssl \ @@ -51,7 +50,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-sprockets3>=3.7.0<3.8:devel/rubygem-sprockets3 \ rubygem-sprockets-rails-rails70>=3.5.1<3.6:devel/rubygem-sprockets-rails-rails70 \ rubygem-view_component-rails70>=3.20.0<3.21:devel/rubygem-view_component-rails70 \ - rubygem-pg>=1.5.6<1.6:databases/rubygem-pg \ + rubygem-pg>=1.5.9<1.6:databases/rubygem-pg \ rubygem-neighbor>=0.3.2<0.4:databases/rubygem-neighbor \ rubygem-rugged>=1.6<2:devel/rubygem-rugged \ rubygem-faraday-gitlab>=2<3:www/rubygem-faraday-gitlab \ @@ -62,8 +61,8 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-coverband>=6.1.4<6.1.5:www/rubygem-coverband \ rubygem-devise-rails70>=4.9.3<4.10:devel/rubygem-devise-rails70 \ 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-doorkeeper-rails70>=5.8.1<6:security/rubygem-doorkeeper-rails70 \ + rubygem-doorkeeper-openid_connect>=1.8.10<2:security/rubygem-doorkeeper-openid_connect \ rubygem-doorkeeper-device_authorization_grant>=1.0.0<1.1:security/rubygem-doorkeeper-device_authorization_grant \ rubygem-rexml>=3.3.2<3.4:textproc/rubygem-rexml \ rubygem-ruby-saml>=1.17.0<1.18:security/rubygem-ruby-saml \ @@ -101,7 +100,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-grape-swagger-entity>=0.5.1<0.6:devel/rubygem-grape-swagger-entity \ rubygem-grape-path-helpers>=2.0.1<2.1:devel/rubygem-grape-path-helpers \ rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \ - rubygem-graphql>=2.4.1<2.5:devel/rubygem-graphql \ + rubygem-graphql>=2.4.8<2.5:devel/rubygem-graphql \ rubygem-apollo_upload_server>=2.1.6<2.2:net/rubygem-apollo_upload_server \ rubygem-graphlient>=0.8.0<0.9:devel/rubygem-graphlient \ rubygem-ffaker>=2.10<3:devel/rubygem-ffaker \ @@ -115,7 +114,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-fog-google-gitlab>=1.24.1<1.25:net/rubygem-fog-google-gitlab \ rubygem-fog-local>=0.8<1.0:net/rubygem-fog-local \ rubygem-fog-aliyun>=0.4<1.0:net/rubygem-fog-aliyun \ - rubygem-gitlab-fog-azure-rm>=2.1.0<2.2:net/rubygem-gitlab-fog-azure-rm \ + rubygem-gitlab-fog-azure-rm>=2.2.0<2.3:net/rubygem-gitlab-fog-azure-rm \ rubygem-google-apis-storage_v1-gitlab>=0.29<1:devel/rubygem-google-apis-storage_v1-gitlab \ rubygem-google-cloud-storage-gitlab>=1.45.0<1.46:net/rubygem-google-cloud-storage-gitlab \ rubygem-google-apis-core-gitlab>=0.11.2<2:devel/rubygem-google-apis-core-gitlab \ @@ -135,9 +134,9 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-elasticsearch-model-gitlab>=7.2<8:textproc/rubygem-elasticsearch-model-gitlab \ rubygem-elasticsearch-rails7>=7.2<8:textproc/rubygem-elasticsearch-rails7 \ rubygem-elasticsearch-api-gitlab>=7.17.11<7.18:textproc/rubygem-elasticsearch-api-gitlab \ - rubygem-aws-sdk-core-gitlab>=3.211.0<3.212:devel/rubygem-aws-sdk-core-gitlab \ + rubygem-aws-sdk-core-gitlab>=3.213.0<3.214:devel/rubygem-aws-sdk-core-gitlab \ rubygem-aws-sdk-cloudformation-gitlab>=1<2:devel/rubygem-aws-sdk-cloudformation-gitlab \ - rubygem-aws-sdk-s3-gitlab>=1.169.0<1.170:devel/rubygem-aws-sdk-s3-gitlab \ + rubygem-aws-sdk-s3-gitlab>=1.172.0<1.173:devel/rubygem-aws-sdk-s3-gitlab \ rubygem-faraday-typhoeus-gitlab>=1.1<2:www/rubygem-faraday-typhoeus-gitlab \ rubygem-faraday_middleware-aws-sigv4-gitlab>=1.0.1<1.1:devel/rubygem-faraday_middleware-aws-sigv4-gitlab \ rubygem-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \ @@ -157,20 +156,20 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-rouge-gitlab>=4.4.0<4.5:textproc/rubygem-rouge-gitlab \ rubygem-truncato>=0.7.12<0.8.0:textproc/rubygem-truncato \ rubygem-tty-prompt>=0.23<1:devel/rubygem-tty-prompt \ - rubygem-nokogiri>=1.16<2:textproc/rubygem-nokogiri \ - rubygem-gitlab-glfm-markdown>=0.0.21<0.1:textproc/rubygem-gitlab-glfm-markdown \ + rubygem-nokogiri>=1.16.8<2:textproc/rubygem-nokogiri \ + rubygem-gitlab-glfm-markdown>=0.0.23<0.1:textproc/rubygem-gitlab-glfm-markdown \ rubygem-tanuki_emoji>=0.13<1:graphics/rubygem-tanuki_emoji \ - rubygem-unicode-emoji>=4.0<5:devel/rubygem-unicode-emoji \ + rubygem-unicode-emoji>=4.0.4<5:devel/rubygem-unicode-emoji \ rubygem-icalendar>=2.10.2<2.11:devel/rubygem-icalendar \ rubygem-diffy>=3.4<4:textproc/rubygem-diffy \ rubygem-rack22>=2.2.9,3<2.3,3:www/rubygem-rack22 \ rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \ - rubygem-puma>=6.4.3<7:www/rubygem-puma \ + rubygem-puma>=6.5.0<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-sidekiq72>=7.2.4<7.3:devel/rubygem-sidekiq72 \ rubygem-sidekiq-cron-rails70>=1.12.0<1.13:devel/rubygem-sidekiq-cron-rails70 \ - rubygem-fugit18>=1.8.1<1.9:devel/rubygem-fugit18 \ + rubygem-fugit>=1.11.1<1.12:devel/rubygem-fugit \ rubygem-httparty021>=0.21.0<0.22:www/rubygem-httparty021 \ rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \ rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \ @@ -183,7 +182,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-redis>=5.3.0<5.4:databases/rubygem-redis \ rubygem-redis-clustering>=5.3.0<5.4:databases/rubygem-redis-clustering \ rubygem-connection_pool>=2.4.1<3.0:net/rubygem-connection_pool \ - rubygem-redis-actionpack-rails70>=5.4.0<5.5:databases/rubygem-redis-actionpack-rails70 \ + rubygem-redis-actionpack-rails70>=5.5.0<5.6:databases/rubygem-redis-actionpack-rails70 \ rubygem-discordrb-webhooks>=3.5<4.0:net-im/rubygem-discordrb-webhooks \ rubygem-jira-ruby>=2.3.0<2.4:devel/rubygem-jira-ruby \ rubygem-atlassian-jwt>=0.2.1<0.3.0:www/rubygem-atlassian-jwt \ @@ -208,14 +207,14 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-gon-rails70>=6.4.0<6.5:www/rubygem-gon-rails70 \ rubygem-request_store15>=1.5.1<1.6:devel/rubygem-request_store15 \ rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \ - rubygem-gitlab-license>=2.5<3:devel/rubygem-gitlab-license \ + rubygem-gitlab-license>=2.6<3:devel/rubygem-gitlab-license \ rubygem-rack-attack>=6.7.0<6.8:www/rubygem-rack-attack \ rubygem-sentry-ruby>=5.21.0<5.22:devel/rubygem-sentry-ruby \ rubygem-sentry-rails>=5.21.0<5.22:devel/rubygem-sentry-rails \ rubygem-sentry-sidekiq>=5.21.0<5.22:devel/rubygem-sentry-sidekiq \ - rubygem-pg_query>=5.1.0<5.2:databases/rubygem-pg_query \ + rubygem-pg_query>=6.0.0<6.1:databases/rubygem-pg_query \ rubygem-premailer-rails-rails70>=1.12.0<1.13:mail/rubygem-premailer-rails-rails70 \ - rubygem-gitlab-labkit>=0.36.0<0.37:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.37.0<0.38:devel/rubygem-gitlab-labkit \ rubygem-thrift>=0.16.0:devel/rubygem-thrift \ rubygem-rails-i18n-rails70>=7.0.9<8:devel/rubygem-rails-i18n-rails70 \ rubygem-gettext_i18n_rails>=1.13.0<1.14:devel/rubygem-gettext_i18n_rails \ @@ -224,16 +223,16 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-tty-prompt>=0.23<1:devel/rubygem-tty-prompt \ rubygem-peek-rails70>=1.1<2.0:devel/rubygem-peek-rails70 \ rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \ - rubygem-webrick>=1.8.1<1.10:www/rubygem-webrick \ + rubygem-webrick>=1.8.2<1.10:www/rubygem-webrick \ rubygem-prometheus-client-mmap>=1.1.1<2:devel/rubygem-prometheus-client-mmap \ rubygem-async212>=2.12.1<2.13:devel/rubygem-async212 \ rubygem-gitlab-security_report_schemas>=0.1.2.min15.0.0.max15.2.1<0.1.2.min15.0.0.max15.2.2:devel/rubygem-gitlab-security_report_schemas \ rubygem-opentelemetry-sdk>=1.5.0:devel/rubygem-opentelemetry-sdk \ rubygem-opentelemetry-exporter-otlp>=0.26.3:devel/rubygem-opentelemetry-exporter-otlp \ rubygem-opentelemetry-instrumentation-active_support>=0.6.0:devel/rubygem-opentelemetry-instrumentation-active_support \ - rubygem-opentelemetry-instrumentation-action_pack>=0.9.0:devel/rubygem-opentelemetry-instrumentation-action_pack \ + rubygem-opentelemetry-instrumentation-action_pack>=0.10.0:devel/rubygem-opentelemetry-instrumentation-action_pack \ rubygem-opentelemetry-instrumentation-active_job>=0.7.7:devel/rubygem-opentelemetry-instrumentation-active_job \ - rubygem-opentelemetry-instrumentation-active_record>=0.7.4:devel/rubygem-opentelemetry-instrumentation-active_record \ + rubygem-opentelemetry-instrumentation-active_record>=0.8.1:devel/rubygem-opentelemetry-instrumentation-active_record \ rubygem-opentelemetry-instrumentation-action_view>=0.7.2:devel/rubygem-opentelemetry-instrumentation-action_view \ rubygem-opentelemetry-instrumentation-aws_sdk>=0.5.4:devel/rubygem-opentelemetry-instrumentation-aws_sdk \ rubygem-opentelemetry-instrumentation-http>=0.23.4:devel/rubygem-opentelemetry-instrumentation-http \ @@ -247,7 +246,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-opentelemetry-instrumentation-net_http>=0.22.7:devel/rubygem-opentelemetry-instrumentation-net_http \ rubygem-opentelemetry-instrumentation-pg>=0.28.0:devel/rubygem-opentelemetry-instrumentation-pg \ rubygem-opentelemetry-instrumentation-rack>=0.24.6:devel/rubygem-opentelemetry-instrumentation-rack \ - rubygem-opentelemetry-instrumentation-rails>=0.31.2:devel/rubygem-opentelemetry-instrumentation-rails \ + rubygem-opentelemetry-instrumentation-rails>=0.33.0:devel/rubygem-opentelemetry-instrumentation-rails \ rubygem-opentelemetry-instrumentation-rake>=0.2.1:devel/rubygem-opentelemetry-instrumentation-rake \ rubygem-opentelemetry-instrumentation-redis>=0.25.7:devel/rubygem-opentelemetry-instrumentation-redis \ rubygem-opentelemetry-instrumentation-sidekiq>=0.25.7:devel/rubygem-opentelemetry-instrumentation-sidekiq \ @@ -290,7 +289,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-mail>=2.8.1<2.8.2,2:mail/rubygem-mail \ 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-jsonb_accessor>=1.4<2:www/rubygem-jsonb_accessor \ rubygem-json27>=2.7.2<2.8:devel/rubygem-json27 \ rubygem-json_schemer>=2.3.0<2.4:devel/rubygem-json_schemer \ rubygem-oj313>=3.13.21<3.14:devel/rubygem-oj313 \ @@ -313,10 +312,12 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-gitlab-sdk>=0.3.0<0.4:devel/rubygem-gitlab-sdk \ rubygem-paper_trail>=15.0<16:devel/rubygem-paper_trail \ rubygem-i18n_data>=0.13.1<1:devel/rubygem-i18n_data \ + rubygem-gitlab-cloud-connector>=0.2.5<0.3:security/rubygem-gitlab-cloud-connector \ rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 \ rubygem-parallel>=1.22<2:sysutils/rubygem-parallel \ rubygem-google-cloud-storage_transfer-gitlab>=1.2.0<1.3:net/rubygem-google-cloud-storage_transfer-gitlab \ - rubygem-minitest>=5.11<6:devel/rubygem-minitest + rubygem-minitest>=5.11<6:devel/rubygem-minitest \ + rubygem-grpc-tools>=1.63.0<1.63.1:net/rubygem-grpc-tools BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 606b57b753fc..6af36d5afcbe 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,4 +1,4 @@ -GITLAB_VERSION= 17.6.2 +GITLAB_VERSION= 17.7.0 GITLAB_PORTREVISION= 0 # Git version gitaly should use (from gitlab mirror) diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index aebc9cad9b27..f395c3002d46 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1733908631 -SHA256 (gitlab-foss-v17.6.2.tar.bz2) = c9a13f7933962f0d951e761a837380145eb460c9514c6b91b38a4ff8d6b90be8 -SIZE (gitlab-foss-v17.6.2.tar.bz2) = 125264269 -TIMESTAMP = 1733908692 -SHA256 (gitlab-v17.6.2-ee.tar.bz2) = 0161fdd3f0b8a990a01f2d1580a3fc8b4c2f7ac7cd4d356f11c46f730a81a565 -SIZE (gitlab-v17.6.2-ee.tar.bz2) = 135960969 +TIMESTAMP = 1734503791 +SHA256 (gitlab-foss-v17.7.0.tar.bz2) = d03aa7375078fe8251821e54daf737e82941e63715073960e3514ca2cb9b0f9b +SIZE (gitlab-foss-v17.7.0.tar.bz2) = 128346762 +TIMESTAMP = 1734503852 +SHA256 (gitlab-v17.7.0-ee.tar.bz2) = 6e00bf0351b76374fbfabc4f1b7705506c7a894b792e56b20fc65e052443954b +SIZE (gitlab-v17.7.0-ee.tar.bz2) = 139156214 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 53b58dc4791e..da0d9d1136a0 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2024-11-20 11:30:30 UTC +--- Gemfile.orig 2024-12-18 06:12:05 UTC +++ Gemfile @@ -160,7 +160,7 @@ gem 'graphql', '~> 2.4.1', feature_category: :api @@ -31,8 +31,8 @@ gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory group :puma do -- gem 'puma', '= 6.4.3', require: false, feature_category: :shared -+ gem 'puma', '~> 6.4.3', require: false, feature_category: :shared +- gem 'puma', '= 6.5.0', require: false, feature_category: :shared ++ gem 'puma', '~> 6.5.0', require: false, feature_category: :shared gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory end @@ -73,7 +73,7 @@ - - gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'ruby-lsp', "~> 0.19.0", require: false, feature_category: :tooling +- gem 'ruby-lsp', "~> 0.21.0", require: false, feature_category: :tooling - - gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling - @@ -102,7 +102,7 @@ - gem 'spring', '~> 4.1.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'gitlab-styles', '~> 13.0.1', feature_category: :tooling +- gem 'gitlab-styles', '~> 13.0.2', feature_category: :tooling - gem 'haml_lint', '~> 0.58', feature_category: :tooling - - gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory @@ -185,7 +185,7 @@ - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'gitlab_quality-test_tooling', '~> 2.1.0', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 2.4.0', require: false, feature_category: :tooling -end - gem 'octokit', '~> 9.0', feature_category: :importers @@ -196,11 +196,11 @@ # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 17.5.0.pre.rc1', feature_category: :gitaly -+gem 'gitaly', '~> 17.6.0', feature_category: :gitaly ++gem 'gitaly', '~> 17.7.0', feature_category: :gitaly # KAS GRPC protocol definitions --gem 'gitlab-kas-grpc', '~> 17.5.0', feature_category: :deployment_management -+gem 'gitlab-kas-grpc', '~> 17.6.0', feature_category: :deployment_management +-gem 'gitlab-kas-grpc', '~> 17.6.1', feature_category: :deployment_management ++gem 'gitlab-kas-grpc', '~> 17.7.0', feature_category: :deployment_management # Lock the version before issues below are resolved: # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 @@ -220,7 +220,7 @@ gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory -@@ -734,10 +613,15 @@ gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/Missing +@@ -734,12 +613,17 @@ gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/Missing gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory @@ -237,3 +237,5 @@ -gem "i18n_data", "~> 0.13.1", feature_category: :system_access +gem "i18n_data", "~> 0.13", feature_category: :system_access + + gem "gitlab-cloud-connector", "~> 0.2.5", require: 'cloud_connector', feature_category: :cloud_connector diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index b061da53401c..2735cd180083 100644 --- a/www/gitlab/files/patch-config_gitlab.yml.example +++ b/www/gitlab/files/patch-config_gitlab.yml.example @@ -1,4 +1,4 @@ ---- config/gitlab.yml.example.orig 2024-11-20 11:30:30 UTC +--- config/gitlab.yml.example.orig 2024-12-18 06:12:05 UTC +++ config/gitlab.yml.example @@ -473,7 +473,7 @@ production: &base ## GitLab Pages @@ -63,7 +63,7 @@ topology_service: # enabled: false -@@ -1288,7 +1288,7 @@ production: &base +@@ -1289,7 +1289,7 @@ production: &base # enabled: true # File that contains the secret key for verifying access for gitlab-kas. # Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app). @@ -72,7 +72,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1312,13 +1312,13 @@ production: &base +@@ -1313,13 +1313,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -88,7 +88,7 @@ ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1339,18 +1339,18 @@ production: &base +@@ -1340,18 +1340,18 @@ production: &base # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq. sidekiq_exporter: @@ -114,7 +114,7 @@ # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. web_exporter: -@@ -1577,13 +1577,13 @@ test: +@@ -1578,13 +1578,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: diff --git a/www/gitlab/files/patch-gems_gitlab-secret__detection_gitlab-secret__detection.gemspec b/www/gitlab/files/patch-gems_gitlab-secret__detection_gitlab-secret__detection.gemspec new file mode 100644 index 000000000000..792a7e1bd16e --- /dev/null +++ b/www/gitlab/files/patch-gems_gitlab-secret__detection_gitlab-secret__detection.gemspec @@ -0,0 +1,11 @@ +--- gems/gitlab-secret_detection/gitlab-secret_detection.gemspec.orig 2024-12-18 07:22:32 UTC ++++ gems/gitlab-secret_detection/gitlab-secret_detection.gemspec +@@ -24,7 +24,7 @@ Gem::Specification.new do |spec| + spec.files = Dir['lib/**/*.rb'] + spec.require_paths = ["lib"] + +- spec.add_runtime_dependency "grpc", "= 1.63.0" ++ spec.add_runtime_dependency "grpc", "~> 1.63" + spec.add_runtime_dependency "grpc-tools", "= 1.63.0" + spec.add_runtime_dependency "parallel", "~> 1.22" + spec.add_runtime_dependency "re2", "~> 2.4" diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message index af4e4b97404d..47830cb0f1eb 100644 --- a/www/gitlab/pkg-message +++ b/www/gitlab/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.com/mfechner/freebsd-gitlab-docu/blob/master/install/17.6-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/17.7-freebsd.md EOM type: install } @@ -20,7 +20,7 @@ EOM If you just installed an major upgrade of GitLab, for example you switched from 17.5.x to 17.6.x, please follow the instructions in the guide at: -https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/17.5-17.6-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/17.6-17.7-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412190618.4BJ6ItmN066582>