sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Applied security upgrade to gitlab 10.7.5.

Browse source 
Fixed bug with wrong path for gitlab-workhouse that should fix artifacts (reported by Felix <mail@felix.flornet.de>). This was fix upstream but is not included in this version yet: https://gitlab.com/gitlab-org/gitlab-ce/issues/46763
Update net/rubygem-grpc to 1.11.1 which is required for gitlab 10.7.5.
Sync dep net/rubygem-grpc with gitlab which uses now 1.11.1.
Added gitlab-pages again to dependencies as the new version builds again.

Reported by:	Felix <mail@felix.flornet.de>
Reviewed by:	swills (mentor)
Approved by:	swills (mentor)
Differential Revision:	https://reviews.freebsd.org/D15631
This commit is contained in:
Matthias Fechner 2018-05-31 13:48:39 +00:00
parent 326ad662af
commit b0e34e37f8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=471208
9 changed files with 41 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
devel/gitaly/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= gitaly
DISTVERSION= 0.96.1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= devel
MAINTAINER= mfechner@FreeBSD.org

8
devel/gitaly/files/patch-ruby_Gemfile
View file

@ -1,6 +1,12 @@
--- ruby/Gemfile.orig 2018-04-12 00:44:37 UTC
+++ ruby/Gemfile
@@ -13,12 +13,8 @@ gem 'sentry-raven', '~> 2.7.2', require:
@@ -8,17 +8,13 @@ gem 'activesupport', '~> 5.0.2'
gem 'rdoc', '~> 4.2'
gem 'gollum-lib', '~> 4.2', require: false
gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
-gem 'grpc', '~> 1.10.0'
+gem 'grpc', '~> 1.11.0'
gem 'sentry-raven', '~> 2.7.2', require: false
# Detects the open source license the repository includes
# This version needs to be in sync with GitLab CE/EE

2
net/rubygem-grpc/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= grpc
PORTVERSION= 1.10.0
PORTVERSION= 1.11.1
CATEGORIES= net rubygems
MASTER_SITES= RG

6
net/rubygem-grpc/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1523377112
SHA256 (rubygem/grpc-1.10.0.gem) = 0235e5e5cff0253c53f022bbfa6929a4c4ef97db5900122981b7375a25c49b9f
SIZE (rubygem/grpc-1.10.0.gem) = 2769408
TIMESTAMP = 1527758749
SHA256 (rubygem/grpc-1.11.1.gem) = 890ee82183285ac228c13122ee8d0f17e29f055c102d75a5d7bf31364b25729c
SIZE (rubygem/grpc-1.11.1.gem) = 2883584

6
www/gitlab/Makefile
View file

@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= gitlab
PORTVERSION= 10.7.3
PORTVERSION= 10.7.5
DISTVERSIONPREFIX= v
PORTREVISION= 2
CATEGORIES= www devel
MAINTAINER= mfechner@FreeBSD.org
@ -29,6 +28,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
gitlab-shell>=7.1.2:devel/gitlab-shell \
gitlab-workhorse>=4.1.0:www/gitlab-workhorse \
gitaly>=0.96.1:devel/gitaly \
gitlab-pages>=0.9.1:www/gitlab-pages \
redis>=2.8.23:databases/redis \
npm>=4.3.0:www/npm \
yarn>=0.17.0:www/yarn \
@ -191,7 +191,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-rbnacl-libsodium>=0:security/rubygem-rbnacl-libsodium \
rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \
rubygem-gitaly-proto096>=0.96.0:net/rubygem-gitaly-proto096 \
rubygem-grpc>=1.10.0:net/rubygem-grpc \
rubygem-grpc>=1.11.0:net/rubygem-grpc \
rubygem-gitaly>=0.8.0:net/rubygem-gitaly \
rubygem-google-protobuf351>=3.5.1:devel/rubygem-google-protobuf351 \
rubygem-toml-rb10>=1.0.0:www/rubygem-toml-rb10 \

6
www/gitlab/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1525513670
SHA256 (gitlabhq-gitlabhq-v10.7.3_GH0.tar.gz) = dac97113796da034784cdfb8489468e261af2266ada6a8faaecd11bab0525cb7
SIZE (gitlabhq-gitlabhq-v10.7.3_GH0.tar.gz) = 47806135
TIMESTAMP = 1527763488
SHA256 (gitlabhq-gitlabhq-v10.7.5_GH0.tar.gz) = 69829e44acec5622b98a957874bd0426779540866bfd5ac6637b2bb331101f30
SIZE (gitlabhq-gitlabhq-v10.7.5_GH0.tar.gz) = 47807879

14
www/gitlab/files/patch-Gemfile
View file

@ -1,4 +1,4 @@
--- Gemfile.orig 2018-04-23 19:39:01 UTC
--- Gemfile.orig 2018-05-28 11:47:11 UTC
+++ Gemfile
@@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0'
gem 'default_value_for', gem_versions['default_value_for']
@ -9,7 +9,7 @@
gem 'pg', '~> 0.18.2', group: :postgres
gem 'rugged', '~> 0.27'
@@ -126,7 +126,7 @@ gem 'fog-rackspace', '~> 0.1.1'
@@ -125,7 +125,7 @@ gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.2.0'
# for Google storage
@ -18,7 +18,7 @@
# for aws storage
gem 'unf', '~> 0.1.4'
@@ -177,7 +177,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req
@@ -176,7 +176,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req
gem 'rufus-scheduler', '~> 3.4'
# HTTP requests
@ -27,7 +27,7 @@
# Colored output to console
gem 'rainbow', '~> 2.2'
@@ -227,7 +227,7 @@ gem 'kubeclient', '~> 3.0'
@@ -226,7 +226,7 @@ gem 'kubeclient', '~> 3.0'
gem 'd3_rails', '~> 3.5.0'
# Sanitize user input
@ -36,7 +36,7 @@
gem 'babosa', '~> 1.0.2'
# Sanitizes SVG input
@@ -289,7 +289,7 @@ gem 'batch-loader', '~> 1.2.1'
@@ -288,7 +288,7 @@ gem 'batch-loader', '~> 1.2.1'
# Perf bar
gem 'peek', '~> 1.0.1'
gem 'peek-gc', '~> 0.0.2'
@ -45,7 +45,7 @@
gem 'peek-performance_bar', '~> 1.3.0'
gem 'peek-pg', '~> 1.3.0', group: :postgres
gem 'peek-rblineprof', '~> 0.2.0'
@@ -298,98 +298,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
@@ -297,98 +297,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
# Metrics
group :metrics do
@ -144,7 +144,7 @@
gem 'octokit', '~> 4.8'
gem 'mail_room', '~> 0.9.1'
@@ -440,3 +353,4 @@ gem 'grape_logging', '~> 1.7'
@@ -439,3 +352,4 @@ gem 'grape_logging', '~> 1.7'
# Asset synchronization
gem 'asset_sync', '~> 2.2.0'

11
www/gitlab/files/patch-app_uploaders_object__storage.rb Normal file
View file

@ -0,0 +1,11 @@
--- app/uploaders/object_storage.rb.orig 2018-05-31 10:45:20 UTC
+++ app/uploaders/object_storage.rb
@@ -11,7 +11,7 @@ module ObjectStorage
ObjectStorageUnavailable = Class.new(StandardError)
DIRECT_UPLOAD_TIMEOUT = 4.hours
- TMP_UPLOAD_PATH = 'tmp/upload'.freeze
+ TMP_UPLOAD_PATH = 'tmp/uploads'.freeze
module Store
LOCAL = 1

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

@ -1,6 +1,6 @@
--- config/gitlab.yml.example.orig 2018-02-25 17:42:24 UTC
--- config/gitlab.yml.example.orig 2018-05-28 11:47:11 UTC
+++ config/gitlab.yml.example
@@ -517,7 +517,7 @@ production: &base
@@ -570,7 +570,7 @@ production: &base
# Gitaly settings
gitaly:
# Path to the directory containing Gitaly client executables.
@ -9,7 +9,7 @@
# Default Gitaly authentication token. Can be overriden per storage. Can
# be left blank when Gitaly is running locally on a Unix socket, which
# is the normal way to deploy Gitaly.
@@ -535,8 +535,8 @@ production: &base
@@ -588,8 +588,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
@@ -564,12 +564,12 @@ production: &base
@@ -617,12 +617,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@ -36,7 +36,7 @@
# Git over HTTP
upload_pack: true
@@ -590,7 +590,7 @@ production: &base
@@ -643,7 +643,7 @@ production: &base
# CAUTION!
# Use the default values unless you really know what you are doing
git: