Date: Fri, 22 Nov 2024 13:48:20 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: 2c08bdde9415 - main - www/gitlab: update to 17.6.0 Message-ID: <202411221348.4AMDmKAu028111@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=2c08bdde941541c19d159fe8f51cfc01085c744a commit 2c08bdde941541c19d159fe8f51cfc01085c744a Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2024-11-21 08:00:41 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2024-11-22 13:11:14 +0000 www/gitlab: update to 17.6.0 Changes: https://gitlab.com/gitlab-org/gitlab/-/blob/master/CHANGELOG.md?expanded=true&viewer=simple Changes: https://about.gitlab.com/releases/2024/11/21/gitlab-17-6-released/ --- devel/gitaly/distinfo | 14 +++---- net/gitlab-agent/distinfo | 10 ++--- net/rubygem-gitaly/Makefile | 2 +- net/rubygem-gitaly/distinfo | 6 +-- net/rubygem-gitlab-kas-grpc/distinfo | 6 +-- textproc/gitlab-elasticsearch-indexer/Makefile | 3 +- textproc/gitlab-elasticsearch-indexer/distinfo | 10 ++--- www/gitlab-pages/distinfo | 10 ++--- www/gitlab-workhorse/distinfo | 10 ++--- .../files/patch-__support_make-gnu-build-id.sh | 11 ------ www/gitlab/Makefile | 40 ++++++++++---------- www/gitlab/Makefile.common | 4 +- www/gitlab/distinfo | 12 +++--- www/gitlab/files/patch-Gemfile | 44 ++++++++++++---------- www/gitlab/files/patch-config_gitlab.yml.example | 10 ++--- .../files/patch-config_initializers_1__settings.rb | 4 +- www/gitlab/pkg-message | 6 +-- 17 files changed, 96 insertions(+), 106 deletions(-) diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index 7d19ec25739e..ca30539ff4ab 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1731505544 -SHA256 (go/devel_gitaly/gitaly-v17.5.2/go.mod) = 3357833cf725a4e9c07d7c7d6100daf11ef82104b2940d27cae1e27e8e8ff1aa -SIZE (go/devel_gitaly/gitaly-v17.5.2/go.mod) = 12083 -SHA256 (go/devel_gitaly/gitaly-v17.5.2/gitaly-v17.5.2.tar.bz2) = 6014557ddd82bfae705ace491e1ce1a3f670dc13a785469d828643d9ccbdbaf7 -SIZE (go/devel_gitaly/gitaly-v17.5.2/gitaly-v17.5.2.tar.bz2) = 4334601 -SHA256 (go/devel_gitaly/gitaly-v17.5.2/git-v2.47.0.tar.bz2) = bda955065ff46d04f980a25858b45352e49de18f04d8dd319b6a681c55ee4529 -SIZE (go/devel_gitaly/gitaly-v17.5.2/git-v2.47.0.tar.bz2) = 8892022 +TIMESTAMP = 1732168895 +SHA256 (go/devel_gitaly/gitaly-v17.6.0/go.mod) = 9d7f2283ada2f6ff1013802fa6f15bf29bc3f664bd4bd9d2dd35e871e9a17f3a +SIZE (go/devel_gitaly/gitaly-v17.6.0/go.mod) = 12116 +SHA256 (go/devel_gitaly/gitaly-v17.6.0/gitaly-v17.6.0.tar.bz2) = accb0470324c5f1250cb32763dd7a050c4d6c7100755abe93ec2ff90c258ec93 +SIZE (go/devel_gitaly/gitaly-v17.6.0/gitaly-v17.6.0.tar.bz2) = 4355566 +SHA256 (go/devel_gitaly/gitaly-v17.6.0/git-v2.47.0.tar.bz2) = bda955065ff46d04f980a25858b45352e49de18f04d8dd319b6a681c55ee4529 +SIZE (go/devel_gitaly/gitaly-v17.6.0/git-v2.47.0.tar.bz2) = 8892022 diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index 940be4433858..840c779fb802 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1731505547 -SHA256 (go/net_gitlab-agent/gitlab-agent-v17.5.2/v17.5.2.mod) = 5b20a758e950f6a939a2be6906957bbeb7ecaf2af94ce47c82529ec8c76d03eb -SIZE (go/net_gitlab-agent/gitlab-agent-v17.5.2/v17.5.2.mod) = 8560 -SHA256 (go/net_gitlab-agent/gitlab-agent-v17.5.2/v17.5.2.zip) = 64c3ab824716d835ca167d570929bbcc2ea52a17e0497b2d16f76b62618c916a -SIZE (go/net_gitlab-agent/gitlab-agent-v17.5.2/v17.5.2.zip) = 1400631 +TIMESTAMP = 1732169020 +SHA256 (go/net_gitlab-agent/gitlab-agent-v17.6.0/v17.6.0.mod) = 57da1bdc356a3b942c8f39431e6a077f4a471b45df4e51ae32df881f85a4a0e9 +SIZE (go/net_gitlab-agent/gitlab-agent-v17.6.0/v17.6.0.mod) = 8625 +SHA256 (go/net_gitlab-agent/gitlab-agent-v17.6.0/v17.6.0.zip) = d2bec19a6b34c700b9c3288f9a1351ba050ae41c920237305f88d16cb5c73b36 +SIZE (go/net_gitlab-agent/gitlab-agent-v17.6.0/v17.6.0.zip) = 1430336 diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile index fece13ef28b6..ee2d09a22601 100644 --- a/net/rubygem-gitaly/Makefile +++ b/net/rubygem-gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -PORTVERSION= 17.4.0 +PORTVERSION= 17.6.0 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-gitaly/distinfo b/net/rubygem-gitaly/distinfo index 5b92ebc27ce3..d4ea1ad083c0 100644 --- a/net/rubygem-gitaly/distinfo +++ b/net/rubygem-gitaly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1726720937 -SHA256 (rubygem/gitaly-17.4.0.gem) = 4da3b713a151fcdf1d08ad35dfd12895671dca8510ef92d8a88c040c618a907e -SIZE (rubygem/gitaly-17.4.0.gem) = 49664 +TIMESTAMP = 1732167687 +SHA256 (rubygem/gitaly-17.6.0.gem) = c0b1f37b6d7b9e3e519ec1769a9aae1d43dc5ad7beef99875d24829bac2f3cb6 +SIZE (rubygem/gitaly-17.6.0.gem) = 49152 diff --git a/net/rubygem-gitlab-kas-grpc/distinfo b/net/rubygem-gitlab-kas-grpc/distinfo index 4fdcc963e356..a14634429957 100644 --- a/net/rubygem-gitlab-kas-grpc/distinfo +++ b/net/rubygem-gitlab-kas-grpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1731505607 -SHA256 (rubygem/gitlab-kas-grpc-17.5.2.gem) = 224001a60a645f10332d3bbafe1b7b2ff43674b10247f04e0242b45c0a95dd9c -SIZE (rubygem/gitlab-kas-grpc-17.5.2.gem) = 8704 +TIMESTAMP = 1732169098 +SHA256 (rubygem/gitlab-kas-grpc-17.6.0.gem) = d212ee0d87677f0a3300a7c233a0add549819829877c7fda4acd91a7034f48c8 +SIZE (rubygem/gitlab-kas-grpc-17.6.0.gem) = 8704 diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile index 67fb1f2de7ab..5ee29668ee76 100644 --- a/textproc/gitlab-elasticsearch-indexer/Makefile +++ b/textproc/gitlab-elasticsearch-indexer/Makefile @@ -1,7 +1,6 @@ PORTNAME= gitlab-elasticsearch-indexer -PORTVERSION= 5.3.0 +PORTVERSION= 5.4.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= mfechner@FreeBSD.org diff --git a/textproc/gitlab-elasticsearch-indexer/distinfo b/textproc/gitlab-elasticsearch-indexer/distinfo index e6911316239e..f963d35e9edd 100644 --- a/textproc/gitlab-elasticsearch-indexer/distinfo +++ b/textproc/gitlab-elasticsearch-indexer/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1729148343 -SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.3.0/go.mod) = f35f3452b17003137caac0dd58f9b54304f346d994496a80f3b61156c245999a -SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.3.0/go.mod) = 4995 -SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.3.0/gitlab-elasticsearch-indexer-v5.3.0.tar.bz2) = 2ce127f2d32b662de30a9b8774041ff1255169f4a5e13ee70c13dc5b81025013 -SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.3.0/gitlab-elasticsearch-indexer-v5.3.0.tar.bz2) = 67763 +TIMESTAMP = 1732170969 +SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.4.0/go.mod) = d2985eae2316426054b7e3cf2d6ea7cf777401ea0e4dcae6d3128ca06db4bd1a +SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.4.0/go.mod) = 5002 +SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.4.0/gitlab-elasticsearch-indexer-v5.4.0.tar.bz2) = 91d2e3becb3ec0a227d2637b0cc157f9bdb03aab9341a26eb6d4edb43fa29e63 +SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.4.0/gitlab-elasticsearch-indexer-v5.4.0.tar.bz2) = 69073 diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index fe56072181d4..9954c78b4eff 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1731505550 -SHA256 (go/www_gitlab-pages/gitlab-pages-v17.5.2/go.mod) = 121f4f5d1ab2962bf653ae3cb735a80ef9fb20b0ea39c04b7b0dc6a9fd7775d1 -SIZE (go/www_gitlab-pages/gitlab-pages-v17.5.2/go.mod) = 3456 -SHA256 (go/www_gitlab-pages/gitlab-pages-v17.5.2/gitlab-pages-v17.5.2.tar.bz2) = 3097ab185ab56ae110770bf405a41dff755db2eed3017f3807a3bb3c66890e9a -SIZE (go/www_gitlab-pages/gitlab-pages-v17.5.2/gitlab-pages-v17.5.2.tar.bz2) = 230758 +TIMESTAMP = 1732169031 +SHA256 (go/www_gitlab-pages/gitlab-pages-v17.6.0/go.mod) = d9507d787e0977a0477afb67a577972dd0efd3b277a813119a074f58b3999d5c +SIZE (go/www_gitlab-pages/gitlab-pages-v17.6.0/go.mod) = 3462 +SHA256 (go/www_gitlab-pages/gitlab-pages-v17.6.0/gitlab-pages-v17.6.0.tar.bz2) = 5ded0722c9935a2b01bfe2eabba06766b8acb722dc52713520af3fe919caaf04 +SIZE (go/www_gitlab-pages/gitlab-pages-v17.6.0/gitlab-pages-v17.6.0.tar.bz2) = 231715 diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 1ca1fa2c2c60..babb72c8ae4f 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1731505606 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.5.2/go.mod) = 029bc5f21b93644dc278494622505975de94e0659f3e512e78cd75fd7a0783af -SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.5.2/go.mod) = 8053 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.5.2/gitlab-foss-v17.5.2.tar.bz2) = 3777a7613f2df0f364bb6db4b0b929b0a144f84f8fbaf97e1be1aab0994843cb -SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.5.2/gitlab-foss-v17.5.2.tar.bz2) = 122452026 +TIMESTAMP = 1732169097 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.6.0/go.mod) = 3dda3d577bce0181f6b43c0b0cad430c198c7353b2b6dc57292b0be04138d99b +SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.6.0/go.mod) = 8007 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.6.0/gitlab-foss-v17.6.0.tar.bz2) = 28fbbf2f4b46894bfaa94875e3292bab99d08512250d5e74f9b5c72b83c4b192 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.6.0/gitlab-foss-v17.6.0.tar.bz2) = 125264585 diff --git a/www/gitlab-workhorse/files/patch-__support_make-gnu-build-id.sh b/www/gitlab-workhorse/files/patch-__support_make-gnu-build-id.sh deleted file mode 100644 index 1a161c5e22ed..000000000000 --- a/www/gitlab-workhorse/files/patch-__support_make-gnu-build-id.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- _support/make-gnu-build-id.sh.orig 2022-03-08 22:36:38 UTC -+++ _support/make-gnu-build-id.sh -@@ -13,7 +13,7 @@ main() - fail "ERROR: Could not extract Go build-id or generate a random hex string." - fi - -- GNU_BUILD_ID=$( echo $GO_BUILD_ID | sha1sum | cut -d' ' -f1 ) -+ GNU_BUILD_ID=$( echo $GO_BUILD_ID | sha1 | cut -d' ' -f1 ) - if [ -z "$GNU_BUILD_ID" ] ; then - fail "ERROR: Could not generate a GNU build-id" - fi diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index bfb975c722b5..21f2c961d514 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -29,7 +29,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # 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 \ - gitlab-elasticsearch-indexer>=5.3.0:textproc/gitlab-elasticsearch-indexer \ + gitlab-elasticsearch-indexer>=5.4.0:textproc/gitlab-elasticsearch-indexer \ gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \ gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \ gitlab-shell>=14.39.0:devel/gitlab-shell \ @@ -38,9 +38,10 @@ MY_DEPENDS= git>=2.41.0:devel/git \ yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \ gtar>0:archivers/gtar \ bash>0:shells/bash \ + rubygem-parser>=3.3.6.0:devel/rubygem-parser \ rubygem-net-smtp>=0:mail/rubygem-net-smtp \ - rubygem-net-pop>=0:mail/rubygem-net-pop \ 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-bootsnap>=1.18.3<1.19:devel/rubygem-bootsnap \ rubygem-ffi>=1.17<2:devel/rubygem-ffi \ @@ -49,7 +50,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-responders-rails70>=3.0<4.0:www/rubygem-responders-rails70 \ 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.14.0<3.15:devel/rubygem-view_component-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-neighbor>=0.3.2<0.4:databases/rubygem-neighbor \ rubygem-rugged>=1.6<2:devel/rubygem-rugged \ @@ -58,7 +59,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-logger15>=1.5.3<1.6:devel/rubygem-logger15 \ rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \ rubygem-declarative_policy>=1.1.0<1.2:security/rubygem-declarative_policy \ - rubygem-coverband>=6.1.2<6.1.3:www/rubygem-coverband \ + 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 \ @@ -79,7 +80,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-openid_connect>=2.3.0<2.4:net/rubygem-openid_connect \ rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \ rubygem-rack-oauth2>=2.2.1<2.3:security/rubygem-rack-oauth2 \ - rubygem-jwt>=2.5<3:www/rubygem-jwt \ + rubygem-jwt>=2.9.3<3:www/rubygem-jwt \ 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 \ @@ -100,8 +101,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.3.14<2.4:devel/rubygem-graphql \ - rubygem-graphiql-rails>=1.10<1.11:devel/rubygem-graphiql-rails \ + rubygem-graphql>=2.4.1<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 \ @@ -135,9 +135,9 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-elasticsearch-model713>=7.2<8:textproc/rubygem-elasticsearch-model713 \ rubygem-elasticsearch-rails7>=7.2<8:textproc/rubygem-elasticsearch-rails7 \ rubygem-elasticsearch-api7>=7.17.11<7.18:textproc/rubygem-elasticsearch-api7 \ - rubygem-aws-sdk-core-gitlab>=3.206.0<3.207:devel/rubygem-aws-sdk-core-gitlab \ + rubygem-aws-sdk-core-gitlab>=3.211.0<3.212: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.163.0<1.164:devel/rubygem-aws-sdk-s3-gitlab \ + rubygem-aws-sdk-s3-gitlab>=1.169.0<1.170:devel/rubygem-aws-sdk-s3-gitlab \ rubygem-faraday-typhoeus>=1.1<2:www/rubygem-faraday-typhoeus \ rubygem-faraday_middleware-aws-sigv4>=1.0.1<1.1:devel/rubygem-faraday_middleware-aws-sigv4 \ rubygem-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \ @@ -145,7 +145,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-deckar01-task_list>=2.3.4<2.4:www/rubygem-deckar01-task_list \ rubygem-gitlab-markup>=1.9.0<1.10.0:textproc/rubygem-gitlab-markup \ rubygem-commonmarker0>=0.23.10<0.24:textproc/rubygem-commonmarker0 \ - rubygem-kramdown23>=2.3.1<2.4:textproc/rubygem-kramdown23 \ + rubygem-kramdown>=2.4.0<2.5:textproc/rubygem-kramdown \ rubygem-redcloth>=4.3.3<4.4.0:www/rubygem-redcloth \ rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \ rubygem-creole>=0.5.0<0.6.0:textproc/rubygem-creole \ @@ -154,11 +154,13 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-asciidoctor-include-ext>=0.4.0<0.5.0:textproc/rubygem-asciidoctor-include-ext \ rubygem-asciidoctor-plantuml00>=0.0.16<0.1:textproc/rubygem-asciidoctor-plantuml00 \ rubygem-asciidoctor-kroki>=0.10.0<0.11:textproc/rubygem-asciidoctor-kroki \ - rubygem-rouge43>=4.3.0<4.4:textproc/rubygem-rouge43 \ + rubygem-rouge>=4.4.0<4.5:textproc/rubygem-rouge \ 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-tanuki_emoji>=0.13<1:graphics/rubygem-tanuki_emoji \ + rubygem-unicode-emoji>=4.0<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 \ @@ -203,15 +205,14 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-cssbundling-rails-rails70>=1.4.1<1.5:www/rubygem-cssbundling-rails-rails70 \ rubygem-terser>=1.0.2<1.0.3:textproc/rubygem-terser \ rubygem-addressable>=2.8<3:www/rubygem-addressable \ - rubygem-tanuki_emoji>=0.9<1:graphics/rubygem-tanuki_emoji \ 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-rack-attack>=6.7.0<6.8:www/rubygem-rack-attack \ - rubygem-sentry-ruby>=5.19.0<5.20:devel/rubygem-sentry-ruby \ - rubygem-sentry-rails>=5.19.0<5.20:devel/rubygem-sentry-rails \ - rubygem-sentry-sidekiq>=5.19.0<5.20:devel/rubygem-sentry-sidekiq \ + 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-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 \ @@ -270,7 +271,7 @@ 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>=17.4.0:net/rubygem-gitaly \ + rubygem-gitaly>=17.6.0:net/rubygem-gitaly \ rubygem-gitlab-kas-grpc>=${GITLAB_VERSION}:net/rubygem-gitlab-kas-grpc \ rubygem-grpc>=1.63.0<2:net/rubygem-grpc \ rubygem-google-protobuf3>=3.25.3<4:devel/rubygem-google-protobuf3 \ @@ -300,10 +301,9 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \ rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1 \ rubygem-ed25519>=1.3.0<1.4:security/rubygem-ed25519 \ - rubygem-parser>=3.3.0.5:devel/rubygem-parser \ rubygem-cvss-suite>=3.0.1<3.1:security/rubygem-cvss-suite \ rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \ - rubygem-devfile>=0.0.28.p.a1<0.0.29:net/rubygem-devfile \ + rubygem-devfile>=0.1.0<0.2:net/rubygem-devfile \ rubygem-CFPropertyList>=3.0.0<3.1:devel/rubygem-CFPropertyList \ rubygem-app_store_connect>=0:net/rubygem-app_store_connect \ rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \ @@ -344,9 +344,9 @@ SHEBANG_FILES= scripts/build_qa_image \ scripts/db_tasks \ scripts/rails-update-bisect \ scripts/generate-e2e-pipeline \ + scripts/frontend/codemods/vuex-to-pinia/migrate.sh \ scripts/frontend/execute-on-staged-files.sh \ scripts/frontend/start_storybook.sh \ - scripts/partitioning/generate-fk \ scripts/validate-monorepo-gem \ .lefthook/gitleaks.sh \ .lefthook/pre-push/merge_conflicts \ @@ -492,8 +492,6 @@ post-install: @${ECHO_CMD} "@dir(,,755) ${WWWDIR_REL}/shared" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp" >> ${TMPPLIST} - @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/cache" >> ${TMPPLIST} - @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/uploads" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/work" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/ci_secure_files" >> ${TMPPLIST} # TODO: Maybe we need to add here a new dir: ${WWWDIR_REL}/shared/external-diffs diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 0bc0562f1f98..37f1c8f0c2c7 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,5 +1,5 @@ -GITLAB_VERSION= 17.5.2 -GITLAB_PORTREVISION= 1 +GITLAB_VERSION= 17.6.0 +GITLAB_PORTREVISION= 0 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index e2f939f5cd65..a7a133fa9d7b 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1731505474 -SHA256 (gitlab-foss-v17.5.2.tar.bz2) = 3777a7613f2df0f364bb6db4b0b929b0a144f84f8fbaf97e1be1aab0994843cb -SIZE (gitlab-foss-v17.5.2.tar.bz2) = 122452026 -TIMESTAMP = 1731505534 -SHA256 (gitlab-v17.5.2-ee.tar.bz2) = fac1f9004cd1c6dc816f9c4f9a5cbc038a157cd4be6bbcf0ca48cc5c36222706 -SIZE (gitlab-v17.5.2-ee.tar.bz2) = 131809531 +TIMESTAMP = 1732168815 +SHA256 (gitlab-foss-v17.6.0.tar.bz2) = 28fbbf2f4b46894bfaa94875e3292bab99d08512250d5e74f9b5c72b83c4b192 +SIZE (gitlab-foss-v17.6.0.tar.bz2) = 125264585 +TIMESTAMP = 1732168872 +SHA256 (gitlab-v17.6.0-ee.tar.bz2) = bf6fe14bda1e8791a4beac69213d73c780ea9f86f115751a87d4b06e51a4172c +SIZE (gitlab-v17.6.0-ee.tar.bz2) = 135969428 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 8254fe335591..53b58dc4791e 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,15 +1,15 @@ ---- Gemfile.orig 2024-10-22 18:38:20 UTC +--- Gemfile.orig 2024-11-20 11:30:30 UTC +++ Gemfile -@@ -160,7 +160,7 @@ gem 'graphql', '~> 2.3.14', feature_category: :api +@@ -160,7 +160,7 @@ gem 'graphql', '~> 2.4.1', feature_category: :api # GraphQL API - gem 'graphql', '~> 2.3.14', feature_category: :api + gem 'graphql', '~> 2.4.1', feature_category: :api -gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api +#gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api - gem 'graphiql-rails', '~> 1.10', feature_category: :api gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api gem 'graphlient', '~> 0.8.0', feature_category: :importers # Used by BulkImport feature (group::import) -@@ -213,7 +213,7 @@ gem 'google-cloud-storage', '~> 1.45.0' # rubocop:todo + +@@ -212,7 +212,7 @@ gem 'google-cloud-storage', '~> 1.45.0' # rubocop:todo gem 'google-apis-storage_v1', '~> 0.29' # rubocop:todo Gemfile/MissingFeatureCategory gem 'google-cloud-storage', '~> 1.45.0' # rubocop:todo Gemfile/MissingFeatureCategory # We need >= 0.11.1 because that's when match_glob support is added to list_objects @@ -18,7 +18,7 @@ gem 'google-apis-compute_v1', '~> 0.57.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'google-apis-container_v1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'google-apis-container_v1beta1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory -@@ -224,7 +224,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # r +@@ -223,7 +223,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # r gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -27,7 +27,7 @@ gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared -@@ -275,7 +275,7 @@ group :puma do +@@ -276,7 +276,7 @@ group :puma do gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory group :puma do @@ -36,7 +36,7 @@ gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory end -@@ -283,7 +283,7 @@ gem 'state_machines-activerecord', '~> 0.8.0' # ruboco +@@ -284,7 +284,7 @@ gem 'state_machines-activerecord', '~> 0.8.0' # ruboco gem 'state_machines-activerecord', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory # Background jobs @@ -45,7 +45,7 @@ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -424,7 +424,7 @@ gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemf +@@ -423,7 +423,7 @@ gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemf gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory # Metrics @@ -54,7 +54,7 @@ gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory # Event-driven reactor for Ruby -@@ -466,136 +466,15 @@ gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/Missi +@@ -465,136 +465,15 @@ gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/Missi gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -85,7 +85,7 @@ -group :development, :test do - gem 'deprecation_toolkit', '~> 1.5.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'bullet', '~> 7.1.2' # rubocop:todo Gemfile/MissingFeatureCategory -- gem 'parser', '= 3.3.3.0', feature_category: :shared +- gem 'parser', '= 3.3.6.0', feature_category: :shared - gem 'pry-byebug' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'pry-rails', '~> 0.3.9' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'pry-shell', '~> 0.6.4' # rubocop:todo Gemfile/MissingFeatureCategory @@ -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', '~> 12.0.1', feature_category: :tooling +- gem 'gitlab-styles', '~> 13.0.1', feature_category: :tooling - gem 'haml_lint', '~> 0.58', feature_category: :tooling - - gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory @@ -174,7 +174,7 @@ - - gem 'shoulda-matchers', '~> 5.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'email_spec', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory -- gem 'webmock', '~> 3.23.0', feature_category: :shared +- gem 'webmock', '~> 3.24.0', feature_category: :shared - gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'test-prof', '~> 1.4.0', feature_category: :tooling @@ -185,18 +185,22 @@ - # 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', '~> 1.39.0', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 2.1.0', require: false, feature_category: :tooling -end - gem 'octokit', '~> 9.0', feature_category: :importers # Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688 gem 'faraday-multipart', '~> 1.0', feature_category: :importers -@@ -633,13 +512,13 @@ gem 'gitaly', '~> 17.4.0.pre.rc1', feature_category: : - gem 'gitaly', '~> 17.4.0.pre.rc1', feature_category: :gitaly +@@ -629,16 +508,16 @@ gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/Mis + gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory + + # Gitaly GRPC protocol definitions +-gem 'gitaly', '~> 17.5.0.pre.rc1', feature_category: :gitaly ++gem 'gitaly', '~> 17.6.0', feature_category: :gitaly # KAS GRPC protocol definitions --gem 'gitlab-kas-grpc', '~> 17.4.0.pre.rc1', feature_category: :deployment_management -+gem 'gitlab-kas-grpc', '~> 17.4', feature_category: :deployment_management +-gem 'gitlab-kas-grpc', '~> 17.5.0', feature_category: :deployment_management ++gem 'gitlab-kas-grpc', '~> 17.6.0', feature_category: :deployment_management # Lock the version before issues below are resolved: # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 @@ -207,7 +211,7 @@ gem 'google-protobuf', '~> 3.25', '>= 3.25.3' # rubocop:todo Gemfile/MissingFeatureCategory -@@ -660,7 +539,7 @@ gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfil +@@ -659,7 +538,7 @@ gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfil gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory # Countries list @@ -216,7 +220,7 @@ gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory -@@ -735,10 +614,15 @@ gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/Missing +@@ -734,10 +613,15 @@ gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/Missing gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index 872bcceb51d3..b061da53401c 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-10-16 08:01:39 UTC +--- config/gitlab.yml.example.orig 2024-11-20 11:30:30 UTC +++ config/gitlab.yml.example @@ -473,7 +473,7 @@ production: &base ## GitLab Pages @@ -63,7 +63,7 @@ topology_service: # enabled: false -@@ -1287,7 +1287,7 @@ production: &base +@@ -1288,7 +1288,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 -@@ -1311,13 +1311,13 @@ production: &base +@@ -1312,13 +1312,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 -@@ -1338,18 +1338,18 @@ production: &base +@@ -1339,18 +1339,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: -@@ -1582,13 +1582,13 @@ test: +@@ -1577,13 +1577,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: diff --git a/www/gitlab/files/patch-config_initializers_1__settings.rb b/www/gitlab/files/patch-config_initializers_1__settings.rb index 67d12e5c5767..c35affe6219a 100644 --- a/www/gitlab/files/patch-config_initializers_1__settings.rb +++ b/www/gitlab/files/patch-config_initializers_1__settings.rb @@ -1,6 +1,6 @@ ---- config/initializers/1_settings.rb.orig 2024-08-20 19:36:17 UTC +--- config/initializers/1_settings.rb.orig 2024-11-20 11:30:30 UTC +++ config/initializers/1_settings.rb -@@ -210,11 +210,7 @@ Settings.gitlab['ssh_user'] ||= Settings.gitlab.user +@@ -211,11 +211,7 @@ Settings.gitlab['ssh_user'] ||= Settings.gitlab.user 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/pkg-message b/www/gitlab/pkg-message index d6f254eb0e15..af4e4b97404d 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.5-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/17.6-freebsd.md EOM type: install } @@ -18,9 +18,9 @@ EOM { message: <<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: +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.4-17.5-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/17.5-17.6-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?202411221348.4AMDmKAu028111>