git: 2f757d6c4401 - main - www/gitlab-ce: Update to 14.2.1
Matthias Fechner
mfechner at FreeBSD.org
Tue Aug 31 09:55:18 UTC 2021
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2f757d6c4401f88ceef7ed05d9583de44159fb62
commit 2f757d6c4401f88ceef7ed05d9583de44159fb62
Author: Matthias Fechner <mfechner at FreeBSD.org>
AuthorDate: 2021-08-31 09:53:21 +0000
Commit: Matthias Fechner <mfechner at FreeBSD.org>
CommitDate: 2021-08-31 09:54:32 +0000
www/gitlab-ce: Update to 14.2.1
Changelog:
https://about.gitlab.com/releases/2021/08/22/gitlab-14-2-released/
https://about.gitlab.com/releases/2021/08/23/gitlab-14-2-1-released/
---
www/gitlab-ce/Makefile | 27 +++++++++++-----------
www/gitlab-ce/distinfo | 6 ++---
www/gitlab-ce/files/patch-Gemfile | 26 ++++++++-------------
.../files/patch-config_gitlab.yml.example | 12 +++++-----
.../files/patch-config_initializers_1__settings.rb | 4 ++--
www/gitlab-ce/pkg-message | 4 ++--
6 files changed, 36 insertions(+), 43 deletions(-)
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index e10da6d9512d..02d9adec7fd6 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,7 +1,7 @@
# Created by: Torsten Zuehlsdorff <tz at FreeBSD.org>
PORTNAME= gitlab-ce
-PORTVERSION= 14.1.2
+PORTVERSION= 14.2.1
PORTREVISION= 0
CATEGORIES= www devel
@@ -15,9 +15,9 @@ 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-agent>=14.1.0:net/gitlab-agent \
- gitlab-elasticsearch-indexer>=2.12.0:textproc/gitlab-elasticsearch-indexer \
- gitlab-pages>=1.40.0:www/gitlab-pages \
+ gitlab-elasticsearch-indexer>=2.13.0:textproc/gitlab-elasticsearch-indexer \
+ gitlab-agent>=14.2.2:net/gitlab-agent \
+ gitlab-pages>=1.42.0:www/gitlab-pages \
gitlab-shell>=13.19.1:devel/gitlab-shell \
gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \
redis>=6.0.14:databases/redis \
@@ -57,7 +57,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-omniauth-twitter>=1.4<2.0:net/rubygem-omniauth-twitter \
rubygem-omniauth_crowd>=2.4.0<2.5:devel/rubygem-omniauth_crowd \
rubygem-omniauth-authentiq>=0.3.3<0.4.0:net/rubygem-omniauth-authentiq \
- rubygem-gitlab-omniauth-openid-connect>=0.4.0<0.5.0:net/rubygem-gitlab-omniauth-openid-connect \
+ rubygem-gitlab-omniauth-openid-connect>=0.8.0<0.9.0:net/rubygem-gitlab-omniauth-openid-connect \
rubygem-omniauth-ultraauth>=0.0.2<0.1.0:net/rubygem-omniauth-ultraauth \
rubygem-omniauth-salesforce>=1.0.5<1.1.0:net/rubygem-omniauth-salesforce \
rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \
@@ -151,7 +151,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-settingslogic>=2.0.9<2.1.0:devel/rubygem-settingslogic \
rubygem-re2>=1.2.0<1.3.0:devel/rubygem-re2 \
rubygem-version_sorter>=2.2.4<2.3.0:textproc/rubygem-version_sorter \
- rubygem-js_regex>=3.4<4.0:textproc/rubygem-js_regex \
+ 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-connection_pool>=2.0<3.0:net/rubygem-connection_pool \
@@ -188,7 +188,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-sentry-raven>=3.1<4.0:devel/rubygem-sentry-raven \
rubygem-pg_query>=2.1<3:databases/rubygem-pg_query \
rubygem-premailer-rails-rails61>=1.10.3<1.11.0:mail/rubygem-premailer-rails-rails61 \
- rubygem-gitlab-labkit>=0.20.0<0.21:devel/rubygem-gitlab-labkit \
+ rubygem-gitlab-labkit>=0.21.0<0.22:devel/rubygem-gitlab-labkit \
rubygem-thrift>=0.14.0:devel/rubygem-thrift \
rubygem-ruby_parser>=3.15<4.0:devel/rubygem-ruby_parser \
rubygem-rails-i18n-rails61>=6.0<7.0:devel/rubygem-rails-i18n-rails61 \
@@ -201,6 +201,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-method_source>=1.0<2:devel/rubygem-method_source \
rubygem-webrick>=1.6.1:www/rubygem-webrick \
rubygem-prometheus-client-mmap>=0.12.0<0.13.0:devel/rubygem-prometheus-client-mmap \
+ rubygem-warning>=1.2.0<1.3:devel/rubygem-warning \
rubygem-octokit>=4.20<5.0:net/rubygem-octokit \
rubygem-gitlab-mail_room>=0.0.9<0.1.0:mail/rubygem-gitlab-mail_room \
rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \
@@ -221,16 +222,16 @@ 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.1.0.pre.rc3<14.2.0:net/rubygem-gitaly \
+ rubygem-gitaly>=14.2.0.pre.rc2<14.3.0:net/rubygem-gitaly \
rubygem-kas-grpc>=0.0.2<0.1:net/rubygem-kas-grpc \
- rubygem-grpc>=1.30.2<2:net/rubygem-grpc \
+ rubygem-grpc>=1.38.0<2:net/rubygem-grpc \
rubygem-google-protobuf>=3.17.1<3.18:devel/rubygem-google-protobuf \
rubygem-toml-rb>=2.0.1<3:www/rubygem-toml-rb \
rubygem-flipper021>=0.21.0<0.22:devel/rubygem-flipper021 \
rubygem-flipper-active_record-rails61>=0.21.0<0.22:databases/rubygem-flipper-active_record-rails61 \
rubygem-flipper-active_support_cache_store-rails61>=0.21.0<0.22:devel/rubygem-flipper-active_support_cache_store-rails61 \
- rubygem-unleash>=0.1.5<0.2.0:devel/rubygem-unleash \
- rubygem-gitlab-experiment>=0.6.1<0.7:devel/rubygem-gitlab-experiment \
+ rubygem-unleash>=3.2.2<3.3:devel/rubygem-unleash \
+ rubygem-gitlab-experiment>=0.6.4<0.7:devel/rubygem-gitlab-experiment \
rubygem-lograge-rails61>=0.11.2<1.0:www/rubygem-lograge-rails61 \
rubygem-grape_logging>=1.7<2.0:devel/rubygem-grape_logging \
rubygem-gitlab-net-dns>=0.9.1<0.10:dns/rubygem-gitlab-net-dns \
@@ -242,7 +243,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-lockbox>=0.6.2<0.7:security/rubygem-lockbox \
rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \
rubygem-json>=2.3.0<2.4:devel/rubygem-json \
- rubygem-json_schemer>=0.2.12<0.3:devel/rubygem-json_schemer \
+ rubygem-json_schemer>=0.2.18<0.3:devel/rubygem-json_schemer \
rubygem-oj310>=3.10.6<3.11:devel/rubygem-oj310 \
rubygem-multi_json114>=1.14.1<1.15:devel/rubygem-multi_json114 \
rubygem-yajl-ruby>=1.4.1<1.5:devel/rubygem-yajl-ruby \
@@ -269,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= 8c67b4991465e92dcd6752cc42e54a9c5cd9f0f2
+GL_COMMIT= 2da7c8579601c14a93d4291b8cf5fa39c6eeabd8
USERS= git
GROUPS= git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index ba1b6d5fb4bf..2a2c4529edfd 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628060592
-SHA256 (gitlab-org-gitlab-foss-8c67b4991465e92dcd6752cc42e54a9c5cd9f0f2_GL0.tar.gz) = 750408fe02d95fd826bff91a17e2a52373388909aaa866b437a280a4b6416d7b
-SIZE (gitlab-org-gitlab-foss-8c67b4991465e92dcd6752cc42e54a9c5cd9f0f2_GL0.tar.gz) = 96497031
+TIMESTAMP = 1630394518
+SHA256 (gitlab-org-gitlab-foss-2da7c8579601c14a93d4291b8cf5fa39c6eeabd8_GL0.tar.gz) = 1c1e4112c79271612ad093f4ca59fc9a60f606be45013724e465d1ab394de326
+SIZE (gitlab-org-gitlab-foss-2da7c8579601c14a93d4291b8cf5fa39c6eeabd8_GL0.tar.gz) = 94809131
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index c7aa11500f7c..c3b55831d7e6 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig 2021-07-21 12:00:21 UTC
+--- Gemfile.orig 2021-08-23 16:27:44 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,7 +17,7 @@
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
gem 'hashie'
-@@ -229,7 +228,7 @@ gem 'js_regex', '~> 3.4'
+@@ -229,7 +228,7 @@ gem 'js_regex', '~> 3.7'
gem 'device_detector'
# Redis
@@ -26,7 +26,7 @@
gem 'connection_pool', '~> 2.0'
# Redis session store
-@@ -332,104 +331,9 @@ gem 'snowplow-tracker', '~> 0.6.1'
+@@ -332,105 +331,10 @@ gem 'snowplow-tracker', '~> 0.6.1'
# Metrics
gem 'method_source', '~> 1.0', require: false
@@ -34,9 +34,11 @@
+gem 'webrick', '~> 1.6', require: false
gem 'prometheus-client-mmap', '~> 0.12.0', require: 'prometheus/client'
+ gem 'warning', '~> 1.2.0'
+-
-group :development do
- gem 'lefthook', '~> 0.7.0', require: false
-- gem 'solargraph', '~> 0.42', require: false
+- gem 'solargraph', '~> 0.43', require: false
-
- gem 'letter_opener_web', '~> 1.4.0'
-
@@ -57,7 +59,7 @@
- gem 'awesome_print', require: false
-
- gem 'database_cleaner', '~> 1.7.0'
-- gem 'factory_bot_rails', '~> 6.1.0'
+- gem 'factory_bot_rails', '~> 6.2.0'
- gem 'rspec-rails', '~> 5.0.1'
-
- # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
@@ -93,7 +95,7 @@
-end
-
-group :development, :test, :danger do
-- gem 'gitlab-dangerfiles', '~> 2.2.2', require: false
+- gem 'gitlab-dangerfiles', '~> 2.3.0', require: false
-end
-
-group :development, :test, :coverage do
@@ -128,16 +130,6 @@
- # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
- gem 'derailed_benchmarks', require: false
-end
--
- gem 'octokit', '~> 4.15'
- # https://gitlab.com/gitlab-org/gitlab/issues/207207
-@@ -477,7 +381,7 @@ gem 'gitaly', '~> 14.1.0.pre.rc3'
- # KAS GRPC protocol definitions
- gem 'kas-grpc', '~> 0.0.2'
-
--gem 'grpc', '~> 1.30.2'
-+gem 'grpc', '~> 1.30'
-
- gem 'google-protobuf', '~> 3.17.1'
+ gem 'octokit', '~> 4.15'
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example
index e27690a87049..89723cc9c122 100644
--- 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 2021-07-21 12:00:21 UTC
+--- config/gitlab.yml.example.orig 2021-08-23 16:27:44 UTC
+++ config/gitlab.yml.example
-@@ -1114,8 +1114,8 @@ production: &base
+@@ -1123,8 +1123,8 @@ production: &base
# real path not the symlink.
storages: # You must have at least a `default` storage path.
default:
@@ -11,7 +11,7 @@
# gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
## Backup settings
-@@ -1162,12 +1162,12 @@ production: &base
+@@ -1171,12 +1171,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -27,7 +27,7 @@
# Git over HTTP
upload_pack: true
-@@ -1182,13 +1182,13 @@ production: &base
+@@ -1191,13 +1191,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).
@@ -43,7 +43,7 @@
# The URL to the external KAS API (used by the Kubernetes agents)
# external_url: wss://kas.example.com
-@@ -1198,13 +1198,13 @@ production: &base
+@@ -1207,13 +1207,13 @@ production: &base
## GitLab Elasticsearch settings
elasticsearch:
@@ -59,7 +59,7 @@
## Webpack settings
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
-@@ -1431,7 +1431,7 @@ test:
+@@ -1440,7 +1440,7 @@ 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
index adabf3ccc257..700475acbec5 100644
--- 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 2021-04-22 21:13:23 UTC
+--- config/initializers/1_settings.rb.orig 2021-08-23 16:27:44 UTC
+++ config/initializers/1_settings.rb
-@@ -182,11 +182,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi
+@@ -184,11 +184,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/pkg-message b/www/gitlab-ce/pkg-message
index 7c1cb708bc3c..5b67ecb3b3ff 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.1-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/14.2-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.0-14.1-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/14.1-14.2-freebsd.md
If you just installed an minor upgrade of GitLab please follow
the instructions in the guide at:
More information about the dev-commits-ports-main
mailing list