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

www/gitlab-ce: upgrade to 12.4.0.

Browse source 
Changelog:
https://about.gitlab.com/blog/2019/10/22/gitlab-12-4-released/
This commit is contained in:
Matthias Fechner 2019-10-24 17:05:56 +00:00
parent 6221723e46
commit 256b4f4ddd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=515492
7 changed files with 2480 additions and 161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
www/gitlab-ce/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gitlab-ce
PORTVERSION= 12.3.3
PORTVERSION= 12.4.0
PORTREVISION= 0
CATEGORIES= www devel
@ -15,10 +15,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
# the rubygems of RUN_DEPENDS matches the order of the Gemfile
# which makes maintaining this long list much easier!
MY_DEPENDS= git>=2.21.0:devel/git \
gitlab-shell>=10.0.0:devel/gitlab-shell \
gitlab-workhorse>=8.10.0:www/gitlab-workhorse \
gitaly>=1.65.0:devel/gitaly \
gitlab-pages>=1.9.0:www/gitlab-pages \
gitlab-shell>=10.2.0:devel/gitlab-shell \
gitlab-workhorse>=8.14.0:www/gitlab-workhorse \
gitaly>=1.67.0:devel/gitaly \
gitlab-pages>=1.11.0:www/gitlab-pages \
redis>=3.2.12:databases/redis \
yarn>=1.10.0:www/yarn \
rubygem-rails52>=5.2.3:www/rubygem-rails52 \
@ -109,7 +109,7 @@ MY_DEPENDS= git>=2.21.0:devel/git \
rubygem-asciidoctor>=2.0.10<2.1.0:textproc/rubygem-asciidoctor \
rubygem-asciidoctor-include-ext>=0.3.1<0.4.0:textproc/rubygem-asciidoctor-include-ext \
rubygem-asciidoctor-plantuml=0.0.9.:textproc/rubygem-asciidoctor-plantuml \
rubygem-rouge>=3.7<4.0:textproc/rubygem-rouge \
rubygem-rouge>=3.11.0<3.13:textproc/rubygem-rouge \
rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \
rubygem-bootstrap_form>=4.2.0<4.3.0:devel/rubygem-bootstrap_form \
rubygem-nokogiri>=1.10.4<1.11.0:textproc/rubygem-nokogiri \
@ -206,7 +206,7 @@ MY_DEPENDS= git>=2.21.0:devel/git \
rubygem-sshkey>=2.0<3.0:security/rubygem-sshkey \
rubygem-ed25519>=1.2<2.0:security/rubygem-ed25519 \
rubygem-bcrypt_pbkdf>=1.0<2.0:security/rubygem-bcrypt_pbkdf \
rubygem-gitaly>=1.58.0<1.59.0:net/rubygem-gitaly \
rubygem-gitaly>=1.65.0<1.66:net/rubygem-gitaly \
rubygem-grpc>=1.19.0<1.20.0:net/rubygem-grpc \
rubygem-google-protobuf371>=3.7.1<3.8.0:devel/rubygem-google-protobuf371 \
rubygem-toml-rb10>=1.0.0<1.1.0:www/rubygem-toml-rb10 \
@ -216,7 +216,7 @@ MY_DEPENDS= git>=2.21.0:devel/git \
rubygem-unleash>=0.1.5<0.2.0:devel/rubygem-unleash \
rubygem-lograge-rails52>=0.5<1.0:www/rubygem-lograge-rails52 \
rubygem-grape_logging>=1.7<2.0:devel/rubygem-grape_logging \
rubygem-net-dns>=0.9.0<0.10.0:dns/rubygem-net-dns \
rubygem-gitlab-net-dns>=0.9.1<0.10:dns/rubygem-gitlab-net-dns \
rubygem-countries>=3.0.0<4.0.0:devel/rubygem-countries
BUILD_DEPENDS= gem:devel/ruby-gems \
@ -237,12 +237,11 @@ USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
GL_PROJECT= gitlab-foss
# Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
GL_COMMIT= ab531f31825d8d5aedce12d9975ecaa3e2720417
GL_COMMIT= 1425a56c75beecaa289ad59587d636f8f469509e
USERS= git
GROUPS= git
NO_ARCH= yes
NO_BUILD= yes
post-patch:

6
www/gitlab-ce/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1570175752
SHA256 (gitlab-org-gitlab-foss-ab531f31825d8d5aedce12d9975ecaa3e2720417_GL0.tar.gz) = c6080cd14ba403f34d7861346d72a88eefd1625c28b5aa736fa503d91e12acce
SIZE (gitlab-org-gitlab-foss-ab531f31825d8d5aedce12d9975ecaa3e2720417_GL0.tar.gz) = 74638773
TIMESTAMP = 1571860432
SHA256 (gitlab-org-gitlab-foss-1425a56c75beecaa289ad59587d636f8f469509e_GL0.tar.gz) = 6e5007c68af005794b4ba6cebefcf08e284568bc93cc4384572d6f3a35ec690d
SIZE (gitlab-org-gitlab-foss-1425a56c75beecaa289ad59587d636f8f469509e_GL0.tar.gz) = 100104540

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

@ -1,13 +1,22 @@
--- Gemfile.orig 2019-09-24 12:11:44 UTC
--- Gemfile.orig 2019-10-22 12:01:49 UTC
+++ Gemfile
@@ -92,7 +92,6 @@ gem 'graphql', '~> 1.9.11'
# https://gitlab.com/gitlab-org/gitlab-ce/issues/67263
# https://gitlab.com/gitlab-org/gitlab/issues/31747
gem 'graphiql-rails', '~> 1.4.10'
gem 'apollo_upload_server', '~> 2.0.0.beta3'
-gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
# Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes'
@@ -148,7 +147,7 @@ gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
gem 'asciidoctor-plantuml', '0.0.9'
-gem 'rouge', '~> 3.11.0'
+gem 'rouge', '~> 3.11'
gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.10.4'
@@ -225,7 +224,7 @@ gem 'redis-rails', '~> 5.0.2'
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
@ -48,7 +57,7 @@
- gem 'fuubar', '~> 2.2.0'
-
- gem 'database_cleaner', '~> 1.7.0'
- gem 'factory_bot_rails', '~> 4.8.2'
- gem 'factory_bot_rails', '~> 5.1.0'
- gem 'rspec-rails', '~> 3.8.0'
- gem 'rspec-retry', '~> 0.6.1'
- gem 'rspec_profiling', '~> 0.0.5'
@ -98,7 +107,7 @@
- gem 'webmock', '~> 3.5.1'
- gem 'rails-controller-testing'
- gem 'concurrent-ruby', '~> 1.1'
- gem 'test-prof', '~> 0.2.5'
- gem 'test-prof', '~> 0.10.0'
- gem 'rspec_junit_formatter'
end

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

@ -1,15 +1,6 @@
--- config/gitlab.yml.example.orig 2019-09-24 12:11:44 UTC
--- config/gitlab.yml.example.orig 2019-10-22 12:01:49 UTC
+++ config/gitlab.yml.example
@@ -320,7 +320,7 @@ production: &base
# 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
admin:
- address: unix:/home/git/gitlab/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port)
+ address: unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port)
# File that contains the shared secret key for verifying access for gitlab-pages.
# Default is '.gitlab_pages_shared_secret' relative to Rails.root (i.e. root of the GitLab app).
# secret_file: /home/git/gitlab/.gitlab_pages_shared_secret
@@ -895,7 +895,7 @@ production: &base
@@ -894,7 +894,7 @@ production: &base
# Gitaly settings
gitaly:
# Path to the directory containing Gitaly client executables.
@ -18,7 +9,7 @@
# Default Gitaly authentication token. Can be overridden per storage. Can
# be left blank when Gitaly is running locally on a Unix socket, which
# is the normal way to deploy Gitaly.
@@ -913,8 +913,8 @@ production: &base
@@ -912,8 +912,8 @@ production: &base
# real path not the symlink.
storages: # You must have at least a `default` storage path.
default:
@ -29,7 +20,7 @@
# gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
## Backup settings
@@ -960,12 +960,12 @@ production: &base
@@ -959,12 +959,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@ -45,7 +36,7 @@
# Git over HTTP
upload_pack: true
@@ -990,7 +990,7 @@ production: &base
@@ -989,7 +989,7 @@ production: &base
# CAUTION!
# Use the default values unless you really know what you are doing
git:

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

@ -1,6 +1,6 @@
--- config/initializers/1_settings.rb.orig 2019-07-26 17:57:42 UTC
--- config/initializers/1_settings.rb.orig 2019-10-22 12:01:49 UTC
+++ config/initializers/1_settings.rb
@@ -174,12 +174,8 @@ Settings.gitlab['email_subject_suffix'] ||= ENV['GITLA
@@ -178,12 +178,8 @@ Settings.gitlab['email_smime'] = SmimeSignatureSetting
Settings.gitlab['base_url'] ||= Settings.__send__(:build_base_gitlab_url)
Settings.gitlab['url'] ||= Settings.__send__(:build_gitlab_url)
Settings.gitlab['user'] ||= 'git'

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

@ -6,7 +6,7 @@ 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/12.3-freebsd.md
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/12.4-freebsd.md
EOM
type: install
}
@ -20,7 +20,7 @@ EOM
If you just installed an major upgrade of GitLab, for example you
switched from 11.8.x to 11.9.x, please follow the instructions in the guide at:
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/12.2-12.3-freebsd.md
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/12.3-12.4-freebsd.md
If you just installed an minor upgrade of GitLab please follow
the instructions in the guide at:

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

File diff suppressed because it is too large Load diff