www/gitlab-ce: update to 15.10.2

Changelog: https://about.gitlab.com/releases/2023/04/05/gitlab-15-10-2-released/
freebsd · Apr 12, 2023 · f3e5320 · f3e5320
1 parent bb29234
commit f3e5320
Show file tree

Hide file tree

Showing 13 changed files with 53 additions and 61 deletions.
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitaly
-DISTVERSION=	15.10.1
+DISTVERSION=	15.10.2
 PORTREVISION=	0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
@@ -49,7 +49,7 @@ MAKE_ENV+=	${GO_ENV}
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT=	267edbe4a3f5416d75b5f0213bbcee9012f7797d
+GL_COMMIT=	aee76b7fd5b7e2fd68911f2b6b5203ee7512e0fe
 
 # for go dependencies
 # Gitlab hosts there dependencies on their own platform and not on go-proxy

diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1681104389
-SHA256 (go/devel_gitaly/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0/go.mod) = f9e62b5491c17780d343f8de6921e04e1012858cd7ad6de24a77d38e6d941235
-SIZE (go/devel_gitaly/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0/go.mod) = 10320
-SHA256 (go/devel_gitaly/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0.tar.gz) = dfc2a54be503458235d45fe771de0402203ea81af176fd3786aadfdf21f499b1
-SIZE (go/devel_gitaly/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0.tar.gz) = 3096478
+TIMESTAMP = 1681126542
+SHA256 (go/devel_gitaly/gitlab-org-gitaly-aee76b7fd5b7e2fd68911f2b6b5203ee7512e0fe_GL0/go.mod) = f9e62b5491c17780d343f8de6921e04e1012858cd7ad6de24a77d38e6d941235
+SIZE (go/devel_gitaly/gitlab-org-gitaly-aee76b7fd5b7e2fd68911f2b6b5203ee7512e0fe_GL0/go.mod) = 10320
+SHA256 (go/devel_gitaly/gitlab-org-gitaly-aee76b7fd5b7e2fd68911f2b6b5203ee7512e0fe_GL0/gitlab-org-gitaly-aee76b7fd5b7e2fd68911f2b6b5203ee7512e0fe_GL0.tar.gz) = 3e46f5ad5f82f2997395504a3233e0973adc33e2b27b9d4a6ef0944910b44ac2
+SIZE (go/devel_gitaly/gitlab-org-gitaly-aee76b7fd5b7e2fd68911f2b6b5203ee7512e0fe_GL0/gitlab-org-gitaly-aee76b7fd5b7e2fd68911f2b6b5203ee7512e0fe_GL0.tar.gz) = 3096434
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-ce
-PORTVERSION=	15.10.1
+PORTVERSION=	15.10.2
 PORTREVISION=	0
 CATEGORIES=	www devel
 
@@ -248,7 +248,7 @@ MY_DEPENDS=	git>=2.39.2:devel/git \
 	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-mail27>=2.7.1<2.7.2,2:mail/rubygem-mail27 \
+	rubygem-mail>=2.8.1<2.8.2,2:mail/rubygem-mail \
 	rubygem-lockbox>=1.1.1<1.2:security/rubygem-lockbox \
 	rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \
 	rubygem-json>=2.6.3<3:devel/rubygem-json \
@@ -268,7 +268,8 @@ MY_DEPENDS=	git>=2.39.2:devel/git \
 	rubygem-app_store_connect>=0:net/rubygem-app_store_connect \
 	rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \
 	rubygem-net-protocol01>=0.1.3<0.2:net/rubygem-net-protocol01 \
-	rubygem-duo_api>=1.3<2:security/rubygem-duo_api
+	rubygem-duo_api>=1.3<2:security/rubygem-duo_api \
+	rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2
 
 BUILD_DEPENDS=	gem:devel/ruby-gems \
 	${MY_DEPENDS}
@@ -288,7 +289,7 @@ USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GL_PROJECT=	gitlab-foss
 # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
-GL_COMMIT=	a2b7634113a2b2f3b9aad86b1a98c52c380e5e76
+GL_COMMIT=	ae06966da16860568740fd607fdf98377fcada81
 
 USERS=	git
 GROUPS=	git

diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680516365
-SHA256 (gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0.tar.gz) = 0d1b33ffd7478861636d49d4a8f26ec08ff93d534ade6c472b36c1d13dec5cb5
-SIZE (gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0.tar.gz) = 101622772
+TIMESTAMP = 1681126489
+SHA256 (gitlab-org-gitlab-foss-ae06966da16860568740fd607fdf98377fcada81_GL0.tar.gz) = d4880ac1c3e2ddbdb94a786156a4f7c76a1895e0adc957da69beeb72f4873077
+SIZE (gitlab-org-gitlab-foss-ae06966da16860568740fd607fdf98377fcada81_GL0.tar.gz) = 101624422
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2023-02-21 16:38:51 UTC
+--- Gemfile.orig	2023-04-05 16:11:51 UTC
 +++ Gemfile
 @@ -19,7 +19,7 @@ gem 'bootsnap', '~> 1.16.0', require: false
 
@@ -9,7 +9,7 @@
  # This gem was originally bundled with Ruby 2.7, but is unbundled as of Ruby 3.
  # Since the latest version caused problems with GitLab, we pin this to an older
  # version for now.
-@@ -52,23 +52,23 @@ gem 'declarative_policy', '~> 1.1.0'
+@@ -49,23 +49,23 @@ gem 'declarative_policy', '~> 1.1.0'
  gem 'devise', '~> 4.8.1'
  gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable'
  gem 'bcrypt', '~> 3.1', '>= 3.1.14'
@@ -37,8 +37,8 @@
 +gem 'omniauth-saml', '~> 2.0'
  gem 'omniauth-twitter', '~> 1.4'
  gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md
- gem 'omniauth_openid_connect', '~> 0.6.0'
-@@ -78,7 +78,7 @@ gem 'openid_connect', '= 1.3.0'
+ gem 'omniauth_openid_connect', '~> 0.6.1'
+@@ -75,7 +75,7 @@ gem 'openid_connect', '= 1.3.0'
  gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md
  gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
  gem 'rack-oauth2', '~> 1.21.3'
@@ -47,7 +47,7 @@
 
  # Kerberos authentication. EE-only
  gem 'gssapi', '~> 1.3.1', group: :kerberos
-@@ -162,7 +162,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.4.0', require: 'fog/a
+@@ -157,7 +157,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.7.0', require: 'fog/a
 
  # for Google storage
  gem 'google-cloud-storage', '~> 1.44.0'
@@ -56,27 +56,18 @@
  gem 'google-apis-compute_v1', '~> 0.57.0'
  gem 'google-apis-container_v1', '~> 0.43.0'
  gem 'google-apis-container_v1beta1', '~> 0.43.0'
-@@ -348,7 +348,7 @@ gem 'pg_query', '~> 2.2', '>= 2.2.1'
-
- gem 'premailer-rails', '~> 1.10.3'
-
--gem 'gitlab-labkit', '~> 0.30.1'
-+gem 'gitlab-labkit', '~> 0.30'
- gem 'thrift', '>= 0.16.0'
-
- # I18n
-@@ -367,116 +367,20 @@ gem 'peek', '~> 1.1'
+@@ -365,117 +365,20 @@ gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/
  gem 'snowplow-tracker', '~> 0.8.0'
 
  # Metrics
 -gem 'webrick', '~> 1.6.1', require: false
 +gem 'webrick', '~> 1.7.0', require: false
- gem 'prometheus-client-mmap', '~> 0.17', require: 'prometheus/client'
+ gem 'prometheus-client-mmap', '~> 0.19', require: 'prometheus/client'
 
  gem 'warning', '~> 1.3.0'
 
 -group :development do
--  gem 'lefthook', '~> 1.2.9', require: false
+-  gem 'lefthook', '~> 1.3.3', require: false
 -  gem 'rubocop'
 -  gem 'solargraph', '~> 0.47.2', require: false
 -
@@ -119,7 +110,7 @@
 -  gem 'bundler-audit', '~> 0.7.0.1', require: false
 -
 -  # Benchmarking & profiling
--  gem 'benchmark-ips', '~> 2.3.0', require: false
+-  gem 'benchmark-ips', '~> 2.11.0', require: false
 -  gem 'benchmark-memory', '~> 0.1', require: false
 -
 -  gem 'knapsack', '~> 1.21.1'
@@ -139,7 +130,7 @@
 -end
 -
  group :development, :test, :danger do
-   gem 'gitlab-dangerfiles', '~> 3.7.0', require: false
+   gem 'gitlab-dangerfiles', '~> 3.8.0', require: false
  end
 
 -group :development, :test, :coverage do
@@ -159,7 +150,7 @@
 -  gem 'rspec-retry', '~> 0.6.1'
 -  gem 'rspec_profiling', '~> 0.0.6'
 -  gem 'rspec-benchmark', '~> 0.6.0'
--  gem 'rspec-parameterized', require: false
+-  gem 'rspec-parameterized', '~> 1.0', require: false
 -
 -  gem 'capybara', '~> 3.35.3'
 -  gem 'capybara-screenshot', '~> 1.0.22'

diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example
@@ -1,6 +1,6 @@
---- config/gitlab.yml.example.orig	2023-02-21 16:38:51 UTC
+--- config/gitlab.yml.example.orig	2023-04-05 16:11:51 UTC
 +++ config/gitlab.yml.example
-@@ -1190,14 +1190,14 @@ production: &base
+@@ -1204,14 +1204,14 @@ production: &base
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
@@ -18,7 +18,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
-@@ -1232,12 +1232,12 @@ production: &base
+@@ -1246,12 +1246,12 @@ production: &base
 
    ## GitLab Shell settings
    gitlab_shell:
@@ -34,7 +34,7 @@
 
      # Git over HTTP
      upload_pack: true
-@@ -1252,13 +1252,13 @@ production: &base
+@@ -1266,13 +1266,13 @@ 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).
@@ -50,7 +50,7 @@
 
      # The URL to the external KAS API (used by the Kubernetes agents)
      # external_url: wss://kas.example.com
-@@ -1276,13 +1276,13 @@ production: &base
+@@ -1290,13 +1290,13 @@ production: &base
 
    ## GitLab Elasticsearch settings
    elasticsearch:
@@ -66,7 +66,7 @@
 
    ## Webpack settings
    # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
-@@ -1303,18 +1303,18 @@ production: &base
+@@ -1317,18 +1317,18 @@ production: &base
 
      # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq.
      sidekiq_exporter:
@@ -92,7 +92,7 @@
 
      # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma.
      web_exporter:
-@@ -1539,13 +1539,13 @@ test:
+@@ -1553,13 +1553,13 @@ test:
          gitaly_address: unix:tmp/tests/gitaly/praefect.socket
 
    gitaly:

diff --git a/www/gitlab-ce/files/patch-config_initializers_1__settings.rb b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb
@@ -1,6 +1,6 @@
---- config/initializers/1_settings.rb.orig	2023-02-21 16:38:51 UTC
+--- config/initializers/1_settings.rb.orig	2023-04-05 16:11:51 UTC
 +++ config/initializers/1_settings.rb
-@@ -208,11 +208,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi
+@@ -209,11 +209,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi
  Settings.gitlab['user'] ||= 'git'
  # External configuration may cause the ssh user to differ from the GitLab user
  Settings.gitlab['ssh_user'] ||= Settings.gitlab.user

diff --git a/www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl b/www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl
@@ -1,4 +1,4 @@
---- lib/support/nginx/gitlab-ssl.orig	2020-11-20 12:00:55 UTC
+--- lib/support/nginx/gitlab-ssl.orig	2023-04-05 16:11:51 UTC
 +++ lib/support/nginx/gitlab-ssl
 @@ -23,7 +23,7 @@
  upstream gitlab-workhorse {
@@ -9,7 +9,7 @@
  }
 
  map $http_upgrade $connection_upgrade_gitlab_ssl {
-@@ -164,7 +164,7 @@ server {
+@@ -161,7 +161,7 @@ server {
    location ~ ^/(404|422|500|502|503)\.html$ {
      # Location to the GitLab's public directory,
      # for Omnibus this would be: /opt/gitlab/embedded/service/gitlab-rails/public

diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/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.fechner.net/mfechner/Gitlab-docu/blob/master/install/15.9-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/15.10-freebsd.md
 EOM
   type: install
 }
@@ -20,7 +20,7 @@ EOM
 If you just installed an major upgrade of GitLab, for example you
 switched from 14.5.x to 14.6.x, please follow the instructions in the guide at:
 
-https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/15.8-15.9-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/15.9-15.10-freebsd.md
 
 If you just installed an minor upgrade of GitLab please follow
 the instructions in the guide at:

diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-pages
-PORTVERSION=	15.10.1
+PORTVERSION=	15.10.2
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	www
@@ -19,7 +19,7 @@ GO_MODULE=	gitlab.com/gitlab-org/gitlab-pages
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitlab-pages/-/tags/
-GL_COMMIT=	a6f8992867871247a0b5486ecbff642a6d23ad1b
+GL_COMMIT=	26ce22b38663488101dbfec70a86289de8fd0f6b
 
 GO_BUILDFLAGS=	-ldflags="-X 'main.VERSION=${PORTVERSION}' -X 'main.REVISION=${GL_COMMIT}'"
 

diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1681107198
-SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-a6f8992867871247a0b5486ecbff642a6d23ad1b_GL0/go.mod) = 46db8658c6f0351191e106a870b9570de4ab97b900b450daa66ea74ec805f1f5
-SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-a6f8992867871247a0b5486ecbff642a6d23ad1b_GL0/go.mod) = 3020
-SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-a6f8992867871247a0b5486ecbff642a6d23ad1b_GL0/gitlab-org-gitlab-pages-a6f8992867871247a0b5486ecbff642a6d23ad1b_GL0.tar.gz) = 88f11e7b5646dd199b7f2072d2b65290f7de6cb7425c7988d200c91a21ca118e
-SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-a6f8992867871247a0b5486ecbff642a6d23ad1b_GL0/gitlab-org-gitlab-pages-a6f8992867871247a0b5486ecbff642a6d23ad1b_GL0.tar.gz) = 227626
+TIMESTAMP = 1681126581
+SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-26ce22b38663488101dbfec70a86289de8fd0f6b_GL0/go.mod) = 46db8658c6f0351191e106a870b9570de4ab97b900b450daa66ea74ec805f1f5
+SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-26ce22b38663488101dbfec70a86289de8fd0f6b_GL0/go.mod) = 3020
+SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-26ce22b38663488101dbfec70a86289de8fd0f6b_GL0/gitlab-org-gitlab-pages-26ce22b38663488101dbfec70a86289de8fd0f6b_GL0.tar.gz) = 577da9906f4ac5e6ea71df0de2af88eefeb8dac9cc0e57131df7ef5e51571e97
+SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-26ce22b38663488101dbfec70a86289de8fd0f6b_GL0/gitlab-org-gitlab-pages-26ce22b38663488101dbfec70a86289de8fd0f6b_GL0.tar.gz) = 227640
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-workhorse
-PORTVERSION=	15.10.1
+PORTVERSION=	15.10.2
 PORTREVISION=	0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
@@ -25,7 +25,7 @@ USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GL_PROJECT=	gitlab-foss
 # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
-GL_COMMIT=	a2b7634113a2b2f3b9aad86b1a98c52c380e5e76
+GL_COMMIT=	ae06966da16860568740fd607fdf98377fcada81
 
 # for go dependencies
 # Gitlab hosts there dependencies on their own platform and not on go-proxy

diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1680517474
-SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0/go.mod) = 9fdf8cb254d815b1e1887360684bc8b5969b03cdaacbc9a7c8628e2828622458
-SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0/go.mod) = 6201
-SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0/gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0.tar.gz) = 0d1b33ffd7478861636d49d4a8f26ec08ff93d534ade6c472b36c1d13dec5cb5
-SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0/gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0.tar.gz) = 101622772
+TIMESTAMP = 1681126570
+SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ae06966da16860568740fd607fdf98377fcada81_GL0/go.mod) = 9fdf8cb254d815b1e1887360684bc8b5969b03cdaacbc9a7c8628e2828622458
+SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ae06966da16860568740fd607fdf98377fcada81_GL0/go.mod) = 6201
+SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ae06966da16860568740fd607fdf98377fcada81_GL0/gitlab-org-gitlab-foss-ae06966da16860568740fd607fdf98377fcada81_GL0.tar.gz) = d4880ac1c3e2ddbdb94a786156a4f7c76a1895e0adc957da69beeb72f4873077
+SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ae06966da16860568740fd607fdf98377fcada81_GL0/gitlab-org-gitlab-foss-ae06966da16860568740fd607fdf98377fcada81_GL0.tar.gz) = 101624422