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

Major update to 13.7.

Browse Source 
Changelog:
https://about.gitlab.com/releases/2020/12/22/gitlab-13-7-released/
This commit is contained in:
Matthias Fechner 2020-12-22 16:51:09 +00:00
parent a5be3ac10e
commit 52a2e1466e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=558926
7 changed files with 1386 additions and 382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
www/gitlab-ce/Makefile
View File

@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME?= gitlab-ce
PORTVERSION?= 13.6.3
PORTREVISION?= 1
PORTVERSION?= 13.7.0
PORTREVISION?= 0
CATEGORIES= www devel
MAINTAINER?= mfechner@FreeBSD.org
@ -14,13 +14,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
# the rubygems of RUN_DEPENDS matches the order of the Gemfile
# which makes maintaining this long list much easier!
# missing: gitlab-kas>=13.6.1:net/gitlab-agent \
MY_DEPENDS= git>=2.26:devel/git \
MY_DEPENDS= git>=2.29:devel/git \
gitaly>=${PORTVERSION}:devel/gitaly \
gitlab-elasticsearch-indexer>=2.7.0:textproc/gitlab-elasticsearch-indexer \
gitlab-pages>=1.30.0:www/gitlab-pages \
gitlab-shell>=13.13.0:devel/gitlab-shell \
gitlab-workhorse>=8.54.0:www/gitlab-workhorse \
gitlab-elasticsearch-indexer>=2.8.0:textproc/gitlab-elasticsearch-indexer \
gitlab-agent>=13.7.0:net/gitlab-agent \
gitlab-pages>=1.32.0:www/gitlab-pages \
gitlab-shell>=13.14.0:devel/gitlab-shell \
gitlab-workhorse>=8.58.0:www/gitlab-workhorse \
redis>=3.2.12:databases/redis \
yarn>=1.10.0:www/yarn \
gtar>0:archivers/gtar \
@ -70,7 +70,7 @@ MY_DEPENDS= git>=2.26:devel/git \
rubygem-rqrcode-rails3>=0.1.7<0.2.0:www/rubygem-rqrcode-rails3 \
rubygem-attr_encrypted>=3.1.0<3.2.0:security/rubygem-attr_encrypted \
rubygem-u2f0>=0.2.1<0.3.0:net/rubygem-u2f0 \
rubygem-validates_hostname>=1.0.10<1.1.0:dns/rubygem-validates_hostname \
rubygem-validates_hostname>=1.0.11<1.1.0:dns/rubygem-validates_hostname \
rubygem-rubyzip20>=2.0.0<2.1.0:archivers/rubygem-rubyzip20 \
rubygem-acme-client>=2.0.6<3:security/rubygem-acme-client \
rubygem-browser>=4.2<5.0:www/rubygem-browser \
@ -91,9 +91,9 @@ MY_DEPENDS= git>=2.26:devel/git \
rubygem-hamlit>=2.11.0<2.12.0:www/rubygem-hamlit \
rubygem-carrierwave>=1.3<2.0:www/rubygem-carrierwave \
rubygem-mini_magick>=4.10.1<4.11:graphics/rubygem-mini_magick \
rubygem-fog-aws>=3.5<4.0:net/rubygem-fog-aws \
rubygem-fog-aws>=3.7<4.0:net/rubygem-fog-aws \
rubygem-fog-core210=2.1.0:devel/rubygem-fog-core210 \
rubygem-fog-google>=1.11<2:net/rubygem-fog-google \
rubygem-fog-google>=1.12<2:net/rubygem-fog-google \
rubygem-fog-local>=0.6<1.0:net/rubygem-fog-local \
rubygem-fog-openstack>=1.0<2.0:net/rubygem-fog-openstack \
rubygem-fog-rackspace>=0.1.1<1.2.0:net/rubygem-fog-rackspace \
@ -113,7 +113,7 @@ MY_DEPENDS= git>=2.26:devel/git \
rubygem-deckar01-task_list=2.3.1:www/rubygem-deckar01-task_list \
rubygem-gitlab-markup>=1.7.1<1.8.0:textproc/rubygem-gitlab-markup \
rubygem-github-markup17>=1.7.0<1.8.0:textproc/rubygem-github-markup17 \
rubygem-commonmarker>=0.20<1.0:textproc/rubygem-commonmarker \
rubygem-commonmarker>=0.21<1.0:textproc/rubygem-commonmarker \
rubygem-kramdown>=2.3.0<2.4:textproc/rubygem-kramdown \
rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \
rubygem-rdoc>=6.1.2<6.3:devel/rubygem-rdoc \
@ -123,7 +123,8 @@ MY_DEPENDS= git>=2.26: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.12<0.1:textproc/rubygem-asciidoctor-plantuml \
rubygem-rouge325>=3.25.0<3.26:textproc/rubygem-rouge325 \
rubygem-asciidoctor-kroki>=0.2.2<0.3:textproc/rubygem-asciidoctor-kroki \
rubygem-rouge>=3.26.0<3.27: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.10<1.11.0:textproc/rubygem-nokogiri \
@ -146,7 +147,7 @@ MY_DEPENDS= git>=2.26:devel/git \
rubygem-fugit12>=1.2.1<1.3.0:devel/rubygem-fugit12 \
rubygem-httparty>=0.16.4<0.17.0:www/rubygem-httparty \
rubygem-rainbow>=3.0<4.0:devel/rubygem-rainbow \
rubygem-ruby-progressbar>=0:devel/rubygem-ruby-progressbar \
rubygem-ruby-progressbar>=1.10<2:devel/rubygem-ruby-progressbar \
rubygem-settingslogic>=2.0.9<2.1.0:devel/rubygem-settingslogic \
rubygem-re2>=1.2.0<1.3.0:devel/rubygem-re2 \
rubygem-version_sorter>=2.2.4<2.3.0:textproc/rubygem-version_sorter \
@ -178,7 +179,6 @@ MY_DEPENDS= git>=2.26:devel/git \
rubygem-sassc-rails-rails60>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails60 \
rubygem-terser>=1.0.2:textproc/rubygem-terser \
rubygem-addressable>=2.7<3:www/rubygem-addressable \
rubygem-font-awesome-rails-rails60>=4.7<5.0:devel/rubygem-font-awesome-rails-rails60 \
rubygem-gemojione>=3.3<4.0:graphics/rubygem-gemojione \
rubygem-gon-rails60>=6.2<7.0:www/rubygem-gon-rails60 \
rubygem-request_store>=1.5<2.0:devel/rubygem-request_store \
@ -188,7 +188,7 @@ MY_DEPENDS= git>=2.26:devel/git \
rubygem-sentry-raven>=3.0<4.0:devel/rubygem-sentry-raven \
rubygem-gitlab-pg_query>=1.3<2:databases/rubygem-gitlab-pg_query \
rubygem-premailer-rails-rails60>=1.10.3<1.11.0:mail/rubygem-premailer-rails-rails60 \
rubygem-gitlab-labkit>=0.13.2<0.13.3:devel/rubygem-gitlab-labkit \
rubygem-gitlab-labkit>=0.13.3<0.13.4:devel/rubygem-gitlab-labkit \
rubygem-ruby_parser>=3.15<4.0:devel/rubygem-ruby_parser \
rubygem-rails-i18n-rails60>=6.0<7.0:devel/rubygem-rails-i18n-rails60 \
rubygem-gettext_i18n_rails>=1.8.0<1.9.0:devel/rubygem-gettext_i18n_rails \
@ -201,7 +201,7 @@ MY_DEPENDS= git>=2.26:devel/git \
rubygem-prometheus-client-mmap>=0.12.0<0.13.0:devel/rubygem-prometheus-client-mmap \
rubygem-raindrops>=0.18<1.0:www/rubygem-raindrops \
rubygem-octokit>=4.15<5.0:net/rubygem-octokit \
rubygem-gitlab-mail_room>=0.0.7<0.1.0:mail/rubygem-gitlab-mail_room \
rubygem-gitlab-mail_room>=0.0.8<0.1.0:mail/rubygem-gitlab-mail_room \
rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \
rubygem-html2text>=0:textproc/rubygem-html2text \
rubygem-ruby-prof>=1.3.0<1.4.0:devel/rubygem-ruby-prof \
@ -219,7 +219,7 @@ MY_DEPENDS= git>=2.26: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>=13.5.0.pre.rc2<13.6.0:net/rubygem-gitaly \
rubygem-gitaly>=13.7.0.pre.rc1<13.8.0:net/rubygem-gitaly \
rubygem-grpc>=1.30.2<1.31:net/rubygem-grpc \
rubygem-google-protobuf>=3.12<4:devel/rubygem-google-protobuf \
rubygem-toml-rb10>=1.0.0<1.1.0:www/rubygem-toml-rb10 \
@ -227,6 +227,7 @@ MY_DEPENDS= git>=2.26:devel/git \
rubygem-flipper-active_record017>=0.17.1<0.18.0:databases/rubygem-flipper-active_record017 \
rubygem-flipper-active_support_cache_store017>=0.17.1<0.18.0:devel/rubygem-flipper-active_support_cache_store017 \
rubygem-unleash>=0.1.5<0.2.0:devel/rubygem-unleash \
rubygem-gitlab-experiment>=0.4.4<0.5:devel/rubygem-gitlab-experiment \
rubygem-lograge-rails60>=0.11.2<1.0:www/rubygem-lograge-rails60 \
rubygem-grape_logging>=1.7<2.0:devel/rubygem-grape_logging \
rubygem-gitlab-net-dns>=0.9.1<0.10:dns/rubygem-gitlab-net-dns \
@ -265,7 +266,7 @@ USE_GITLAB= yes
GL_ACCOUNT?= gitlab-org
GL_PROJECT?= gitlab-foss
# Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
GL_COMMIT?= 857c6c6a6a9b607b3f261164fa75b084f04d8782
GL_COMMIT?= 91da1dcc7a1e08e70e2a7daa60b7604d8ceecf9e
USERS= git
GROUPS= git
@ -310,6 +311,8 @@ do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/backups
${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/tmp
${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/artifacts/tmp/work
${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/vendor/assets/stylesheets
${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/workhorse/changelogs/unreleased
(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME})
.include <bsd.port.mk>

6
www/gitlab-ce/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1607726585
SHA256 (gitlab-org-gitlab-foss-857c6c6a6a9b607b3f261164fa75b084f04d8782_GL0.tar.gz) = a35638d08fba687748c864f56ba19c337ea7d4a758f5c265731c3b52543a404b
SIZE (gitlab-org-gitlab-foss-857c6c6a6a9b607b3f261164fa75b084f04d8782_GL0.tar.gz) = 98754813
TIMESTAMP = 1608586741
SHA256 (gitlab-org-gitlab-foss-91da1dcc7a1e08e70e2a7daa60b7604d8ceecf9e_GL0.tar.gz) = 27a28bd938205751a01bd3d36a4a61b246a0d2bc3010f50b77d5f47c72abd844
SIZE (gitlab-org-gitlab-foss-91da1dcc7a1e08e70e2a7daa60b7604d8ceecf9e_GL0.tar.gz) = 95868114

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

@ -1,4 +1,4 @@
--- Gemfile.orig 2020-11-20 12:00:55 UTC
--- Gemfile.orig 2020-12-21 11:32:42 UTC
+++ Gemfile
@@ -18,7 +18,7 @@ gem 'default_value_for', '~> 3.3.0'
# Supported DBs
@ -27,7 +27,7 @@
gem 'hashie'
@@ -152,7 +151,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/mark
gem 'commonmarker', '~> 0.20'
gem 'commonmarker', '~> 0.21'
gem 'kramdown', '~> 2.3.0'
gem 'RedCloth', '~> 4.3.2'
-gem 'rdoc', '~> 6.1.2'
@ -35,7 +35,7 @@
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
@@ -238,7 +237,7 @@ gem 'redis-rails', '~> 5.0.2'
@@ -239,7 +238,7 @@ gem 'redis-rails', '~> 5.0.2'
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
# HipChat integration
@ -44,16 +44,7 @@
# Jira integration
gem 'jira-ruby', '~> 2.0.0'
@@ -311,7 +310,7 @@ gem 'gitlab-pg_query', '~> 1.3', require: 'pg_query'
gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '0.13.1'
+gem 'gitlab-labkit', '0.13.2'
# I18n
gem 'ruby_parser', '~> 3.15', require: false
@@ -335,94 +334,6 @@ group :metrics do
@@ -335,95 +334,6 @@ group :metrics do
# Prometheus
gem 'prometheus-client-mmap', '~> 0.12.0'
gem 'raindrops', '~> 0.18'
@ -73,6 +64,7 @@
-end
-
-group :development, :test do
- gem 'deprecation_toolkit', '~> 1.5.1', require: false
- gem 'bullet', '~> 6.1.0'
- gem 'pry-byebug', '~> 3.9.0', platform: :mri
- gem 'pry-rails', '~> 0.3.9'
@ -92,7 +84,7 @@
- gem 'spring', '~> 2.1.0'
- gem 'spring-commands-rspec', '~> 1.0.4'
-
- gem 'gitlab-styles', '~> 5.1.0', require: false
- gem 'gitlab-styles', '~> 5.3.0', require: false
-
- gem 'scss_lint', '~> 0.59.0', require: false
- gem 'haml_lint', '~> 0.36.0', require: false

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

@ -1,6 +1,6 @@
--- config/gitlab.yml.example.orig 2020-11-20 12:00:55 UTC
--- config/gitlab.yml.example.orig 2020-12-21 11:32:42 UTC
+++ config/gitlab.yml.example
@@ -1045,7 +1045,7 @@ production: &base
@@ -1065,7 +1065,7 @@ production: &base
# Gitaly settings
gitaly:
# Path to the directory containing Gitaly client executables.
@ -9,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.
@@ -1063,8 +1063,8 @@ production: &base
@@ -1083,8 +1083,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
@@ -1110,12 +1110,12 @@ production: &base
@@ -1130,12 +1130,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@ -36,7 +36,7 @@
# Git over HTTP
upload_pack: true
@@ -1130,22 +1130,22 @@ production: &base
@@ -1150,22 +1150,22 @@ production: &base
workhorse:
# File that contains the secret key for verifying access for gitlab-workhorse.
# Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app).

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

@ -1,6 +1,6 @@
--- config/initializers/1_settings.rb.orig 2020-09-21 16:23:36 UTC
--- config/initializers/1_settings.rb.orig 2020-12-21 11:32:42 UTC
+++ config/initializers/1_settings.rb
@@ -174,11 +174,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi
@@ -179,11 +179,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi
Settings.gitlab['user'] ||= 'git'
# External configuration may cause the ssh user to differ from the GitLab user
Settings.gitlab['ssh_user'] ||= Settings.gitlab.user

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

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

File diff suppressed because it is too large Load Diff