git: 3729fba860eb - main - www/gitlab-ce: Update to 14.1.0
Matthias Fechner
mfechner at FreeBSD.org
Sat Jul 24 07:08:47 UTC 2021
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3729fba860ebf1802b3883e7ca7e32ac9d35a210
commit 3729fba860ebf1802b3883e7ca7e32ac9d35a210
Author: Matthias Fechner <mfechner at FreeBSD.org>
AuthorDate: 2021-07-24 06:59:19 +0000
Commit: Matthias Fechner <mfechner at FreeBSD.org>
CommitDate: 2021-07-24 07:08:06 +0000
www/gitlab-ce: Update to 14.1.0
Changelog:
https://about.gitlab.com/releases/2021/07/22/gitlab-14-1-released/
---
www/gitlab-ce/Makefile | 46 +++++++++++-----------
www/gitlab-ce/distinfo | 6 +--
www/gitlab-ce/files/patch-Gemfile | 42 +++++++-------------
.../files/patch-config_gitlab.yml.example | 12 +++---
www/gitlab-ce/pkg-message | 4 +-
5 files changed, 49 insertions(+), 61 deletions(-)
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index a1b7024812c4..4c4909615847 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,8 +1,8 @@
# Created by: Torsten Zuehlsdorff <tz at FreeBSD.org>
PORTNAME= gitlab-ce
-PORTVERSION= 14.0.5
-PORTREVISION= 2
+PORTVERSION= 14.1.0
+PORTREVISION= 0
CATEGORIES= www devel
MAINTAINER= mfechner at FreeBSD.org
@@ -15,7 +15,7 @@ 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.0.1:net/gitlab-agent \
+ 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-shell>=13.19.0:devel/gitlab-shell \
@@ -41,9 +41,9 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-doorkeeper-openid_connect>=1.7.5<1.8:security/rubygem-doorkeeper-openid_connect \
rubygem-rexml>=3.2.5<3.3:textproc/rubygem-rexml \
rubygem-ruby-saml>=1.12.1<1.13:security/rubygem-ruby-saml \
- rubygem-omniauth1>=1.8<2.0:security/rubygem-omniauth1 \
+ rubygem-omniauth1>=1.9.1<2.0:security/rubygem-omniauth1 \
rubygem-omniauth-auth0>=2.0.0<2.1.0:net/rubygem-omniauth-auth0 \
- rubygem-omniauth-azure-activedirectory-v2>=0.1<1:net/rubygem-omniauth-azure-activedirectory-v2 \
+ rubygem-omniauth-azure-activedirectory-v2>=1.0<2:net/rubygem-omniauth-azure-activedirectory-v2 \
rubygem-omniauth-azure-oauth2>=0.0.9<0.1.0:net/rubygem-omniauth-azure-oauth2 \
rubygem-omniauth-cas3>=1.1.4<1.2.0:security/rubygem-omniauth-cas3 \
rubygem-omniauth-facebook4>=4.0.0<4.1.0:net/rubygem-omniauth-facebook4 \
@@ -87,7 +87,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-apollo_upload_server>=2.0.2<2.1:net/rubygem-apollo_upload_server \
rubygem-graphql-docs>=1.6.0<1.7.0:devel/rubygem-graphql-docs \
rubygem-graphlient>=0.4.0<0.5:devel/rubygem-graphlient \
- rubygem-hashie>0:devel/rubygem-hashie \
+ rubygem-hashie>=4.1.0:devel/rubygem-hashie \
rubygem-hashie-forbidden_attributes>0:devel/rubygem-hashie-forbidden_attributes \
rubygem-kaminari-rails61>=1.2.1<2.0:www/rubygem-kaminari-rails61 \
rubygem-hamlit>=2.15.0<2.16:www/rubygem-hamlit \
@@ -95,7 +95,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-mini_magick>=4.10.1<4.11:graphics/rubygem-mini_magick \
rubygem-fog-aws>=3.9<4.0:net/rubygem-fog-aws \
rubygem-fog-core210=2.1.0:devel/rubygem-fog-core210 \
- rubygem-gitlab-fog-google>=1.13<2:net/rubygem-gitlab-fog-google \
+ rubygem-fog-google>=1.15<2:net/rubygem-fog-google \
rubygem-fog-local>=0.6<1.0:net/rubygem-fog-local \
rubygem-fog-openstack>=1.0<2.0:net/rubygem-fog-openstack \
rubygem-fog-rackspace>=0.1.1<1.2.0:net/rubygem-fog-rackspace \
@@ -118,18 +118,18 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-commonmarker>=0.21<1.0: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-gitlab-rdoc>=6.3.2<7:devel/rubygem-gitlab-rdoc \
+ rubygem-rdoc>=6.3.2<7:devel/rubygem-rdoc \
rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \
rubygem-creole>=0.5.0<0.6.0:textproc/rubygem-creole \
rubygem-wikicloth081>=0.8.1<0.8.2:textproc/rubygem-wikicloth081 \
- rubygem-asciidoctor>=2.0.12<2.1.0:textproc/rubygem-asciidoctor \
+ rubygem-asciidoctor>=2.0.15<2.1.0:textproc/rubygem-asciidoctor \
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.4.0<0.5:textproc/rubygem-asciidoctor-kroki \
+ rubygem-asciidoctor-kroki>=0.5.0<0.6:textproc/rubygem-asciidoctor-kroki \
rubygem-rouge>=3.26.0<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.4<1.12:textproc/rubygem-nokogiri \
+ rubygem-nokogiri>=1.11.5<1.12:textproc/rubygem-nokogiri \
rubygem-escape_utils>=1.1<2.0:textproc/rubygem-escape_utils \
rubygem-icalendar>=0:devel/rubygem-icalendar \
rubygem-diffy>=3.3<4:textproc/rubygem-diffy \
@@ -142,7 +142,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \
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-cron>=1.0<2.0:devel/rubygem-sidekiq-cron \
- rubygem-redis-namespace17>=1.7.0<1.8.0:databases/rubygem-redis-namespace17 \
+ 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-fugit12>=1.2.1<1.3.0:devel/rubygem-fugit12 \
rubygem-httparty>=0.16.4<0.17.0:www/rubygem-httparty \
@@ -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.4<4.0:textproc/rubygem-js_regex \
rubygem-device_detector>=0:devel/rubygem-device_detector \
- rubygem-redis>=4.0<5.0:databases/rubygem-redis \
+ rubygem-redis>=4.1.4<5:databases/rubygem-redis \
rubygem-connection_pool>=2.0<3.0:net/rubygem-connection_pool \
rubygem-redis-rails-rails61>=5.0.2<5.1:www/rubygem-redis-rails-rails61 \
rubygem-discordrb-webhooks>=3.4<4.0:net-im/rubygem-discordrb-webhooks \
@@ -164,7 +164,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-hangouts-chat>=0.0.5<0.1.0:net/rubygem-hangouts-chat \
rubygem-asana>=0.10.3<0.11:www/rubygem-asana \
rubygem-ruby-fogbugz021>=0.2.1<0.3.0:devel/rubygem-ruby-fogbugz021 \
- rubygem-kubeclient>=4.9.1<4.10.0:www/rubygem-kubeclient \
+ rubygem-kubeclient>=4.9.2<4.10.0:www/rubygem-kubeclient \
rubygem-sanitize>=5.2.1<6:textproc/rubygem-sanitize \
rubygem-babosa>=1.0.4<1.1.0:textproc/rubygem-babosa \
rubygem-loofah>=2.9.0<3.0:textproc/rubygem-loofah \
@@ -178,17 +178,17 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-sassc-rails-rails61>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails61 \
rubygem-autoprefixer-rails>=10.2.5.1<10.2.6:textproc/rubygem-autoprefixer-rails \
rubygem-terser>=1.0.2:textproc/rubygem-terser \
- rubygem-addressable>=2.7<3:www/rubygem-addressable \
+ rubygem-addressable>=2.8<3:www/rubygem-addressable \
rubygem-gemojione>=3.3<4.0:graphics/rubygem-gemojione \
rubygem-gon-rails61>=6.4.0<6.5:www/rubygem-gon-rails61 \
rubygem-request_store>=1.5<2.0:devel/rubygem-request_store \
rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \
- rubygem-gitlab-license>=1.5<2.0:devel/rubygem-gitlab-license \
+ rubygem-gitlab-license>=2.0<3:devel/rubygem-gitlab-license \
rubygem-rack-attack>=6.3.0<6.4.0:www/rubygem-rack-attack \
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.18.0<0.19:devel/rubygem-gitlab-labkit \
+ rubygem-gitlab-labkit>=0.20.0<0.21: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 \
@@ -211,26 +211,26 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-memory_profiler>=0.9<1.0:devel/rubygem-memory_profiler \
rubygem-benchmark-memory>=0.1<1.0:benchmarks/rubygem-benchmark-memory \
rubygem-activerecord-explain-analyze>=0.1<1.0:databases/rubygem-activerecord-explain-analyze \
- rubygem-oauth2>=1.4.4<2.0:net/rubygem-oauth2 \
+ rubygem-oauth2>=1.4.7<2.0:net/rubygem-oauth2 \
rubygem-health_check>=3.0<4:devel/rubygem-health_check \
rubygem-vmstat>=2.3.0<2.4.0:sysutils/rubygem-vmstat \
- rubygem-sys-filesystem>=1.1.6<1.2.0:sysutils/rubygem-sys-filesystem \
+ rubygem-sys-filesystem>=1.1.9<1.2.0:sysutils/rubygem-sys-filesystem \
rubygem-net-ntp>0:net/rubygem-net-ntp \
rubygem-net-ssh>=6.0<7,2:security/rubygem-net-ssh \
rubygem-sshkey>=2.0<3.0:security/rubygem-sshkey \
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.0.0.pre.rc2<14.1.0:net/rubygem-gitaly \
+ rubygem-gitaly>=14.1.0.pre.rc3<14.2.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-google-protobuf>=3.17.1<3.18:devel/rubygem-google-protobuf \
- rubygem-toml-rb10>=1.0.0<1.1.0:www/rubygem-toml-rb10 \
+ 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.5.4<0.6:devel/rubygem-gitlab-experiment \
+ rubygem-gitlab-experiment>=0.6.1<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 \
@@ -269,7 +269,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?= 25fc1060affe576fd7c2f8aad586c5109c51cf7e
+GL_COMMIT?= b1a082345cee74a633bc8536e00b09fc5c425a60
USERS= git
GROUPS= git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index d9a2122238fc..89449b65e5c0 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625902013
-SHA256 (gitlab-org-gitlab-foss-25fc1060affe576fd7c2f8aad586c5109c51cf7e_GL0.tar.gz) = 38930f9942eabc5fa3b84fe71c3774b32a60d5d99f6230752fbde5f3a274acb5
-SIZE (gitlab-org-gitlab-foss-25fc1060affe576fd7c2f8aad586c5109c51cf7e_GL0.tar.gz) = 96614850
+TIMESTAMP = 1627071254
+SHA256 (gitlab-org-gitlab-foss-b1a082345cee74a633bc8536e00b09fc5c425a60_GL0.tar.gz) = 8eaa5a4425572f9668871831f0042fc08506f5a483e65a0604feb939ce48cbd0
+SIZE (gitlab-org-gitlab-foss-b1a082345cee74a633bc8536e00b09fc5c425a60_GL0.tar.gz) = 96486524
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index 391b432b243f..c7aa11500f7c 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig 2021-07-01 10:22:34 UTC
+--- Gemfile.orig 2021-07-21 12:00:21 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,34 +17,22 @@
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
gem 'hashie'
-@@ -286,7 +285,7 @@ gem 'gitlab_chronic_duration', '~> 0.10.6.2'
- gem 'rack-proxy', '~> 0.6.0'
+@@ -229,7 +228,7 @@ gem 'js_regex', '~> 3.4'
+ gem 'device_detector'
- gem 'sassc-rails', '~> 2.1.0'
--gem 'autoprefixer-rails', '10.2.0.0'
-+gem 'autoprefixer-rails', '10.2.5.1'
- gem 'terser', '1.0.2'
+ # Redis
+-gem 'redis', '~> 4.1.4'
++gem 'redis', '~> 4.1'
+ gem 'connection_pool', '~> 2.0'
- gem 'addressable', '~> 2.7'
-@@ -309,7 +308,7 @@ gem 'sentry-raven', '~> 3.1'
- # and https://github.com/pganalyze/pg_query/pull/213 are
- # released. gitlab-labkit will need to be updated to use the pg_query
- # version.
--gem 'gitlab-pg_query', '~> 2.0.4', require: 'pg_query'
-+gem 'pg_query', '~> 2.1', require: 'pg_query'
+ # Redis session store
+@@ -332,104 +331,9 @@ gem 'snowplow-tracker', '~> 0.6.1'
- gem 'premailer-rails', '~> 1.10.3'
-
-@@ -337,107 +336,12 @@ gem 'snowplow-tracker', '~> 0.6.1'
# Metrics
- group :metrics do
- gem 'method_source', '~> 1.0', require: false
-- gem 'webrick', '~> 1.6.1', require: false
-+ gem 'webrick', '~> 1.6', require: false
-
- # Prometheus
- gem 'prometheus-client-mmap', '~> 0.12.0'
- end
+ gem 'method_source', '~> 1.0', require: false
+-gem 'webrick', '~> 1.6.1', require: false
++gem 'webrick', '~> 1.6', require: false
+ gem 'prometheus-client-mmap', '~> 0.12.0', require: 'prometheus/client'
-group :development do
- gem 'lefthook', '~> 0.7.0', require: false
@@ -105,7 +93,7 @@
-end
-
-group :development, :test, :danger do
-- gem 'gitlab-dangerfiles', '~> 2.1.2', require: false
+- gem 'gitlab-dangerfiles', '~> 2.2.2', require: false
-end
-
-group :development, :test, :coverage do
@@ -144,7 +132,7 @@
gem 'octokit', '~> 4.15'
# https://gitlab.com/gitlab-org/gitlab/issues/207207
-@@ -485,7 +389,7 @@ gem 'gitaly', '~> 14.0.0.pre.rc2'
+@@ -477,7 +381,7 @@ gem 'gitaly', '~> 14.1.0.pre.rc3'
# 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 c776e15ee016..e27690a87049 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-06-21 15:55:09 UTC
+--- config/gitlab.yml.example.orig 2021-07-21 12:00:21 UTC
+++ config/gitlab.yml.example
-@@ -1109,8 +1109,8 @@ production: &base
+@@ -1114,8 +1114,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
-@@ -1156,12 +1156,12 @@ production: &base
+@@ -1162,12 +1162,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -27,7 +27,7 @@
# Git over HTTP
upload_pack: true
-@@ -1176,13 +1176,13 @@ production: &base
+@@ -1182,13 +1182,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
-@@ -1192,13 +1192,13 @@ production: &base
+@@ -1198,13 +1198,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
-@@ -1425,7 +1425,7 @@ test:
+@@ -1431,7 +1431,7 @@ test:
gitaly_address: unix:tmp/tests/gitaly/praefect.socket
gitaly:
diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message
index 1965d0bff0b9..7c1cb708bc3c 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.0-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/14.1-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/13.12-14.0-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/14.0-14.1-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