diff options
34 files changed, 146 insertions, 135 deletions
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 @@ -26,7 +26,8 @@ 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 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 @@ -14,16 +14,17 @@ 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" 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 @@ -17,11 +17,11 @@ RUN_DEPENDS= rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:deve 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" 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 @@ -27,10 +27,10 @@ RUN_DEPENDS= rubygem-base64>=0:converters/rubygem-base64 \ USES= cpe gem -NO_ARCH= yes - CPE_VENDOR= activesupport_project +NO_ARCH= yes + PORTSCOUT= limit:^7\.1\. .include "${.CURDIR}/../../www/gitlab/Makefile.common" 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 @@ -17,6 +17,9 @@ RUN_DEPENDS= rubygem-actionpack-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rub 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 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,5 +1,5 @@ PORTNAME= gitaly -PORTVERSION= 18.5.1 +PORTVERSION= 18.6.0 CATEGORIES= net rubygems MASTER_SITES= RG 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 @@ -29,17 +29,17 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # 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 \ @@ -49,8 +49,8 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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 \ @@ -76,7 +76,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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 \ @@ -130,7 +130,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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 \ @@ -184,10 +184,10 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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 \ @@ -208,19 +208,19 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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 \ @@ -279,9 +279,9 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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 \ @@ -295,7 +295,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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 \ @@ -320,12 +320,12 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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 \ 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,4 +1,4 @@ ---- 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 @@ -18,7 +18,7 @@ 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 @@ -57,7 +57,7 @@ -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 @@ -154,22 +154,22 @@ - # 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 @@ -178,7 +178,7 @@ 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 @@ -194,4 +194,4 @@ -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,6 +1,6 @@ ---- 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 @@ -9,7 +9,7 @@ # 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: @@ -25,7 +25,7 @@ # 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: @@ -41,7 +41,7 @@ # 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). 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,4 +1,4 @@ ---- 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 @@ -37,9 +37,9 @@ -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 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 @@ -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/18.5-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.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 18.4.x to 18.5.x, please follow the instructions in the guide at: +switched from 18.5.x to 18.6.x, please follow the instructions in the guide at: -https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.4-18.5-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.5-18.6-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at: diff --git a/www/rubygem-actioncable-gitlab/distinfo b/www/rubygem-actioncable-gitlab/distinfo index a23a9056f1ad..a130cf3bfbc3 100644 --- a/www/rubygem-actioncable-gitlab/distinfo +++ b/www/rubygem-actioncable-gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755146397 -SHA256 (rubygem/actioncable-7.1.5.2.gem) = 79dd467dab2351110fe1fc69e25cee0110bf11f0b9f30165b945b574eebd5e37 -SIZE (rubygem/actioncable-7.1.5.2.gem) = 48128 +TIMESTAMP = 1763614434 +SHA256 (rubygem/actioncable-7.1.6.gem) = ad428d5f0a810452160820ae3cf3d9d68d8f59e7c76de3bd1f1de2a5ad03c3da +SIZE (rubygem/actioncable-7.1.6.gem) = 48128 diff --git a/www/rubygem-actionpack-gitlab/Makefile b/www/rubygem-actionpack-gitlab/Makefile index c9a5845999ee..fb6d98d8d9f2 100644 --- a/www/rubygem-actionpack-gitlab/Makefile +++ b/www/rubygem-actionpack-gitlab/Makefile @@ -14,6 +14,7 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-actionview-gitlab>=${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 \ 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 @@ -28,11 +28,11 @@ RUN_DEPENDS= rubygem-actioncable-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/ru 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" 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 @@ -14,23 +14,25 @@ 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 <bsd.port.mk> 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 |