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

Update www/gitlab-ce to 11.2.3.

Browse source 
For a detailed changelog please see here:
https://about.gitlab.com/2018/08/22/gitlab-11-2-released/
https://about.gitlab.com/2018/08/23/gitlab-11-2-1-released/
https://about.gitlab.com/2018/08/28/security-release-gitlab-11-dot-2-dot-2-released/

Approved by:	mentors (implicit)
This commit is contained in:
Matthias Fechner 2018-09-06 19:09:19 +00:00
parent f16f8ead6a
commit aca0bebe8b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=479140
8 changed files with 428 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
www/gitlab-ce/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= gitlab-ce PORTNAME= gitlab-ce
PORTVERSION= 11.1.6 PORTVERSION= 11.2.3
CATEGORIES= www devel CATEGORIES= www devel
MAINTAINER= mfechner@FreeBSD.org MAINTAINER= mfechner@FreeBSD.org
@ -24,9 +24,9 @@ BUILD_DEPENDS= gem:devel/ruby-gems
# only rubygem-pg and rubygem-mysql are defined later as RUN_DEPENDS # only rubygem-pg and rubygem-mysql are defined later as RUN_DEPENDS
# for the options # for the options
RUN_DEPENDS= git>=2.16.2:devel/git \ RUN_DEPENDS= git>=2.16.2:devel/git \
gitlab-shell>=7.1.4:devel/gitlab-shell \ gitlab-shell>=8.1.1:devel/gitlab-shell \
gitlab-workhorse>=5.0.0:www/gitlab-workhorse \ gitlab-workhorse>=5.1.0:www/gitlab-workhorse \
gitaly>=0.111.2:devel/gitaly \ gitaly>=0.117.2:devel/gitaly \
gitlab-pages>=1.0.0:www/gitlab-pages \ gitlab-pages>=1.0.0:www/gitlab-pages \
redis>=2.8.23:databases/redis \ redis>=2.8.23:databases/redis \
npm>=4.3.0:www/npm \ npm>=4.3.0:www/npm \
@ -80,7 +80,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-graphiql-rails>=1.4.10:devel/rubygem-graphiql-rails \ rubygem-graphiql-rails>=1.4.10:devel/rubygem-graphiql-rails \
rubygem-hashie-forbidden_attributes>=0:devel/rubygem-hashie-forbidden_attributes \ rubygem-hashie-forbidden_attributes>=0:devel/rubygem-hashie-forbidden_attributes \
rubygem-kaminari-rails4>=1.0:www/rubygem-kaminari-rails4 \ rubygem-kaminari-rails4>=1.0:www/rubygem-kaminari-rails4 \
rubygem-hamlit26>=2.6.1:www/rubygem-hamlit26 \ rubygem-hamlit>=2.8.8:www/rubygem-hamlit \
rubygem-carrierwave>=1.1:www/rubygem-carrierwave \ rubygem-carrierwave>=1.1:www/rubygem-carrierwave \
rubygem-mini_magick>=0:graphics/rubygem-mini_magick \ rubygem-mini_magick>=0:graphics/rubygem-mini_magick \
rubygem-dropzonejs-rails07>=0.7.1:www/rubygem-dropzonejs-rails07 \ rubygem-dropzonejs-rails07>=0.7.1:www/rubygem-dropzonejs-rails07 \
@ -136,10 +136,11 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-gitlab-flowdock-git-hook>=1.0.1:www/rubygem-gitlab-flowdock-git-hook \ rubygem-gitlab-flowdock-git-hook>=1.0.1:www/rubygem-gitlab-flowdock-git-hook \
rubygem-gemnasium-gitlab-service>=0.2:devel/rubygem-gemnasium-gitlab-service \ rubygem-gemnasium-gitlab-service>=0.2:devel/rubygem-gemnasium-gitlab-service \
rubygem-slack-notifier1>=1.5.1:devel/rubygem-slack-notifier1 \ rubygem-slack-notifier1>=1.5.1:devel/rubygem-slack-notifier1 \
rubygem-hangouts-chat>=0.0.5:net/rubygem-hangouts-chat \
rubygem-asana>=0.6.0:www/rubygem-asana \ rubygem-asana>=0.6.0:www/rubygem-asana \
rubygem-ruby-fogbugz021>=0.2.1:devel/rubygem-ruby-fogbugz021 \ rubygem-ruby-fogbugz021>=0.2.1:devel/rubygem-ruby-fogbugz021 \
rubygem-kubeclient>=3.1.0:www/rubygem-kubeclient \ rubygem-kubeclient>=3.1.0:www/rubygem-kubeclient \
rubygem-sanitize>=4.6.5:textproc/rubygem-sanitize \ rubygem-sanitize>=4.6:textproc/rubygem-sanitize \
rubygem-babosa>=1.0.2:textproc/rubygem-babosa \ rubygem-babosa>=1.0.2:textproc/rubygem-babosa \
rubygem-loofah>=2.2:textproc/rubygem-loofah \ rubygem-loofah>=2.2:textproc/rubygem-loofah \
rubygem-licensee8>=8.9:devel/rubygem-licensee8 \ rubygem-licensee8>=8.9:devel/rubygem-licensee8 \
@ -176,12 +177,13 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-peek-rblineprof>=0.2.0:devel/rubygem-peek-rblineprof \ rubygem-peek-rblineprof>=0.2.0:devel/rubygem-peek-rblineprof \
rubygem-peek-redis>=1.2.0:devel/rubygem-peek-redis \ rubygem-peek-redis>=1.2.0:devel/rubygem-peek-redis \
rubygem-peek-sidekiq>=1.0.3:devel/rubygem-peek-sidekiq \ rubygem-peek-sidekiq>=1.0.3:devel/rubygem-peek-sidekiq \
rubygem-prometheus-client-mmap>=0.9.3:devel/rubygem-prometheus-client-mmap \ rubygem-prometheus-client-mmap>=0.9.4:devel/rubygem-prometheus-client-mmap \
rubygem-octokit>=4.9:net/rubygem-octokit \ rubygem-octokit>=4.9:net/rubygem-octokit \
rubygem-mail_room>=0.9.1:mail/rubygem-mail_room \ rubygem-mail_room>=0.9.1:mail/rubygem-mail_room \
rubygem-email_reply_trimmer>=0.1:mail/rubygem-email_reply_trimmer \ rubygem-email_reply_trimmer>=0.1:mail/rubygem-email_reply_trimmer \
rubygem-html2text>=0:textproc/rubygem-html2text \ rubygem-html2text>=0:textproc/rubygem-html2text \
rubygem-ruby-prof>=0.17.0:devel/rubygem-ruby-prof \ rubygem-ruby-prof>=0.17.0:devel/rubygem-ruby-prof \
rubygem-rbtrace>=0.4:devel/rubygem-rbtrace \
rubygem-oauth2>=1.4.0:net/rubygem-oauth2 \ rubygem-oauth2>=1.4.0:net/rubygem-oauth2 \
rubygem-health_check26>=2.6.0:devel/rubygem-health_check26 \ rubygem-health_check26>=2.6.0:devel/rubygem-health_check26 \
rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \ rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \
@ -190,7 +192,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-sshkey>=1.9.0:security/rubygem-sshkey \ rubygem-sshkey>=1.9.0:security/rubygem-sshkey \
rubygem-ed25519>=1.2:security/rubygem-ed25519 \ rubygem-ed25519>=1.2:security/rubygem-ed25519 \
rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \ rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \
rubygem-gitaly-proto>=0.105.0:net/rubygem-gitaly-proto \ rubygem-gitaly-proto>=0.113.0:net/rubygem-gitaly-proto \
rubygem-grpc>=1.11.0:net/rubygem-grpc \ rubygem-grpc>=1.11.0:net/rubygem-grpc \
rubygem-gitaly>=0.8.0:net/rubygem-gitaly \ rubygem-gitaly>=0.8.0:net/rubygem-gitaly \
rubygem-google-protobuf351>=3.5.1:devel/rubygem-google-protobuf351 \ rubygem-google-protobuf351>=3.5.1:devel/rubygem-google-protobuf351 \
@ -213,7 +215,7 @@ USE_RC_SUBR= gitlab
USE_GITLAB= yes USE_GITLAB= yes
GL_ACCOUNT= gitlab-org GL_ACCOUNT= gitlab-org
# Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags # Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags
GL_COMMIT= 014912084ddfbafa35da6d52f1b1b46b601bfc62 GL_COMMIT= 06cbee3bf9dd960380390c0a5df9b67a52a85ba9
USERS= git USERS= git
GROUPS= git GROUPS= git

6
www/gitlab-ce/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1535648221 TIMESTAMP = 1535876579
SHA256 (gitlab-org-gitlab-ce-014912084ddfbafa35da6d52f1b1b46b601bfc62_GL0.tar.gz) = d7c9af8398266c51869dc8124cb5ceb88908f55def696aa4542f41f9137d848b SHA256 (gitlab-org-gitlab-ce-06cbee3bf9dd960380390c0a5df9b67a52a85ba9_GL0.tar.gz) = b7735a0589b4eaba762ee28e3d6ba2a3a3f788c82de1c3dffd57a5ad2b35dda5
SIZE (gitlab-org-gitlab-ce-014912084ddfbafa35da6d52f1b1b46b601bfc62_GL0.tar.gz) = 51958008 SIZE (gitlab-org-gitlab-ce-06cbee3bf9dd960380390c0a5df9b67a52a85ba9_GL0.tar.gz) = 52777352

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

@ -1,4 +1,4 @@
--- Gemfile.orig 2018-07-20 09:55:24 UTC --- Gemfile.orig 2018-08-22 22:40:32 UTC
+++ Gemfile +++ Gemfile
@@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0' @@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0'
gem 'default_value_for', gem_versions['default_value_for'] gem 'default_value_for', gem_versions['default_value_for']
@ -27,7 +27,7 @@
# Colored output to console # Colored output to console
gem 'rainbow', '~> 2.2' gem 'rainbow', '~> 2.2'
@@ -291,7 +291,7 @@ gem 'batch-loader', '~> 1.2.1' @@ -294,7 +294,7 @@ gem 'batch-loader', '~> 1.2.1'
# Perf bar # Perf bar
gem 'peek', '~> 1.0.1' gem 'peek', '~> 1.0.1'
gem 'peek-gc', '~> 0.0.2' gem 'peek-gc', '~> 0.0.2'
@ -36,7 +36,7 @@
gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-pg', '~> 1.3.0', group: :postgres
gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-rblineprof', '~> 0.2.0'
gem 'peek-redis', '~> 1.2.0' gem 'peek-redis', '~> 1.2.0'
@@ -299,95 +299,11 @@ gem 'peek-sidekiq', '~> 1.0.3' @@ -302,96 +302,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
# Metrics # Metrics
group :metrics do group :metrics do
@ -44,7 +44,7 @@
- gem 'influxdb', '~> 0.2', require: false - gem 'influxdb', '~> 0.2', require: false
- -
# Prometheus # Prometheus
gem 'prometheus-client-mmap', '~> 0.9.3' gem 'prometheus-client-mmap', '~> 0.9.4'
gem 'raindrops', '~> 0.18' gem 'raindrops', '~> 0.18'
end end
@ -64,6 +64,7 @@
-end -end
- -
-group :development, :test do -group :development, :test do
- gem 'bootsnap', '~> 1.3'
- gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] - gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
- gem 'pry-byebug', '~> 3.4.1', platform: :mri - gem 'pry-byebug', '~> 3.4.1', platform: :mri
- gem 'pry-rails', '~> 0.3.4' - gem 'pry-rails', '~> 0.3.4'
@ -92,9 +93,9 @@
- gem 'spring', '~> 2.0.0' - gem 'spring', '~> 2.0.0'
- gem 'spring-commands-rspec', '~> 1.0.4' - gem 'spring-commands-rspec', '~> 1.0.4'
- -
- gem 'gitlab-styles', '~> 2.3', require: false - gem 'gitlab-styles', '~> 2.4', require: false
- # Pin these dependencies, otherwise a new rule could break the CI pipelines - # Pin these dependencies, otherwise a new rule could break the CI pipelines
- gem 'rubocop', '~> 0.52.1' - gem 'rubocop', '~> 0.54.0'
- gem 'rubocop-rspec', '~> 1.22.1' - gem 'rubocop-rspec', '~> 1.22.1'
- -
- gem 'scss_lint', '~> 0.56.0', require: false - gem 'scss_lint', '~> 0.56.0', require: false

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

@ -1,6 +1,6 @@
--- config/gitlab.yml.example.orig 2018-06-21 15:14:17 UTC --- config/gitlab.yml.example.orig 2018-08-22 22:40:32 UTC
+++ config/gitlab.yml.example +++ config/gitlab.yml.example
@@ -218,7 +218,7 @@ production: &base @@ -223,7 +223,7 @@ production: &base
# external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages
# external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages
admin: admin:
@ -9,7 +9,7 @@
## Mattermost ## Mattermost
## For enabling Add to Mattermost button ## For enabling Add to Mattermost button
@@ -577,7 +577,7 @@ production: &base @@ -582,7 +582,7 @@ production: &base
# Gitaly settings # Gitaly settings
gitaly: gitaly:
# Path to the directory containing Gitaly client executables. # Path to the directory containing Gitaly client executables.
@ -18,7 +18,7 @@
# Default Gitaly authentication token. Can be overriden per storage. Can # Default Gitaly authentication token. Can be overriden per storage. Can
# be left blank when Gitaly is running locally on a Unix socket, which # be left blank when Gitaly is running locally on a Unix socket, which
# is the normal way to deploy Gitaly. # is the normal way to deploy Gitaly.
@@ -595,8 +595,8 @@ production: &base @@ -600,8 +600,8 @@ production: &base
# real path not the symlink. # real path not the symlink.
storages: # You must have at least a `default` storage path. storages: # You must have at least a `default` storage path.
default: default:
@ -29,7 +29,7 @@
# gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
## Backup settings ## Backup settings
@@ -624,12 +624,12 @@ production: &base @@ -629,12 +629,12 @@ production: &base
## GitLab Shell settings ## GitLab Shell settings
gitlab_shell: gitlab_shell:
@ -45,7 +45,7 @@
# Git over HTTP # Git over HTTP
upload_pack: true upload_pack: true
@@ -650,7 +650,7 @@ production: &base @@ -655,7 +655,7 @@ production: &base
# CAUTION! # CAUTION!
# Use the default values unless you really know what you are doing # Use the default values unless you really know what you are doing
git: git:

4
www/gitlab-ce/files/patch-config_initializers_1__settings.rb
View file

@ -1,6 +1,6 @@
--- config/initializers/1_settings.rb.orig 2018-06-06 20:30:27 UTC --- config/initializers/1_settings.rb.orig 2018-08-22 22:40:32 UTC
+++ config/initializers/1_settings.rb +++ config/initializers/1_settings.rb
@@ -125,12 +125,8 @@ Settings.gitlab['email_subject_suffix'] @@ -126,12 +126,8 @@ Settings.gitlab['email_subject_suffix']
Settings.gitlab['base_url'] ||= Settings.__send__(:build_base_gitlab_url) Settings.gitlab['base_url'] ||= Settings.__send__(:build_base_gitlab_url)
Settings.gitlab['url'] ||= Settings.__send__(:build_gitlab_url) Settings.gitlab['url'] ||= Settings.__send__(:build_gitlab_url)
Settings.gitlab['user'] ||= 'git' Settings.gitlab['user'] ||= 'git'

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

@ -1,4 +1,4 @@
--- config/unicorn.rb.example.orig 2017-06-07 20:58:14 UTC --- config/unicorn.rb.example.orig 2018-08-22 22:40:32 UTC
+++ config/unicorn.rb.example +++ config/unicorn.rb.example
@@ -33,12 +33,12 @@ worker_processes 3 @@ -33,12 +33,12 @@ worker_processes 3
@ -30,5 +30,5 @@
+stderr_path "%%PREFIX%%/www/gitlab-ce/log/unicorn.stderr.log" +stderr_path "%%PREFIX%%/www/gitlab-ce/log/unicorn.stderr.log"
+stdout_path "%%PREFIX%%/www/gitlab-ce/log/unicorn.stdout.log" +stdout_path "%%PREFIX%%/www/gitlab-ce/log/unicorn.stdout.log"
# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings # Save memory by sharing the application code among multiple Unicorn workers
# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow # with "preload_app true". See:

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

@ -4,12 +4,12 @@ Gitlab was installed successfully.
You now need to set up the various components of Gitlab, so please You now need to set up the various components of Gitlab, so please
follow the instructions in the guide at: follow the instructions in the guide at:
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/11.1-freebsd.md https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/11.2-freebsd.md
If you just installed an major upgrade of GitLab, for example you If you just installed an major upgrade of GitLab, for example you
switched from 11.0.x to 11.1.x, please follow the instructions in the guide at: switched from 11.1.x to 11.2.x, please follow the instructions in the guide at:
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/11.0-11.1-freebsd.md https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/11.1-11.2-freebsd.md
If you just installed an minor upgrade of GitLab please follow If you just installed an minor upgrade of GitLab please follow
the instructions in the guide at: the instructions in the guide at:

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

File diff suppressed because it is too large Load diff