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

MFH: r524831 r525233 r526069

Browse Source 
Update to 12.7.5.
Changelog:
https://about.gitlab.com/releases/2020/01/22/gitlab-12-7-released/
https://about.gitlab.com/releases/2020/01/24/gitlab-12-7-2-released/
https://about.gitlab.com/releases/2020/01/30/security-release-gitlab-12-7-4-released/
https://about.gitlab.com/releases/2020/01/31/gitlab-12-7-5-released/

Use the standard RC system available in FreeBSD.
This makes some commands like:
service gitlab rcvar
available. This is required by configuration management tools like Chef, Puppetm, Salt,
Ansible and more.

PR:		243860
Reported by:	amendlik@gmail.com

Security update to 12.7.6.
Changelog:
https://about.gitlab.com/releases/2020/02/13/critical-security-release-gitlab-12-dot-7-dot-6-released/

Security:	1ece5591-4ea9-11ea-86f0-001b217b3468

Approved by:	ports-secteam (joneum)
This commit is contained in:
Matthias Fechner 2020-02-17 19:03:59 +00:00
parent d70d7f5168
commit a600a37ee6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q1/; revision=526404
8 changed files with 594 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
www/gitlab-ce/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gitlab-ce
PORTVERSION= 12.6.6
PORTVERSION= 12.7.6
PORTREVISION= 0
CATEGORIES= www devel
@ -15,9 +15,9 @@ 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.22.2:devel/git \
gitlab-shell>=10.3.0:devel/gitlab-shell \
gitlab-shell>=11.0.0:devel/gitlab-shell \
gitlab-workhorse>=8.20.0:www/gitlab-workhorse \
gitaly>=1.77.0:devel/gitaly \
gitaly>=1.83.0:devel/gitaly \
gitlab-pages>=1.12.0:www/gitlab-pages \
redis>=3.2.12:databases/redis \
yarn>=1.10.0:www/yarn \
@ -29,7 +29,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \
rubygem-default_value_for>=3.3.0<3.4.0:devel/rubygem-default_value_for \
rubygem-pg>=1.1<2:databases/rubygem-pg \
rubygem-rugged>=0.28<1.0:devel/rubygem-rugged \
rubygem-grape-path-helpers>=1.1<2.0:devel/rubygem-grape-path-helpers \
rubygem-grape-path-helpers>=1.2<2.0:devel/rubygem-grape-path-helpers \
rubygem-faraday>=0.12<1.0:www/rubygem-faraday \
rubygem-marginalia>=1.8.0<1.9:databases/rubygem-marginalia \
rubygem-devise-rails52>=4.6<5.0:devel/rubygem-devise-rails52 \
@ -92,13 +92,13 @@ MY_DEPENDS= git>=2.22.2:devel/git \
rubygem-google-api-client>=0.23<1.0:devel/rubygem-google-api-client \
rubygem-unf>=0.1.4<0.2.0:textproc/rubygem-unf \
rubygem-seed-fu>=2.3.7<2.4.0:databases/rubygem-seed-fu \
rubygem-elasticsearch-model019>=0.1.9<0.2.0:textproc/rubygem-elasticsearch-model019 \
rubygem-elasticsearch-rails019>=0.1.9<0.2.0:textproc/rubygem-elasticsearch-rails019 \
rubygem-elasticsearch-api503=5.0.3:textproc/rubygem-elasticsearch-api503 \
rubygem-elasticsearch-model6>=6.1<7:textproc/rubygem-elasticsearch-model6 \
rubygem-elasticsearch-rails6>=6.1<7:textproc/rubygem-elasticsearch-rails6 \
rubygem-elasticsearch-api6>=6.1<7:textproc/rubygem-elasticsearch-api6 \
rubygem-aws-sdk>0:devel/rubygem-aws-sdk \
rubygem-faraday_middleware-aws-signers-v4>0:devel/rubygem-faraday_middleware-aws-signers-v4 \
rubygem-html-pipeline>=2.12<3.0:textproc/rubygem-html-pipeline \
rubygem-deckar01-task_list>=2.2.1<2.3.0:www/rubygem-deckar01-task_list \
rubygem-deckar01-task_list=2.3.1:www/rubygem-deckar01-task_list \
rubygem-gitlab-markup>=1.7.0<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 \
@ -109,7 +109,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \
rubygem-wikicloth081>=0.8.1<0.8.2:textproc/rubygem-wikicloth081 \
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-plantuml009=0.0.9.:textproc/rubygem-asciidoctor-plantuml009 \
rubygem-asciidoctor-plantuml=0.0.10.:textproc/rubygem-asciidoctor-plantuml \
rubygem-rouge>=3.11.0<4: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 \
@ -151,7 +151,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \
rubygem-hangouts-chat>=0.0.5<0.1.0:net/rubygem-hangouts-chat \
rubygem-asana>=0.9<1.0:www/rubygem-asana \
rubygem-ruby-fogbugz021>=0.2.1<0.3.0:devel/rubygem-ruby-fogbugz021 \
rubygem-kubeclient>=4.4.0<4.5.0:www/rubygem-kubeclient \
rubygem-kubeclient>=4.6.0<4.7.0:www/rubygem-kubeclient \
rubygem-sanitize>=4.6<5.0:textproc/rubygem-sanitize \
rubygem-babosa>=1.0.2<1.1.0:textproc/rubygem-babosa \
rubygem-loofah>=2.2<3.0:textproc/rubygem-loofah \
@ -166,7 +166,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \
rubygem-rack-proxy>=0.6.0<0.7.0:www/rubygem-rack-proxy \
rubygem-sassc-rails-rails52>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails52 \
rubygem-uglifier27>=2.7.2<2.8.0:www/rubygem-uglifier27 \
rubygem-addressable25>=2.5.2<2.6.0:www/rubygem-addressable25 \
rubygem-addressable>=2.7<3:www/rubygem-addressable \
rubygem-font-awesome-rails-rails52>=4.7<5.0:devel/rubygem-font-awesome-rails-rails52 \
rubygem-gemojione>=3.3<4.0:graphics/rubygem-gemojione \
rubygem-gon-rails52>=6.2<7.0:www/rubygem-gon-rails52 \
@ -176,7 +176,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \
rubygem-rack-attack>=6.2.0<6.3.0:www/rubygem-rack-attack \
rubygem-sentry-raven>=2.9<3.0:devel/rubygem-sentry-raven \
rubygem-premailer-rails-rails52>=1.10.3<1.11.0:mail/rubygem-premailer-rails-rails52 \
rubygem-gitlab-labkit>=0.5<1.0:devel/rubygem-gitlab-labkit \
rubygem-gitlab-labkit=0.8.0:devel/rubygem-gitlab-labkit \
rubygem-ruby_parser>=3.8<4.0:devel/rubygem-ruby_parser \
rubygem-rails-i18n-rails52>=5.1<6.0:devel/rubygem-rails-i18n-rails52 \
rubygem-gettext_i18n_rails>=1.8.0<1.9.0:devel/rubygem-gettext_i18n_rails \
@ -190,7 +190,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \
rubygem-influxdb>=0.2<1.0:databases/rubygem-influxdb \
rubygem-prometheus-client-mmap>=0.10.0<0.11.0:devel/rubygem-prometheus-client-mmap \
rubygem-raindrops>=0.18<1.0:www/rubygem-raindrops \
rubygem-octokit>=4.9<5.0:net/rubygem-octokit \
rubygem-octokit>=4.15<5.0:net/rubygem-octokit \
rubygem-mail_room>=0.10.0<0.11.0:mail/rubygem-mail_room \
rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \
rubygem-html2text>=0:textproc/rubygem-html2text \
@ -208,7 +208,7 @@ MY_DEPENDS= git>=2.22.2: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.73.0<1.74:net/rubygem-gitaly \
rubygem-gitaly>=1.81.0<1.82:net/rubygem-gitaly \
rubygem-grpc>=1.24.0<1.25.0:net/rubygem-grpc \
rubygem-google-protobuf38>=3.8.0<3.9.0:devel/rubygem-google-protobuf38 \
rubygem-toml-rb10>=1.0.0<1.1.0:www/rubygem-toml-rb10 \
@ -220,7 +220,9 @@ MY_DEPENDS= git>=2.22.2:devel/git \
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 \
rubygem-countries>=3.0.0<4.0.0:devel/rubygem-countries \
rubygem-retriable>=3.1.2<3.2.0:devel/rubygem-retriable
rubygem-retriable>=3.1.2<3.2.0:devel/rubygem-retriable \
rubygem-liquid>=4.0<5:textproc/rubygem-liquid \
rubygem-lru_redux>0:devel/rubygem-lru_redux
BUILD_DEPENDS= gem:devel/ruby-gems \
${MY_DEPENDS}
@ -240,7 +242,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= 114d26c615cd6305270b0f29d11b177ab9e655c0
GL_COMMIT= 61654d25b205e5c720de4d82402ff83fd8f18849
USERS= git
GROUPS= git

6
www/gitlab-ce/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1580459225
SHA256 (gitlab-org-gitlab-foss-114d26c615cd6305270b0f29d11b177ab9e655c0_GL0.tar.gz) = b49b184e911ec564360ff81673f55d78d1c61a32a3f451c2cf56994e73b727ca
SIZE (gitlab-org-gitlab-foss-114d26c615cd6305270b0f29d11b177ab9e655c0_GL0.tar.gz) = 99803475
TIMESTAMP = 1581628674
SHA256 (gitlab-org-gitlab-foss-61654d25b205e5c720de4d82402ff83fd8f18849_GL0.tar.gz) = 1d91bcfdaf0dfd89eaa2dac215850063aa740d0ca80cdd3341983adf2fefd8c7
SIZE (gitlab-org-gitlab-foss-61654d25b205e5c720de4d82402ff83fd8f18849_GL0.tar.gz) = 86836659

56
www/gitlab-ce/files/gitlab.in
View File

@ -129,14 +129,14 @@ fi
# Switch to the app_user if it is not he/she who is running the script.
if [ "$USER" != "$app_user" ]; then
# Regenerate the Gemfile.lock for all related products
echo "Regenerate Gitlab Gemfile.lock"
# echo "Regenerate Gitlab Gemfile.lock"
rm -f "${app_root}"/Gemfile.lock
if ! su -l root -c "cd ${app_root} && %%LOCALBASE%%/bin/bundle install --local --quiet"; then
echo "Could not create Gemfile.lock for gitlab, please report this using FreeBSD Bugtracker, https://bugs.freebsd.org/"
exit 1
fi
chown git "${app_root}"/Gemfile.lock
echo "Regenerate Gitaly Gemfile.lock"
# echo "Regenerate Gitaly Gemfile.lock"
rm -f "${gitaly_dir}"/ruby/Gemfile.lock
if ! su -l root -c "cd ${gitaly_dir}/ruby && %%LOCALBASE%%/bin/bundle install --local --quiet"; then
echo "Could not create Gemfile.lock for gitaly, please report this using FreeBSD Bugtracker, https://bugs.freebsd.org/"
@ -563,56 +563,6 @@ restart_gitlab(){
}
### Finally the input handling.
case $gitlab_enable in
[yY][eE][sS])
case "$1" in
start|quietstart|faststart)
start_gitlab
;;
stop|faststop)
stop_gitlab
;;
restart)
restart_gitlab
;;
reload|force-reload)
reload_gitlab
;;
status)
print_status
exit $gitlab_status
;;
*)
echo "Usage: service gitlab {start|quietstart|faststop|stop|restart|reload|onestart|onestop|onerestart|onreload|status}"
exit 1
;;
esac
;;
*)
case "$1" in
onestart)
start_gitlab
;;
onestop)
stop_gitlab
;;
onerestart)
restart_gitlab
;;
onreload)
reload_gitlab
;;
status)
print_status
exit $gitlab_status
;;
*)
echo "Usage: service gitlab {start|quietstart|faststop|stop|restart|reload|onestart|onestop|onerestart|onreload|status}"
exit 1
;;
esac
esac
run_rc_command "$1"
exit

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

@ -1,4 +1,4 @@
--- Gemfile.orig 2020-01-30 15:15:59 UTC
--- Gemfile.orig 2020-01-31 21:59:11 UTC
+++ Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
@ -19,7 +19,7 @@
@@ -149,7 +148,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 'asciidoctor-plantuml', '0.0.10'
-gem 'rouge', '~> 3.11.0'
+gem 'rouge', '~> 3.11'
gem 'truncato', '~> 0.7.11'
@ -34,7 +34,7 @@
# Jira integration
gem 'jira-ruby', '~> 1.7'
@@ -329,90 +328,6 @@ group :metrics do
@@ -329,94 +328,6 @@ group :metrics do
# Prometheus
gem 'prometheus-client-mmap', '~> 0.10.0'
gem 'raindrops', '~> 0.18'
@ -75,11 +75,11 @@
- gem 'spring', '~> 2.0.0'
- gem 'spring-commands-rspec', '~> 1.0.4'
-
- gem 'gitlab-styles', '~> 2.7', require: false
- gem 'gitlab-styles', '~> 3.1.0', require: false
- # Pin these dependencies, otherwise a new rule could break the CI pipelines
- gem 'rubocop', '~> 0.69.0'
- gem 'rubocop-performance', '~> 1.1.0'
- gem 'rubocop-rspec', '~> 1.22.1'
- gem 'rubocop', '~> 0.74.0'
- gem 'rubocop-performance', '~> 1.4.1'
- gem 'rubocop-rspec', '~> 1.37.0'
-
- gem 'scss_lint', '~> 0.56.0', require: false
- gem 'haml_lint', '~> 0.34.0', require: false
@ -95,6 +95,10 @@
- gem 'simple_po_parser', '~> 1.1.2', require: false
-
- gem 'timecop', '~> 0.8.0'
-
- gem 'png_quantizator', '~> 0.2.1', require: false
-
- gem 'parallel', '~> 1.19', require: false
-end
-
-# Gems required in omnibus-gitlab pipeline
@ -124,4 +128,4 @@
- gem 'guard-rspec'
end
gem 'octokit', '~> 4.9'
gem 'octokit', '~> 4.15'

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

@ -1,6 +1,6 @@
--- config/gitlab.yml.example.orig 2020-01-02 15:06:44 UTC
--- config/gitlab.yml.example.orig 2020-01-31 21:59:11 UTC
+++ config/gitlab.yml.example
@@ -910,7 +910,7 @@ production: &base
@@ -916,7 +916,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.
@@ -928,8 +928,8 @@ production: &base
@@ -934,8 +934,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
@@ -975,12 +975,12 @@ production: &base
@@ -981,12 +981,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@ -36,7 +36,7 @@
# Git over HTTP
upload_pack: true
@@ -1005,7 +1005,7 @@ production: &base
@@ -1011,7 +1011,7 @@ production: &base
# CAUTION!
# Use the default values unless you really know what you are doing
git:

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

@ -1,17 +1,15 @@
--- config/initializers/1_settings.rb.orig 2019-12-03 11:22:02 UTC
--- config/initializers/1_settings.rb.orig 2020-01-31 21:59:11 UTC
+++ config/initializers/1_settings.rb
@@ -179,12 +179,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'
-Settings.gitlab['user_home'] ||= begin
@@ -179,11 +179,7 @@ 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'
-Settings.gitlab['user_home'] ||= begin
- Etc.getpwnam(Settings.gitlab['user']).dir
-rescue ArgumentError # no user configured
- '/home/' + Settings.gitlab['user']
-end
-Settings.gitlab['time_zone'] ||= nil
+Settings.gitlab['user_home'] ||= '/usr/home/' + Settings.gitlab['user']
+Settings.gitlab['time_zone'] ||= nil
+Settings.gitlab['user_home'] ||= '/usr/local/git'
Settings.gitlab['time_zone'] ||= nil
Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil?
Settings.gitlab['restricted_visibility_levels'] = Settings.__send__(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], [])

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

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

File diff suppressed because it is too large Load Diff