From owner-svn-ports-head@freebsd.org Thu Mar 29 10:35:40 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B3E6BF68E6A; Thu, 29 Mar 2018 10:35:40 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 64CDF86707; Thu, 29 Mar 2018 10:35:40 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5BA0218B1A; Thu, 29 Mar 2018 10:35:40 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2TAZeWx008679; Thu, 29 Mar 2018 10:35:40 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2TAZdFo008675; Thu, 29 Mar 2018 10:35:39 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201803291035.w2TAZdFo008675@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Thu, 29 Mar 2018 10:35:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465880 - in head/www/gitlab: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tz X-SVN-Commit-Paths: in head/www/gitlab: . files X-SVN-Commit-Revision: 465880 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2018 10:35:40 -0000 Author: tz Date: Thu Mar 29 10:35:39 2018 New Revision: 465880 URL: https://svnweb.freebsd.org/changeset/ports/465880 Log: www/gitlab: Update von 10.4.4 to 10.4.6 Changelog: https://github.com/gitlabhq/gitlabhq/blob/v10.4.4/CHANGELOG.md Approved by: mfechner Security: CVE-2018-8801 Security: https://www.vuxml.org/freebsd/dc0c201c-31da-11e8-ac53-d8cb8abf62dd.html Modified: head/www/gitlab/Makefile head/www/gitlab/distinfo head/www/gitlab/files/patch-Gemfile head/www/gitlab/pkg-plist Modified: head/www/gitlab/Makefile ============================================================================== --- head/www/gitlab/Makefile Thu Mar 29 10:33:45 2018 (r465879) +++ head/www/gitlab/Makefile Thu Mar 29 10:35:39 2018 (r465880) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= gitlab -PORTVERSION= 10.4.4 +PORTVERSION= 10.4.6 DISTVERSIONPREFIX= v -PORTREVISION= 4 CATEGORIES= www devel MAINTAINER= idefix@fechner.net @@ -43,7 +42,7 @@ RUN_DEPENDS= git>=2.14.3:devel/git \ rubygem-doorkeeper42>=4.2:security/rubygem-doorkeeper42 \ rubygem-doorkeeper-openid_connect12>=1.2.0:security/rubygem-doorkeeper-openid_connect12 \ rubygem-omniauth14>=1.4.2:security/rubygem-omniauth14 \ - rubygem-omniauth-auth014>=1.4.1:net/rubygem-omniauth-auth014 \ + rubygem-omniauth-auth0>=2.0.0:net/rubygem-omniauth-auth0 \ rubygem-omniauth-azure-oauth2>=0.0.9:net/rubygem-omniauth-azure-oauth2 \ rubygem-omniauth-cas3>=1.1.4:security/rubygem-omniauth-cas3 \ rubygem-omniauth-facebook>=4.0.0:net/rubygem-omniauth-facebook \ Modified: head/www/gitlab/distinfo ============================================================================== --- head/www/gitlab/distinfo Thu Mar 29 10:33:45 2018 (r465879) +++ head/www/gitlab/distinfo Thu Mar 29 10:35:39 2018 (r465880) @@ -1,3 +1,3 @@ -TIMESTAMP = 1518865521 -SHA256 (gitlabhq-gitlabhq-v10.4.4_GH0.tar.gz) = 552572672bd5228194636739bcbd37689c650895093fa5b945e9d0937ae767dd -SIZE (gitlabhq-gitlabhq-v10.4.4_GH0.tar.gz) = 43410230 +TIMESTAMP = 1522311697 +SHA256 (gitlabhq-gitlabhq-v10.4.6_GH0.tar.gz) = db396bcba1b0f50af2b315becd7f9e3795aaa7d4e2e7393a3809c4184cde5130 +SIZE (gitlabhq-gitlabhq-v10.4.6_GH0.tar.gz) = 43412940 Modified: head/www/gitlab/files/patch-Gemfile ============================================================================== --- head/www/gitlab/files/patch-Gemfile Thu Mar 29 10:33:45 2018 (r465879) +++ head/www/gitlab/files/patch-Gemfile Thu Mar 29 10:35:39 2018 (r465880) @@ -1,4 +1,4 @@ ---- Gemfile.orig 2018-02-16 17:13:43 UTC +--- Gemfile.orig 2018-03-16 19:14:20 UTC +++ Gemfile @@ -12,8 +12,8 @@ gem 'sprockets', '~> 3.7.0' gem 'default_value_for', '~> 3.0.0' @@ -18,7 +18,7 @@ -gem 'doorkeeper-openid_connect', '~> 1.2.0' +gem 'doorkeeper-openid_connect', '~> 1.2' gem 'omniauth', '~> 1.4.2' - gem 'omniauth-auth0', '~> 1.4.1' + gem 'omniauth-auth0', '~> 2.0.0' gem 'omniauth-azure-oauth2', '~> 0.0.9' @@ -109,7 +109,7 @@ gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.2.0' @@ -47,7 +47,7 @@ # Colored output to console gem 'rainbow', '~> 2.2' -@@ -209,7 +209,7 @@ gem 'kubeclient', '~> 2.2.0' +@@ -209,11 +209,11 @@ gem 'kubeclient', '~> 2.2.0' gem 'd3_rails', '~> 3.5.0' # Sanitize user input @@ -56,6 +56,11 @@ gem 'babosa', '~> 1.0.2' # Sanitizes SVG input +-gem 'loofah', '~> 2.0.3' ++gem 'loofah', '>= 2.0.3' + + # Working with license + gem 'licensee', '~> 8.7.0' @@ -273,7 +273,7 @@ gem 'batch-loader', '~> 1.2.1' gem 'peek', '~> 1.0.1' gem 'peek-gc', '~> 0.0.2' Modified: head/www/gitlab/pkg-plist ============================================================================== --- head/www/gitlab/pkg-plist Thu Mar 29 10:33:45 2018 (r465879) +++ head/www/gitlab/pkg-plist Thu Mar 29 10:35:39 2018 (r465880) @@ -6159,6 +6159,7 @@ %%WWWDIR%%/db/migrate/20171230123729_add_rebase_commit_sha_to_merge_requests_ce.rb %%WWWDIR%%/db/migrate/20180113220114_rework_redirect_routes_indexes.rb %%WWWDIR%%/db/migrate/20180208183958_schedule_populate_untracked_uploads_if_needed.rb +%%WWWDIR%%/db/migrate/20180223144945_add_allow_local_requests_from_hooks_and_services_to_application_settings.rb %%WWWDIR%%/db/migrate/limits_to_mysql.rb %%WWWDIR%%/db/migrate/markdown_cache_limits_to_mysql.rb %%WWWDIR%%/db/migrate/merge_request_diff_file_limits_to_mysql.rb @@ -6274,6 +6275,7 @@ %%WWWDIR%%/db/post_migrate/20171219121201_normalize_extern_uid_from_identities.rb %%WWWDIR%%/db/post_migrate/20171221140220_schedule_issues_closed_at_type_change.rb %%WWWDIR%%/db/post_migrate/20180202111106_remove_project_labels_group_id.rb +%%WWWDIR%%/db/post_migrate/20180220150310_remove_empty_extern_uid_auth0_identities.rb @(git,,) %%WWWDIR%%/db/schema.rb %%WWWDIR%%/db/seeds.rb %%WWWDIR%%/doc/README.md @@ -8435,6 +8437,7 @@ %%WWWDIR%%/lib/gitlab/hook_data/issuable_builder.rb %%WWWDIR%%/lib/gitlab/hook_data/issue_builder.rb %%WWWDIR%%/lib/gitlab/hook_data/merge_request_builder.rb +%%WWWDIR%%/lib/gitlab/http.rb %%WWWDIR%%/lib/gitlab/i18n.rb %%WWWDIR%%/lib/gitlab/i18n/metadata_entry.rb %%WWWDIR%%/lib/gitlab/i18n/po_linter.rb @@ -8574,6 +8577,7 @@ %%WWWDIR%%/lib/gitlab/prometheus/queries/query_additional_metrics.rb %%WWWDIR%%/lib/gitlab/prometheus_client.rb %%WWWDIR%%/lib/gitlab/protocol_access.rb +%%WWWDIR%%/lib/gitlab/proxy_http_connection_adapter.rb %%WWWDIR%%/lib/gitlab/quick_actions/command_definition.rb %%WWWDIR%%/lib/gitlab/quick_actions/dsl.rb %%WWWDIR%%/lib/gitlab/quick_actions/extractor.rb @@ -8925,6 +8929,7 @@ %%WWWDIR%%/qa/spec/scenario/bootable_spec.rb %%WWWDIR%%/qa/spec/scenario/entrypoint_spec.rb %%WWWDIR%%/qa/spec/spec_helper.rb +%%WWWDIR%%/rubocop/cop/gitlab/httparty.rb %%WWWDIR%%/rubocop/cop/gitlab/module_with_instance_variables.rb %%WWWDIR%%/rubocop/cop/include_sidekiq_worker.rb %%WWWDIR%%/rubocop/cop/migration/add_column.rb @@ -10778,6 +10783,7 @@ %%WWWDIR%%/spec/lib/gitlab/hook_data/issuable_builder_spec.rb %%WWWDIR%%/spec/lib/gitlab/hook_data/issue_builder_spec.rb %%WWWDIR%%/spec/lib/gitlab/hook_data/merge_request_builder_spec.rb +%%WWWDIR%%/spec/lib/gitlab/http_spec.rb %%WWWDIR%%/spec/lib/gitlab/i18n/metadata_entry_spec.rb %%WWWDIR%%/spec/lib/gitlab/i18n/po_linter_spec.rb %%WWWDIR%%/spec/lib/gitlab/i18n/translation_entry_spec.rb @@ -11046,6 +11052,7 @@ %%WWWDIR%%/spec/migrations/remove_assignee_id_from_issue_spec.rb %%WWWDIR%%/spec/migrations/remove_dot_git_from_usernames_spec.rb %%WWWDIR%%/spec/migrations/remove_duplicate_mr_events_spec.rb +%%WWWDIR%%/spec/migrations/remove_empty_extern_uid_auth0_identities_spec.rb %%WWWDIR%%/spec/migrations/remove_empty_fork_networks_spec.rb %%WWWDIR%%/spec/migrations/remove_project_labels_group_id_spec.rb %%WWWDIR%%/spec/migrations/remove_soft_removed_objects_spec.rb @@ -11429,6 +11436,7 @@ %%WWWDIR%%/spec/routing/openid_connect_spec.rb %%WWWDIR%%/spec/routing/project_routing_spec.rb %%WWWDIR%%/spec/routing/routing_spec.rb +%%WWWDIR%%/spec/rubocop/cop/gitlab/httparty_spec.rb %%WWWDIR%%/spec/rubocop/cop/gitlab/module_with_instance_variables_spec.rb %%WWWDIR%%/spec/rubocop/cop/include_sidekiq_worker_spec.rb %%WWWDIR%%/spec/rubocop/cop/migration/add_concurrent_foreign_key_spec.rb