svn commit: r483503 - in branches/2018Q4/www/gitlab-ce: . files
Matthias Fechner
mfechner at FreeBSD.org
Tue Oct 30 16:37:50 UTC 2018
Author: mfechner
Date: Tue Oct 30 16:37:48 2018
New Revision: 483503
URL: https://svnweb.freebsd.org/changeset/ports/483503
Log:
MFH: r483457 r483459
One of the last dependency updates gitlab-ce requires, has broken the Gemfile.lock generation for user git.
I use now a work-around to generate the file as user root and change the ownership back to git.
This commit can maybe be undone if the source of the problem is fixed.
PR: 232791
Reported by: freebsd at felix.flornet.de
Approved by: mentors (implicit)
MFC after: 1 day
www/gitlab-ce security update to version 11.3.8.
Approved by: mentors (implicit)
MFC after: 1 day
Security: b9591212-dba7-11e8-9416-001b217b3468
Approved by: ports-secteam (miwi)
Modified:
branches/2018Q4/www/gitlab-ce/Makefile
branches/2018Q4/www/gitlab-ce/distinfo
branches/2018Q4/www/gitlab-ce/files/gitlab.in
branches/2018Q4/www/gitlab-ce/pkg-plist
Directory Properties:
branches/2018Q4/ (props changed)
Modified: branches/2018Q4/www/gitlab-ce/Makefile
==============================================================================
--- branches/2018Q4/www/gitlab-ce/Makefile Tue Oct 30 16:24:34 2018 (r483502)
+++ branches/2018Q4/www/gitlab-ce/Makefile Tue Oct 30 16:37:48 2018 (r483503)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gitlab-ce
-PORTVERSION= 11.3.4
+PORTVERSION= 11.3.8
CATEGORIES= www devel
MAINTAINER= mfechner at FreeBSD.org
@@ -20,7 +20,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \
gitlab-workhorse>=6.1.0:www/gitlab-workhorse \
gitaly>=0.120.1:devel/gitaly \
gitlab-pages>=1.1.0:www/gitlab-pages \
- redis>=2.8.23:databases/redis \
+ redis>=3.2.12:databases/redis \
npm>=4.3.0:www/npm \
yarn>=0.17.0:www/yarn \
rubygem-rails4>=4.2.10:www/rubygem-rails4 \
@@ -218,7 +218,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= 30f019dca78bb64bcb8b355a267be006884e6d8f
+GL_COMMIT= 0a6f6119fa3e6f708e745bba369ecba18c3d07cc
USERS= git
GROUPS= git
Modified: branches/2018Q4/www/gitlab-ce/distinfo
==============================================================================
--- branches/2018Q4/www/gitlab-ce/distinfo Tue Oct 30 16:24:34 2018 (r483502)
+++ branches/2018Q4/www/gitlab-ce/distinfo Tue Oct 30 16:37:48 2018 (r483503)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538768604
-SHA256 (gitlab-org-gitlab-ce-30f019dca78bb64bcb8b355a267be006884e6d8f_GL0.tar.gz) = 160f74ee44d034ca5a2b804856d5b132951461b41bac6ac2a14324ee822641d5
-SIZE (gitlab-org-gitlab-ce-30f019dca78bb64bcb8b355a267be006884e6d8f_GL0.tar.gz) = 42469501
+TIMESTAMP = 1540838450
+SHA256 (gitlab-org-gitlab-ce-0a6f6119fa3e6f708e745bba369ecba18c3d07cc_GL0.tar.gz) = 679e5338e3d40f6db60472477c33fc0b974e2ed97218eb3b08fc6509d1a79472
+SIZE (gitlab-org-gitlab-ce-0a6f6119fa3e6f708e745bba369ecba18c3d07cc_GL0.tar.gz) = 42479125
Modified: branches/2018Q4/www/gitlab-ce/files/gitlab.in
==============================================================================
--- branches/2018Q4/www/gitlab-ce/files/gitlab.in Tue Oct 30 16:24:34 2018 (r483502)
+++ branches/2018Q4/www/gitlab-ce/files/gitlab.in Tue Oct 30 16:37:48 2018 (r483503)
@@ -91,10 +91,11 @@ if [ "$USER" != "$app_user" ]; then
# Regenerate the Gemfile.lock for all related products
echo "Regenerate Gitlab Gemfile.lock"
rm -f "${app_root}"/Gemfile.lock
- if ! su -l ${app_user} -c "cd ${app_root} && %%LOCALBASE%%/bin/bundle install --local --quiet"; then
+ 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"
rm -f "${gitaly_dir}"/ruby/Gemfile.lock
if ! su -l root -c "cd ${gitaly_dir}/ruby && %%LOCALBASE%%/bin/bundle install --local --quiet"; then
Modified: branches/2018Q4/www/gitlab-ce/pkg-plist
==============================================================================
--- branches/2018Q4/www/gitlab-ce/pkg-plist Tue Oct 30 16:24:34 2018 (r483502)
+++ branches/2018Q4/www/gitlab-ce/pkg-plist Tue Oct 30 16:37:48 2018 (r483503)
@@ -3812,6 +3812,7 @@
%%WWWDIR%%/app/models/concerns/protected_tag_access.rb
%%WWWDIR%%/app/models/concerns/reactive_caching.rb
%%WWWDIR%%/app/models/concerns/reactive_service.rb
+%%WWWDIR%%/app/models/concerns/redactable.rb
%%WWWDIR%%/app/models/concerns/redis_cacheable.rb
%%WWWDIR%%/app/models/concerns/referable.rb
%%WWWDIR%%/app/models/concerns/relative_positioning.rb
@@ -3831,6 +3832,9 @@
%%WWWDIR%%/app/models/concerns/throttled_touch.rb
%%WWWDIR%%/app/models/concerns/time_trackable.rb
%%WWWDIR%%/app/models/concerns/token_authenticatable.rb
+%%WWWDIR%%/app/models/concerns/token_authenticatable_strategies/base.rb
+%%WWWDIR%%/app/models/concerns/token_authenticatable_strategies/digest.rb
+%%WWWDIR%%/app/models/concerns/token_authenticatable_strategies/insecure.rb
%%WWWDIR%%/app/models/concerns/triggerable_hooks.rb
%%WWWDIR%%/app/models/concerns/uniquify.rb
%%WWWDIR%%/app/models/concerns/updated_at_filterable.rb
@@ -6067,6 +6071,7 @@
%%WWWDIR%%/config/initializers/grpc.rb
%%WWWDIR%%/config/initializers/hamlit.rb
%%WWWDIR%%/config/initializers/health_check.rb
+%%WWWDIR%%/config/initializers/hipchat_client_patch.rb
%%WWWDIR%%/config/initializers/kaminari_config.rb
%%WWWDIR%%/config/initializers/kubeclient.rb
%%WWWDIR%%/config/initializers/lograge.rb
@@ -7035,6 +7040,8 @@
%%WWWDIR%%/db/migrate/20180901171833_add_project_config_source_status_index_to_pipeline.rb
%%WWWDIR%%/db/migrate/20180901200537_add_resource_label_event_reference_fields.rb
%%WWWDIR%%/db/migrate/20180906101639_add_user_ping_consent_to_application_settings.rb
+%%WWWDIR%%/db/migrate/20180910153412_add_token_digest_to_personal_access_tokens.rb
+%%WWWDIR%%/db/migrate/20180910153413_add_index_to_token_digest_on_personal_access_tokens.rb
%%WWWDIR%%/db/migrate/gpg_keys_limits_to_mysql.rb
%%WWWDIR%%/db/migrate/limits_ci_build_trace_chunks_raw_data_for_mysql.rb
%%WWWDIR%%/db/migrate/limits_to_mysql.rb
@@ -7198,6 +7205,8 @@
%%WWWDIR%%/db/post_migrate/20180816193530_rename_login_root_namespaces.rb
%%WWWDIR%%/db/post_migrate/20180826111825_recalculate_site_statistics.rb
%%WWWDIR%%/db/post_migrate/20180906051323_remove_orphaned_label_links.rb
+%%WWWDIR%%/db/post_migrate/20180913142237_schedule_digest_personal_access_tokens.rb
+%%WWWDIR%%/db/post_migrate/20181014121030_enqueue_redact_links.rb
@(git,,) %%WWWDIR%%/db/schema.rb
%%WWWDIR%%/db/seeds.rb
%%WWWDIR%%/doc/README.md
@@ -8920,6 +8929,7 @@
%%WWWDIR%%/lib/api/todos.rb
%%WWWDIR%%/lib/api/triggers.rb
%%WWWDIR%%/lib/api/users.rb
+%%WWWDIR%%/lib/api/validations/types/safe_file.rb
%%WWWDIR%%/lib/api/variables.rb
%%WWWDIR%%/lib/api/version.rb
%%WWWDIR%%/lib/api/wikis.rb
@@ -9137,6 +9147,7 @@
%%WWWDIR%%/lib/gitlab/background_migration/delete_conflicting_redirect_routes_range.rb
%%WWWDIR%%/lib/gitlab/background_migration/delete_diff_files.rb
%%WWWDIR%%/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits.rb
+%%WWWDIR%%/lib/gitlab/background_migration/digest_column.rb
%%WWWDIR%%/lib/gitlab/background_migration/fill_file_store_job_artifact.rb
%%WWWDIR%%/lib/gitlab/background_migration/fill_file_store_lfs_object.rb
%%WWWDIR%%/lib/gitlab/background_migration/fill_store_upload.rb
@@ -9157,6 +9168,7 @@
%%WWWDIR%%/lib/gitlab/background_migration/populate_untracked_uploads.rb
%%WWWDIR%%/lib/gitlab/background_migration/populate_untracked_uploads_dependencies.rb
%%WWWDIR%%/lib/gitlab/background_migration/prepare_untracked_uploads.rb
+%%WWWDIR%%/lib/gitlab/background_migration/redact_links.rb
%%WWWDIR%%/lib/gitlab/background_migration/remove_restricted_todos.rb
%%WWWDIR%%/lib/gitlab/background_migration/rollback_import_state_data.rb
%%WWWDIR%%/lib/gitlab/background_migration/schedule_diff_files_deletion.rb
@@ -9343,6 +9355,7 @@
%%WWWDIR%%/lib/gitlab/cross_project_access/check_collection.rb
%%WWWDIR%%/lib/gitlab/cross_project_access/check_info.rb
%%WWWDIR%%/lib/gitlab/cross_project_access/class_methods.rb
+%%WWWDIR%%/lib/gitlab/crypto_helper.rb
%%WWWDIR%%/lib/gitlab/current_settings.rb
%%WWWDIR%%/lib/gitlab/cycle_analytics/base_event_fetcher.rb
%%WWWDIR%%/lib/gitlab/cycle_analytics/base_query.rb
@@ -12352,6 +12365,7 @@
%%WWWDIR%%/spec/lib/gitlab/background_migration/delete_conflicting_redirect_routes_range_spec.rb
%%WWWDIR%%/spec/lib/gitlab/background_migration/delete_diff_files_spec.rb
%%WWWDIR%%/spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/background_migration/digest_column_spec.rb
%%WWWDIR%%/spec/lib/gitlab/background_migration/fix_cross_project_label_links_spec.rb
%%WWWDIR%%/spec/lib/gitlab/background_migration/migrate_build_stage_spec.rb
%%WWWDIR%%/spec/lib/gitlab/background_migration/migrate_events_to_push_event_payloads_spec.rb
@@ -12368,6 +12382,7 @@
%%WWWDIR%%/spec/lib/gitlab/background_migration/populate_untracked_uploads_dependencies/untracked_file_spec.rb
%%WWWDIR%%/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb
%%WWWDIR%%/spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/background_migration/redact_links_spec.rb
%%WWWDIR%%/spec/lib/gitlab/background_migration/remove_restricted_todos_spec.rb
%%WWWDIR%%/spec/lib/gitlab/background_migration/rollback_import_state_data_spec.rb
%%WWWDIR%%/spec/lib/gitlab/background_migration/schedule_diff_files_deletion_spec.rb
@@ -13059,6 +13074,7 @@
%%WWWDIR%%/spec/migrations/delete_inconsistent_internal_id_records_spec.rb
%%WWWDIR%%/spec/migrations/drop_duplicate_protected_tags_spec.rb
%%WWWDIR%%/spec/migrations/enqueue_delete_diff_files_workers_spec.rb
+%%WWWDIR%%/spec/migrations/enqueue_redact_links_spec.rb
%%WWWDIR%%/spec/migrations/enqueue_verify_pages_domain_workers_spec.rb
%%WWWDIR%%/spec/migrations/fill_file_store_spec.rb
%%WWWDIR%%/spec/migrations/fix_wrongly_renamed_routes_spec.rb
@@ -13106,6 +13122,7 @@
%%WWWDIR%%/spec/migrations/reschedule_builds_stages_migration_spec.rb
%%WWWDIR%%/spec/migrations/reschedule_commits_count_for_merge_request_diff_spec.rb
%%WWWDIR%%/spec/migrations/schedule_create_gpg_key_subkeys_from_gpg_keys_spec.rb
+%%WWWDIR%%/spec/migrations/schedule_digest_personal_access_tokens_spec.rb
%%WWWDIR%%/spec/migrations/schedule_merge_request_diff_migrations_spec.rb
%%WWWDIR%%/spec/migrations/schedule_merge_request_diff_migrations_take_two_spec.rb
%%WWWDIR%%/spec/migrations/schedule_merge_request_latest_merge_request_diff_id_migrations_spec.rb
@@ -13216,6 +13233,7 @@
%%WWWDIR%%/spec/models/concerns/prometheus_adapter_spec.rb
%%WWWDIR%%/spec/models/concerns/protected_ref_access_spec.rb
%%WWWDIR%%/spec/models/concerns/reactive_caching_spec.rb
+%%WWWDIR%%/spec/models/concerns/redactable_spec.rb
%%WWWDIR%%/spec/models/concerns/redis_cacheable_spec.rb
%%WWWDIR%%/spec/models/concerns/relative_positioning_spec.rb
%%WWWDIR%%/spec/models/concerns/resolvable_discussion_spec.rb
More information about the svn-ports-all
mailing list