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

MFH: r475377 r475417 

- Update to 11.1.1, for more details please check:
  https://about.gitlab.com/2018/07/22/gitlab-11-1-released/
- Fixed a typo in config/gitlab.yml.example that was introduced by the prefix update.

Approved by:	mentors (implicit)

Security update to 11.1.2.

For more info see here:
https://about.gitlab.com/2018/07/26/security-release-gitlab-11-dot-1-dot-2-released/

Approved by:	mentors (implicit)
Security:	2da838f9-9168-11e8-8c75-d8cb8abf62dd

Approved by:	ports-secteam (miwi)
This commit is contained in:
Matthias Fechner 2018-07-28 20:07:53 +00:00
parent 15ae8e8085
commit 03dd42fe9d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2018Q3/; revision=475609
6 changed files with 287 additions and 94 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$
PORTNAME= gitlab-ce
PORTVERSION= 11.0.4
PORTVERSION= 11.1.2
CATEGORIES= www devel
MAINTAINER= mfechner@FreeBSD.org
@ -25,9 +25,9 @@ BUILD_DEPENDS= gem:devel/ruby-gems
# for the options
RUN_DEPENDS= git>=2.16.2:devel/git \
gitlab-shell>=7.1.4:devel/gitlab-shell \
gitlab-workhorse>=4.3.1:www/gitlab-workhorse \
gitaly>=0.105.0:devel/gitaly \
gitlab-pages>=0.9.1:www/gitlab-pages \
gitlab-workhorse>=5.0.0:www/gitlab-workhorse \
gitaly>=0.111.2:devel/gitaly \
gitlab-pages>=1.0.0:www/gitlab-pages \
redis>=2.8.23:databases/redis \
npm>=4.3.0:www/npm \
yarn>=0.17.0:www/yarn \
@ -41,7 +41,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-faraday>=0.12.0:www/rubygem-faraday \
rubygem-devise>=4.4:devel/rubygem-devise \
rubygem-doorkeeper>=4.3:security/rubygem-doorkeeper \
rubygem-doorkeeper-openid_connect>=1.3:security/rubygem-doorkeeper-openid_connect \
rubygem-doorkeeper-openid_connect>=1.5:security/rubygem-doorkeeper-openid_connect \
rubygem-omniauth>=1.8:security/rubygem-omniauth \
rubygem-omniauth-auth0>=2.0.0:net/rubygem-omniauth-auth0 \
rubygem-omniauth-azure-oauth2>=0.0.9:net/rubygem-omniauth-azure-oauth2 \
@ -53,7 +53,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-omniauth-kerberos>=0.3.0:net/rubygem-omniauth-kerberos \
rubygem-omniauth-oauth2-generic>=0.2.2:security/rubygem-omniauth-oauth2-generic \
rubygem-omniauth-saml>=1.10:security/rubygem-omniauth-saml \
rubygem-omniauth-shibboleth12>=1.2.0:security/rubygem-omniauth-shibboleth12 \
rubygem-omniauth-shibboleth>=1.3.0:security/rubygem-omniauth-shibboleth \
rubygem-omniauth-twitter>=1.4:net/rubygem-omniauth-twitter \
rubygem-omniauth_crowd22>=2.2.0:devel/rubygem-omniauth_crowd22 \
rubygem-omniauth-authentiq>=0.3.3:net/rubygem-omniauth-authentiq \
@ -94,9 +94,9 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-google-api-client>=0.19.8:devel/rubygem-google-api-client \
rubygem-unf>=0.1.4:textproc/rubygem-unf \
rubygem-seed-fu>=2.3.7:databases/rubygem-seed-fu \
rubygem-html-pipeline-gitlab>=2.7.1:textproc/rubygem-html-pipeline-gitlab \
rubygem-html-pipeline>=2.8:textproc/rubygem-html-pipeline \
rubygem-deckar01-task_list>=2.0.0:www/rubygem-deckar01-task_list \
rubygem-gitlab-markup>=1.6.2:textproc/rubygem-gitlab-markup \
rubygem-gitlab-markup>=1.6.4: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 \
@ -190,7 +190,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-sshkey>=1.9.0:security/rubygem-sshkey \
rubygem-ed25519>=1.2:security/rubygem-ed25519 \
rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \
rubygem-gitaly-proto>=0.101.0:net/rubygem-gitaly-proto \
rubygem-gitaly-proto>=0.105.0:net/rubygem-gitaly-proto \
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 \
@ -213,7 +213,7 @@ USE_RC_SUBR= gitlab
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags
GL_COMMIT= edb037cbc85225261e8ede5455be4aad771ba3bb
GL_COMMIT= 35936b0b6282db026128d21abe8f3490c1d376f2
USERS= git
GROUPS= git

6
www/gitlab-ce/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1531901551
SHA256 (gitlab-org-gitlab-ce-edb037cbc85225261e8ede5455be4aad771ba3bb_GL0.tar.gz) = e93a0e8b8dc7f759830eccfdef4cba12223644d2abbf36b0487d37d5491f5d54
SIZE (gitlab-org-gitlab-ce-edb037cbc85225261e8ede5455be4aad771ba3bb_GL0.tar.gz) = 49742351
TIMESTAMP = 1532671627
SHA256 (gitlab-org-gitlab-ce-35936b0b6282db026128d21abe8f3490c1d376f2_GL0.tar.gz) = 732295b8fa10381ae867042fd1173e86033014b8f76ddbc8f5cc70bc324a718e
SIZE (gitlab-org-gitlab-ce-35936b0b6282db026128d21abe8f3490c1d376f2_GL0.tar.gz) = 51962312

16
www/gitlab-ce/files/patch-Gemfile
View File

@ -1,4 +1,4 @@
--- Gemfile.orig 2018-06-21 15:14:17 UTC
--- Gemfile.orig 2018-07-20 09:55:24 UTC
+++ Gemfile
@@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0'
gem 'default_value_for', gem_versions['default_value_for']
@ -36,11 +36,10 @@
gem 'peek-pg', '~> 1.3.0', group: :postgres
gem 'peek-rblineprof', '~> 0.2.0'
gem 'peek-redis', '~> 1.2.0'
@@ -299,96 +299,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
@@ -299,95 +299,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
# Metrics
group :metrics do
- gem 'allocations', '~> 1.0', require: false, platform: :mri
- gem 'method_source', '~> 0.8', require: false
- gem 'influxdb', '~> 0.2', require: false
-
@ -74,7 +73,7 @@
-
- gem 'database_cleaner', '~> 1.5.0'
- gem 'factory_bot_rails', '~> 4.8.2'
- gem 'rspec-rails', '~> 3.6.0'
- gem 'rspec-rails', '~> 3.7.0'
- gem 'rspec-retry', '~> 0.4.5'
- gem 'rspec_profiling', '~> 0.0.5'
- gem 'rspec-set', '~> 0.1.3'
@ -133,12 +132,3 @@
gem 'octokit', '~> 4.9'
gem 'mail_room', '~> 0.9.1'
@@ -419,7 +334,7 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.100.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.101.0', require: 'gitaly'
gem 'grpc', '~> 1.11.0'
# Locked until https://github.com/google/protobuf/issues/4210 is closed

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

@ -36,7 +36,7 @@
- path: /home/git/gitlab-shell/
- hooks_path: /home/git/gitlab-shell/hooks/
+ path: %%PREFIX%%/share/gitlab-shell/
+ hooks_path: %%PREFIX/share/gitlab-shell/hooks/
+ hooks_path: %%PREFIX%%/share/gitlab-shell/hooks/
# File that contains the secret key for verifying access for gitlab-shell.
# Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app).

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

331
www/gitlab-ce/pkg-plist
View File

File diff suppressed because it is too large Load Diff