mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-30 10:38:37 +00:00
Code Issues Releases Activity

www/gitlab: Update from 8.14.9 to 8.15.8

Browse Source 
Changelog: https://github.com/gitlabhq/gitlabhq/blob/v8.15.8/CHANGELOG.md

Also remove CVE patch because its already included in the new version
This commit is contained in:
Torsten Zuehlsdorff 2017-03-27 15:13:52 +00:00
parent b21397034f
commit b8384e0f42
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=437051
12 changed files with 549 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
www/gitlab/Makefile
View File

@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= gitlab
PORTVERSION= 8.14.9
PORTVERSION= 8.15.8
DISTVERSIONPREFIX= v
PORTREVISION= 8
CATEGORIES= www devel
CATEGORIES= www devel
MAINTAINER= tz@FreeBSD.org
@ -25,9 +25,9 @@ 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.7.4:devel/git \
RUN_DEPENDS= git>=2.8.4:devel/git \
gitlab-shell>=4.1.1:devel/gitlab-shell\
gitlab-workhorse>=1.1.1:www/gitlab-workhorse \
gitlab-workhorse>=1.2.1:www/gitlab-workhorse \
redis>=2.8.23:databases/redis \
rubygem-rails4>=4.2.7.1:www/rubygem-rails4 \
rubygem-rails-deprecated_sanitizer>=1.0.3:devel/rubygem-rails-deprecated_sanitizer \
@ -40,7 +40,6 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-omniauth>=1.3.2:security/rubygem-omniauth \
rubygem-omniauth-auth0>=1.4.1:net/rubygem-omniauth-auth0 \
rubygem-omniauth-azure-oauth2>=0.0.6:net/rubygem-omniauth-azure-oauth2 \
rubygem-omniauth-bitbucket>=0.0.2:security/rubygem-omniauth-bitbucket \
rubygem-omniauth-cas3>=1.1.2:security/rubygem-omniauth-cas3 \
rubygem-omniauth-facebook>=4.0.0:net/rubygem-omniauth-facebook \
rubygem-omniauth-github>=1.1.1:net/rubygem-omniauth-github \
@ -50,6 +49,7 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-omniauth-shibboleth>=1.2.0:security/rubygem-omniauth-shibboleth \
rubygem-omniauth-twitter>=1.2.0:net/rubygem-omniauth-twitter \
rubygem-omniauth_crowd>=2.2.0:devel/rubygem-omniauth_crowd \
rubygem-omniauth-authentiq>=0.2.0:net/rubygem-omniauth-authentiq \
rubygem-rack-oauth2>=1.2.1:security/rubygem-rack-oauth2 \
rubygem-jwt>=1.0:www/rubygem-jwt \
rubygem-recaptcha>=3.0:devel/rubygem-recaptcha \
@ -64,7 +64,7 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-gollum-lib-gitlab>=4.2.0:www/rubygem-gollum-lib-gitlab \
rubygem-gollum-rugged_adapter>=0.4.2:www/rubygem-gollum-rugged_adapter \
rubygem-github-linguist>=4.7.0:textproc/rubygem-github-linguist \
rubygem-grape>=0.15.0:devel/rubygem-grape \
rubygem-grape>=0.18.0:devel/rubygem-grape \
rubygem-grape-entity>=0.6.0:devel/rubygem-grape-entity \
rubygem-rack-cors>=0.4.0:www/rubygem-rack-cors \
rubygem-kaminari-rails4>=0.17.0:www/rubygem-kaminari-rails4 \
@ -72,12 +72,12 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-carrierwave>=0.10.0:www/rubygem-carrierwave \
rubygem-dropzonejs-rails>=0.7.1:www/rubygem-dropzonejs-rails \
rubygem-fog-aws0>=0.9:net/rubygem-fog-aws0 \
rubygem-fog-azure>=0.0:net/rubygem-fog-azure \
rubygem-fog-core>=1.40:devel/rubygem-fog-core \
rubygem-fog-local>=0.3:net/rubygem-fog-local \
rubygem-fog-google>=0.3:net/rubygem-fog-google \
rubygem-fog-local>=0.3:net/rubygem-fog-local \
rubygem-fog-openstack>=0.1:net/rubygem-fog-openstack \
rubygem-fog-rackspace>=0.1.1:net/rubygem-fog-rackspace \
rubygem-google-api-client>=0.8.6:devel/rubygem-google-api-client \
rubygem-unf>=0.1.4:textproc/rubygem-unf \
rubygem-seed-fu>=2.3.5:databases/rubygem-seed-fu \
rubygem-html-pipeline1>=1.11.0:textproc/rubygem-html-pipeline1 \
@ -99,7 +99,7 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-state_machines-activerecord>=0.4.0:databases/rubygem-state_machines-activerecord \
rubygem-after_commit_queue>=1.3.0:databases/rubygem-after_commit_queue \
rubygem-acts-as-taggable-on>=4.0.0:www/rubygem-acts-as-taggable-on \
rubygem-sidekiq>=4.2:devel/rubygem-sidekiq \
rubygem-sidekiq>=4.2.7:devel/rubygem-sidekiq \
rubygem-sidekiq-cron>=0.4.4:devel/rubygem-sidekiq-cron \
rubygem-redis-namespace>=1.5.2:databases/rubygem-redis-namespace \
rubygem-sidekiq-limit_fetch>=3.4:devel/rubygem-sidekiq-limit_fetch \
@ -114,9 +114,10 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-jira-ruby>=1.1.2:devel/rubygem-jira-ruby \
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-slack-notifier1>=1.2.0:devel/rubygem-slack-notifier1 \
rubygem-slack-notifier1>=1.5.1:devel/rubygem-slack-notifier1 \
rubygem-asana>=0.4.0:www/rubygem-asana \
rubygem-ruby-fogbugz>=0.2.1:devel/rubygem-ruby-fogbugz \
rubygem-kubeclient>=2.2.0:www/rubygem-kubeclient \
rubygem-d3_rails-rails4>=3.5.0:www/rubygem-d3_rails-rails4 \
rubygem-underscore-rails>=1.8.0:www/rubygem-underscore-rails \
rubygem-sanitize>=2.0:textproc/rubygem-sanitize \
@ -156,7 +157,7 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-html2text>=0:textproc/rubygem-html2text \
rubygem-ruby-prof>=0.16.2:devel/rubygem-ruby-prof \
rubygem-oauth2>=1.2.0:net/rubygem-oauth2 \
rubygem-paranoia>=2.0:databases/rubygem-paranoia \
rubygem-paranoia>=2.2:databases/rubygem-paranoia \
rubygem-health_check>=2.2.0:devel/rubygem-health_check \
rubygem-vmstat>=2.2:sysutils/rubygem-vmstat \
rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \

6
www/gitlab/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1489053342
SHA256 (gitlabhq-gitlabhq-v8.14.9_GH0.tar.gz) = 7a53f7da1cddba2b7f3a32a0051f66bde69af12fb4291c9da7432f915f95ffb9
SIZE (gitlabhq-gitlabhq-v8.14.9_GH0.tar.gz) = 29722977
TIMESTAMP = 1490115158
SHA256 (gitlabhq-gitlabhq-v8.15.8_GH0.tar.gz) = a7ca42ff5a7a7258638f91e45586b47365da74100762049c9a47caee4df3de5e
SIZE (gitlabhq-gitlabhq-v8.15.8_GH0.tar.gz) = 20031222

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

@ -1,4 +1,4 @@
--- Gemfile.orig 2017-02-14 21:48:43 UTC
--- Gemfile.orig 2017-03-19 14:19:38 UTC
+++ Gemfile
@@ -1,20 +1,16 @@
source 'https://rubygems.org'
@ -24,7 +24,7 @@
# Authentication libraries
gem 'devise', '~> 4.2'
@@ -28,16 +24,15 @@ gem 'omniauth-facebook', '~> 4.0.0'
@@ -27,17 +23,16 @@ gem 'omniauth-facebook', '~> 4.0.0'
gem 'omniauth-github', '~> 1.1.1'
gem 'omniauth-gitlab', '~> 1.0.2'
gem 'omniauth-google-oauth2', '~> 0.4.1'
@ -34,7 +34,9 @@
-gem 'omniauth-twitter', '~> 1.2.0'
+gem 'omniauth-twitter', '>= 1.2.0'
gem 'omniauth_crowd', '~> 2.2.0'
-gem 'omniauth-authentiq', '~> 0.2.0'
-gem 'rack-oauth2', '~> 1.2.1'
+gem 'omniauth-authentiq', '>= 0.2.0'
+gem 'rack-oauth2', '>= 1.2.1'
gem 'jwt'
@ -52,8 +54,8 @@
+gem 'github-linguist', '>= 4.7.0', require: 'linguist'
# API
-gem 'grape', '~> 0.15.0'
+gem 'grape', '>= 0.15.0'
-gem 'grape', '~> 0.18.0'
+gem 'grape', '>= 0.18.0'
gem 'grape-entity', '~> 0.6.0'
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
@ -70,7 +72,16 @@
# Drag and Drop UI
gem 'dropzonejs-rails', '~> 0.7.1'
@@ -100,28 +95,28 @@ gem 'seed-fu', '~> 2.3.5'
@@ -92,7 +87,7 @@ gem 'fog-openstack', '~> 0.1'
gem 'fog-rackspace', '~> 0.1.1'
# for Google storage
-gem 'google-api-client', '~> 0.8.6'
+gem 'google-api-client', '>= 0.8.6'
# for aws storage
gem 'unf', '~> 0.1.4'
@@ -102,28 +97,28 @@ gem 'seed-fu', '~> 2.3.5'
# Markdown and HTML processing
gem 'html-pipeline', '~> 1.11.0'
@ -105,7 +116,7 @@
gem 'unicorn-worker-killer', '~> 0.4.4'
end
@@ -140,7 +135,7 @@ gem 'redis-namespace', '~> 1.5.2'
@@ -142,7 +137,7 @@ gem 'redis-namespace', '~> 1.5.2'
gem 'sidekiq-limit_fetch', '~> 3.4'
# HTTP requests
@ -114,7 +125,7 @@
# Colored output to console
gem 'rainbow', '~> 2.1.0'
@@ -163,7 +158,7 @@ gem 'connection_pool', '~> 2.0'
@@ -165,7 +160,7 @@ gem 'connection_pool', '~> 2.0'
gem 'hipchat', '~> 1.5.0'
# JIRA integration
@ -123,12 +134,8 @@
# Flowdock integration
gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
@@ -172,10 +167,10 @@ gem 'gitlab-flowdock-git-hook', '~> 1.0.
gem 'gemnasium-gitlab-service', '~> 0.2'
# Slack integration
-gem 'slack-notifier', '~> 1.2.0'
+gem 'slack-notifier', '>= 1.2.0'
@@ -177,13 +172,13 @@ gem 'gemnasium-gitlab-service', '~> 0.2'
gem 'slack-notifier', '~> 1.5.1'
# Asana integration
-gem 'asana', '~> 0.4.0'
@ -136,7 +143,14 @@
# FogBugz integration
gem 'ruby-fogbugz', '~> 0.2.1'
@@ -187,17 +182,17 @@ gem 'd3_rails', '~> 3.5.0'
# Kubernetes integration
-gem 'kubeclient', '~> 2.2.0'
+gem 'kubeclient', '>= 2.2.0'
# d3
gem 'd3_rails', '~> 3.5.0'
@@ -192,17 +187,17 @@ gem 'd3_rails', '~> 3.5.0'
gem 'underscore-rails', '~> 1.8.0'
# Sanitize user input
@ -157,7 +171,7 @@
# Ace editor
gem 'ace-rails-ap', '~> 4.1.0'
@@ -217,114 +212,31 @@ gem 'chronic_duration', '~> 0.10.6'
@@ -222,116 +217,31 @@ gem 'chronic_duration', '~> 0.10.6'
gem 'sass-rails', '~> 5.0.6'
gem 'coffee-rails', '~> 4.1.0'
@ -216,14 +230,14 @@
-end
-
-group :development, :test do
- gem 'byebug', '~> 8.2.1', platform: :mri
- gem 'pry-byebug', '~> 3.4.1', platform: :mri
- gem 'pry-rails', '~> 0.3.4'
-
- gem 'awesome_print', '~> 1.2.0', require: false
- gem 'fuubar', '~> 2.0.0'
-
- gem 'database_cleaner', '~> 1.5.0'
- gem 'factory_girl_rails', '~> 4.6.0'
- gem 'factory_girl_rails', '~> 4.7.0'
- gem 'rspec-rails', '~> 3.5.0'
- gem 'rspec-retry', '~> 0.4.5'
- gem 'spinach-rails', '~> 0.2.1'
@ -261,6 +275,8 @@
- gem 'knapsack', '~> 1.11.0'
-
- gem 'activerecord_sane_schema_dumper', '0.2'
-
- gem 'stackprof', '~> 0.2.10'
-end
-
-group :test do
@ -280,8 +296,8 @@
gem 'mail_room', '~> 0.9.0'
@@ -340,8 +252,10 @@ gem 'oauth2', '~> 1.2.0'
gem 'paranoia', '~> 2.0'
@@ -347,8 +257,10 @@ gem 'oauth2', '~> 1.2.0'
gem 'paranoia', '~> 2.2'
# Health check
-gem 'health_check', '~> 2.2.0'

2
www/gitlab/files/patch-config_database.yml.postgresql
View File

@ -1,4 +1,4 @@
--- config/database.yml.postgresql.orig 2017-02-14 21:48:43 UTC
--- config/database.yml.postgresql.orig 2017-03-19 14:19:38 UTC
+++ config/database.yml.postgresql
@@ -6,7 +6,7 @@ production:
encoding: unicode

8
www/gitlab/files/patch-config_gitlab.yml.example
View File

@ -1,6 +1,6 @@
--- config/gitlab.yml.example.orig 2017-02-14 21:48:43 UTC
--- config/gitlab.yml.example.orig 2017-03-19 14:19:38 UTC
+++ config/gitlab.yml.example
@@ -438,7 +438,7 @@ production: &base
@@ -454,7 +454,7 @@ production: &base
# gitlab-shell invokes Dir.pwd inside the repository path and that results
# real path not the symlink.
storages: # You must have at least a `default` storage path.
@ -9,7 +9,7 @@
## Backup settings
backup:
@@ -463,12 +463,12 @@ production: &base
@@ -479,12 +479,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@ -25,7 +25,7 @@
# Git over HTTP
upload_pack: true
@@ -481,7 +481,7 @@ production: &base
@@ -497,7 +497,7 @@ production: &base
# CAUTION!
# Use the default values unless you really know what you are doing
git:

2
www/gitlab/files/patch-config_initializers_1__settings.rb
View File

@ -1,4 +1,4 @@
--- config/initializers/1_settings.rb.orig 2017-02-14 21:48:43 UTC
--- config/initializers/1_settings.rb.orig 2017-03-19 14:19:38 UTC
+++ config/initializers/1_settings.rb
@@ -190,12 +190,8 @@ Settings.gitlab['email_subject_suffix']
Settings.gitlab['base_url'] ||= Settings.send(:build_base_gitlab_url)

2
www/gitlab/files/patch-config_unicorn.rb.example
View File

@ -1,4 +1,4 @@
--- config/unicorn.rb.example.orig 2017-02-14 21:48:43 UTC
--- config/unicorn.rb.example.orig 2017-03-19 14:19:38 UTC
+++ config/unicorn.rb.example
@@ -33,12 +33,12 @@ worker_processes 3

22
www/gitlab/files/patch-cve-2017-0882
View File

@ -1,22 +0,0 @@
--- app/controllers/projects/issues_controller.rb.orig 2017-02-14 21:48:43 UTC
+++ app/controllers/projects/issues_controller.rb
@@ -112,7 +112,7 @@ class Projects::IssuesController < Proje
end
format.json do
- render json: @issue.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short])
+ render json: @issue.to_json(include: { milestone: {}, assignee: { only: [:name, :username], methods: [:avatar_url] }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short])
end
end
--- app/controllers/projects/merge_requests_controller.rb.orig 2017-03-21 01:49:52 UTC
+++ app/controllers/projects/merge_requests_controller.rb
@@ -277,7 +277,7 @@ class Projects::MergeRequestsController
@merge_request.target_project, @merge_request])
end
format.json do
- render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short])
+ render json: @merge_request.to_json(include: { milestone: {}, assignee: { only: [:name, :username], methods: [:avatar_url] }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short])
end
end
else

6
www/gitlab/files/patch-lib_support_nginx_gitlab
View File

@ -1,4 +1,4 @@
--- lib/support/nginx/gitlab.orig 2017-02-14 21:48:43 UTC
--- lib/support/nginx/gitlab.orig 2017-03-19 14:19:38 UTC
+++ lib/support/nginx/gitlab
@@ -17,7 +17,7 @@
## See installation.md#using-https for additional HTTPS configuration details.
@ -8,8 +8,8 @@
+ server unix:/usr/local/www/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
}
## Normal HTTP host
@@ -63,7 +63,7 @@ server {
map $http_upgrade $connection_upgrade_gitlab {
@@ -70,7 +70,7 @@ server {
error_page 502 /502.html;
error_page 503 /503.html;
location ~ ^/(404|422|500|502|503)\.html$ {

6
www/gitlab/files/patch-lib_support_nginx_gitlab-ssl
View File

@ -1,4 +1,4 @@
--- lib/support/nginx/gitlab-ssl.orig 2017-02-14 21:48:43 UTC
--- lib/support/nginx/gitlab-ssl.orig 2017-03-19 14:19:38 UTC
+++ lib/support/nginx/gitlab-ssl
@@ -21,7 +21,7 @@
## See installation.md#using-https for additional HTTPS configuration details.
@ -8,8 +8,8 @@
+ server unix:/usr/local/www/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
}
## Redirects all HTTP traffic to the HTTPS host
@@ -107,7 +107,7 @@ server {
map $http_upgrade $connection_upgrade_gitlab_ssl {
@@ -115,7 +115,7 @@ server {
error_page 502 /502.html;
error_page 503 /503.html;
location ~ ^/(404|422|500|502|503)\.html$ {

2
www/gitlab/files/patch-lib_tasks_gitlab_check.rake
View File

@ -1,4 +1,4 @@
--- lib/tasks/gitlab/check.rake.orig 2017-03-21 16:35:39 UTC
--- lib/tasks/gitlab/check.rake.orig 2017-03-19 14:19:38 UTC
+++ lib/tasks/gitlab/check.rake
@@ -621,7 +621,7 @@ namespace :gitlab do
end

598
www/gitlab/pkg-plist
View File

File diff suppressed because it is too large Load Diff