diff --git a/databases/rubygem-activemodel-gitlab/distinfo b/databases/rubygem-activemodel-gitlab/distinfo index 35a6adef53a7..3395520cd17d 100644 --- a/databases/rubygem-activemodel-gitlab/distinfo +++ b/databases/rubygem-activemodel-gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755146399 -SHA256 (rubygem/activemodel-7.1.5.2.gem) = 4fb6a56a8614ee820c218563fcdebcf0d7b16ab153b81ecd2ed91877cf4ac8b5 -SIZE (rubygem/activemodel-7.1.5.2.gem) = 69632 +TIMESTAMP = 1763614437 +SHA256 (rubygem/activemodel-7.1.6.gem) = f72f510018a560b5969e3ffc88214441ff09eed60b310feba678a597b2a2e721 +SIZE (rubygem/activemodel-7.1.6.gem) = 69632 diff --git a/databases/rubygem-activerecord-gitlab/distinfo b/databases/rubygem-activerecord-gitlab/distinfo index cc4e846e1649..f0852596524e 100644 --- a/databases/rubygem-activerecord-gitlab/distinfo +++ b/databases/rubygem-activerecord-gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755146399 -SHA256 (rubygem/activerecord-7.1.5.2.gem) = 923da72b2da727fd2868bfa2a536db6facf71d67064889a4fb16ff323da99d2a -SIZE (rubygem/activerecord-7.1.5.2.gem) = 548352 +TIMESTAMP = 1763614437 +SHA256 (rubygem/activerecord-7.1.6.gem) = 1aa298cd7fc97ed8639ebb05a46bd17243a1218d89945bdc2bac1e61e673f079 +SIZE (rubygem/activerecord-7.1.6.gem) = 548864 diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 751c46613f9e..f695543637b8 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,58 +1,59 @@ PORTNAME= gitaly DISTVERSIONPREFIX= v DISTVERSION= ${GITLAB_VERSION} PORTREVISION= ${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org COMMENT= Smart reverse proxy for GitLab WWW= https://gitlab.com/gitlab-org/gitaly LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= bash>0:shells/bash \ ${LOCALBASE}/bin/cmake:devel/cmake-core \ pcre2>0:devel/pcre2 \ http-parser>0:www/http-parser LIB_DEPENDS= libcurl.so:ftp/curl \ libiconv.so:converters/libiconv \ libpcre2-8.so:devel/pcre2 USES= cpe gmake go:modules,no_targets,1.24 iconv pkgconfig CPE_VENDOR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_TUPLE= gitlab-org:git:v${GITLAB_GIT_VERSION}:git_dep/_build/deps/git-v${GITLAB_GIT_VERSION_SHORT} \ - gitlab-org:git:${GITLAB_GIT_MASTER_VERSION}:git_master_dep/_build/deps/git-master + gitlab-org:git:${GITLAB_GIT_MASTER_VERSION}:git_master_dep/_build/deps/git-master \ + gitlab-org:git:${GITLAB_GIT_PREV_VERSION}:git_prev_dep/_build/deps/git-prev GO_MOD_DIST= gitlab GO_MODULE= gitlab.com/gitlab-org/gitaly/v18 MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" # make sure to pass go build options into make process MAKE_ENV+= ${GO_ENV} # parallel build failed in my tests, so disable it here MAKE_JOBS_UNSAFE=yes post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example ${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample do-install: ${MKDIR} ${STAGEDIR}${DATADIR}/bin ${FIND} ${WRKSRC} -name '*.orig' -delete (cd ${WRKSRC}/_build/bin/ && ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR}/bin && \ cd ${WRKSRC} && ${COPYTREE_SHARE} config.toml.sample ${STAGEDIR}${DATADIR}) post-install: ${FIND} -s ${STAGEDIR}${DATADIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \ ${SED} -E -e '/sample$$/ s#^#@sample #; \ /gitlab-shell-hook$$/ s#^#@(,,755) #; \ s#${DATADIR_REL}/bin#@(,,555) ${DATADIR_REL}/bin#; ' >> ${TMPPLIST} .include "${.CURDIR}/../../www/gitlab/Makefile.common" .include diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index 2d8fd76d3a5a..ef1184d177eb 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,9 +1,11 @@ -TIMESTAMP = 1763010405 -SHA256 (go/devel_gitaly/gitaly-v18.5.2/go.mod) = 103dce63500bcc4d831877292de059e6aff0001c595bd10a20458e1c4b191dfc -SIZE (go/devel_gitaly/gitaly-v18.5.2/go.mod) = 13012 -SHA256 (go/devel_gitaly/gitaly-v18.5.2/gitaly-v18.5.2.tar.bz2) = 85b3994ce1e8618865a340e6e7773808e2e634cd4c3997c996ea7aa7f06f8a00 -SIZE (go/devel_gitaly/gitaly-v18.5.2/gitaly-v18.5.2.tar.bz2) = 4605362 -SHA256 (go/devel_gitaly/gitaly-v18.5.2/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4 -SIZE (go/devel_gitaly/gitaly-v18.5.2/git-v2.50.0.tar.bz2) = 9249878 -SHA256 (go/devel_gitaly/gitaly-v18.5.2/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 01a4069b15e9262151b3b97f989d4939ba8966bd5269875add2a34806817c01a -SIZE (go/devel_gitaly/gitaly-v18.5.2/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 11745131 +TIMESTAMP = 1763615394 +SHA256 (go/devel_gitaly/gitaly-v18.6.0/go.mod) = 1aace7ab09969668d9aad9416851833a2ec122442b060ce133e60d1d7c9b0252 +SIZE (go/devel_gitaly/gitaly-v18.6.0/go.mod) = 14044 +SHA256 (go/devel_gitaly/gitaly-v18.6.0/gitaly-v18.6.0.tar.bz2) = d182251c770cc67e1def2d621ad51415717d8ca093df87d357e918dcf56cefdf +SIZE (go/devel_gitaly/gitaly-v18.6.0/gitaly-v18.6.0.tar.bz2) = 4657060 +SHA256 (go/devel_gitaly/gitaly-v18.6.0/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4 +SIZE (go/devel_gitaly/gitaly-v18.6.0/git-v2.50.0.tar.bz2) = 9249878 +SHA256 (go/devel_gitaly/gitaly-v18.6.0/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = d3397b210ca156ed84ff69b3a7f6316c5026bd05d11455f23d8335473dceaf1b +SIZE (go/devel_gitaly/gitaly-v18.6.0/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = 11822923 +SHA256 (go/devel_gitaly/gitaly-v18.6.0/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 01a4069b15e9262151b3b97f989d4939ba8966bd5269875add2a34806817c01a +SIZE (go/devel_gitaly/gitaly-v18.6.0/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 11745131 diff --git a/devel/rubygem-actionview-gitlab/Makefile b/devel/rubygem-actionview-gitlab/Makefile index 992e2ceab740..32827b1fe883 100644 --- a/devel/rubygem-actionview-gitlab/Makefile +++ b/devel/rubygem-actionview-gitlab/Makefile @@ -1,30 +1,31 @@ PORTNAME= actionview PORTVERSION= ${RAILS_VERSION} CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab MAINTAINER= mfechner@FreeBSD.org COMMENT= Simple, battle-tested conventions and helpers for building web pages WWW= https://github.com/rails/rails/tree/main/actionview \ https://rubyonrails.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \ rubygem-builder>=3.1<4:devel/rubygem-builder \ + rubygem-cgi>=0:www/rubygem-cgi \ rubygem-erubi>=1.11<2:www/rubygem-erubi \ rubygem-rails-dom-testing-rails-gitlab>=2.2<3:textproc/rubygem-rails-dom-testing-rails-gitlab \ rubygem-rails-html-sanitizer>=1.6<2:textproc/rubygem-rails-html-sanitizer USES= cpe gem -NO_ARCH= yes - CPE_VENDOR= rubyonrails +NO_ARCH= yes + PORTSCOUT= limit:^7\.1\. .include "${.CURDIR}/../../www/gitlab/Makefile.common" .include diff --git a/devel/rubygem-actionview-gitlab/distinfo b/devel/rubygem-actionview-gitlab/distinfo index e7c119f2cd6d..48580e7ec0fb 100644 --- a/devel/rubygem-actionview-gitlab/distinfo +++ b/devel/rubygem-actionview-gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755146398 -SHA256 (rubygem/actionview-7.1.5.2.gem) = 4fc916ac7eac631e228955207b1730935a7944a4d87d45a32cc40e977d5ca1c9 -SIZE (rubygem/actionview-7.1.5.2.gem) = 188416 +TIMESTAMP = 1763614436 +SHA256 (rubygem/actionview-7.1.6.gem) = 11147d81f90465ae062b2a77805c6f8f446e044e309c51bd9449bdbd43edf566 +SIZE (rubygem/actionview-7.1.6.gem) = 188416 diff --git a/devel/rubygem-activejob-gitlab/Makefile b/devel/rubygem-activejob-gitlab/Makefile index e7d9e5c7550f..ea3ba2cbb0e7 100644 --- a/devel/rubygem-activejob-gitlab/Makefile +++ b/devel/rubygem-activejob-gitlab/Makefile @@ -1,28 +1,28 @@ PORTNAME= activejob PORTVERSION= ${RAILS_VERSION} CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab MAINTAINER= mfechner@FreeBSD.org COMMENT= Declare job classes that can be run by a variety of queuing backends WWW= https://github.com/rails/rails/tree/main/activejob \ https://rubyonrails.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \ rubygem-globalid-rails-gitlab>=0.3.6:databases/rubygem-globalid-rails-gitlab USES= cpe gem -NO_ARCH= yes - CPE_VENDOR= rubyonrails CPE_PRODUCT= active_job +NO_ARCH= yes + PORTSCOUT= limit:^7\.1\. .include "${.CURDIR}/../../www/gitlab/Makefile.common" .include diff --git a/devel/rubygem-activejob-gitlab/distinfo b/devel/rubygem-activejob-gitlab/distinfo index 8b9ed3194a20..5b948bf8f252 100644 --- a/devel/rubygem-activejob-gitlab/distinfo +++ b/devel/rubygem-activejob-gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755146399 -SHA256 (rubygem/activejob-7.1.5.2.gem) = afb662a5c5cda81e34fe6b09089cdf4084aabc27c6aedbd58ba4c1bef7bd804e -SIZE (rubygem/activejob-7.1.5.2.gem) = 37376 +TIMESTAMP = 1763614436 +SHA256 (rubygem/activejob-7.1.6.gem) = 0dd9cd051d494608349dd9223a3e61c3933250db77e35ab6617c26c1d52dccbb +SIZE (rubygem/activejob-7.1.6.gem) = 37376 diff --git a/devel/rubygem-activesupport-gitlab/Makefile b/devel/rubygem-activesupport-gitlab/Makefile index 87203593c575..98841a6c947c 100644 --- a/devel/rubygem-activesupport-gitlab/Makefile +++ b/devel/rubygem-activesupport-gitlab/Makefile @@ -1,37 +1,37 @@ PORTNAME= activesupport PORTVERSION= ${RAILS_VERSION} CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab MAINTAINER= mfechner@FreeBSD.org COMMENT= Toolkit of support libraries and Ruby core extensions extracted from the Rails framework WWW= https://github.com/rails/rails/tree/main/activesupport \ https://rubyonrails.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-base64>=0:converters/rubygem-base64 \ rubygem-benchmark>=0.3:benchmarks/rubygem-benchmark \ rubygem-bigdecimal>=0:math/rubygem-bigdecimal \ rubygem-concurrent-ruby>=1.0.2<2:devel/rubygem-concurrent-ruby \ rubygem-connection_pool>=2.2.5:net/rubygem-connection_pool \ rubygem-drb>=0:devel/rubygem-drb \ rubygem-i18n>=1.6,2<2,2:devel/rubygem-i18n \ rubygem-logger-gitlab>=1.4.2:devel/rubygem-logger-gitlab \ rubygem-minitest>=5.1:devel/rubygem-minitest \ rubygem-mutex_m>=0:devel/rubygem-mutex_m \ rubygem-securerandom>=0.3:security/rubygem-securerandom \ rubygem-tzinfo>=2.0<3:devel/rubygem-tzinfo USES= cpe gem -NO_ARCH= yes - CPE_VENDOR= activesupport_project +NO_ARCH= yes + PORTSCOUT= limit:^7\.1\. .include "${.CURDIR}/../../www/gitlab/Makefile.common" .include diff --git a/devel/rubygem-activesupport-gitlab/distinfo b/devel/rubygem-activesupport-gitlab/distinfo index 1fea5c20432a..0f993ff744fd 100644 --- a/devel/rubygem-activesupport-gitlab/distinfo +++ b/devel/rubygem-activesupport-gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755146400 -SHA256 (rubygem/activesupport-7.1.5.2.gem) = 900031b9c8acbfea604977addcbfe990ba8f36e1059e9d448df520bbead36ed1 -SIZE (rubygem/activesupport-7.1.5.2.gem) = 258560 +TIMESTAMP = 1763614438 +SHA256 (rubygem/activesupport-7.1.6.gem) = 7f12140a813b1c4922a322663e547129aef1840fc512fa262378f6d7e7fd3a7c +SIZE (rubygem/activesupport-7.1.6.gem) = 258560 diff --git a/mail/rubygem-actionmailbox-gitlab/distinfo b/mail/rubygem-actionmailbox-gitlab/distinfo index a92f4014f786..bba159b3263a 100644 --- a/mail/rubygem-actionmailbox-gitlab/distinfo +++ b/mail/rubygem-actionmailbox-gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755146397 -SHA256 (rubygem/actionmailbox-7.1.5.2.gem) = 192b1dc102fe2b917cfc829a9944f6b08fd3237d10cf166498f7927857dcac4e -SIZE (rubygem/actionmailbox-7.1.5.2.gem) = 22528 +TIMESTAMP = 1763614435 +SHA256 (rubygem/actionmailbox-7.1.6.gem) = ded958ad8ec147a5f14555833541f07063af188777b09b50cfeeaa623bc2f731 +SIZE (rubygem/actionmailbox-7.1.6.gem) = 22528 diff --git a/mail/rubygem-actionmailer-gitlab/Makefile b/mail/rubygem-actionmailer-gitlab/Makefile index 36bf654c541a..7446e2fe6c5e 100644 --- a/mail/rubygem-actionmailer-gitlab/Makefile +++ b/mail/rubygem-actionmailer-gitlab/Makefile @@ -1,29 +1,32 @@ PORTNAME= actionmailer PORTVERSION= ${RAILS_VERSION} CATEGORIES= mail rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab MAINTAINER= mfechner@FreeBSD.org COMMENT= Compose, deliver, and test emails on Rails WWW= https://github.com/rails/rails/tree/main/actionmailer \ https://rubyonrails.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-actionpack-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actionpack-gitlab \ rubygem-actionview-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-actionview-gitlab \ rubygem-activejob-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activejob-gitlab \ rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \ rubygem-mail>=2.5.4,2<3,2:mail/rubygem-mail \ + rubygem-net-imap>=0:mail/rubygem-net-imap \ + rubygem-net-pop>=0:mail/rubygem-net-pop \ + rubygem-net-smtp>=0:mail/rubygem-net-smtp \ rubygem-rails-dom-testing-rails-gitlab>=2.2<3:textproc/rubygem-rails-dom-testing-rails-gitlab USES= gem NO_ARCH= yes PORTSCOUT= limit:^7\.1\. .include "${.CURDIR}/../../www/gitlab/Makefile.common" .include diff --git a/mail/rubygem-actionmailer-gitlab/distinfo b/mail/rubygem-actionmailer-gitlab/distinfo index 6796fc5d09da..ecfb8866d687 100644 --- a/mail/rubygem-actionmailer-gitlab/distinfo +++ b/mail/rubygem-actionmailer-gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755146398 -SHA256 (rubygem/actionmailer-7.1.5.2.gem) = 7a5c5fec1eb1bc64e97dcb73d38f17f27df30d5118f7eeb60e575ec10a9e860b -SIZE (rubygem/actionmailer-7.1.5.2.gem) = 34304 +TIMESTAMP = 1763614435 +SHA256 (rubygem/actionmailer-7.1.6.gem) = b07f6420ec66bd299a9da5a35c075849fbd5504e82793301b0c275fa4211d273 +SIZE (rubygem/actionmailer-7.1.6.gem) = 34304 diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index 24f3d70b2165..4eae96073e3c 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1763010406 -SHA256 (go/net_gitlab-agent/gitlab-agent-v18.5.2/v18.5.2.mod) = 67dbe3124c9bcd1856d46f400f4270face097bbf16f0080dd0ae9764c96a16c4 -SIZE (go/net_gitlab-agent/gitlab-agent-v18.5.2/v18.5.2.mod) = 9858 -SHA256 (go/net_gitlab-agent/gitlab-agent-v18.5.2/v18.5.2.zip) = 928a21f8ef1f33478c0efd1d4551d5d8c2123251584f9e6ae964b8f4742d22bb -SIZE (go/net_gitlab-agent/gitlab-agent-v18.5.2/v18.5.2.zip) = 1957278 +TIMESTAMP = 1763614383 +SHA256 (go/net_gitlab-agent/gitlab-agent-v18.6.0/v18.6.0.mod) = 70aa1942f288770a76e933b4f648185d795b0ad148162c1bdf91c13c0c122526 +SIZE (go/net_gitlab-agent/gitlab-agent-v18.6.0/v18.6.0.mod) = 9944 +SHA256 (go/net_gitlab-agent/gitlab-agent-v18.6.0/v18.6.0.zip) = c49a4a6cd1dc52f3dbeb2f7f7075e4155c6679d3d7c207a9ad9ca73a7544c20a +SIZE (go/net_gitlab-agent/gitlab-agent-v18.6.0/v18.6.0.zip) = 1917071 diff --git a/net/rubygem-activestorage-gitlab/distinfo b/net/rubygem-activestorage-gitlab/distinfo index ae60a5856a77..387664f0cf38 100644 --- a/net/rubygem-activestorage-gitlab/distinfo +++ b/net/rubygem-activestorage-gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755146399 -SHA256 (rubygem/activestorage-7.1.5.2.gem) = ed9acb147cea135f9e00efd984a7b8ed670b15bc6e434956931b8deecec17c98 -SIZE (rubygem/activestorage-7.1.5.2.gem) = 67584 +TIMESTAMP = 1763614437 +SHA256 (rubygem/activestorage-7.1.6.gem) = 2f1acb8e6592ba783d9cbc3da93ac4477d441dffc5d533ceccbbfab39f4bf398 +SIZE (rubygem/activestorage-7.1.6.gem) = 67584 diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile index ca4b285c1e0c..2ad81adffec7 100644 --- a/net/rubygem-gitaly/Makefile +++ b/net/rubygem-gitaly/Makefile @@ -1,20 +1,20 @@ PORTNAME= gitaly -PORTVERSION= 18.5.1 +PORTVERSION= 18.6.0 CATEGORIES= net rubygems MASTER_SITES= RG MAINTAINER= mfechner@FreeBSD.org COMMENT= Auto-generated gRPC client for gitaly WWW= https://gitlab.com/gitlab-org/gitaly LICENSE= MIT RUN_DEPENDS= rubygem-grpc-gitlab>=1.0<2.0:net/rubygem-grpc-gitlab USES= cpe gem CPE_VENDOR= gitlab NO_ARCH= yes .include diff --git a/net/rubygem-gitaly/distinfo b/net/rubygem-gitaly/distinfo index 0297b821bee4..4d22ca2b1355 100644 --- a/net/rubygem-gitaly/distinfo +++ b/net/rubygem-gitaly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1763011058 -SHA256 (rubygem/gitaly-18.5.1.gem) = 70d23f4fc787c87ee88d33f32eebf1702299c262bdc09490c2faf05cb1eec90b -SIZE (rubygem/gitaly-18.5.1.gem) = 53760 +TIMESTAMP = 1763614415 +SHA256 (rubygem/gitaly-18.6.0.gem) = 9dba24ab9fd71ac026967b0e9c2a99d65a8b6d034a5a3efe63c6db16c0a1464c +SIZE (rubygem/gitaly-18.6.0.gem) = 54272 diff --git a/textproc/rubygem-actiontext-gitlab/distinfo b/textproc/rubygem-actiontext-gitlab/distinfo index 3b08cb448f3f..30bc6b2e45e0 100644 --- a/textproc/rubygem-actiontext-gitlab/distinfo +++ b/textproc/rubygem-actiontext-gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755146398 -SHA256 (rubygem/actiontext-7.1.5.2.gem) = 505678e4611762cb68e9c05bc5776ce5977415beed2fbabdd0ed110c63390207 -SIZE (rubygem/actiontext-7.1.5.2.gem) = 137216 +TIMESTAMP = 1763614436 +SHA256 (rubygem/actiontext-7.1.6.gem) = 79d657422dd67cc8cb46866a7bec9d89ec8699f7fa5647c0eab3472dc0297e66 +SIZE (rubygem/actiontext-7.1.6.gem) = 137216 diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index aa17d4c45bb4..a4256f8b6aec 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1763010408 -SHA256 (go/www_gitlab-pages/gitlab-pages-v18.5.2/go.mod) = ac8a9352d8b2a358be9c716c703e89a2b1623b7abd3d9738213b2e0d50baef8b -SIZE (go/www_gitlab-pages/gitlab-pages-v18.5.2/go.mod) = 3416 -SHA256 (go/www_gitlab-pages/gitlab-pages-v18.5.2/gitlab-pages-v18.5.2.tar.bz2) = b46609913beaa016b08718977dab4d87bfc56a87a123aa6325f7e85d33696a20 -SIZE (go/www_gitlab-pages/gitlab-pages-v18.5.2/gitlab-pages-v18.5.2.tar.bz2) = 236830 +TIMESTAMP = 1763614388 +SHA256 (go/www_gitlab-pages/gitlab-pages-v18.6.0/go.mod) = 01a4fafec3c597505de06cc4dc76a706e78e461b21562113750dfec75e9458c2 +SIZE (go/www_gitlab-pages/gitlab-pages-v18.6.0/go.mod) = 3416 +SHA256 (go/www_gitlab-pages/gitlab-pages-v18.6.0/gitlab-pages-v18.6.0.tar.bz2) = e74a8dfdb8fea931886c48cf242299988615136ac003d84762e6435e8fbb6efb +SIZE (go/www_gitlab-pages/gitlab-pages-v18.6.0/gitlab-pages-v18.6.0.tar.bz2) = 236677 diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index cd43c18e5307..8d31232d84cc 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1763010422 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.5.2/go.mod) = 39650d5ecf720c85d09f111d574d56810f1d80074f1efb4fabac0db4c369d717 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.5.2/go.mod) = 9343 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.5.2/gitlab-foss-v18.5.2.tar.bz2) = 9bfd39dc3f34dec8af17f55bda6aa6217600be016e8c498804f7c3568064ee8c -SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.5.2/gitlab-foss-v18.5.2.tar.bz2) = 122917718 +TIMESTAMP = 1763614433 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.6.0/go.mod) = 11c339bb0fbbc0ad18e7e636a2f3cd686ea3425805f0ed0db5f629008a1d6952 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.6.0/go.mod) = 9356 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.6.0/gitlab-foss-v18.6.0.tar.bz2) = 2a7891b1347e730d26dbe6acf3dd7197a289694e3aa0d1bc2af6e5c6b322cc55 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.6.0/gitlab-foss-v18.6.0.tar.bz2) = 126821552 diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index d1d6371587c8..cf17c23d70a0 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -1,584 +1,584 @@ PORTNAME= gitlab-${FLAVOR:Uce} PORTVERSION= ${GITLAB_VERSION} DISTVERSIONPREFIX= v .if ${FLAVOR:U} == ee DISTVERSIONSUFFIX= -ee .endif PORTREVISION= ${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common CATEGORIES= www devel # include patch to fix database migration #https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153560.patch #PATCH_SITES= https://gitlab.com/gitlab-org/gitlab/-/merge_requests/ #PATCHFILES+= 153560.patch:-p1 # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153560 MAINTAINER= mfechner@FreeBSD.org COMMENT= Web GUI for managing git repositories WWW= https://gitlab.com/ \ https://gitlab.com/gitlab-org/gitlab LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE # the rubygems of RUN_DEPENDS matches the order of the Gemfile # which makes maintaining this long list much easier! # devel/rubygem-parser is required for database upgrade process # see https://gitlab.com/gitlab-org/gitlab/-/issues/350866 # 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 #gitlab-zoekt-indexer>=0.16.0:textproc/gitlab-zoekt-indexer MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ - gitlab-elasticsearch-indexer>=5.9.4:textproc/gitlab-elasticsearch-indexer \ + gitlab-elasticsearch-indexer>=5.10.1:textproc/gitlab-elasticsearch-indexer \ gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \ gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \ gitlab-shell>=14.45.3:devel/gitlab-shell \ gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \ - gitlab-zoekt-indexer>=1.6.2:textproc/gitlab-zoekt-indexer \ + gitlab-zoekt-indexer>=1.7.6:textproc/gitlab-zoekt-indexer \ redis>=6.2.11:databases/redis \ yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \ gtar>0:archivers/gtar \ bash>0:shells/bash \ - rubygem-parser>=3.3.9.0:devel/rubygem-parser \ + rubygem-parser>=3.3.10.0:devel/rubygem-parser \ 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-rails-gitlab>=${RAILS_VERSION}<7.2:www/rubygem-rails-gitlab \ rubygem-zeitwerk>=2.6.18<2.6.19:devel/rubygem-zeitwerk \ rubygem-mutex_m>=0.3<1:devel/rubygem-mutex_m \ rubygem-drb-gitlab>=2.2.3<3:devel/rubygem-drb-gitlab \ rubygem-bootsnap>=1.18.6<1.19:devel/rubygem-bootsnap \ rubygem-ffi>=1.17.2<2:devel/rubygem-ffi \ - rubygem-openssl>=3.3.2<4:security/rubygem-openssl \ - rubygem-gitlab-secret_detection>=0.35.1<1:security/rubygem-gitlab-secret_detection \ + rubygem-openssl>=3.3.2<3.4:security/rubygem-openssl \ + rubygem-gitlab-secret_detection>=0.38.0<1:security/rubygem-gitlab-secret_detection \ rubygem-responders-rails-gitlab>=3.0<4.0:www/rubygem-responders-rails-gitlab \ rubygem-sprockets-gitlab>=3.7.5<3.8:devel/rubygem-sprockets-gitlab \ rubygem-sprockets-rails-rails-gitlab>=3.5.2<3.6:devel/rubygem-sprockets-rails-rails-gitlab \ rubygem-view_component-rails-gitlab>=3.23.2<3.24:devel/rubygem-view_component-rails-gitlab \ rubygem-pg-gitlab>=1.6.1<1.7:databases/rubygem-pg-gitlab \ rubygem-rugged>=1.6<2:devel/rubygem-rugged \ rubygem-faraday-gitlab>=2.13.4<3:www/rubygem-faraday-gitlab \ rubygem-faraday-retry-gitlab>=2<3:www/rubygem-faraday-retry-gitlab \ rubygem-logger-gitlab>=1.7.0<1.8:devel/rubygem-logger-gitlab \ rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \ rubygem-declarative_policy>=2.0.1<2.1:security/rubygem-declarative_policy \ rubygem-coverband>=6.1.5<6.1.6:www/rubygem-coverband \ rubygem-devise-rails-gitlab>=4.9.3<4.10:devel/rubygem-devise-rails-gitlab \ rubygem-bcrypt>=3.1.20<3.2:security/rubygem-bcrypt \ rubygem-doorkeeper-rails-gitlab>=5.8.1<6:security/rubygem-doorkeeper-rails-gitlab \ rubygem-doorkeeper-openid_connect>=1.8.11<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.4.4<3.5:textproc/rubygem-rexml \ rubygem-ruby-saml-gitlab>=1.18.1<2:security/rubygem-ruby-saml-gitlab \ rubygem-omniauth-saml-gitlab>=2.2.4<3:security/rubygem-omniauth-saml-gitlab \ rubygem-omniauth-gl>=2.1.3<3:security/rubygem-omniauth-gl \ rubygem-omniauth-auth0-gitlab>=3.1.1<3.2.0:net/rubygem-omniauth-auth0-gitlab \ rubygem-omniauth-azure-activedirectory-v2>=2.0<3:net/rubygem-omniauth-azure-activedirectory-v2 \ rubygem-omniauth-alicloud>=3.0.0<3.1:security/rubygem-omniauth-alicloud \ rubygem-omniauth-github-gitlab>=2.0.1<2.1:net/rubygem-omniauth-github-gitlab \ - rubygem-omniauth-google-oauth2-gitlab>=1.1<2:net/rubygem-omniauth-google-oauth2-gitlab \ + rubygem-omniauth-google-oauth2-gitlab>=1.2.1<2:net/rubygem-omniauth-google-oauth2-gitlab \ rubygem-omniauth-oauth2-generic-gitlab>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic-gitlab \ rubygem-omniauth-shibboleth-redux-gitlab>=2.0<3:security/rubygem-omniauth-shibboleth-redux-gitlab \ rubygem-omniauth_openid_connect>=0.8.0<0.9:net/rubygem-omniauth_openid_connect \ rubygem-openid_connect>=2.3.1<2.4:net/rubygem-openid_connect \ rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \ rubygem-rack-oauth2-gitlab>=2.2.1<2.3:security/rubygem-rack-oauth2-gitlab \ rubygem-jwt2>=2.10.2<2.11:www/rubygem-jwt2 \ 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.3.0<2.4:graphics/rubygem-invisible_captcha \ rubygem-devise-two-factor-rails-gitlab>=4.1.1<4.2:security/rubygem-devise-two-factor-rails-gitlab \ rubygem-rqrcode-gitlab>=2.2.0<3:www/rubygem-rqrcode-gitlab \ rubygem-attr_encrypted>=4.2<5:security/rubygem-attr_encrypted \ rubygem-validates_hostname-gitlab>=1.0.13<1.1.0:dns/rubygem-validates_hostname-gitlab \ rubygem-rubyzip-gitlab>=2.4.1<2.5:archivers/rubygem-rubyzip-gitlab \ rubygem-acme-client-gitlab>=2.0.26<3:security/rubygem-acme-client-gitlab \ rubygem-browser5>=5.3.1<5.4:www/rubygem-browser5 \ rubygem-ohai>=18.1.18<19:sysutils/rubygem-ohai \ rubygem-gpgme>=2.0.25<2.1.0:security/rubygem-gpgme \ rubygem-gitlab_omniauth-ldap-gitlab>=2.3.0<2.4.0:net/rubygem-gitlab_omniauth-ldap-gitlab \ rubygem-net-ldap017>=0.17.1<0.18:net/rubygem-net-ldap017 \ rubygem-grape20>=2.0.0<2.1:devel/rubygem-grape20 \ rubygem-grape-entity>=1.0.1<1.1,1:devel/rubygem-grape-entity \ rubygem-grape-swagger>=2.1.2<2.2:devel/rubygem-grape-swagger \ rubygem-grape-swagger-entity>=0.5.5<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.5.11<2.6:devel/rubygem-graphql \ rubygem-apollo_upload_server>=2.1.6<2.2:net/rubygem-apollo_upload_server \ rubygem-ffaker>=2.25.0<3:devel/rubygem-ffaker \ rubygem-hashie>=5.0.0<5.1:devel/rubygem-hashie \ rubygem-kaminari-rails-gitlab>=1.2.2<1.3:www/rubygem-kaminari-rails-gitlab \ rubygem-hamlit-gitlab>=3.0.3<3.1:www/rubygem-hamlit-gitlab \ rubygem-carrierwave-gitlab>=1.3.4<2.0:www/rubygem-carrierwave-gitlab \ rubygem-mini_magick4>=4.12<5:graphics/rubygem-mini_magick4 \ rubygem-marcel-gitlab>=1.0.4<1.1:devel/rubygem-marcel-gitlab \ rubygem-prawn>=0:print/rubygem-prawn \ rubygem-prawn-svg>=0:print/rubygem-prawn-svg \ rubygem-fog-aws-gitlab>=3.28.0<4:net/rubygem-fog-aws-gitlab \ rubygem-fog-core-gitlab>=2.5<3:devel/rubygem-fog-core-gitlab \ rubygem-fog-google-gitlab>=1.25.0<2:net/rubygem-fog-google-gitlab \ rubygem-fog-local-gitlab>=0.8<1.0:net/rubygem-fog-local-gitlab \ rubygem-fog-aliyun-gitlab>=0.4<1.0:net/rubygem-fog-aliyun-gitlab \ rubygem-gitlab-fog-azure-rm>=2.4.0<2.5: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.57.0<1.58:net/rubygem-google-cloud-storage-gitlab \ rubygem-google-apis-core-gitlab>=0.18.0<0.19:devel/rubygem-google-apis-core-gitlab \ rubygem-google-apis-compute_v1-gitlab>=0.129.0<0.130:devel/rubygem-google-apis-compute_v1-gitlab \ rubygem-google-apis-container_v1>=0.100.0<0.101:devel/rubygem-google-apis-container_v1 \ rubygem-google-apis-container_v1beta1>=0.91.0<0.92:devel/rubygem-google-apis-container_v1beta1 \ rubygem-google-apis-cloudbilling_v1>=0.22.0<0.23:devel/rubygem-google-apis-cloudbilling_v1 \ rubygem-google-apis-cloudresourcemanager_v1-gitlab>=0.44.0<0.45:devel/rubygem-google-apis-cloudresourcemanager_v1-gitlab \ - rubygem-google-apis-iam_v1-gitlab>=0.73.0<0.74:devel/rubygem-google-apis-iam_v1-gitlab \ + rubygem-google-apis-iam_v1-gitlab>=0.79.0<0.80:devel/rubygem-google-apis-iam_v1-gitlab \ rubygem-google-apis-serviceusage_v1>=0.28.0<0.29:devel/rubygem-google-apis-serviceusage_v1 \ rubygem-google-apis-sqladmin_v1beta4-gitlab>=0.41.0<0.42:devel/rubygem-google-apis-sqladmin_v1beta4-gitlab \ rubygem-google-apis-androidpublisher_v3-gitlab>=0.86.0<0.87:devel/rubygem-google-apis-androidpublisher_v3-gitlab \ rubygem-googleauth-gitlab>=1.14<2:security/rubygem-googleauth-gitlab \ rubygem-google-cloud-artifact_registry-v1>=0.11.0<0.12:textproc/rubygem-google-cloud-artifact_registry-v1 \ rubygem-google-cloud-compute-v1>=2.6.0<2.7:net/rubygem-google-cloud-compute-v1 \ rubygem-seed-fu-gitlab>=2.3.9<2.4.0:databases/rubygem-seed-fu-gitlab \ 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.226.3<3.227:devel/rubygem-aws-sdk-core-gitlab \ rubygem-aws-sdk-cloudformation-gitlab>=1.134<2:devel/rubygem-aws-sdk-cloudformation-gitlab \ rubygem-aws-sdk-s3-gitlab>=1.193.0<1.194: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-gitlab>=1.4.0<1.5:www/rubygem-typhoeus-gitlab \ rubygem-html-pipeline-gitlab>=2.14.3<2.15:textproc/rubygem-html-pipeline-gitlab \ rubygem-deckar01-task_list-gitlab>=2.3.4<2.4:www/rubygem-deckar01-task_list-gitlab \ rubygem-gitlab-markup>=2.0.0<2.1:textproc/rubygem-gitlab-markup \ rubygem-commonmarker0>=0.23.12<0.24:textproc/rubygem-commonmarker0 \ rubygem-kramdown-gitlab>=2.5.1<2.6:textproc/rubygem-kramdown-gitlab \ 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 \ rubygem-wikicloth081>=0.8.1<0.8.2:textproc/rubygem-wikicloth081 \ rubygem-asciidoctor>=2.0.18<2.1.0:textproc/rubygem-asciidoctor \ 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-rouge-gitlab>=4.6.1<4.7:textproc/rubygem-rouge-gitlab \ rubygem-truncato>=0.7.13<0.8.0:textproc/rubygem-truncato \ rubygem-nokogiri>=1.18.10<2:textproc/rubygem-nokogiri \ rubygem-gitlab-glfm-markdown>=0.0.38<0.1:textproc/rubygem-gitlab-glfm-markdown \ rubygem-tanuki_emoji>=0.13<1:graphics/rubygem-tanuki_emoji \ rubygem-unicode-emoji>=4.0.4<5:devel/rubygem-unicode-emoji \ rubygem-icalendar-gitlab>=2.10.3<2.11:devel/rubygem-icalendar-gitlab \ rubygem-diffy>=3.4.4<4:textproc/rubygem-diffy \ rubygem-rack22>=2.2.20,3<2.3,3:www/rubygem-rack22 \ rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \ rubygem-puma-gitlab>=6.6.1<6.6.2:www/rubygem-puma-gitlab \ rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \ rubygem-state_machines-activerecord-gitlab>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord-gitlab \ rubygem-sidekiq-gitlab>=7.3.9:devel/rubygem-sidekiq-gitlab \ rubygem-sidekiq-cron-rails-gitlab>=1.12.0<1.13:devel/rubygem-sidekiq-cron-rails-gitlab \ rubygem-fugit-gitlab>=1.11.2<1.12:devel/rubygem-fugit-gitlab \ rubygem-httparty-gitlab>=0.23.0<0.24:www/rubygem-httparty-gitlab \ rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \ rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \ rubygem-re2>=2.20.0<3:devel/rubygem-re2 \ rubygem-semver_dialects>=3.7.0<4:devel/rubygem-semver_dialects \ rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \ rubygem-js_regex>=3.13.0<4.0:textproc/rubygem-js_regex \ rubygem-device_detector>=1.1.3:devel/rubygem-device_detector \ - rubygem-redis-gitlab>=5.4.0<5.4.1:databases/rubygem-redis-gitlab \ + rubygem-redis-gitlab>=5.4.1<5.5:databases/rubygem-redis-gitlab \ rubygem-redis-client>=0.26.1<1:databases/rubygem-redis-client \ rubygem-redis-cluster-client>=0.13.5<1:databases/rubygem-redis-cluster-client \ - rubygem-redis-clustering-gitlab>=5.4.0<5.4.1:databases/rubygem-redis-clustering-gitlab \ + rubygem-redis-clustering-gitlab>=5.4.1<5.5:databases/rubygem-redis-clustering-gitlab \ rubygem-connection_pool>=2.5.4<2.6:net/rubygem-connection_pool \ rubygem-redis-actionpack-rails-gitlab>=5.5.0<5.6:databases/rubygem-redis-actionpack-rails-gitlab \ rubygem-jira-ruby-gitlab>=2.3.0<2.4:devel/rubygem-jira-ruby-gitlab \ rubygem-atlassian-jwt>=0.2.1<0.3.0:www/rubygem-atlassian-jwt \ rubygem-slack-messenger>=2.3.5<2.4.0:devel/rubygem-slack-messenger \ rubygem-kubeclient>=4.12.0<4.13.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-sanitize60>=6.0.2<6.1:textproc/rubygem-sanitize60 \ rubygem-babosa>=2.0<3:textproc/rubygem-babosa \ rubygem-loofah>=2.24.1<2.25:textproc/rubygem-loofah \ rubygem-licensee-gitlab>=9.16<10:devel/rubygem-licensee-gitlab \ rubygem-charlock_holmes>=0.7.9<0.8:textproc/rubygem-charlock_holmes \ rubygem-ruby-magic>=0.6<1:devel/rubygem-ruby-magic \ rubygem-fast_blank>=1.0.1<1.1:devel/rubygem-fast_blank \ rubygem-gitlab-chronic>=0.10.6<0.11.0:devel/rubygem-gitlab-chronic \ rubygem-gitlab_chronic_duration>=0.12<1:devel/rubygem-gitlab_chronic_duration \ rubygem-rack-proxy>=0.7.7<0.8.0:www/rubygem-rack-proxy \ rubygem-cssbundling-rails-rails-gitlab>=1.4.3<1.5:www/rubygem-cssbundling-rails-rails-gitlab \ rubygem-terser>=1.0.2<1.0.3:textproc/rubygem-terser \ - rubygem-click_house-client>=0.8.0<0.9:databases/rubygem-click_house-client \ + rubygem-click_house-client>=0.8.2<0.9:databases/rubygem-click_house-client \ rubygem-addressable>=2.8<3:www/rubygem-addressable \ rubygem-gon-rails-gitlab>=6.5.0<6.6:www/rubygem-gon-rails-gitlab \ rubygem-request_store>=1.7.0<1.8:devel/rubygem-request_store \ rubygem-base32>=0.3.4<0.4.0:converters/rubygem-base32 \ rubygem-gitlab-license>=2.6<3:devel/rubygem-gitlab-license \ - rubygem-rack-attack>=6.7.0<6.8:www/rubygem-rack-attack \ + rubygem-rack-attack>=6.8.0<6.9:www/rubygem-rack-attack \ rubygem-sentry-ruby>=5.23.0<5.24:devel/rubygem-sentry-ruby \ rubygem-sentry-rails>=5.23.0<5.24:devel/rubygem-sentry-rails \ rubygem-sentry-sidekiq>=5.23.0<5.24:devel/rubygem-sentry-sidekiq \ rubygem-pg_query>=6.1.0<6.2:databases/rubygem-pg_query \ rubygem-premailer-rails-rails-gitlab>=1.12.0<1.13:mail/rubygem-premailer-rails-rails-gitlab \ - rubygem-gitlab-labkit>=0.42.0<0.43:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.42.2<0.43:devel/rubygem-gitlab-labkit \ rubygem-thrift>=0.22.0,1<0.23,1:devel/rubygem-thrift \ rubygem-rails-i18n-rails-gitlab>=7.0.9<8:devel/rubygem-rails-i18n-rails-gitlab \ rubygem-gettext_i18n_rails>=1.13.0<1.14:devel/rubygem-gettext_i18n_rails \ rubygem-gettext>=3.5.1<4:devel/rubygem-gettext \ rubygem-batch-loader>=2.0.5<2.1:devel/rubygem-batch-loader \ rubygem-tty-prompt>=0.23<1:devel/rubygem-tty-prompt \ rubygem-peek-rails-gitlab>=1.1<2.0:devel/rubygem-peek-rails-gitlab \ rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \ rubygem-webrick>=1.9.0<1.10:www/rubygem-webrick \ rubygem-prometheus-client-mmap>=1.2.10<1.3:devel/rubygem-prometheus-client-mmap \ rubygem-async-gitlab>=2.32.0<2.33:devel/rubygem-async-gitlab \ rubygem-io-event>=1.12.1<2:devel/rubygem-io-event \ rubygem-gitlab-security_report_schemas>=0.1.3.min15.0.0.max15.2.3<0.1.3.min15.0.0.max15.2.4:devel/rubygem-gitlab-security_report_schemas \ rubygem-vite_rails-gitlab>=3.0.17<3.1:devel/rubygem-vite_rails-gitlab \ rubygem-vite_ruby-gitlab>=3.9.0<3.10:devel/rubygem-vite_ruby-gitlab \ rubygem-opentelemetry-sdk>=1.5.0:devel/rubygem-opentelemetry-sdk \ rubygem-opentelemetry-exporter-otlp>=0.29.1: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.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.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 \ rubygem-opentelemetry-instrumentation-concurrent_ruby>=0.21.4:devel/rubygem-opentelemetry-instrumentation-concurrent_ruby \ rubygem-opentelemetry-instrumentation-ethon>=0.21.9:devel/rubygem-opentelemetry-instrumentation-ethon \ rubygem-opentelemetry-instrumentation-excon>=0.22.5:devel/rubygem-opentelemetry-instrumentation-excon \ rubygem-opentelemetry-instrumentation-faraday>=0.24.7:devel/rubygem-opentelemetry-instrumentation-faraday \ rubygem-opentelemetry-instrumentation-grape>=0.2.0:devel/rubygem-opentelemetry-instrumentation-grape \ rubygem-opentelemetry-instrumentation-graphql>=0.28.4:devel/rubygem-opentelemetry-instrumentation-graphql \ rubygem-opentelemetry-instrumentation-http_client>=0.22.8:devel/rubygem-opentelemetry-instrumentation-http_client \ rubygem-opentelemetry-instrumentation-net_http>=0.22.8:devel/rubygem-opentelemetry-instrumentation-net_http \ rubygem-opentelemetry-instrumentation-pg>=0.29.1:devel/rubygem-opentelemetry-instrumentation-pg \ rubygem-opentelemetry-instrumentation-rack>=0.24.6:devel/rubygem-opentelemetry-instrumentation-rack \ rubygem-opentelemetry-instrumentation-rails>=0.33.1: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 \ rubygem-warning>=1.5.0<1.6:devel/rubygem-warning \ rubygem-git>=1.19.1<2:devel/rubygem-git \ rubygem-gitlab-dangerfiles>=4.10.0<4.11:devel/rubygem-gitlab-dangerfiles \ rubygem-license_finder-gitlab>=7.2.1<8:devel/rubygem-license_finder-gitlab \ rubygem-rspec>=3.0<4:devel/rubygem-rspec \ rubygem-octokit-gitlab>=9.0<10:net/rubygem-octokit-gitlab \ rubygem-faraday-multipart>=1.1.1<2:www/rubygem-faraday-multipart \ rubygem-gitlab-mail_room>=0.0.27<0.1.0:mail/rubygem-gitlab-mail_room \ rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \ rubygem-html2text>=0.4.0:textproc/rubygem-html2text \ rubygem-stackprof>=0.2.27<0.3:devel/rubygem-stackprof \ rubygem-rbtrace>=0.5.2<1.0:devel/rubygem-rbtrace \ rubygem-memory_profiler>=1.1.0<2.0:devel/rubygem-memory_profiler \ rubygem-oauth2-gitlab>=2.0.10<3:net/rubygem-oauth2-gitlab \ rubygem-health_check-rails-gitlab>=3.0<4:devel/rubygem-health_check-rails-gitlab \ rubygem-vmstat>=2.3.1<2.4.0:sysutils/rubygem-vmstat \ rubygem-sys-filesystem14>=1.4.3<1.5:sysutils/rubygem-sys-filesystem14 \ rubygem-net-ntp>0:net/rubygem-net-ntp \ rubygem-ssh_data>=2.0<3:security/rubygem-ssh_data \ rubygem-spamcheck>=1.3.3<1.4:net/rubygem-spamcheck \ - rubygem-gitaly>=18.4.1:net/rubygem-gitaly \ + rubygem-gitaly>=18.6.0:net/rubygem-gitaly \ rubygem-gitlab-kas-grpc>=${GITLAB_KAS_GRPC_VERSION}:net/rubygem-gitlab-kas-grpc \ - rubygem-grpc-gitlab>=1.75.0<1.76:net/rubygem-grpc-gitlab \ + rubygem-grpc-gitlab>=1.76.0<1.77:net/rubygem-grpc-gitlab \ rubygem-google-protobuf3>=3.25.8<4:devel/rubygem-google-protobuf3 \ rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \ rubygem-flipper-gitlab>=0.28.0<0.29:devel/rubygem-flipper-gitlab \ rubygem-flipper-active_record-rails-gitlab>=0.28.0<0.29:databases/rubygem-flipper-active_record-rails-gitlab \ rubygem-flipper-active_support_cache_store-rails-gitlab>=0.28.0<0.29:devel/rubygem-flipper-active_support_cache_store-rails-gitlab \ rubygem-unleash>=3.2.2<3.3:devel/rubygem-unleash \ rubygem-gitlab-experiment>=1.0.0<1.1:devel/rubygem-gitlab-experiment \ rubygem-lograge-rails-gitlab>=0.11.2<1.0:www/rubygem-lograge-rails-gitlab \ rubygem-grape_logging-gitlab>=1.8.4<2.0:devel/rubygem-grape_logging-gitlab \ rubygem-gitlab-net-dns>=0.15.0<0.16:dns/rubygem-gitlab-net-dns \ rubygem-countries>=4.1.3<4.2.0:devel/rubygem-countries \ 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-mail-gitlab>=2.9.0<2.9.1:mail/rubygem-mail-gitlab \ rubygem-lockbox>=1.4.1<1.5:security/rubygem-lockbox \ rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \ rubygem-jsonb_accessor>=1.4<2:www/rubygem-jsonb_accessor \ rubygem-json-gitlab>=2.13.1<2.14:devel/rubygem-json-gitlab \ rubygem-json_schemer>=2.3.0<2.4:devel/rubygem-json_schemer \ rubygem-oj>=3.16.11<3.17:devel/rubygem-oj \ rubygem-oj-introspect>=0.8<1:devel/rubygem-oj-introspect \ rubygem-multi_json-gitlab>=1.17.0<1.18:devel/rubygem-multi_json-gitlab \ rubygem-yajl-ruby>=1.4.3<1.5:devel/rubygem-yajl-ruby \ rubygem-webauthn>=3.0<4:security/rubygem-webauthn \ rubygem-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \ rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1 \ rubygem-ed25519>=1.4.0<1.5:security/rubygem-ed25519 \ rubygem-cvss-suite>=3.3.0<3.4:security/rubygem-cvss-suite \ rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \ rubygem-devfile>=0.4.8<0.5:net/rubygem-devfile \ rubygem-hashdiff>=1.2.1<1.3:devel/rubygem-hashdiff \ rubygem-CFPropertyList-gitlab>=3.0.7<3.1:devel/rubygem-CFPropertyList-gitlab \ rubygem-app_store_connect>=0:net/rubygem-app_store_connect \ rubygem-telesignenterprise>=2.6<3:devel/rubygem-telesignenterprise \ rubygem-base6402>=0.2.0<0.3:converters/rubygem-base6402 \ rubygem-net-protocol>=0.2.2<0.3:net/rubygem-net-protocol \ rubygem-nkf>=0.2.0<0.3:net/rubygem-nkf \ rubygem-net-http-gitlab>=0.6.0<0.6.1:www/rubygem-net-http-gitlab \ - rubygem-uri-gitlab>=0.13.2<0.13.3:net/rubygem-uri-gitlab \ + rubygem-uri-gitlab>=0.13.3<0.13.4:net/rubygem-uri-gitlab \ rubygem-duo_api>=1.4<2:security/rubygem-duo_api \ rubygem-gitlab-sdk>=0.3.0<0.4:devel/rubygem-gitlab-sdk \ rubygem-paper_trail>=16.0<17:devel/rubygem-paper_trail \ rubygem-i18n_data>=0.13.1<1:devel/rubygem-i18n_data \ - rubygem-gitlab-cloud-connector>=1.33<2:security/rubygem-gitlab-cloud-connector \ + rubygem-gitlab-cloud-connector>=1.35<2:security/rubygem-gitlab-cloud-connector \ rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 \ rubygem-parallel>=1.27.0<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-grpc-tools>=1.69.0<1.70:net/rubygem-grpc-tools \ rubygem-opensearch-ruby-gitlab>=0:textproc/rubygem-opensearch-ruby-gitlab BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} RUN_DEPENDS= gmake>=4.4.1:devel/gmake \ ${MY_DEPENDS} FLAVORS= ce ee FLAVOR?= ${FLAVORS:[1]} USES= nodejs:env python:run ruby shebangfix USE_GITLAB= yes GL_ACCOUNT= gitlab-org .if ${FLAVOR:U} == ee GL_PROJECT= gitlab .else # ce GL_PROJECT= gitlab-foss .endif USE_RC_SUBR= gitlab SHEBANG_FILES= gems/bundler-checksum/test/project_with_checksum_lock/scripts/test \ scripts/aigw-tagging.sh \ scripts/build_assets_image \ scripts/build_qa_image \ scripts/build_gdk_image \ scripts/compile_assets \ scripts/db_tasks \ scripts/rails-update-bisect \ scripts/frontend/codemods/vuex-to-pinia/migrate.sh \ scripts/frontend/execute-on-staged-files.sh \ scripts/frontend/start_storybook.sh \ scripts/validate-monorepo-gem \ .lefthook/gitleaks.sh \ .lefthook/pre-push/merge_conflicts \ qa/gdk/entrypoint \ qa/bin/test \ vendor/gems/sidekiq/scripts/update-sidekiq.sh CONFLICTS_INSTALL= gitolite \ gitolite2 \ gogs \ gitea \ gitosis # We install the CE and EE flavor in the same directory WWWDIR= ${PREFIX}/www/gitlab NO_ARCH= yes NO_BUILD= yes USERS= git GROUPS= git OPTIONS_DEFINE= KERBEROS OPTIONS_DEFAULT= KERBEROS KERBEROS_BUILD_DEPENDS= rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5 KERBEROS_RUN_DEPENDS= rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5 KERBEROS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Gemfile-kerberos-off post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" -e "s|%%LOCALBASE%%|${LOCALBASE}|" -e "s|%%WWWDIR%%|${WWWDIR}|" ${WRKSRC}/config/gitlab.yml.example \ ${WRKSRC}/config/puma.rb.example \ ${WRKSRC}/lib/support/nginx/gitlab \ ${WRKSRC}/lib/support/nginx/gitlab-ssl # Remove symlink a create a file with content ${RM} ${WRKSRC}/GITLAB_WORKHORSE_VERSION ${ECHO} ${PORTVERSION} > ${WRKSRC}/GITLAB_WORKHORSE_VERSION # Correct link for pipeline secret scanning tool ${REINPLACE_CMD} -e 's|/analyzer run|/usr/local/bin/analyzer run|g' \ ${WRKSRC}/lib/gitlab/ci/templates/Jobs/*.yml do-install: ${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample # TODO: Vendored gems are installing binaries not into STAGEDIR, this needs to be fixed. # As intermediate solution, the binaries are not disabled by patches #(cd ${WRKSRC} && ${RM} Gemfile.lock && bundle config set path ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} && ${WRK_ENV} ${GEM_ENV} bundle install --local) (cd ${WRKSRC} && bundle config set --local bin .bin) # should skip development and test, but does not work #(cd ${WRKSRC} && bundle config set --local without development test) #(cd ${WRKSRC} && cat .bundle/config) (cd ${WRKSRC} && ${RM} Gemfile.lock && ${WRK_ENV} ${GEM_ENV} bundle install --local) (cd ${WRKSRC} && bundle binstubs --all --path .bin) ${RM} -R ${WRKSRC}/workhorse # remove vendored sidekiq gem as it breaks gitlab 17.1.0 for FreeBSD # See also: https://gitlab.com/gitlab-org/gitlab/-/issues/468435 #${RM} -R ${WRKSRC}/vendor/gems/sidekiq-7.1.6 ${FIND} ${WRKSRC} -name '*.orig' -delete ${FIND} ${WRKSRC} -name '*.bak' -delete ${FIND} ${WRKSRC} -name '*.gitkeep' -delete ${FIND} ${WRKSRC} -name '*.gitignore' -delete ${FIND} ${WRKSRC} -name "Gemfile.lock" -delete ${MV} ${WRKSRC}/config/initializers/relative_url.rb.sample ${WRKSRC}/config/initializers/relative_url.rb.example # get files for workdir with: find . -name "*.example" | sort ${MV} ${WRKSRC}/config/cable.yml.example ${WRKSRC}/config/cable.yml.sample ${MV} ${WRKSRC}/config/gitlab.yml.example ${WRKSRC}/config/gitlab.yml.sample ${MV} ${WRKSRC}/config/initializers/devise_password_length.rb.example ${WRKSRC}/config/initializers/devise_password_length.rb.sample ${MV} ${WRKSRC}/config/puma.rb.example ${WRKSRC}/config/puma.rb.sample ${MV} ${WRKSRC}/config/redis.yml.example ${WRKSRC}/config/redis.yml.sample ${MV} ${WRKSRC}/config/resque.yml.example ${WRKSRC}/config/resque.yml.sample ${MV} ${WRKSRC}/config/secrets.yml.example ${WRKSRC}/config/secrets.yml.sample ${MV} ${WRKSRC}/config/session_store.yml.example ${WRKSRC}/config/session_store.yml.sample ${MV} ${WRKSRC}/config/sidekiq.yml.example ${WRKSRC}/config/sidekiq.yml.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab ${WRKSRC}/lib/support/nginx/gitlab.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab-ssl ${WRKSRC}/lib/support/nginx/gitlab-ssl.sample ${MV} ${WRKSRC}/public/robots.txt ${WRKSRC}/public/robots.txt.sample ${MKDIR} ${STAGEDIR}${WWWDIR}/app/assets/builds ${MKDIR} ${STAGEDIR}${WWWDIR}/config/helpers/tailwind ${MKDIR} ${STAGEDIR}${WWWDIR}/public/assets ${MKDIR} ${STAGEDIR}${WWWDIR}/public/uploads ${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/cache ${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/sessions ${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/backups ${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/sockets/private/internal ${MKDIR} ${STAGEDIR}${WWWDIR}/shared/external-diffs ${MKDIR} ${STAGEDIR}${WWWDIR}/shared/tmp ${MKDIR} ${STAGEDIR}${WWWDIR}/shared/artifacts/tmp/work ${MKDIR} ${STAGEDIR}${WWWDIR}/vendor/assets/stylesheets ${MKDIR} ${STAGEDIR}${WWWDIR}/workhorse/changelogs/unreleased # Skip file having an executable bit (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} "-not ( -type f -perm -a=x )") # now copy all files having an execution bit and preserve to x bit (this fixes some issues we saw) (cd ${WRKSRC} && ${COPYTREE_BIN} . ${STAGEDIR}${WWWDIR} "-type f -perm -a=x") post-install: ${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \ ${SED} -E -e '/sample$$/ s#^#@sample #; \ /secrets.yml.sample$$/ s#^@sample #@sample(git,www,0600) #; \ /database.yml.sample$$/ s#^@sample #@sample(git,www,0600) #; \ s#${WWWDIR_REL}/bin#@(git,,544) ${WWWDIR_REL}/bin#; \ /db\/schema.rb$$|gitlab.po$$|gitlab.pot$$|gitlab.po.time_stamp$$|locale\/index.js$$/ s#^#@(git,,) #;' >> ${TMPPLIST} @${ECHO_CMD} "@owner git" >> ${TMPPLIST} @${ECHO_CMD} "@group www" >> ${TMPPLIST} @${ECHO_CMD} "@dir(git,git) ${WWWDIR_REL}/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/builds/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/images/auth_buttons/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/locale/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/pipeline_wizard/templates/" >> ${TMPPLIST} @${ECHO_CMD} "@dir(git,git,554) ${WWWDIR_REL}/bin" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/config" >> ${TMPPLIST} @${ECHO_CMD} "@dir(git,git,755) ${WWWDIR_REL}/config/helpers/tailwind" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/builds" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/lib/assets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/bg" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/de" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/eo" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/es" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/fil_PH" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/fr" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/id_ID" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/it" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ja" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ko" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/nl_NL" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/pl_PL" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/pt_BR" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ru" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/tr_TR" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/uk" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_CN" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_HK" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_TW" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/log" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/public" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/public/assets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/public/uploads" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/2_plan" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/4_verify" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/5_package" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/8_monitor" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/5_package" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/8_monitor" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/spec/support/gitlab-git-test.git/refs/heads" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/spec/support/gitlab-git-test.git/refs/tags" >> ${TMPPLIST} @${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/work" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/ci_secure_files" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/shared/packages" >> ${TMPPLIST} @${ECHO_CMD} "@group gitlab-pages" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/shared/pages" >> ${TMPPLIST} @${ECHO_CMD} "@group www" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/terraform_state" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/external-diffs" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/lfs-objects" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/registry" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/backups" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/cache" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/feature_flags" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/pids" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/puma" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/sidekiq" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/unicorn" >> ${TMPPLIST} #@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/run" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sessions" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets/private" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets/private/internal" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor/assets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor/assets/stylesheets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/workhorse/changelogs/unreleased" >> ${TMPPLIST} .if ${FLAVOR:U} == ee # Gitlab-ee version @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/ee/db/active_context/migrate" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/gems/gitlab-backup-cli/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/4_verify" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/5_package" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/8_monitor" >> ${TMPPLIST} .endif .if !defined(_GITLAB_MAKESUM_GUARD) makesum: ${MAKE} -D_GITLAB_MAKESUM_GUARD makesum DISTINFO_FILE=${.CURDIR}/distinfo FLAVOR=ce ${MAKE} -D_GITLAB_MAKESUM_GUARD makesum DISTINFO_FILE=${.CURDIR}/distinfo.ee FLAVOR=ee ${CAT} ${.CURDIR}/distinfo.ee >> ${.CURDIR}/distinfo ${RM} ${.CURDIR}/distinfo.ee (cd ../../devel/gitaly && ${MAKE} makesum) (cd ../../net/gitlab-agent && ${MAKE} makesum) (cd ../../www/gitlab-pages && ${MAKE} makesum) (cd ../../www/gitlab-workhorse && ${MAKE} makesum) (cd ../../net/rubygem-gitlab-kas-grpc && ${MAKE} makesum) (cd ../../www/rubygem-rails-gitlab && ${MAKE} makesum) (cd ../../www/rubygem-actioncable-gitlab && ${MAKE} makesum) (cd ../../mail/rubygem-actionmailbox-gitlab && ${MAKE} makesum) (cd ../../mail/rubygem-actionmailer-gitlab && ${MAKE} makesum) (cd ../../www/rubygem-actionpack-gitlab && ${MAKE} makesum) (cd ../../textproc/rubygem-actiontext-gitlab && ${MAKE} makesum) (cd ../../devel/rubygem-actionview-gitlab && ${MAKE} makesum) (cd ../../devel/rubygem-activejob-gitlab && ${MAKE} makesum) (cd ../../databases/rubygem-activemodel-gitlab && ${MAKE} makesum) (cd ../../databases/rubygem-activerecord-gitlab && ${MAKE} makesum) (cd ../../net/rubygem-activestorage-gitlab && ${MAKE} makesum) (cd ../../devel/rubygem-activesupport-gitlab && ${MAKE} makesum) (cd ../../www/rubygem-railties-gitlab && ${MAKE} makesum) (cd ../../databases/rubygem-globalid-rails-gitlab && ${MAKE} makesum) (cd ../../www/rubygem-responders-rails-gitlab && ${MAKE} makesum) .endif .include "${.CURDIR}/Makefile.common" .include diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 1c759292e321..646a93dc3e95 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,18 +1,19 @@ -GITLAB_VERSION= 18.5.2 -GITLAB_PORTREVISION= 1 +GITLAB_VERSION= 18.6.0 +GITLAB_PORTREVISION= 0 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml # and from https://gitlab.com/gitlab-org/git/-/tags GITLAB_GIT_VERSION= 2.50.0 -GITLAB_GIT_MASTER_VERSION= 23466173824c0a0f835c0d790c2f38156ae6284a # return something like x.yy GITLAB_GIT_VERSION_SHORT= ${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/} +GITLAB_GIT_MASTER_VERSION= 419c72cb8ada252b260efc38ff91fe201de7c8c3 +GITLAB_GIT_PREV_VERSION= 23466173824c0a0f835c0d790c2f38156ae6284a # Overwrite version for gitlab-kas-grpc -GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION} -#GITLAB_KAS_GRPC_VERSION= 18.2.1 +#GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION} +GITLAB_KAS_GRPC_VERSION= 18.5.2 # Rails version -RAILS_VERSION= 7.1.5.2 +RAILS_VERSION= 7.1.6 diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index 3032f717c2d3..341c68edb483 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1763010355 -SHA256 (gitlab-foss-v18.5.2.tar.bz2) = 9bfd39dc3f34dec8af17f55bda6aa6217600be016e8c498804f7c3568064ee8c -SIZE (gitlab-foss-v18.5.2.tar.bz2) = 122917718 -TIMESTAMP = 1763010399 -SHA256 (gitlab-v18.5.2-ee.tar.bz2) = 3b281a0ee6b170de3befa46db60ac8b0da7663ac3b55225576741c947242d85b -SIZE (gitlab-v18.5.2-ee.tar.bz2) = 139293550 +TIMESTAMP = 1763647030 +SHA256 (gitlab-foss-v18.6.0.tar.bz2) = 2a7891b1347e730d26dbe6acf3dd7197a289694e3aa0d1bc2af6e5c6b322cc55 +SIZE (gitlab-foss-v18.6.0.tar.bz2) = 126821552 +TIMESTAMP = 1763647031 +SHA256 (gitlab-v18.6.0-ee.tar.bz2) = d1d07dcd0f79b244cf3d7d1acb5bd1b29d1dcc4aae3d11f932df8a51f62135fb +SIZE (gitlab-v18.6.0-ee.tar.bz2) = 143690179 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index f995a6f85547..cfe5cabc50e5 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,197 +1,197 @@ ---- Gemfile.orig 2025-11-11 08:08:24 UTC +--- Gemfile.orig 2025-11-19 16:58:17 UTC +++ Gemfile @@ -169,7 +169,7 @@ gem 'graphql', '2.5.11', feature_category: :api # GraphQL API gem 'graphql', '2.5.11', feature_category: :api -gem 'graphql-docs', '~> 5.2.0', group: [:development, :test], feature_category: :api +#gem 'graphql-docs', '~> 5.2.0', group: [:development, :test], feature_category: :api gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api # Cells @@ -299,7 +299,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared # Background jobs -gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq', feature_category: :scalability +gem 'sidekiq', '>= 7.3.9', require: 'sidekiq', feature_category: :scalability gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -477,141 +477,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared +@@ -476,141 +476,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared gem 'warning', '~> 1.5.0', feature_category: :shared -group :development do - gem 'lefthook', '~> 1.13.0', require: false, feature_category: :tooling - gem 'rubocop', feature_category: :tooling, require: false - gem 'debug', '~> 1.11.0', feature_category: :shared - - gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared - gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared - - gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared - gem 'lookbook', '~> 2.3', feature_category: :shared - - # Better errors handler - gem 'better_errors', '~> 2.10.1', feature_category: :shared - - gem 'sprite-factory', '~> 1.7', feature_category: :shared - - gem 'listen', '~> 3.7', feature_category: :shared - - gem 'ruby-lsp', "~> 0.26.0", require: false, feature_category: :tooling - - gem 'ruby-lsp-rails', "~> 0.4.8", feature_category: :tooling - - gem 'ruby-lsp-rspec', "~> 0.1.27", require: false, feature_category: :tooling - - gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling - - # Used by - # * `lib/tasks/gitlab/security/update_banned_ssh_keys.rake` - # * `lib/tasks/gitlab/db/migration_squash.rake` - gem 'git', '~> 1.8', feature_category: :shared -end - -group :development, :test do - gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared - gem 'bullet', '~> 8.0.0', feature_category: :shared -- gem 'parser', '= 3.3.9.0', feature_category: :shared +- gem 'parser', '= 3.3.10.0', feature_category: :shared - gem 'pry-byebug', feature_category: :shared - gem 'pry-rails', '~> 0.3.9', feature_category: :shared - gem 'pry-shell', '~> 0.6.4', feature_category: :shared - - gem 'amazing_print', require: false, feature_category: :shared - - gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database - gem 'rspec-rails', '~> 7.1.0', feature_category: :shared - gem 'factory_bot_rails', '~> 6.5.0', feature_category: :tooling - - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.11.0', feature_category: :shared - - gem 'spring', '~> 4.3.0', feature_category: :shared - gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared - - gem 'gitlab-styles', '~> 13.1.0', feature_category: :tooling, require: false - gem 'haml_lint', '~> 0.58', feature_category: :tooling, require: false - - # Benchmarking & profiling - gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared - gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared - - gem 'knapsack', '~> 4.0.0', feature_category: :tooling - gem 'gitlab-crystalball', '~> 1.1.0', require: false, feature_category: :tooling - gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling - - gem 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared - - gem 'png_quantizator', '~> 0.2.1', require: false, feature_category: :shared - - gem 'parallel', '~> 1.19', require: false, feature_category: :shared - - gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup', feature_category: :shared - - gem 'pact', '~> 1.64', feature_category: :shared - - gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling - - gem 'yard', '~> 0.9', require: false, feature_category: :tooling -end - group :development, :test, :danger do gem 'gitlab-dangerfiles', '~> 4.10.0', require: false, feature_category: :tooling end -group :development, :test, :coverage do - gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling - gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling - gem 'simplecov-cobertura', '~> 3.1.0', require: false, feature_category: :tooling - gem 'undercover', '~> 0.7.0', require: false, feature_category: :tooling -end - # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do gem 'license_finder', '~> 7.0', require: false, feature_category: :shared end -# Gems required in various pipelines -group :development, :test, :monorepo do - gem 'gitlab-rspec', path: 'gems/gitlab-rspec', feature_category: :shared - gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling -end - -group :test do - gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling - gem 'rspec_profiling', '~> 0.0.9', feature_category: :tooling - gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling - gem 'rspec-parameterized', '~> 1.0', '>= 1.0.2', require: false, feature_category: :tooling - gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling - - gem 'capybara', '~> 3.40', feature_category: :test_platform - gem 'capybara-screenshot', '~> 1.0.26', feature_category: :test_platform - gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1', feature_category: :test_platform - - gem 'graphlyte', '~> 1.0.0', feature_category: :shared - - # Upload CI metrics to a GCP BigQuery instance - # - # We only use this gem in CI. - gem 'google-cloud-bigquery', '~> 1.0', feature_category: :tooling - - gem 'shoulda-matchers', '~> 6.4.0', require: false, feature_category: :shared - gem 'email_spec', '~> 2.3.0', feature_category: :shared - gem 'webmock', '~> 3.25.0', feature_category: :shared - gem 'rails-controller-testing', feature_category: :shared - gem 'concurrent-ruby', '~> 1.1', feature_category: :shared - gem 'test-prof', '~> 1.4.0', feature_category: :tooling - gem 'rspec_junit_formatter', feature_category: :shared - gem 'guard-rspec', feature_category: :shared - gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling - gem 'state_machines-rspec', '~> 0.6', feature_category: :shared - - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false, feature_category: :shared - -- gem 'gitlab_quality-test_tooling', '~> 2.20.0', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 2.26.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 -@@ -645,7 +519,7 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside - gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat - - # Gitaly GRPC protocol definitions --gem 'gitaly', '~> 18.4.0.pre.rc1', feature_category: :gitaly -+gem 'gitaly', '~> 18.4', feature_category: :gitaly +@@ -647,7 +521,7 @@ gem 'gitaly', '~> 18.6.0.pre.rc1', feature_category: : + gem 'gitaly', '~> 18.6.0.pre.rc1', feature_category: :gitaly # KAS GRPC protocol definitions - gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management -@@ -671,7 +545,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : +-gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management ++gem 'gitlab-kas-grpc', '~> 18.5.2', feature_category: :deployment_management + + gem 'grpc', '~> 1.76.0', feature_category: :shared + +@@ -670,7 +544,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared # Countries list -gem 'countries', '~> 4.0.0', feature_category: :shared +gem 'countries', '~> 4.0', feature_category: :shared gem 'retriable', '~> 3.1.2', feature_category: :shared -@@ -756,10 +630,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -755,10 +629,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access +gem 'parser' +gem 'net-smtp' +gem 'net-pop' +gem 'psych', '~> 3.1' + gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation gem 'paper_trail', '~> 16.0', feature_category: :shared -gem "i18n_data", "~> 0.13.1", feature_category: :system_access +gem "i18n_data", "~> 0.13", feature_category: :system_access - gem "gitlab-cloud-connector", "~> 1.26", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning + gem "gitlab-cloud-connector", "~> 1.35", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index d4e98d985eb3..fae18cb60868 100644 --- a/www/gitlab/files/patch-config_gitlab.yml.example +++ b/www/gitlab/files/patch-config_gitlab.yml.example @@ -1,119 +1,119 @@ ---- config/gitlab.yml.example.orig 2025-10-21 19:24:47 UTC +--- config/gitlab.yml.example.orig 2025-11-19 16:58:17 UTC +++ config/gitlab.yml.example -@@ -507,7 +507,7 @@ production: &base +@@ -508,7 +508,7 @@ production: &base ## GitLab Pages pages: enabled: false - access_control: false + access_control: true # The location where pages are stored (default: shared/pages). # path: shared/pages -@@ -1252,13 +1252,13 @@ production: &base +@@ -1253,13 +1253,13 @@ production: &base repositories: storages: # You must have at least a `default` storage path. default: - gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). + gitaly_address: unix:%%WWWDIR%%/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings backup: path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) - # gitaly_backup_path: /home/git/gitaly/_build/bin/gitaly-backup # Path of the gitaly-backup binary (default: searches $PATH) + gitaly_backup_path: %%LOCALBASE%%/share/gitaly/bin/gitaly-backup # Path of the gitaly-backup binary (default: searches $PATH) # archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600) # keep_time: 604800 # default: 0 (forever) (in seconds) # pg_schema: public # default: nil, it means that all schemas will be backed up -@@ -1293,12 +1293,12 @@ production: &base +@@ -1294,12 +1294,12 @@ production: &base ## GitLab Shell settings gitlab_shell: - path: /home/git/gitlab-shell/ - authorized_keys_file: /home/git/.ssh/authorized_keys + path: %%LOCALBASE%%/share/gitlab-shell/ + authorized_keys_file: %%LOCALBASE%%/git/.ssh/authorized_keys # File that contains the secret key for verifying access for gitlab-shell. # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app). - # secret_file: /home/git/gitlab/.gitlab_shell_secret + # secret_file: %%WWWDIR%%/.gitlab_shell_secret # Git over HTTP upload_pack: true -@@ -1313,7 +1313,7 @@ production: &base +@@ -1314,7 +1314,7 @@ production: &base workhorse: # File that contains the secret key for verifying access for gitlab-workhorse. # Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app). - # secret_file: /home/git/gitlab/.gitlab_workhorse_secret + # secret_file: %%WWWDIR%%/.gitlab_workhorse_secret database_traffic_capture: config: @@ -1340,7 +1340,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). - # secret_file: /home/git/gitlab/.gitlab_kas_secret + # secret_file: %%WWWDIR%%/.gitlab_kas_secret # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com @@ -1367,13 +1367,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: - indexer_path: /home/git/gitlab-elasticsearch-indexer/ + indexer_path: %%LOCALBASE%%/bin/ ## Git settings # CAUTION! # Use the default values unless you really know what you are doing git: - bin_path: /usr/bin/git + bin_path: %%LOCALBASE%%/bin/git ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running @@ -1394,18 +1394,18 @@ production: &base # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq. sidekiq_exporter: - # enabled: true - # log_enabled: false - # address: localhost - # port: 8082 + enabled: true + log_enabled: false + address: localhost + port: 8082 # tls_enabled: false # tls_cert_path: /path/to/cert.pem # tls_key_path: /path/to/key.pem sidekiq_health_checks: - # enabled: true - # address: localhost - # port: 8092 + enabled: true + address: localhost + port: 8092 # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. web_exporter: @@ -1632,13 +1632,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: - client_path: tmp/tests/gitaly/_build/bin + client_path: %%LOCALBASE%%/share/gitaly/bin token: secret workhorse: secret_file: tmp/gitlab_workhorse_test_secret backup: path: tmp/tests/backups - gitaly_backup_path: tmp/tests/gitaly/_build/bin/gitaly-backup + gitaly_backup_path: %%LOCALBASE%%/share/gitaly/bin/gitaly-backup gitlab_shell: path: tmp/tests/gitlab-shell/ authorized_keys_file: tmp/tests/authorized_keys diff --git a/www/gitlab/files/patch-config_puma.rb.example b/www/gitlab/files/patch-config_puma.rb.example index b3218c5ffa71..aa031d5fd82c 100644 --- a/www/gitlab/files/patch-config_puma.rb.example +++ b/www/gitlab/files/patch-config_puma.rb.example @@ -1,58 +1,58 @@ ---- config/puma.rb.example.orig 2025-01-22 04:13:11 UTC +--- config/puma.rb.example.orig 2025-11-19 16:58:17 UTC +++ config/puma.rb.example @@ -1,15 +1,20 @@ # frozen_string_literal: true +# Required as rubygem-concurrent-ruby version 1.3.5 has remove logger, but is required by active_support +# The fix has only applied to rails 7.1 and 7.2 +# https://github.com/rails/rails/pull/49372 +require "logger" + # Load "path" as a rackup file. # # The default is "config.ru". # rackup 'config.ru' -pidfile '/home/git/gitlab/tmp/pids/puma.pid' -state_path '/home/git/gitlab/tmp/pids/puma.state' +pidfile '%%WWWDIR%%/tmp/pids/puma.pid' +state_path '%%WWWDIR%%/tmp/pids/puma.state' -stdout_redirect '/home/git/gitlab/log/puma.stdout.log', - '/home/git/gitlab/log/puma.stderr.log', +stdout_redirect '%%WWWDIR%%/log/puma.stdout.log', + '%%WWWDIR%%/log/puma.stderr.log', true # Configure "min" to be the minimum number of threads to use to answer @@ -31,11 +36,11 @@ queue_requests false # Bind the server to "url". "tcp://", "unix://" and "ssl://" are the only # accepted protocols. -bind 'unix:///home/git/gitlab/tmp/sockets/gitlab.socket' +bind 'unix://%%WWWDIR%%/tmp/sockets/gitlab.socket' workers 3 -require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events" +require_relative "%%WWWDIR%%/lib/gitlab/cluster/lifecycle_events" - on_restart do - # Signal application hooks that we're about to restart -@@ -74,14 +79,14 @@ wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LES + if Gem::Version.new(Puma::Const::PUMA_VERSION) < Gem::Version.new('7.0') + Gitlab::Cluster::LifecycleEvents.set_puma_options @config.options +@@ -94,14 +99,14 @@ wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LES wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f # Use json formatter -require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter" +require_relative "%%WWWDIR%%/lib/gitlab/puma_logging/json_formatter" json_formatter = Gitlab::PumaLogging::JSONFormatter.new log_formatter do |str| json_formatter.call(str) end -require_relative "/home/git/gitlab/lib/gitlab/puma/error_handler" +require_relative "%%WWWDIR%%/lib/gitlab/puma/error_handler" error_handler = Gitlab::Puma::ErrorHandler.new(ENV['RAILS_ENV'] == 'production') diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message index c11311173fd9..44d60ee23e86 100644 --- a/www/gitlab/pkg-message +++ b/www/gitlab/pkg-message @@ -1,33 +1,33 @@ [ { message: <=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-actionview-gitlab \ rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \ + rubygem-cgi>=0:www/rubygem-cgi \ rubygem-nokogiri>=1.8.5:textproc/rubygem-nokogiri \ rubygem-racc>=0:devel/rubygem-racc \ rubygem-rack22>=2.2.4,3:www/rubygem-rack22 \ rubygem-rack-session10>=1.0.1:www/rubygem-rack-session10 \ rubygem-rack-test>=0.6.3:www/rubygem-rack-test \ rubygem-rails-dom-testing-rails-gitlab>=2.2<3:textproc/rubygem-rails-dom-testing-rails-gitlab \ rubygem-rails-html-sanitizer>=1.6<2:textproc/rubygem-rails-html-sanitizer USES= gem NO_ARCH= yes PORTSCOUT= limit:^7\.1\. .include "${.CURDIR}/../../www/gitlab/Makefile.common" .include diff --git a/www/rubygem-actionpack-gitlab/distinfo b/www/rubygem-actionpack-gitlab/distinfo index 7cf6fd23dc4f..4be4b44bc606 100644 --- a/www/rubygem-actionpack-gitlab/distinfo +++ b/www/rubygem-actionpack-gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755146398 -SHA256 (rubygem/actionpack-7.1.5.2.gem) = a7bfedc8aaeb260778a358870120321a3146954497be465d534722c8c0d644fd -SIZE (rubygem/actionpack-7.1.5.2.gem) = 246272 +TIMESTAMP = 1763614435 +SHA256 (rubygem/actionpack-7.1.6.gem) = 3fa42da36fdcfc3690a711ed35ac5d527b87d3d676f8d111238aa399151203eb +SIZE (rubygem/actionpack-7.1.6.gem) = 246272 diff --git a/www/rubygem-rails-gitlab/Makefile b/www/rubygem-rails-gitlab/Makefile index e065bb9c853f..ba7625fb5e63 100644 --- a/www/rubygem-rails-gitlab/Makefile +++ b/www/rubygem-rails-gitlab/Makefile @@ -1,39 +1,39 @@ PORTNAME= rails PORTVERSION= ${RAILS_VERSION} CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab MAINTAINER= mfechner@FreeBSD.org COMMENT= Full-stack web application framework WWW= https://rubyonrails.org/ \ https://github.com/rails/rails LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-actioncable-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actioncable-gitlab \ rubygem-actionmailbox-gitlab>=${PORTVERSION}<${PORTVERSION}_99:mail/rubygem-actionmailbox-gitlab \ rubygem-actionmailer-gitlab>=${PORTVERSION}<${PORTVERSION}_99:mail/rubygem-actionmailer-gitlab \ rubygem-actionpack-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actionpack-gitlab \ rubygem-actiontext-gitlab>=${PORTVERSION}<${PORTVERSION}_99:textproc/rubygem-actiontext-gitlab \ rubygem-actionview-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-actionview-gitlab \ rubygem-activejob-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activejob-gitlab \ rubygem-activemodel-gitlab>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-activemodel-gitlab \ rubygem-activerecord-gitlab>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-activerecord-gitlab \ rubygem-activestorage-gitlab>=${PORTVERSION}<${PORTVERSION}_99:net/rubygem-activestorage-gitlab \ rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \ rubygem-bundler>=1.15.0:sysutils/rubygem-bundler \ rubygem-railties-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-railties-gitlab USES= cpe gem -NO_ARCH= yes - CPE_VENDOR= rubyonrails CPE_PRODUCT= ruby_on_rails +NO_ARCH= yes + PORTSCOUT= limit:^7\.1\. .include "${.CURDIR}/../../www/gitlab/Makefile.common" .include diff --git a/www/rubygem-rails-gitlab/distinfo b/www/rubygem-rails-gitlab/distinfo index 78a3bec1f6a1..f4dc67e0d529 100644 --- a/www/rubygem-rails-gitlab/distinfo +++ b/www/rubygem-rails-gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755146397 -SHA256 (rubygem/rails-7.1.5.2.gem) = a292087202c5babf4f4c39a8c37afda732117c481c619986ae1559446e927546 -SIZE (rubygem/rails-7.1.5.2.gem) = 7168 +TIMESTAMP = 1763614434 +SHA256 (rubygem/rails-7.1.6.gem) = 9a0a335e510de3daad7542cd791af3d8ff710c644e1da17ed12e96d2f28a7470 +SIZE (rubygem/rails-7.1.6.gem) = 7168 diff --git a/www/rubygem-railties-gitlab/Makefile b/www/rubygem-railties-gitlab/Makefile index 0ad939166601..91c4aa023e91 100644 --- a/www/rubygem-railties-gitlab/Makefile +++ b/www/rubygem-railties-gitlab/Makefile @@ -1,36 +1,38 @@ PORTNAME= railties PORTVERSION= ${RAILS_VERSION} CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab MAINTAINER= mfechner@FreeBSD.org COMMENT= Rails internals: application bootup, plugins, generators, and rake tasks WWW= https://github.com/rails/rails/tree/master/railties \ https://rubyonrails.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-actionpack-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actionpack-gitlab \ rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \ + rubygem-cgi>=0:www/rubygem-cgi \ rubygem-irb-gitlab>=0:devel/rubygem-irb-gitlab \ rubygem-rackup10>=1.0.0:www/rubygem-rackup10 \ rubygem-rake>=12.2:devel/rubygem-rake \ rubygem-thor>=1.2.2<2:devel/rubygem-thor \ + rubygem-tsort>=0.2:devel/rubygem-tsort \ rubygem-zeitwerk>=2.6<3:devel/rubygem-zeitwerk USES= gem shebangfix -NO_ARCH= yes - -PLIST_FILES= bin/rails +SHEBANG_FILES= lib/rails/generators/rails/app/templates/docker-entrypoint.tt CONFLICTS_INSTALL= rubygem-railties[0-9] rubygem-railties[0-9][0-9] +NO_ARCH= yes + PORTSCOUT= limit:^7\.1\. -SHEBANG_FILES= lib/rails/generators/rails/app/templates/docker-entrypoint.tt +PLIST_FILES= bin/rails .include "${.CURDIR}/../../www/gitlab/Makefile.common" .include diff --git a/www/rubygem-railties-gitlab/distinfo b/www/rubygem-railties-gitlab/distinfo index 69374c014da2..b0007c1be21f 100644 --- a/www/rubygem-railties-gitlab/distinfo +++ b/www/rubygem-railties-gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755146400 -SHA256 (rubygem/railties-7.1.5.2.gem) = af0ac89f0bfbb957c9fd12cc5a5561248b95b8df938758bfb553d6e916a9d621 -SIZE (rubygem/railties-7.1.5.2.gem) = 182272 +TIMESTAMP = 1763614438 +SHA256 (rubygem/railties-7.1.6.gem) = 2a10e97f2eaca66d11f0fef4b1f4d826e6ee28d4cf01ff16624420dd45e7de1c +SIZE (rubygem/railties-7.1.6.gem) = 182272