index | | raw e-mail
URL: https://cgit.FreeBSD.org/ports/commit/?id=87819e541e396c752b1a26b1690708e427fa3932 commit 87819e541e396c752b1a26b1690708e427fa3932 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2026-04-19 07:32:38 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2026-04-20 08:17:37 +0000 www/gitlab: major upgrade to 18.11.0 Changes: https://docs.gitlab.com/releases/18/gitlab-18-11-released/ --- devel/gitaly/Makefile | 2 +- devel/gitaly/distinfo | 24 +++++------ devel/gitlab-shell/Makefile | 3 +- devel/gitlab-shell/distinfo | 10 ++--- net/gitlab-agent/distinfo | 10 ++--- net/rubygem-gitaly/Makefile | 2 +- net/rubygem-gitaly/distinfo | 6 +-- www/gitlab-pages/distinfo | 10 ++--- www/gitlab-workhorse/distinfo | 10 ++--- www/gitlab/Makefile | 52 ++++++++++++------------ www/gitlab/Makefile.common | 6 +-- www/gitlab/distinfo | 12 +++--- www/gitlab/files/patch-Gemfile | 23 +++++------ www/gitlab/files/patch-config_gitlab.yml.example | 20 ++++----- www/gitlab/files/patch-package.json | 12 ------ www/gitlab/pkg-message | 4 +- 16 files changed, 96 insertions(+), 110 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 3a65be57df80..3e3f6a00f5d9 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -5,7 +5,7 @@ PORTREVISION= ${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common CATEGORIES= devel PATCH_SITES= https://gitlab.com/gitlab-org/gitaly/-/merge_requests/ -PATCHFILES+= 8309.patch:-p1 # https://gitlab.com/gitlab-org/gitaly/-/merge_requests/8309, Fix build on i386 system +#PATCHFILES+= 8309.patch:-p1 # https://gitlab.com/gitlab-org/gitaly/-/merge_requests/8309, Fix build on i386 system MAINTAINER= mfechner@FreeBSD.org COMMENT= Smart reverse proxy for GitLab WWW= https://gitlab.com/gitlab-org/gitaly diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index 3e9faab576d9..eec5c10c00dc 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,13 +1,11 @@ -TIMESTAMP = 1775709661 -SHA256 (go/devel_gitaly/gitaly-v18.10.3/go.mod) = dab7ea26b0ae73c109e904d853d3429a1afa94421a8770ea01fb83128e33f61c -SIZE (go/devel_gitaly/gitaly-v18.10.3/go.mod) = 13978 -SHA256 (go/devel_gitaly/gitaly-v18.10.3/gitaly-v18.10.3.tar.bz2) = ac68f35699dc6cdef15e9fdf76fcfbee3a9a7a3b9232d68040152f64ce8e64d9 -SIZE (go/devel_gitaly/gitaly-v18.10.3/gitaly-v18.10.3.tar.bz2) = 4700914 -SHA256 (go/devel_gitaly/gitaly-v18.10.3/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4 -SIZE (go/devel_gitaly/gitaly-v18.10.3/git-v2.50.0.tar.bz2) = 9249878 -SHA256 (go/devel_gitaly/gitaly-v18.10.3/gitlab-org-git-e417bf2996fbd77acabbf354ed9b5adedacf91c9_GL0.tar.gz) = afbeed5c85fae32fa2eb68b6d53c5f3aff6ac2fb89c8420d601f0755695e4c3e -SIZE (go/devel_gitaly/gitaly-v18.10.3/gitlab-org-git-e417bf2996fbd77acabbf354ed9b5adedacf91c9_GL0.tar.gz) = 11990547 -SHA256 (go/devel_gitaly/gitaly-v18.10.3/gitlab-org-git-c61120cf654250ac63bdcb5d5ee0bbb9caeae9cd_GL0.tar.gz) = a6eb9a6d8bf6ac845972279db187907e2d576d19facb47d9eaa18f92c5fd8335 -SIZE (go/devel_gitaly/gitaly-v18.10.3/gitlab-org-git-c61120cf654250ac63bdcb5d5ee0bbb9caeae9cd_GL0.tar.gz) = 11975656 -SHA256 (go/devel_gitaly/gitaly-v18.10.3/8309.patch) = 90377ee1d14ec92e69dd97ad6d7c1d2bcce1c05fdf6095f04d51780b22cd65c7 -SIZE (go/devel_gitaly/gitaly-v18.10.3/8309.patch) = 1285 +TIMESTAMP = 1776342594 +SHA256 (go/devel_gitaly/gitaly-v18.11.0/go.mod) = f9f452dae231ff3c8a5f01dd9dab293a271c6d7c2e2e406ab8e2e5ec758c450d +SIZE (go/devel_gitaly/gitaly-v18.11.0/go.mod) = 13823 +SHA256 (go/devel_gitaly/gitaly-v18.11.0/gitaly-v18.11.0.tar.bz2) = 5f6bb2f210039b09eadd55efb6843ef39981b22570da14e478e8298879e82c49 +SIZE (go/devel_gitaly/gitaly-v18.11.0/gitaly-v18.11.0.tar.bz2) = 4727601 +SHA256 (go/devel_gitaly/gitaly-v18.11.0/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4 +SIZE (go/devel_gitaly/gitaly-v18.11.0/git-v2.50.0.tar.bz2) = 9249878 +SHA256 (go/devel_gitaly/gitaly-v18.11.0/gitlab-org-git-b15384c06f77bc2d34d0d3623a8a58218313a561_GL0.tar.gz) = edad17ac5f10a37873aa5da1f7a556d7b81fa6b71ba623dbfed2b0c868ad8a92 +SIZE (go/devel_gitaly/gitaly-v18.11.0/gitlab-org-git-b15384c06f77bc2d34d0d3623a8a58218313a561_GL0.tar.gz) = 12072239 +SHA256 (go/devel_gitaly/gitaly-v18.11.0/gitlab-org-git-e417bf2996fbd77acabbf354ed9b5adedacf91c9_GL0.tar.gz) = afbeed5c85fae32fa2eb68b6d53c5f3aff6ac2fb89c8420d601f0755695e4c3e +SIZE (go/devel_gitaly/gitaly-v18.11.0/gitlab-org-git-e417bf2996fbd77acabbf354ed9b5adedacf91c9_GL0.tar.gz) = 11990547 diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile index d3d00834e5bb..daaf39c9eedf 100644 --- a/devel/gitlab-shell/Makefile +++ b/devel/gitlab-shell/Makefile @@ -1,6 +1,5 @@ PORTNAME= gitlab-shell -PORTVERSION= 14.47.0 -PORTREVISION= 1 +PORTVERSION= 14.49.0 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo index 56f609cc44e4..9d38c393c55e 100644 --- a/devel/gitlab-shell/distinfo +++ b/devel/gitlab-shell/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1773988591 -SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.47.0/go.mod) = 5336966b1bae3f54113ff2600013e6548d7c13a500b3561d4a2278100b8b7e1c -SIZE (go/devel_gitlab-shell/gitlab-shell-v14.47.0/go.mod) = 6762 -SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.47.0/gitlab-shell-v14.47.0.tar.bz2) = 5303b81ad8c784018f1d13d3078c420a08f86c09ff3b7b5a2405c5a94956b145 -SIZE (go/devel_gitlab-shell/gitlab-shell-v14.47.0/gitlab-shell-v14.47.0.tar.bz2) = 176262 +TIMESTAMP = 1776334534 +SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.49.0/go.mod) = 32e326e288a18ce33ad267c88e7d72a8cd7c3007ae85223776c1a0ff6e58bc92 +SIZE (go/devel_gitlab-shell/gitlab-shell-v14.49.0/go.mod) = 6380 +SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.49.0/gitlab-shell-v14.49.0.tar.bz2) = 79b034c0cb70105412602cf103bf96f534a9697495a00fefea188a64ffc49633 +SIZE (go/devel_gitlab-shell/gitlab-shell-v14.49.0/gitlab-shell-v14.49.0.tar.bz2) = 184292 diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index 4dfd243d7268..94861d9df8c2 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1775709662 -SHA256 (go/net_gitlab-agent/gitlab-agent-v18.10.3/v18.10.3.mod) = 0e8f6064fdfeea47a7e7f80177e6e243bc7d8782e8375f373c30f8fa893d9097 -SIZE (go/net_gitlab-agent/gitlab-agent-v18.10.3/v18.10.3.mod) = 9113 -SHA256 (go/net_gitlab-agent/gitlab-agent-v18.10.3/v18.10.3.zip) = 8fa5dc102f499bc1eb81c32de73c27eba6fcbd3b006873474367b13106de7366 -SIZE (go/net_gitlab-agent/gitlab-agent-v18.10.3/v18.10.3.zip) = 1905884 +TIMESTAMP = 1776334416 +SHA256 (go/net_gitlab-agent/gitlab-agent-v18.11.0/v18.11.0.mod) = 4852ac02fc2899bdf5b476b84f907b9bd7e0a6b43c872143037d0864b5302bb6 +SIZE (go/net_gitlab-agent/gitlab-agent-v18.11.0/v18.11.0.mod) = 9596 +SHA256 (go/net_gitlab-agent/gitlab-agent-v18.11.0/v18.11.0.zip) = e9c200cd746fdcc064fa95342c87a0708703430421d07c4ba3f5f200dc81f8a2 +SIZE (go/net_gitlab-agent/gitlab-agent-v18.11.0/v18.11.0.zip) = 2068895 diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile index 0c3efa303c1e..7a395879ea89 100644 --- a/net/rubygem-gitaly/Makefile +++ b/net/rubygem-gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -PORTVERSION= 18.8.4 +PORTVERSION= 18.10.0 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-gitaly/distinfo b/net/rubygem-gitaly/distinfo index bd94b8002519..37a1b28e0f47 100644 --- a/net/rubygem-gitaly/distinfo +++ b/net/rubygem-gitaly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1771568601 -SHA256 (rubygem/gitaly-18.8.4.gem) = 08e8ed358ef82dc5ac88b89b548469e395ef90a55b5daf4ecfa5bc52804a3efb -SIZE (rubygem/gitaly-18.8.4.gem) = 54272 +TIMESTAMP = 1776335795 +SHA256 (rubygem/gitaly-18.10.0.gem) = 7b809d0ba1895983ac0bf55974183d8c1e7011214faa41e725e4b0bf455a89ec +SIZE (rubygem/gitaly-18.10.0.gem) = 54784 diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index fdf3ba1bbf91..871cf23cb0b1 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1775709664 -SHA256 (go/www_gitlab-pages/gitlab-pages-v18.10.3/go.mod) = 11961afed883951b41907bba936149f45e0dab3217730080cdc3e1029a9643aa -SIZE (go/www_gitlab-pages/gitlab-pages-v18.10.3/go.mod) = 3523 -SHA256 (go/www_gitlab-pages/gitlab-pages-v18.10.3/gitlab-pages-v18.10.3.tar.bz2) = 7961d665b40c9d8546137790343d46eaafd10c29bbb7f4939e40f14ae6cb7184 -SIZE (go/www_gitlab-pages/gitlab-pages-v18.10.3/gitlab-pages-v18.10.3.tar.bz2) = 238579 +TIMESTAMP = 1776334433 +SHA256 (go/www_gitlab-pages/gitlab-pages-v18.11.0/go.mod) = f0ac1edc88b3e9d8008e61ec9827a74cd47c79068c8b44b7e673d11d128b804a +SIZE (go/www_gitlab-pages/gitlab-pages-v18.11.0/go.mod) = 3987 +SHA256 (go/www_gitlab-pages/gitlab-pages-v18.11.0/gitlab-pages-v18.11.0.tar.bz2) = 00dde201d0200e179207d60c2e5ab18c9495f9cabd1b12112817afc753c83779 +SIZE (go/www_gitlab-pages/gitlab-pages-v18.11.0/gitlab-pages-v18.11.0.tar.bz2) = 240261 diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index cc344661e9c3..9155b6d63dce 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1775709679 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.10.3/go.mod) = f7fa397c4a00d52058cf8604cc36442d4c0179ed02eb1c679d95653abe47d365 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.10.3/go.mod) = 12563 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.10.3/gitlab-foss-v18.10.3.tar.bz2) = 2369e129d2ecf32777bcecd45c19007e784029c649bbe327b4096a37beaace30 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.10.3/gitlab-foss-v18.10.3.tar.bz2) = 134856554 +TIMESTAMP = 1776334448 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.11.0/go.mod) = ac84781d3b95a273e771511035d5d7d62262d4237f9ed92882ac7dc09b2b93ef +SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.11.0/go.mod) = 12631 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.11.0/gitlab-foss-v18.11.0.tar.bz2) = e8f3f9d8885634f682524dd50e2aec871cd36761ee6a7cd06fe2d07fd36f19e0 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.11.0/gitlab-foss-v18.11.0.tar.bz2) = 134339095 diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 86846147d233..88eb355c596c 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -31,38 +31,37 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ gitlab-elasticsearch-indexer>=5.13.3:textproc/gitlab-elasticsearch-indexer \ gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \ gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \ - gitlab-shell>=14.47.0:devel/gitlab-shell \ + gitlab-shell>=14.49.0:devel/gitlab-shell \ gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \ - gitlab-zoekt-indexer>=1.11.0:textproc/gitlab-zoekt-indexer \ + gitlab-zoekt-indexer>=1.13.0: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.10.1:devel/rubygem-parser \ + rubygem-parser-gitlab>=3.3.11.1:devel/rubygem-parser-gitlab \ 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.3:www/rubygem-rails-gitlab \ rubygem-zeitwerk>=2.6.18<2.6.19:devel/rubygem-zeitwerk \ rubygem-drb-gitlab>=2.2.3<3:devel/rubygem-drb-gitlab \ - rubygem-bootsnap-gitlab>=1.18.6<1.19:devel/rubygem-bootsnap-gitlab \ + rubygem-bootsnap-gitlab>=1.23.0<1.24:devel/rubygem-bootsnap-gitlab \ rubygem-ffi>=1.17.3<2:devel/rubygem-ffi \ rubygem-openssl3>=3.3.2<3.4:security/rubygem-openssl3 \ - rubygem-gitlab-secret_detection>=0.39.3<1:security/rubygem-gitlab-secret_detection \ + rubygem-gitlab-secret_detection>=0.40.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.3<1.7:databases/rubygem-pg-gitlab \ - rubygem-rugged>=1.9<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.1.0<2.2:security/rubygem-declarative_policy \ - rubygem-coverband>=6.1.7<6.2:www/rubygem-coverband \ + rubygem-coverband>=6.2.0<6.3:www/rubygem-coverband \ rubygem-devise-rails-gitlab>=4.9.3<4.10:devel/rubygem-devise-rails-gitlab \ - rubygem-bcrypt>=3.1.21<3.2:security/rubygem-bcrypt \ + rubygem-bcrypt>=3.1.22<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 \ @@ -74,7 +73,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.2.1<2:net/rubygem-omniauth-google-oauth2-gitlab \ + rubygem-omniauth-google-oauth2-gitlab>=1.2.2<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 \ @@ -92,9 +91,9 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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.30<3:security/rubygem-acme-client-gitlab \ + rubygem-acme-client-gitlab>=2.0.31<3:security/rubygem-acme-client-gitlab \ rubygem-browser5>=5.3.1<5.4:www/rubygem-browser5 \ - rubygem-ohai>=19.1.6<19.2:sysutils/rubygem-ohai \ + rubygem-ohai>=19.1.24<19.2:sysutils/rubygem-ohai \ rubygem-gpgme>=2.0.26<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-ldap>=0.20.0<0.21:net/rubygem-net-ldap \ @@ -149,7 +148,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-html-pipeline-gitlab>=2.14.3<2.15:textproc/rubygem-html-pipeline-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-kramdown-gitlab>=2.5.2<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 \ @@ -166,7 +165,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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.22,3<2.3,3:www/rubygem-rack22 \ + rubygem-rack-gitlab>=2.2.23<2.3:www/rubygem-rack-gitlab \ rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \ rubygem-puma-gitlab>=7.2<8:www/rubygem-puma-gitlab \ rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \ @@ -196,7 +195,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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-gitlab>=2.25.0<2.26:textproc/rubygem-loofah-gitlab \ + rubygem-loofah-gitlab>=2.25.1<2.26:textproc/rubygem-loofah-gitlab \ 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 \ @@ -222,7 +221,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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-gettext>=3.5.2<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 \ @@ -230,10 +229,11 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-webrick>=1.9.0<1.10:www/rubygem-webrick \ rubygem-prometheus-client-mmap>=1.5.0<1.6: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-io-event-gitlab>=1.14.5<2:devel/rubygem-io-event-gitlab \ + rubygem-gitlab-security_report_schemas>=0.2.0.min15.0.0.max15.2.4<0.2.0.min15.0.0.max15.2.5:devel/rubygem-gitlab-security_report_schemas \ + rubygem-vite_rails-gitlab>=3.10.0<3.11:devel/rubygem-vite_rails-gitlab \ + rubygem-vite_ruby-gitlab>=3.10.1<3.11:devel/rubygem-vite_ruby-gitlab \ + rubygem-js-routes>=2.3<3:www/rubygem-js-routes \ rubygem-opentelemetry-sdk-gitlab>=1.10.0:devel/rubygem-opentelemetry-sdk-gitlab \ rubygem-opentelemetry-exporter-otlp-gitlab>=0.31.1:devel/rubygem-opentelemetry-exporter-otlp-gitlab \ rubygem-opentelemetry-instrumentation-active_support-gitlab>=0.10.0:devel/rubygem-opentelemetry-instrumentation-active_support-gitlab \ @@ -277,10 +277,10 @@ 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.8.3:net/rubygem-gitaly \ + rubygem-gitaly>=18.10.0:net/rubygem-gitaly \ rubygem-gitlab-kas-grpc>=${GITLAB_KAS_GRPC_VERSION}:net/rubygem-gitlab-kas-grpc \ rubygem-gitlab-gkg-proto>=0.7.0<0.8:net/rubygem-gitlab-gkg-proto \ - rubygem-grpc-gitlab>=1.78.1<1.79:net/rubygem-grpc-gitlab \ + rubygem-grpc-gitlab>=1.80.0<1.81:net/rubygem-grpc-gitlab \ rubygem-google-protobuf>=3.25.8<5:devel/rubygem-google-protobuf \ rubygem-toml-rb>=4.1<5:www/rubygem-toml-rb \ rubygem-flipper-gitlab>=1.3.6<1.4:devel/rubygem-flipper-gitlab \ @@ -298,13 +298,13 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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-json-gitlab>=2.19.2<2.20:devel/rubygem-json-gitlab \ + rubygem-json_schemer>=2.4.0<2.5:devel/rubygem-json_schemer \ rubygem-oj-gitlab>=3.16.16<3.17:devel/rubygem-oj-gitlab \ rubygem-oj-introspect>=0.9<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-webauthn>=3.4.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 \ @@ -326,7 +326,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-i18n_data>=0.13.1<1:devel/rubygem-i18n_data \ rubygem-gitlab-cloud-connector>=1.46<2:security/rubygem-gitlab-cloud-connector \ rubygem-gvltools>=0.4.0<0.5:devel/rubygem-gvltools \ - rubygem-gitlab_query_language>=0.23.0<0.24:devel/rubygem-gitlab_query_language \ + rubygem-gitlab_query_language>=0.26.0<0.27:devel/rubygem-gitlab_query_language \ 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 \ @@ -442,6 +442,7 @@ do-install: ${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}/app/assets/javascripts/lib/utils/path_helpers ${MKDIR} ${STAGEDIR}${WWWDIR}/config/helpers/tailwind ${MKDIR} ${STAGEDIR}${WWWDIR}/public/assets ${MKDIR} ${STAGEDIR}${WWWDIR}/public/uploads @@ -472,6 +473,7 @@ post-install: @${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/lib/utils/path_helpers/" >> ${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} diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index d8cbd47a78c7..638978ed92b7 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,4 +1,4 @@ -GITLAB_VERSION= 18.10.3 +GITLAB_VERSION= 18.11.0 GITLAB_PORTREVISION= 6 # decrease this only if GITLAB_KAS_GRPC_VERSION is upgraded # Git version gitaly should use (from gitlab mirror) @@ -7,8 +7,8 @@ GITLAB_PORTREVISION= 6 # decrease this only if GITLAB_KAS_GRPC_VERSION is upgrad GITLAB_GIT_VERSION= 2.50.0 # return something like x.yy GITLAB_GIT_VERSION_SHORT= ${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/} -GITLAB_GIT_MASTER_VERSION= e417bf2996fbd77acabbf354ed9b5adedacf91c9 -GITLAB_GIT_PREV_VERSION= c61120cf654250ac63bdcb5d5ee0bbb9caeae9cd +GITLAB_GIT_MASTER_VERSION= b15384c06f77bc2d34d0d3623a8a58218313a561 +GITLAB_GIT_PREV_VERSION= e417bf2996fbd77acabbf354ed9b5adedacf91c9 # Overwrite version for gitlab-kas-grpc #GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION} diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index a504fac58d1e..f84e1dd2dff2 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1775709606 -SHA256 (gitlab-foss-v18.10.3.tar.bz2) = 2369e129d2ecf32777bcecd45c19007e784029c649bbe327b4096a37beaace30 -SIZE (gitlab-foss-v18.10.3.tar.bz2) = 134856554 -TIMESTAMP = 1775709654 -SHA256 (gitlab-v18.10.3-ee.tar.bz2) = 91737b716ec4d8f491fb1ff18159694420b735fff4227e132bd5b09fef619e30 -SIZE (gitlab-v18.10.3-ee.tar.bz2) = 153287465 +TIMESTAMP = 1776342388 +SHA256 (gitlab-foss-v18.11.0.tar.bz2) = e8f3f9d8885634f682524dd50e2aec871cd36761ee6a7cd06fe2d07fd36f19e0 +SIZE (gitlab-foss-v18.11.0.tar.bz2) = 134339095 +TIMESTAMP = 1776342389 +SHA256 (gitlab-v18.11.0-ee.tar.bz2) = d80215d720dcb4e0d7c923eddab5e04a013546017a9e1d6431e48f78e8e4517e +SIZE (gitlab-v18.11.0-ee.tar.bz2) = 153144216 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 07addd8dc048..26fd1e56cd41 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,6 +1,6 @@ ---- Gemfile.orig 2026-03-18 13:38:20 UTC +--- Gemfile.orig 2026-04-15 21:42:44 UTC +++ Gemfile -@@ -169,7 +169,7 @@ gem 'graphql', '2.5.11', feature_category: :api +@@ -167,7 +167,7 @@ gem 'graphql', '2.5.11', feature_category: :api # GraphQL API gem 'graphql', '2.5.11', feature_category: :api @@ -9,7 +9,7 @@ gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api # Cells -@@ -298,7 +298,7 @@ gem 'state_machines-activerecord', '~> 0.100.0', featu +@@ -296,7 +296,7 @@ gem 'state_machines-activerecord', '~> 0.100.0', featu gem 'state_machines-activerecord', '~> 0.100.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Background jobs @@ -18,7 +18,7 @@ gem 'sidekiq-cron', '~> 2.3.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -475,137 +475,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared # +@@ -476,136 +476,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared # gem 'warning', '~> 1.5.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 @@ -52,9 +52,8 @@ -end - -group :development, :test do -- gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'bullet', '~> 8.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -- gem 'parser', '= 3.3.10.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +- gem 'parser', '= 3.3.11.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'pry-byebug', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'pry-rails', '~> 0.3.9', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'pry-shell', '~> 0.6.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 @@ -141,7 +140,7 @@ - gem 'webmock', '~> 3.26.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'rails-controller-testing', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'concurrent-ruby', '~> 1.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -- gem 'test-prof', '~> 1.5.0', feature_category: :tooling +- gem 'test-prof', '~> 1.6.0', feature_category: :tooling - gem 'rspec_junit_formatter', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'guard-rspec', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling @@ -150,14 +149,14 @@ - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - -- gem 'gitlab_quality-test_tooling', '~> 3.9.0', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 3.10.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 -@@ -642,7 +520,7 @@ gem 'gitaly', '~> 18.8.0', feature_category: :gitaly - gem 'gitaly', '~> 18.8.0', feature_category: :gitaly +@@ -642,7 +521,7 @@ gem 'gitaly', '~> 18.10.0', feature_category: :gitaly + gem 'gitaly', '~> 18.10.0', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management @@ -165,7 +164,7 @@ # Knowledge Graph GRPC protocol definitions gem 'gitlab-gkg-proto', '~> 0.7.0', feature_category: :knowledge_graph -@@ -668,7 +546,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : +@@ -668,7 +547,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Countries list @@ -174,7 +173,7 @@ gem 'retriable', '~> 3.1.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -@@ -749,11 +627,16 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -749,11 +628,16 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index 0a64246613f1..c16c208783c7 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 2026-03-18 13:38:20 UTC +--- config/gitlab.yml.example.orig 2026-04-15 21:42:44 UTC +++ config/gitlab.yml.example -@@ -551,7 +551,7 @@ production: &base +@@ -567,7 +567,7 @@ production: &base ## GitLab Pages pages: enabled: false @@ -9,7 +9,7 @@ # The location where pages are stored (default: shared/pages). # path: shared/pages -@@ -1326,7 +1326,7 @@ production: &base +@@ -1342,7 +1342,7 @@ production: &base repositories: storages: # You must have at least a `default` storage path. default: @@ -18,7 +18,7 @@ # For DNS-based load balancing with TLS, use: dns+tls://[authority_host]:[authority_port]/[host]:[port] # The host:port portion will be used as the TLS server name for SNI. # Example: dns+tls://1.1.1.1/gitaly.example.com:8075 -@@ -1335,7 +1335,7 @@ production: &base +@@ -1351,7 +1351,7 @@ production: &base ## Backup settings backup: path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) @@ -27,7 +27,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 -@@ -1370,12 +1370,12 @@ production: &base +@@ -1386,12 +1386,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -43,7 +43,7 @@ # Git over HTTP upload_pack: true -@@ -1390,7 +1390,7 @@ production: &base +@@ -1406,7 +1406,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). @@ -52,7 +52,7 @@ database_traffic_capture: config: -@@ -1416,7 +1416,7 @@ production: &base +@@ -1432,7 +1432,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). @@ -61,7 +61,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1437,13 +1437,13 @@ production: &base +@@ -1453,13 +1453,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -77,7 +77,7 @@ ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1464,18 +1464,18 @@ production: &base +@@ -1480,18 +1480,18 @@ production: &base # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq. sidekiq_exporter: @@ -103,7 +103,7 @@ # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. web_exporter: -@@ -1702,13 +1702,13 @@ test: +@@ -1729,13 +1729,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: diff --git a/www/gitlab/files/patch-package.json b/www/gitlab/files/patch-package.json deleted file mode 100644 index a3e1b75ba6a0..000000000000 --- a/www/gitlab/files/patch-package.json +++ /dev/null @@ -1,12 +0,0 @@ ---- package.json.orig 2026-02-18 17:09:38 UTC -+++ package.json -@@ -320,7 +320,8 @@ - "@types/node": "14.17.5", - "chokidar": "^3.5.3", - "nwsapi": "2.2.2", -- "tough-cookie": "4.1.3" -+ "tough-cookie": "4.1.3", -+ "tree-sitter": "0.22.4" - }, - "engines": { - "node": ">=12.22.1", diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message index c9c05322d26a..642c499194ba 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.10-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.11-freebsd.md EOM type: install } @@ -20,7 +20,7 @@ EOM If you just installed an major upgrade of GitLab, for example you switched from 18.6.x to 18.7.x, please follow the instructions in the guide at: -https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.9-18.10-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.10-18.11-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at:home | help