From c84709f019f018b38ab53d8a74ca74d669362507 Mon Sep 17 00:00:00 2001 From: Matthias Fechner Date: Thu, 4 Apr 2019 12:12:57 +0000 Subject: [PATCH] MFH: r497590 Security upgrade to 11.9.4. Changelog: https://about.gitlab.com/2019/04/01/security-release-gitlab-11-dot-9-dot-4-released/ Security: da459dbc-5586-11e9-abd6-001b217b3468 Approved by: ports-secteam (miwi) --- www/gitlab-ce/Makefile | 6 +++--- www/gitlab-ce/distinfo | 6 +++--- www/gitlab-ce/pkg-plist | 12 ++++++++++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index ef5d911281a0..152a36a1da6f 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-ce -PORTVERSION= 11.9.1 +PORTVERSION= 11.9.4 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # for the options MY_DEPENDS= git>=2.16.2:devel/git \ gitlab-shell>=8.7.1:devel/gitlab-shell \ - gitlab-workhorse>=8.3.1:www/gitlab-workhorse \ + gitlab-workhorse>=8.3.3:www/gitlab-workhorse \ gitaly>=1.27.1:devel/gitaly \ gitlab-pages>=1.5.0:www/gitlab-pages \ redis>=3.2.12:databases/redis \ @@ -220,7 +220,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= 86f0b5dd4d0ead4978e106e4ef16855fe78bbbdb +GL_COMMIT= 47339506cc2d63174782f72fb870836a2d67d58f USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 53a2ff2a5ed6..d890e990c192 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553769689 -SHA256 (gitlab-org-gitlab-ce-86f0b5dd4d0ead4978e106e4ef16855fe78bbbdb_GL0.tar.gz) = a78e95d7558906b12fca5701f27721b34145dc94ceafbe1a2ed33f604cad9190 -SIZE (gitlab-org-gitlab-ce-86f0b5dd4d0ead4978e106e4ef16855fe78bbbdb_GL0.tar.gz) = 61371979 +TIMESTAMP = 1554236672 +SHA256 (gitlab-org-gitlab-ce-47339506cc2d63174782f72fb870836a2d67d58f_GL0.tar.gz) = cac2a3c6c1f1f8b8253880e01a9c1f76ee78d5f11cc0c533d552926724f0deb6 +SIZE (gitlab-org-gitlab-ce-47339506cc2d63174782f72fb870836a2d67d58f_GL0.tar.gz) = 61547597 diff --git a/www/gitlab-ce/pkg-plist b/www/gitlab-ce/pkg-plist index 3f1d86dcb4d1..9bc057e23189 100644 --- a/www/gitlab-ce/pkg-plist +++ b/www/gitlab-ce/pkg-plist @@ -4685,6 +4685,7 @@ %%WWWDIR%%/app/services/keys/create_service.rb %%WWWDIR%%/app/services/keys/destroy_service.rb %%WWWDIR%%/app/services/keys/last_used_service.rb +%%WWWDIR%%/app/services/labels/available_labels_service.rb %%WWWDIR%%/app/services/labels/base_service.rb %%WWWDIR%%/app/services/labels/create_service.rb %%WWWDIR%%/app/services/labels/find_or_create_service.rb @@ -4808,6 +4809,7 @@ %%WWWDIR%%/app/services/projects/participants_service.rb %%WWWDIR%%/app/services/projects/propagate_service_template.rb %%WWWDIR%%/app/services/projects/protect_default_branch_service.rb +%%WWWDIR%%/app/services/projects/repository_languages_service.rb %%WWWDIR%%/app/services/projects/transfer_service.rb %%WWWDIR%%/app/services/projects/unlink_fork_service.rb %%WWWDIR%%/app/services/projects/update_pages_configuration_service.rb @@ -7593,6 +7595,7 @@ %%WWWDIR%%/db/migrate/20190225160300_steal_encrypt_runners_tokens.rb %%WWWDIR%%/db/migrate/20190225160301_add_runner_tokens_indexes.rb %%WWWDIR%%/db/migrate/20190301182457_add_external_hostname_to_ingress_and_knative.rb +%%WWWDIR%%/db/migrate/20190312071108_add_detected_repository_languages_to_projects.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 @@ -7889,6 +7892,7 @@ %%WWWDIR%%/doc/administration/raketasks/project_import_export.md %%WWWDIR%%/doc/administration/raketasks/storage.md %%WWWDIR%%/doc/administration/raketasks/uploads/migrate.md +%%WWWDIR%%/doc/administration/raketasks/uploads/sanitize.md %%WWWDIR%%/doc/administration/reply_by_email.md %%WWWDIR%%/doc/administration/reply_by_email_postfix_setup.md %%WWWDIR%%/doc/administration/repository_checks.md @@ -9536,6 +9540,7 @@ %%WWWDIR%%/doc/workflow/workflow.md %%WWWDIR%%/docker-compose.yml %%WWWDIR%%/docker/README.md +%%WWWDIR%%/ee/changelogs/unreleased/security-milestone-labels.yml %%WWWDIR%%/fixtures/emojis/aliases.json %%WWWDIR%%/fixtures/emojis/digests.json %%WWWDIR%%/fixtures/emojis/emoji-unicode-version-map.json @@ -10722,6 +10727,7 @@ %%WWWDIR%%/lib/gitlab/route_map.rb %%WWWDIR%%/lib/gitlab/routing.rb %%WWWDIR%%/lib/gitlab/safe_request_store.rb +%%WWWDIR%%/lib/gitlab/sanitizers/exif.rb %%WWWDIR%%/lib/gitlab/sanitizers/svg.rb %%WWWDIR%%/lib/gitlab/sanitizers/svg/whitelist.rb %%WWWDIR%%/lib/gitlab/search/found_blob.rb @@ -10826,6 +10832,7 @@ %%WWWDIR%%/lib/gitlab/tracing/sidekiq/sidekiq_common.rb %%WWWDIR%%/lib/gitlab/tree_summary.rb %%WWWDIR%%/lib/gitlab/untrusted_regexp.rb +%%WWWDIR%%/lib/gitlab/untrusted_regexp/ruby_syntax.rb %%WWWDIR%%/lib/gitlab/update_path_error.rb %%WWWDIR%%/lib/gitlab/uploads_transfer.rb %%WWWDIR%%/lib/gitlab/url_blocker.rb @@ -10988,6 +10995,7 @@ %%WWWDIR%%/lib/tasks/gitlab/update_templates.rake %%WWWDIR%%/lib/tasks/gitlab/uploads/check.rake %%WWWDIR%%/lib/tasks/gitlab/uploads/migrate.rake +%%WWWDIR%%/lib/tasks/gitlab/uploads/sanitize.rake %%WWWDIR%%/lib/tasks/gitlab/web_hook.rake %%WWWDIR%%/lib/tasks/gitlab/workhorse.rake %%WWWDIR%%/lib/tasks/grape.rake @@ -14267,6 +14275,7 @@ %%WWWDIR%%/spec/lib/gitlab/route_map_spec.rb %%WWWDIR%%/spec/lib/gitlab/routing_spec.rb %%WWWDIR%%/spec/lib/gitlab/safe_request_store_spec.rb +%%WWWDIR%%/spec/lib/gitlab/sanitizers/exif_spec.rb %%WWWDIR%%/spec/lib/gitlab/sanitizers/svg_spec.rb %%WWWDIR%%/spec/lib/gitlab/search/found_blob_spec.rb %%WWWDIR%%/spec/lib/gitlab/search/query_spec.rb @@ -14340,6 +14349,7 @@ %%WWWDIR%%/spec/lib/gitlab/tracing/sidekiq/server_middleware_spec.rb %%WWWDIR%%/spec/lib/gitlab/tracing_spec.rb %%WWWDIR%%/spec/lib/gitlab/tree_summary_spec.rb +%%WWWDIR%%/spec/lib/gitlab/untrusted_regexp/ruby_syntax_spec.rb %%WWWDIR%%/spec/lib/gitlab/untrusted_regexp_spec.rb %%WWWDIR%%/spec/lib/gitlab/uploads_transfer_spec.rb %%WWWDIR%%/spec/lib/gitlab/url_blocker_spec.rb @@ -15207,6 +15217,7 @@ %%WWWDIR%%/spec/services/keys/create_service_spec.rb %%WWWDIR%%/spec/services/keys/destroy_service_spec.rb %%WWWDIR%%/spec/services/keys/last_used_service_spec.rb +%%WWWDIR%%/spec/services/labels/available_labels_service_spec.rb %%WWWDIR%%/spec/services/labels/create_service_spec.rb %%WWWDIR%%/spec/services/labels/find_or_create_service_spec.rb %%WWWDIR%%/spec/services/labels/promote_service_spec.rb @@ -15311,6 +15322,7 @@ %%WWWDIR%%/spec/services/projects/participants_service_spec.rb %%WWWDIR%%/spec/services/projects/propagate_service_template_spec.rb %%WWWDIR%%/spec/services/projects/protect_default_branch_service_spec.rb +%%WWWDIR%%/spec/services/projects/repository_languages_service_spec.rb %%WWWDIR%%/spec/services/projects/transfer_service_spec.rb %%WWWDIR%%/spec/services/projects/unlink_fork_service_spec.rb %%WWWDIR%%/spec/services/projects/update_pages_configuration_service_spec.rb