Date: Wed, 27 Oct 2021 09:36:20 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: fddbf3e082b6 - 2021Q4 - www/gitlab-ce: Update to 14.4.0 Message-ID: <202110270936.19R9aKfG018124@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=fddbf3e082b6e2729b948d05a0c821acd2d33929 commit fddbf3e082b6e2729b948d05a0c821acd2d33929 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2021-10-26 19:24:05 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2021-10-27 09:35:34 +0000 www/gitlab-ce: Update to 14.4.0 Changelog: https://about.gitlab.com/releases/2021/10/22/gitlab-14-4-released/ I included the following patch to fix a problem with sidekiq-cron gem version 1.2.0: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73093 (cherry picked from commit 46b95c05501c643fada4e953533f5eb9ff3caba6) --- www/gitlab-ce/Makefile | 33 ++++++++++------------ www/gitlab-ce/distinfo | 6 ++-- www/gitlab-ce/files/patch-Gemfile | 19 ++++--------- .../files/patch-config_gitlab.yml.example | 6 ++-- .../files/patch-config_redis.cache.yml.example | 11 -------- .../files/patch-config_redis.queues.yml.example | 11 -------- .../patch-config_redis.shared__state.yml.example | 11 -------- ...b_gitlab_sidekiq__logging_structured__logger.rb | 10 +++++++ www/gitlab-ce/pkg-message | 4 +-- 9 files changed, 38 insertions(+), 73 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index d189b92fa667..d911ef7fe0a9 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,8 +1,8 @@ # Created by: Torsten Zuehlsdorff <tz@FreeBSD.org> PORTNAME= gitlab-ce -PORTVERSION= 14.3.2 -PORTREVISION= 3 +PORTVERSION= 14.4.0 +PORTREVISION= 0 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -15,16 +15,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # which makes maintaining this long list much easier! MY_DEPENDS= git>=2.32.0:devel/git \ gitaly>=${PORTVERSION}:devel/gitaly \ - gitlab-elasticsearch-indexer>=2.13.0:textproc/gitlab-elasticsearch-indexer \ - gitlab-agent>=14.3.3:net/gitlab-agent \ - gitlab-pages>=1.44.0:www/gitlab-pages \ + gitlab-elasticsearch-indexer>=2.16.0:textproc/gitlab-elasticsearch-indexer \ + gitlab-agent>=14.4.0:net/gitlab-agent \ + gitlab-pages>=1.46.0:www/gitlab-pages \ gitlab-shell>=13.21.1:devel/gitlab-shell \ gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \ redis>=6.0.14:databases/redis \ yarn>=1.10.0:www/yarn \ gtar>0:archivers/gtar \ bash>0:shells/bash \ - rubygem-rails61>=6.1.3.2<6.1.4:www/rubygem-rails61 \ + rubygem-rails61>=6.1.4.1<6.1.4.2:www/rubygem-rails61 \ rubygem-bootsnap14>=1.4.6<2.0:devel/rubygem-bootsnap14 \ rubygem-responders-rails61>=3.0<4.0:www/rubygem-responders-rails61 \ rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \ @@ -80,7 +80,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-gitlab_omniauth-ldap>=2.1.1<2.2.0:net/rubygem-gitlab_omniauth-ldap \ rubygem-net-ldap>0.16.3:net/rubygem-net-ldap \ rubygem-grape>=1.5.2<1.6:devel/rubygem-grape \ - rubygem-grape-entity>=0.9.0<0.10.0,1:devel/rubygem-grape-entity \ + rubygem-grape-entity>=0.10.0<0.11.0,1:devel/rubygem-grape-entity \ rubygem-rack-cors>=1.0.6<1.1.0:www/rubygem-rack-cors \ rubygem-graphql>=1.11.8<1.12:devel/rubygem-graphql \ rubygem-graphiql-rails>=1.4.10<1.5.0:devel/rubygem-graphiql-rails \ @@ -100,7 +100,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-fog-openstack>=1.0<2.0:net/rubygem-fog-openstack \ rubygem-fog-rackspace>=0.1.1<1.2.0:net/rubygem-fog-rackspace \ rubygem-fog-aliyun>=0.3<1.0:net/rubygem-fog-aliyun \ - rubygem-gitlab-fog-azure-rm>=1.1.1<1.2:net/rubygem-gitlab-fog-azure-rm \ + rubygem-gitlab-fog-azure-rm>=1.2.0<1.3:net/rubygem-gitlab-fog-azure-rm \ rubygem-google-api-client>=0.33<1:devel/rubygem-google-api-client \ rubygem-unf>=0.1.4<0.2.0:textproc/rubygem-unf \ rubygem-seed-fu>=2.3.7<2.4.0:databases/rubygem-seed-fu \ @@ -115,7 +115,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-deckar01-task_list=2.3.1:www/rubygem-deckar01-task_list \ rubygem-gitlab-markup>=1.7.1<1.8.0:textproc/rubygem-gitlab-markup \ rubygem-github-markup17>=1.7.0<1.8.0:textproc/rubygem-github-markup17 \ - rubygem-commonmarker>=0.21<1.0:textproc/rubygem-commonmarker \ + rubygem-commonmarker>=0.23.2<0.24:textproc/rubygem-commonmarker \ rubygem-kramdown>=2.3.1<2.4:textproc/rubygem-kramdown \ rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \ rubygem-rdoc>=6.3.2<7:devel/rubygem-rdoc \ @@ -126,7 +126,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-asciidoctor-include-ext>=0.3.1<0.4.0:textproc/rubygem-asciidoctor-include-ext \ rubygem-asciidoctor-plantuml>=0.0.12<0.1:textproc/rubygem-asciidoctor-plantuml \ rubygem-asciidoctor-kroki>=0.5.0<0.6:textproc/rubygem-asciidoctor-kroki \ - rubygem-rouge>=3.26.0<3.27:textproc/rubygem-rouge \ + rubygem-rouge>=3.26.1<3.27:textproc/rubygem-rouge \ rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \ rubygem-bootstrap_form>=4.2.0<4.3.0:devel/rubygem-bootstrap_form \ rubygem-nokogiri>=1.11.5<1.12:textproc/rubygem-nokogiri \ @@ -140,10 +140,10 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-puma_worker_killer>=0.3.1:www/rubygem-puma_worker_killer \ rubygem-state_machines-activerecord>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord \ rubygem-acts-as-taggable-on>=7.0<8.0:www/rubygem-acts-as-taggable-on \ - rubygem-sidekiq5>=5.2.9<5.3.0:devel/rubygem-sidekiq5 \ + rubygem-sidekiq>=6.2.2<6.3:devel/rubygem-sidekiq \ rubygem-sidekiq-cron>=1.0<2.0:devel/rubygem-sidekiq-cron \ rubygem-redis-namespace>=1.8.1<1.9.0:databases/rubygem-redis-namespace \ - rubygem-gitlab-sidekiq-fetcher>=0.5.6<0.5.7:devel/rubygem-gitlab-sidekiq-fetcher \ + rubygem-gitlab-sidekiq-fetcher>=0.8.0<0.9:devel/rubygem-gitlab-sidekiq-fetcher \ rubygem-fugit12>=1.2.1<1.3.0:devel/rubygem-fugit12 \ rubygem-httparty>=0.16.4<0.17.0:www/rubygem-httparty \ rubygem-rainbow>=3.0<4.0:devel/rubygem-rainbow \ @@ -153,7 +153,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-version_sorter>=2.2.4<2.3.0:textproc/rubygem-version_sorter \ rubygem-js_regex>=3.7<4.0:textproc/rubygem-js_regex \ rubygem-device_detector>=0:devel/rubygem-device_detector \ - rubygem-redis>=4.1.4<5:databases/rubygem-redis \ + rubygem-redis>=4.4.0<4.5:databases/rubygem-redis \ rubygem-connection_pool>=2.0<3.0:net/rubygem-connection_pool \ rubygem-redis-actionpack-rails61>=5.2.0<5.3:databases/rubygem-redis-actionpack-rails61 \ rubygem-discordrb-webhooks>=3.4<4.0:net-im/rubygem-discordrb-webhooks \ @@ -222,7 +222,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-ed25519>=1.2<2.0:security/rubygem-ed25519 \ rubygem-bcrypt_pbkdf>=1.0<2.0:security/rubygem-bcrypt_pbkdf \ rubygem-spamcheck>=0.1.0<0.2:net/rubygem-spamcheck \ - rubygem-gitaly>=14.3.0.pre.rc1<14.4.0:net/rubygem-gitaly \ + rubygem-gitaly>=14.3.0.pre.rc2<14.4.0:net/rubygem-gitaly \ rubygem-kas-grpc>=0.0.2,1<0.0.3,1:net/rubygem-kas-grpc \ rubygem-grpc>=1.30.2<2:net/rubygem-grpc \ rubygem-google-protobuf317>=3.17.1<3.18:devel/rubygem-google-protobuf317 \ @@ -270,7 +270,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= 92acfb1b8a9019b3fa3c817d251b2624d55da26d +GL_COMMIT= 51b27ab58055b65e14e68b19604e4823389adb73 USERS= git GROUPS= git @@ -301,13 +301,10 @@ do-install: # get files for workdir with: find . -name "*.example" ${MV} ${WRKSRC}/config/puma.rb.example ${WRKSRC}/config/puma.rb.sample ${MV} ${WRKSRC}/config/secrets.yml.example ${WRKSRC}/config/secrets.yml.sample - ${MV} ${WRKSRC}/config/redis.cache.yml.example ${WRKSRC}/config/redis.cache.yml.sample ${MV} ${WRKSRC}/config/sidekiq.yml.example ${WRKSRC}/config/sidekiq.yml.sample ${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/redis.queues.yml.example ${WRKSRC}/config/redis.queues.yml.sample ${MV} ${WRKSRC}/config/initializers/devise_password_length.rb.example ${WRKSRC}/config/initializers/devise_password_length.rb.sample - ${MV} ${WRKSRC}/config/redis.shared_state.yml.example ${WRKSRC}/config/redis.shared_state.yml.sample ${MV} ${WRKSRC}/config/resque.yml.example ${WRKSRC}/config/resque.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 diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 9bf43cd68a07..4da5eed1052b 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633159240 -SHA256 (gitlab-org-gitlab-foss-92acfb1b8a9019b3fa3c817d251b2624d55da26d_GL0.tar.gz) = d618d90f40dd63d5b85d8540ee0d31578cf4a317f5ea3b5432c53b0187a0da5b -SIZE (gitlab-org-gitlab-foss-92acfb1b8a9019b3fa3c817d251b2624d55da26d_GL0.tar.gz) = 94745309 +TIMESTAMP = 1634899418 +SHA256 (gitlab-org-gitlab-foss-51b27ab58055b65e14e68b19604e4823389adb73_GL0.tar.gz) = 6092274b8b3292f0c1956ee31591ece91c47ebf2c213ab793ea6fa4b5b7e35f7 +SIZE (gitlab-org-gitlab-foss-51b27ab58055b65e14e68b19604e4823389adb73_GL0.tar.gz) = 94863812 diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index a00d2284d787..21aff8dff2a0 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2021-10-01 16:06:26 UTC +--- Gemfile.orig 2021-10-21 22:00:37 UTC +++ Gemfile @@ -88,7 +88,7 @@ gem 'gpgme', '~> 2.0.19' # GitLab fork with several improvements to original library. For full list of changes @@ -17,15 +17,6 @@ gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import) gem 'hashie' -@@ -229,7 +228,7 @@ gem 'js_regex', '~> 3.7' - gem 'device_detector' - - # Redis --gem 'redis', '~> 4.1.4' -+gem 'redis', '~> 4.1' - gem 'connection_pool', '~> 2.0' - - # Redis session store @@ -332,106 +331,10 @@ gem 'snowplow-tracker', '~> 0.6.1' # Metrics @@ -39,7 +30,7 @@ - gem 'lefthook', '~> 0.7.0', require: false - gem 'solargraph', '~> 0.43', require: false - -- gem 'letter_opener_web', '~> 1.4.0' +- gem 'letter_opener_web', '~> 1.4.1' - - # Better errors handler - gem 'better_errors', '~> 2.9.0' @@ -53,7 +44,7 @@ - gem 'bullet', '~> 6.1.3' - gem 'pry-byebug' - gem 'pry-rails', '~> 0.3.9' -- gem 'pry-shell', '~> 0.4.0' +- gem 'pry-shell', '~> 0.5.0' - - gem 'awesome_print', require: false - @@ -122,7 +113,7 @@ - gem 'webmock', '~> 3.9.1' - gem 'rails-controller-testing' - gem 'concurrent-ruby', '~> 1.1' -- gem 'test-prof', '~> 0.12.0' +- gem 'test-prof', '~> 1.0.7' - gem 'rspec_junit_formatter' - gem 'guard-rspec' - @@ -133,7 +124,7 @@ gem 'octokit', '~> 4.15' # https://gitlab.com/gitlab-org/gitlab/issues/207207 -@@ -479,7 +382,7 @@ gem 'gitaly', '~> 14.3.0.pre.rc1' +@@ -479,7 +382,7 @@ gem 'gitaly', '~> 14.3.0.pre.rc2' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index 6c9974f4a7df..943d15234fb2 100644 --- a/www/gitlab-ce/files/patch-config_gitlab.yml.example +++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example @@ -1,4 +1,4 @@ ---- config/gitlab.yml.example.orig 2021-10-01 16:06:26 UTC +--- config/gitlab.yml.example.orig 2021-10-21 22:00:37 UTC +++ config/gitlab.yml.example @@ -1128,14 +1128,14 @@ production: &base # real path not the symlink. @@ -50,7 +50,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1220,13 +1220,13 @@ production: &base +@@ -1223,13 +1223,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 -@@ -1453,13 +1453,13 @@ test: +@@ -1459,13 +1459,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: diff --git a/www/gitlab-ce/files/patch-config_redis.cache.yml.example b/www/gitlab-ce/files/patch-config_redis.cache.yml.example deleted file mode 100644 index 6b4ab859e73a..000000000000 --- a/www/gitlab-ce/files/patch-config_redis.cache.yml.example +++ /dev/null @@ -1,11 +0,0 @@ ---- config/redis.cache.yml.example.orig 2020-05-23 10:51:33 UTC -+++ config/redis.cache.yml.example -@@ -18,7 +18,7 @@ test: - # url: redis://localhost:6380 - production: - # Redis (single instance) -- url: unix:/var/run/redis/redis.cache.sock -+ url: unix:/var/run/redis/redis.sock - ## - # Redis + Sentinel (for HA) - # diff --git a/www/gitlab-ce/files/patch-config_redis.queues.yml.example b/www/gitlab-ce/files/patch-config_redis.queues.yml.example deleted file mode 100644 index 1d760f26bde3..000000000000 --- a/www/gitlab-ce/files/patch-config_redis.queues.yml.example +++ /dev/null @@ -1,11 +0,0 @@ ---- config/redis.queues.yml.example.orig 2020-05-23 10:52:06 UTC -+++ config/redis.queues.yml.example -@@ -18,7 +18,7 @@ test: - # url: redis://localhost:6381 - production: - # Redis (single instance) -- url: unix:/var/run/redis/redis.queues.sock -+ url: unix:/var/run/redis/redis.sock - ## - # Redis + Sentinel (for HA) - # diff --git a/www/gitlab-ce/files/patch-config_redis.shared__state.yml.example b/www/gitlab-ce/files/patch-config_redis.shared__state.yml.example deleted file mode 100644 index 1e7e1b9e5a11..000000000000 --- a/www/gitlab-ce/files/patch-config_redis.shared__state.yml.example +++ /dev/null @@ -1,11 +0,0 @@ ---- config/redis.shared_state.yml.example.orig 2020-05-23 10:48:31 UTC -+++ config/redis.shared_state.yml.example -@@ -18,7 +18,7 @@ test: - # url: redis://localhost:6382 - production: - # Redis (single instance) -- url: unix:/var/run/redis/redis.shared_state.sock -+ url: unix:/var/run/redis/redis.sock - ## - # Redis + Sentinel (for HA) - # diff --git a/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_structured__logger.rb b/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_structured__logger.rb new file mode 100644 index 000000000000..46586cc70edf --- /dev/null +++ b/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_structured__logger.rb @@ -0,0 +1,10 @@ +--- lib/gitlab/sidekiq_logging/structured_logger.rb.orig 2021-10-26 19:13:52 UTC ++++ lib/gitlab/sidekiq_logging/structured_logger.rb +@@ -2,6 +2,7 @@ + + require 'active_record' + require 'active_record/log_subscriber' ++require 'sidekiq/job_logger' + + module Gitlab + module SidekiqLogging diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message index b245648b6653..6fa2671da9c8 100644 --- 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/14.3-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/14.4-freebsd.md EOM type: install } @@ -20,7 +20,7 @@ EOM If you just installed an major upgrade of GitLab, for example you switched from 12.6.x to 12.7.x, please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/14.2-14.3-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/14.3-14.4-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110270936.19R9aKfG018124>