kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 12.8.1.

Browse source 
Changelog:
https://about.gitlab.com/releases/2020/02/22/gitlab-12-8-released/
https://about.gitlab.com/releases/2020/02/24/gitlab-12-8-1-released/
This commit is contained in:
Matthias Fechner 2020-02-25 15:54:21 +00:00
parent 31811d6596
commit 70ec448e18
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=527094
7 changed files with 1142 additions and 323 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
www/gitlab-ce/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gitlab-ce
PORTVERSION= 12.7.6
PORTVERSION= 12.8.1
PORTREVISION= 0
CATEGORIES= www devel
@ -16,15 +16,15 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
# which makes maintaining this long list much easier!
MY_DEPENDS= git>=2.22.2:devel/git \
gitlab-shell>=11.0.0:devel/gitlab-shell \
gitlab-workhorse>=8.20.0:www/gitlab-workhorse \
gitaly>=1.83.0:devel/gitaly \
gitlab-pages>=1.12.0:www/gitlab-pages \
gitlab-workhorse>=8.21.0:www/gitlab-workhorse \
gitaly>=12.8.1:devel/gitaly \
gitlab-pages>=1.16.0:www/gitlab-pages \
redis>=3.2.12:databases/redis \
yarn>=1.10.0:www/yarn \
rubygem-rails52>=5.2.4.1:www/rubygem-rails52 \
rubygem-rails60>=6.0.2<6.0.3:www/rubygem-rails60 \
rubygem-bootsnap>=1.4<2.0:devel/rubygem-bootsnap \
rubygem-nakayoshi_fork>=0.0.4<0.1.0:devel/rubygem-nakayoshi_fork \
rubygem-responders-rails52>=3.0<4.0:www/rubygem-responders-rails52 \
rubygem-responders-rails60>=3.0<4.0:www/rubygem-responders-rails60 \
rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \
rubygem-default_value_for>=3.3.0<3.4.0:devel/rubygem-default_value_for \
rubygem-pg>=1.1<2:databases/rubygem-pg \
@ -32,15 +32,15 @@ MY_DEPENDS= git>=2.22.2:devel/git \
rubygem-grape-path-helpers>=1.2<2.0:devel/rubygem-grape-path-helpers \
rubygem-faraday>=0.12<1.0:www/rubygem-faraday \
rubygem-marginalia>=1.8.0<1.9:databases/rubygem-marginalia \
rubygem-devise-rails52>=4.6<5.0:devel/rubygem-devise-rails52 \
rubygem-doorkeeper43>=4.3<5.0:security/rubygem-doorkeeper43 \
rubygem-doorkeeper-openid_connect>=1.5<2.0:security/rubygem-doorkeeper-openid_connect \
rubygem-devise-rails60>=4.6<5.0:devel/rubygem-devise-rails60 \
rubygem-doorkeeper>=5.0.2<5.1:security/rubygem-doorkeeper \
rubygem-doorkeeper-openid_connect>=1.6.3<1.7:security/rubygem-doorkeeper-openid_connect \
rubygem-omniauth>=1.8<2.0:security/rubygem-omniauth \
rubygem-omniauth-auth0>=2.0.0<2.1.0:net/rubygem-omniauth-auth0 \
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 \
rubygem-omniauth-github>=1.3.0<2.0:net/rubygem-omniauth-github \
rubygem-omniauth-github>=1.4.0<2.0:net/rubygem-omniauth-github \
rubygem-omniauth-gitlab>=1.0.2<1.1.0:security/rubygem-omniauth-gitlab \
rubygem-omniauth-google-oauth2>=0.6.0<0.7.0:net/rubygem-omniauth-google-oauth2 \
rubygem-omniauth-kerberos>=0.3.0<0.4.0:net/rubygem-omniauth-kerberos \
@ -59,13 +59,13 @@ MY_DEPENDS= git>=2.22.2:devel/git \
rubygem-recaptcha>=4.11<5.0:devel/rubygem-recaptcha \
rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \
rubygem-invisible_captcha>=0.12.1<0.13.0:graphics/rubygem-invisible_captcha \
rubygem-devise-two-factor30-rails52>=3.0.0<3.1.0:security/rubygem-devise-two-factor30-rails52 \
rubygem-devise-two-factor30-rails60>=3.0.0<3.1.0:security/rubygem-devise-two-factor30-rails60 \
rubygem-rqrcode-rails3>=0.1.7<0.2.0:www/rubygem-rqrcode-rails3 \
rubygem-attr_encrypted>=3.1.0<3.2.0:security/rubygem-attr_encrypted \
rubygem-u2f0>=0.2.1<0.3.0:net/rubygem-u2f0 \
rubygem-validates_hostname>=1.0.6<1.1.0:dns/rubygem-validates_hostname \
rubygem-rubyzip20>=2.0.0<2.1.0:archivers/rubygem-rubyzip20 \
rubygem-acme-client>=2.0.2<2.1.0:security/rubygem-acme-client \
rubygem-acme-client>=2.0.5<2.1.0:security/rubygem-acme-client \
rubygem-browser>=2.5<3.0:www/rubygem-browser \
rubygem-gpgme>=2.0.19<2.1.0:security/rubygem-gpgme \
rubygem-gitlab_omniauth-ldap>=2.1.1<2.2.0:net/rubygem-gitlab_omniauth-ldap \
@ -73,12 +73,12 @@ MY_DEPENDS= git>=2.22.2:devel/git \
rubygem-grape11>=1.1.0<1.2.0:devel/rubygem-grape11 \
rubygem-grape-entity>=0.7.1<0.8.0,1:devel/rubygem-grape-entity \
rubygem-rack-cors>=1.0.6<1.1.0:www/rubygem-rack-cors \
rubygem-graphql>=1.9.11<1.10.0:devel/rubygem-graphql \
rubygem-graphql>=1.9.12<1.10.0:devel/rubygem-graphql \
rubygem-graphiql-rails>=1.4.10<1.5.0:devel/rubygem-graphiql-rails \
rubygem-apollo_upload_server>=2.0.0.b.3<2.1.0:net/rubygem-apollo_upload_server \
rubygem-graphql-docs>=1.6.0<1.7.0:devel/rubygem-graphql-docs \
rubygem-hashie-forbidden_attributes>0:devel/rubygem-hashie-forbidden_attributes \
rubygem-kaminari-rails52>=1.0<2.0:www/rubygem-kaminari-rails52 \
rubygem-kaminari-rails60>=1.0<2.0:www/rubygem-kaminari-rails60 \
rubygem-hamlit>=2.11.0<2.12.0:www/rubygem-hamlit \
rubygem-carrierwave>=1.3<2.0:www/rubygem-carrierwave \
rubygem-mini_magick>0:graphics/rubygem-mini_magick \
@ -110,7 +110,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \
rubygem-asciidoctor>=2.0.10<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.10.:textproc/rubygem-asciidoctor-plantuml \
rubygem-rouge>=3.11.0<4:textproc/rubygem-rouge \
rubygem-rouge>=3.15.0: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.10.5<1.11.0:textproc/rubygem-nokogiri \
@ -141,7 +141,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \
rubygem-device_detector>=0:devel/rubygem-device_detector \
rubygem-redis>=4.0<5.0:databases/rubygem-redis \
rubygem-connection_pool>=2.0<3.0:net/rubygem-connection_pool \
rubygem-redis-rails-rails52>=5.0.2<5.1:www/rubygem-redis-rails-rails52 \
rubygem-redis-rails-rails60>=5.0.2<5.1:www/rubygem-redis-rails-rails60 \
rubygem-discordrb-webhooks-blackst0ne>=3.3<4.0:net-im/rubygem-discordrb-webhooks-blackst0ne \
rubygem-hipchat>=1.6.0<1.7.0:net-im/rubygem-hipchat \
rubygem-jira-ruby>=1.7<2.0:devel/rubygem-jira-ruby \
@ -162,28 +162,28 @@ MY_DEPENDS= git>=2.22.2:devel/git \
rubygem-fast_blank>=0:devel/rubygem-fast_blank \
rubygem-gitlab-chronic>=0.10.5<0.11.0:devel/rubygem-gitlab-chronic \
rubygem-gitlab_chronic_duration>=0.10.6.2<0.10.7:devel/rubygem-gitlab_chronic_duration \
rubygem-webpack-rails-rails52>=0.9.10<0.10.0:www/rubygem-webpack-rails-rails52 \
rubygem-webpack-rails-rails60>=0.9.10<0.10.0:www/rubygem-webpack-rails-rails60 \
rubygem-rack-proxy>=0.6.0<0.7.0:www/rubygem-rack-proxy \
rubygem-sassc-rails-rails52>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails52 \
rubygem-sassc-rails-rails60>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails60 \
rubygem-uglifier27>=2.7.2<2.8.0:www/rubygem-uglifier27 \
rubygem-addressable>=2.7<3:www/rubygem-addressable \
rubygem-font-awesome-rails-rails52>=4.7<5.0:devel/rubygem-font-awesome-rails-rails52 \
rubygem-font-awesome-rails-rails60>=4.7<5.0:devel/rubygem-font-awesome-rails-rails60 \
rubygem-gemojione>=3.3<4.0:graphics/rubygem-gemojione \
rubygem-gon-rails52>=6.2<7.0:www/rubygem-gon-rails52 \
rubygem-gon-rails60>=6.2<7.0:www/rubygem-gon-rails60 \
rubygem-request_store>=1.3<2.0:devel/rubygem-request_store \
rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \
rubygem-gitlab-license>=1.0<2.0:devel/rubygem-gitlab-license \
rubygem-rack-attack>=6.2.0<6.3.0:www/rubygem-rack-attack \
rubygem-sentry-raven>=2.9<3.0:devel/rubygem-sentry-raven \
rubygem-premailer-rails-rails52>=1.10.3<1.11.0:mail/rubygem-premailer-rails-rails52 \
rubygem-gitlab-labkit=0.8.0:devel/rubygem-gitlab-labkit \
rubygem-premailer-rails-rails60>=1.10.3<1.11.0:mail/rubygem-premailer-rails-rails60 \
rubygem-gitlab-labkit=0.9.1:devel/rubygem-gitlab-labkit \
rubygem-ruby_parser>=3.8<4.0:devel/rubygem-ruby_parser \
rubygem-rails-i18n-rails52>=5.1<6.0:devel/rubygem-rails-i18n-rails52 \
rubygem-rails-i18n-rails60>=6.0<7.0:devel/rubygem-rails-i18n-rails60 \
rubygem-gettext_i18n_rails>=1.8.0<1.9.0:devel/rubygem-gettext_i18n_rails \
rubygem-gettext_i18n_rails_js-rails52>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails52 \
rubygem-gettext_i18n_rails_js-rails60>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails60 \
rubygem-gettext32>=3.2.2<3.3.0:devel/rubygem-gettext32 \
rubygem-batch-loader>=1.4.0<1.5.0:devel/rubygem-batch-loader \
rubygem-peek-rails52>=1.1.0<2.0:devel/rubygem-peek-rails52 \
rubygem-peek-rails60>=1.1.0<2.0:devel/rubygem-peek-rails60 \
rubygem-snowplow-tracker>=0.6.1<0.7.0:devel/rubygem-snowplow-tracker \
rubygem-derailed_benchmarks>0:benchmarks/rubygem-derailed_benchmarks \
rubygem-method_source>=0.8<1.0:devel/rubygem-method_source \
@ -195,12 +195,13 @@ MY_DEPENDS= git>=2.22.2:devel/git \
rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \
rubygem-html2text>=0:textproc/rubygem-html2text \
rubygem-ruby-prof>=1.0.0<1.1.0:devel/rubygem-ruby-prof \
rubygem-stackprof>=0.2.15<0.3:devel/rubygem-stackprof \
rubygem-rbtrace>=0.4<1.0:devel/rubygem-rbtrace \
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<2.0:net/rubygem-oauth2 \
rubygem-health_check26-rails52>=2.6.0<2.7.0:devel/rubygem-health_check26-rails52 \
rubygem-health_check26-rails60>=2.6.0<2.7.0:devel/rubygem-health_check26-rails60 \
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-net-ntp>0:net/rubygem-net-ntp \
@ -208,7 +209,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \
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-gitaly>=1.81.0<1.82:net/rubygem-gitaly \
rubygem-gitaly>=1.86.0<1.87:net/rubygem-gitaly \
rubygem-grpc>=1.24.0<1.25.0:net/rubygem-grpc \
rubygem-google-protobuf38>=3.8.0<3.9.0:devel/rubygem-google-protobuf38 \
rubygem-toml-rb10>=1.0.0<1.1.0:www/rubygem-toml-rb10 \
@ -216,13 +217,15 @@ MY_DEPENDS= git>=2.22.2:devel/git \
rubygem-flipper-active_record>=0.17.1<0.18.0:databases/rubygem-flipper-active_record \
rubygem-flipper-active_support_cache_store>=0.17.1<0.18.0:devel/rubygem-flipper-active_support_cache_store \
rubygem-unleash>=0.1.5<0.2.0:devel/rubygem-unleash \
rubygem-lograge-rails52>=0.5<1.0:www/rubygem-lograge-rails52 \
rubygem-lograge-rails60>=0.5<1.0:www/rubygem-lograge-rails60 \
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 \
rubygem-countries>=3.0.0<4.0.0:devel/rubygem-countries \
rubygem-retriable>=3.1.2<3.2.0:devel/rubygem-retriable \
rubygem-liquid>=4.0<5:textproc/rubygem-liquid \
rubygem-lru_redux>0:devel/rubygem-lru_redux
rubygem-lru_redux>0:devel/rubygem-lru_redux \
rubygem-erubi>=1.9.0<1.10:www/rubygem-erubi \
rubygem-mail>=2.7.1<2.7.2,2:mail/rubygem-mail
BUILD_DEPENDS= gem:devel/ruby-gems \
${MY_DEPENDS}
@ -242,7 +245,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= 61654d25b205e5c720de4d82402ff83fd8f18849
GL_COMMIT= d18b43a5f5a1dbfeda474ac3e616682e2ebc6abc
USERS= git
GROUPS= git

6
www/gitlab-ce/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1581628674
SHA256 (gitlab-org-gitlab-foss-61654d25b205e5c720de4d82402ff83fd8f18849_GL0.tar.gz) = 1d91bcfdaf0dfd89eaa2dac215850063aa740d0ca80cdd3341983adf2fefd8c7
SIZE (gitlab-org-gitlab-foss-61654d25b205e5c720de4d82402ff83fd8f18849_GL0.tar.gz) = 86836659
TIMESTAMP = 1582631312
SHA256 (gitlab-org-gitlab-foss-d18b43a5f5a1dbfeda474ac3e616682e2ebc6abc_GL0.tar.gz) = 2866dee174b4e250b7afbcbc52a6055b42756ce721694dedcf5c9b3552503b54
SIZE (gitlab-org-gitlab-foss-d18b43a5f5a1dbfeda474ac3e616682e2ebc6abc_GL0.tar.gz) = 88666761

18
www/gitlab-ce/files/patch-Gemfile
View file

@ -1,14 +1,14 @@
--- Gemfile.orig 2020-01-31 21:59:11 UTC
--- Gemfile.orig 2020-02-21 15:14:12 UTC
+++ Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '5.2.3'
+gem 'rails', '5.2.4.1'
-gem 'rails', '6.0.2'
+gem 'rails', '6.0.2.1'
gem 'bootsnap', '~> 1.4'
@@ -93,7 +93,6 @@ gem 'graphql', '~> 1.9.11'
@@ -93,7 +93,6 @@ gem 'graphql', '~> 1.9.12'
# https://gitlab.com/gitlab-org/gitlab/issues/31747
gem 'graphiql-rails', '~> 1.4.10'
gem 'apollo_upload_server', '~> 2.0.0.beta3'
@ -20,8 +20,8 @@
gem 'asciidoctor', '~> 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
gem 'asciidoctor-plantuml', '0.0.10'
-gem 'rouge', '~> 3.11.0'
+gem 'rouge', '~> 3.11'
-gem 'rouge', '~> 3.15.0'
+gem 'rouge', '~> 3.15'
gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.10.5'
@ -34,7 +34,7 @@
# Jira integration
gem 'jira-ruby', '~> 1.7'
@@ -329,94 +328,6 @@ group :metrics do
@@ -329,92 +328,6 @@ group :metrics do
# Prometheus
gem 'prometheus-client-mmap', '~> 0.10.0'
gem 'raindrops', '~> 0.18'
@ -58,7 +58,7 @@
-group :development, :test do
- gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
- gem 'pry-byebug', '~> 3.5.1', platform: :mri
- gem 'pry-rails', '~> 0.3.4'
- gem 'pry-rails', '~> 0.3.9'
-
- gem 'awesome_print', require: false
-
@ -90,8 +90,6 @@
-
- gem 'knapsack', '~> 1.17'
-
- gem 'stackprof', '~> 0.2.13', require: false
-
- gem 'simple_po_parser', '~> 1.1.2', require: false
-
- gem 'timecop', '~> 0.8.0'

12
www/gitlab-ce/files/patch-config_gitlab.yml.example
View file

@ -1,15 +1,15 @@
--- config/gitlab.yml.example.orig 2020-01-31 21:59:11 UTC
--- config/gitlab.yml.example.orig 2020-02-21 15:14:12 UTC
+++ config/gitlab.yml.example
@@ -916,7 +916,7 @@ production: &base
@@ -930,7 +930,7 @@ production: &base
# Gitaly settings
gitaly:
# Path to the directory containing Gitaly client executables.
- client_path: /home/git/gitaly/bin
- client_path: /home/git/gitaly
+ client_path: %%PREFIX%%/share/gitaly/bin
# Default Gitaly authentication token. Can be overridden per storage. Can
# be left blank when Gitaly is running locally on a Unix socket, which
# is the normal way to deploy Gitaly.
@@ -934,8 +934,8 @@ production: &base
@@ -948,8 +948,8 @@ production: &base
# real path not the symlink.
storages: # You must have at least a `default` storage path.
default:
@ -20,7 +20,7 @@
# gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
## Backup settings
@@ -981,12 +981,12 @@ production: &base
@@ -995,12 +995,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@ -36,7 +36,7 @@
# Git over HTTP
upload_pack: true
@@ -1011,7 +1011,7 @@ production: &base
@@ -1025,7 +1025,7 @@ production: &base
# CAUTION!
# Use the default values unless you really know what you are doing
git:

6
www/gitlab-ce/files/patch-config_unicorn.rb.example
View file

@ -1,4 +1,4 @@
--- config/unicorn.rb.example.orig 2018-12-21 14:23:37 UTC
--- config/unicorn.rb.example.orig 2020-02-21 15:14:12 UTC
+++ config/unicorn.rb.example
@@ -33,12 +33,12 @@ worker_processes 3
@ -32,12 +32,14 @@
# Save memory by sharing the application code among multiple Unicorn workers
# with "preload_app true". See:
@@ -81,7 +81,7 @@ preload_app true
@@ -81,8 +81,8 @@ preload_app true
# fast LAN.
check_client_connection false
-require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events"
-require_relative "/home/git/gitlab/lib/gitlab/log_timestamp_formatter.rb"
+require_relative "%%PREFIX%%/www/gitlab-ce/lib/gitlab/cluster/lifecycle_events"
+require_relative "%%PREFIX%%/www/gitlab-ce/lib/gitlab/log_timestamp_formatter.rb"
before_exec do |server|
# Signal application hooks that we're about to restart

4
www/gitlab-ce/pkg-message
View file

@ -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/12.7-freebsd.md
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/12.8-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/12.6-12.7-freebsd.md
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/12.7-12.8-freebsd.md
If you just installed an minor upgrade of GitLab please follow
the instructions in the guide at:

1356
www/gitlab-ce/pkg-plist
View file

File diff suppressed because it is too large Load diff