cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r467332 r468821

Browse Source 
Update gitlab to version 10.6.4.
For detailed new feature with the major version please check https://about.gitlab.com/2018/03/22/gitlab-10-6-released/

Reviewed by:	swills (mentor)
Approved by:	swills (mentor)
Differential Revision:	https://reviews.freebsd.org/D15038

Security update for gitlab to 10.6.5.

Reviewed by:	eugen_grosbein.net, tz (mentor)
Approved by:	eugen_grosbein.net, tz (mentor)
MFC after:	1 day
Security:	9dfe61c8-4d15-11e8-8f2f-d8cb8abf62dd
Differential Revision:	https://reviews.freebsd.org/D15249

Approved by:	ports-secteam (feld)
This commit is contained in:
Matthias Fechner 2018-05-04 17:52:36 +00:00
parent 0138123106
commit 8237508b6a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2018Q2/; revision=469045
5 changed files with 487 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
www/gitlab/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gitlab
PORTVERSION= 10.5.7
PORTVERSION= 10.6.5
DISTVERSIONPREFIX= v
CATEGORIES= www devel
@ -24,11 +24,11 @@ BUILD_DEPENDS= gem:devel/ruby-gems
# which makes maintaining this long list much easier!
# only rubygem-pg and rubygem-mysql are defined later as RUN_DEPENDS
# for the options
RUN_DEPENDS= git>=2.14.3:devel/git \
gitlab-shell>=6.0.3:devel/gitlab-shell \
gitlab-workhorse>=3.6.0:www/gitlab-workhorse \
gitaly>=0.82.0:devel/gitaly \
gitlab-pages>=0.6.0:www/gitlab-pages \
RUN_DEPENDS= git>=2.16.2:devel/git \
gitlab-shell>=6.0.4:devel/gitlab-shell \
gitlab-workhorse>=4.0.0:www/gitlab-workhorse \
gitaly>=0.91.0:devel/gitaly \
gitlab-pages>=0.7.1:www/gitlab-pages \
redis>=2.8.23:databases/redis \
npm>=4.3.0:www/npm \
yarn>=0.17.0:www/yarn \
@ -73,7 +73,7 @@ RUN_DEPENDS= git>=2.14.3:devel/git \
rubygem-net-ldap>=0.16.0:net/rubygem-net-ldap \
rubygem-gollum-lib-gitlab>=4.2.0:www/rubygem-gollum-lib-gitlab \
rubygem-gollum-rugged_adapter>=0.4.4:www/rubygem-gollum-rugged_adapter \
rubygem-github-linguist47>=4.7.0:textproc/rubygem-github-linguist47 \
rubygem-github-linguist53>=5.3.3:textproc/rubygem-github-linguist53 \
rubygem-grape>=1.0:devel/rubygem-grape \
rubygem-grape-entity060>=0.6.0:devel/rubygem-grape-entity060 \
rubygem-rack-cors>=1.0.0:www/rubygem-rack-cors \
@ -96,6 +96,7 @@ RUN_DEPENDS= git>=2.14.3:devel/git \
rubygem-deckar01-task_list>=2.0.0:www/rubygem-deckar01-task_list \
rubygem-gitlab-markup>=1.6.2:textproc/rubygem-gitlab-markup \
rubygem-redcarpet>=3.4:textproc/rubygem-redcarpet \
rubygem-commonmarker>=0.17:textproc/rubygem-commonmarker \
rubygem-redcloth>=4.3.2:www/rubygem-redcloth \
rubygem-rdoc>=4.2:devel/rubygem-rdoc \
rubygem-org-ruby>=0.9.12:textproc/rubygem-org-ruby \
@ -136,7 +137,7 @@ RUN_DEPENDS= git>=2.14.3:devel/git \
rubygem-d3_rails-rails4>=3.5.0:www/rubygem-d3_rails-rails4 \
rubygem-sanitize>=2.0:textproc/rubygem-sanitize \
rubygem-babosa>=1.0.2:textproc/rubygem-babosa \
rubygem-loofah20>=2.0.3:textproc/rubygem-loofah20 \
rubygem-loofah>=2.2:textproc/rubygem-loofah \
rubygem-licensee8>=8.7:devel/rubygem-licensee8 \
rubygem-rack-attack44>=4.4.1:www/rubygem-rack-attack44 \
rubygem-ace-rails-ap>=4.1.0:www/rubygem-ace-rails-ap \
@ -161,7 +162,7 @@ RUN_DEPENDS= git>=2.14.3:devel/git \
rubygem-select2-rails3>=3.5.9:www/rubygem-select2-rails3 \
rubygem-virtus>=1.0.1:devel/rubygem-virtus \
rubygem-base32>=0.3.0:converters/rubygem-base32 \
rubygem-sentry-raven25>=2.5.3:devel/rubygem-sentry-raven25 \
rubygem-sentry-raven>=2.5.3:devel/rubygem-sentry-raven \
rubygem-premailer-rails19>=1.9.7:mail/rubygem-premailer-rails19 \
rubygem-ruby_parser>=3.8.4:devel/rubygem-ruby_parser \
rubygem-rails-i18n-4>=4.0.9:devel/rubygem-rails-i18n-4 \
@ -187,13 +188,15 @@ RUN_DEPENDS= git>=2.14.3:devel/git \
rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \
rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \
rubygem-net-ssh41>=4.1.0:security/rubygem-net-ssh41 \
rubygem-sshkey>=1.9.0:security/rubygem-sshkey \
rubygem-rbnacl4<=4.0.2:security/rubygem-rbnacl4 \
rubygem-rbnacl-libsodium>=0:security/rubygem-rbnacl-libsodium \
rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \
rubygem-gitaly-proto084>=0.84.0:net/rubygem-gitaly-proto084 \
rubygem-gitaly-proto088>=0.88.0:net/rubygem-gitaly-proto088 \
rubygem-grpc>=1.10.0:net/rubygem-grpc \
rubygem-gitaly>=0.8.0:net/rubygem-gitaly \
rubygem-google-protobuf351>=3.5.1:devel/rubygem-google-protobuf351 \
rubygem-toml-rb03>=0.3.15:www/rubygem-toml-rb03 \
rubygem-toml-rb10>=1.0.0:www/rubygem-toml-rb10 \
rubygem-flipper011>=0.11.0:devel/rubygem-flipper011 \
rubygem-flipper-active_record011>=0.11.0:databases/rubygem-flipper-active_record011 \
rubygem-flipper-active_support_cache_store011>=0.11.0:devel/rubygem-flipper-active_support_cache_store011 \

6
www/gitlab/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1522907602
SHA256 (gitlabhq-gitlabhq-v10.5.7_GH0.tar.gz) = 4b5f172d901e29b5da3739341ef7b088c61c5887d68909a995f59609d9d3b34a
SIZE (gitlabhq-gitlabhq-v10.5.7_GH0.tar.gz) = 45334293
TIMESTAMP = 1525161156
SHA256 (gitlabhq-gitlabhq-v10.6.5_GH0.tar.gz) = 47fc8de80d7154150b11457b28920efdc93f4bc583017f6a13b4b6ba4fe8ee35
SIZE (gitlabhq-gitlabhq-v10.6.5_GH0.tar.gz) = 46312621

26
www/gitlab/files/patch-Gemfile
View File

@ -1,4 +1,4 @@
--- Gemfile.orig 2018-04-03 16:35:11 UTC
--- Gemfile.orig 2018-04-09 20:57:26 UTC
+++ Gemfile
@@ -12,7 +12,7 @@ gem 'sprockets', '~> 3.7.0'
gem 'default_value_for', '~> 3.0.0'
@ -18,7 +18,7 @@
# for aws storage
gem 'unf', '~> 0.1.4'
@@ -148,7 +148,7 @@ group :unicorn do
@@ -149,7 +149,7 @@ group :unicorn do
end
# State machine
@ -27,7 +27,7 @@
# Issue tags
gem 'acts-as-taggable-on', '~> 4.0'
@@ -163,7 +163,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req
@@ -164,7 +164,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req
gem 'rufus-scheduler', '~> 3.4'
# HTTP requests
@ -36,7 +36,7 @@
# Colored output to console
gem 'rainbow', '~> 2.2'
@@ -213,11 +213,11 @@ gem 'kubeclient', '~> 2.2.0'
@@ -214,7 +214,7 @@ gem 'kubeclient', '~> 2.2.0'
gem 'd3_rails', '~> 3.5.0'
# Sanitize user input
@ -45,12 +45,16 @@
gem 'babosa', '~> 1.0.2'
# Sanitizes SVG input
-gem 'loofah', '~> 2.0.3'
+gem 'loofah', '>= 2.0.3'
@@ -264,7 +264,7 @@ gem 'virtus', '~> 1.0.1'
gem 'base32', '~> 0.3.0'
# Working with license
gem 'licensee', '~> 8.7.0'
@@ -280,7 +280,7 @@ gem 'batch-loader', '~> 1.2.1'
# Sentry integration
-gem 'sentry-raven', '~> 2.5.3'
+gem 'sentry-raven', '>= 2.5.3'
gem 'premailer-rails', '~> 1.9.7'
@@ -281,7 +281,7 @@ gem 'batch-loader', '~> 1.2.1'
gem 'peek', '~> 1.0.1'
gem 'peek-gc', '~> 0.0.2'
gem 'peek-host', '~> 1.0.0'
@ -59,7 +63,7 @@
gem 'peek-performance_bar', '~> 1.3.0'
gem 'peek-pg', '~> 1.3.0', group: :postgres
gem 'peek-rblineprof', '~> 0.2.0'
@@ -289,97 +289,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
@@ -290,97 +290,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
# Metrics
group :metrics do
@ -157,7 +161,7 @@
gem 'octokit', '~> 4.6.2'
gem 'mail_room', '~> 0.9.1'
@@ -427,3 +341,6 @@ gem 'grape_logging', '~> 1.7'
@@ -431,3 +345,6 @@ gem 'grape_logging', '~> 1.7'
# Asset synchronization
gem 'asset_sync', '~> 2.2.0'

4
www/gitlab/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
follow the instructions in the guide at:
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/10.5-freebsd.md
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/10.6-freebsd.md
If you just installed an major upgrade of GitLab, for example you
switched from 10.4.x to 10.5.x, please follow the instructions in the guide at:
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/10.4-10.5-freebsd.md
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/10.5-10.6-freebsd.md
If you just installed an minor upgrade of GitLab please follow
the instructions in the guide at:

700
www/gitlab/pkg-plist
View File

File diff suppressed because it is too large Load Diff