Date: Fri, 31 Jan 2020 12:24:53 +0000 (UTC) From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524700 - in head/www/gitlab-ce: . files Message-ID: <202001311224.00VCOrdZ096791@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Fri Jan 31 12:24:52 2020 New Revision: 524700 URL: https://svnweb.freebsd.org/changeset/ports/524700 Log: Security update to 12.6.6. Changelog: https://about.gitlab.com/releases/2020/01/30/security-release-gitlab-12-7-4-released/ MFH: 2020Q1 Security: c5bd9068-440f-11ea-9cdb-001b217b3468 Modified: head/www/gitlab-ce/Makefile head/www/gitlab-ce/distinfo head/www/gitlab-ce/files/patch-Gemfile head/www/gitlab-ce/pkg-plist Modified: head/www/gitlab-ce/Makefile ============================================================================== --- head/www/gitlab-ce/Makefile Fri Jan 31 12:18:09 2020 (r524699) +++ head/www/gitlab-ce/Makefile Fri Jan 31 12:24:52 2020 (r524700) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-ce -PORTVERSION= 12.6.4 +PORTVERSION= 12.6.6 PORTREVISION= 0 CATEGORIES= www devel @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # 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-workhorse>=8.18.0:www/gitlab-workhorse \ + gitlab-workhorse>=8.20.0:www/gitlab-workhorse \ gitaly>=1.77.0:devel/gitaly \ gitlab-pages>=1.12.0:www/gitlab-pages \ redis>=3.2.12:databases/redis \ @@ -64,7 +64,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \ 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.6<1.1.0:dns/rubygem-validates_hostname \ - rubygem-rubyzip>=1.3.0<1.4.0:archivers/rubygem-rubyzip \ + rubygem-rubyzip>=2.0.0<2.1.0:archivers/rubygem-rubyzip \ rubygem-acme-client>=2.0.2<2.1.0:security/rubygem-acme-client \ rubygem-browser>=2.5<3.0:www/rubygem-browser \ rubygem-gpgme>=2.0.19<2.1.0:security/rubygem-gpgme \ @@ -72,7 +72,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \ rubygem-net-ldap>0:net/rubygem-net-ldap \ rubygem-grape11>=1.1.0<1.2.0:devel/rubygem-grape11 \ rubygem-grape-entity>=0.7.1<0.8.0,1:devel/rubygem-grape-entity \ - rubygem-rack-cors>=1.0.0<1.1.0:www/rubygem-rack-cors \ + rubygem-rack-cors>=1.0.6<1.1.0:www/rubygem-rack-cors \ rubygem-graphql>=1.9.11<1.10.0:devel/rubygem-graphql \ rubygem-graphiql-rails>=1.4.10<1.5.0:devel/rubygem-graphiql-rails \ rubygem-apollo_upload_server>=2.0.0.b.3<2.1.0:net/rubygem-apollo_upload_server \ @@ -103,7 +103,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \ rubygem-github-markup17>=1.7.0<1.8.0:textproc/rubygem-github-markup17 \ rubygem-commonmarker>=0.20<1.0:textproc/rubygem-commonmarker \ rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \ - rubygem-rdoc>=6.0<7.0:devel/rubygem-rdoc \ + rubygem-rdoc>=6.1.2<6.2:devel/rubygem-rdoc \ rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \ rubygem-creole>=0.5.0<0.6.0:textproc/rubygem-creole \ rubygem-wikicloth081>=0.8.1<0.8.2:textproc/rubygem-wikicloth081 \ @@ -240,7 +240,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= 70900054dfe381ccca7d570d431d96705e6b6473 +GL_COMMIT= 114d26c615cd6305270b0f29d11b177ab9e655c0 USERS= git GROUPS= git Modified: head/www/gitlab-ce/distinfo ============================================================================== --- head/www/gitlab-ce/distinfo Fri Jan 31 12:18:09 2020 (r524699) +++ head/www/gitlab-ce/distinfo Fri Jan 31 12:24:52 2020 (r524700) @@ -1,3 +1,3 @@ -TIMESTAMP = 1578987020 -SHA256 (gitlab-org-gitlab-foss-70900054dfe381ccca7d570d431d96705e6b6473_GL0.tar.gz) = d91cbf17c1bc417a1b50b1b109a5f1543bc827054db1bd36caf12ae3febb4595 -SIZE (gitlab-org-gitlab-foss-70900054dfe381ccca7d570d431d96705e6b6473_GL0.tar.gz) = 99800896 +TIMESTAMP = 1580459225 +SHA256 (gitlab-org-gitlab-foss-114d26c615cd6305270b0f29d11b177ab9e655c0_GL0.tar.gz) = b49b184e911ec564360ff81673f55d78d1c61a32a3f451c2cf56994e73b727ca +SIZE (gitlab-org-gitlab-foss-114d26c615cd6305270b0f29d11b177ab9e655c0_GL0.tar.gz) = 99803475 Modified: head/www/gitlab-ce/files/patch-Gemfile ============================================================================== --- head/www/gitlab-ce/files/patch-Gemfile Fri Jan 31 12:18:09 2020 (r524699) +++ head/www/gitlab-ce/files/patch-Gemfile Fri Jan 31 12:24:52 2020 (r524700) @@ -1,4 +1,4 @@ ---- Gemfile.orig 2019-12-20 19:09:32 UTC +--- Gemfile.orig 2020-01-30 15:15:59 UTC +++ Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' @@ -36,7 +36,7 @@ gem 'jira-ruby', '~> 1.7' @@ -329,90 +328,6 @@ group :metrics do # Prometheus - gem 'prometheus-client-mmap', '~> 0.9.10' + gem 'prometheus-client-mmap', '~> 0.10.0' gem 'raindrops', '~> 0.18' -end - Modified: head/www/gitlab-ce/pkg-plist ============================================================================== --- head/www/gitlab-ce/pkg-plist Fri Jan 31 12:18:09 2020 (r524699) +++ head/www/gitlab-ce/pkg-plist Fri Jan 31 12:24:52 2020 (r524700) @@ -11664,6 +11664,7 @@ %%WWWDIR%%/lib/gitlab/git/conflict/parser.rb %%WWWDIR%%/lib/gitlab/git/conflict/resolution.rb %%WWWDIR%%/lib/gitlab/git/conflict/resolver.rb +%%WWWDIR%%/lib/gitlab/git/cross_repo_comparer.rb %%WWWDIR%%/lib/gitlab/git/diff.rb %%WWWDIR%%/lib/gitlab/git/diff_collection.rb %%WWWDIR%%/lib/gitlab/git/diff_stats_collection.rb @@ -12050,6 +12051,7 @@ %%WWWDIR%%/lib/gitlab/multi_collection_paginator.rb %%WWWDIR%%/lib/gitlab/namespace_sanitizer.rb %%WWWDIR%%/lib/gitlab/namespaced_session_store.rb +%%WWWDIR%%/lib/gitlab/no_cache_headers.rb %%WWWDIR%%/lib/gitlab/noteable_metadata.rb %%WWWDIR%%/lib/gitlab/null_request_store.rb %%WWWDIR%%/lib/gitlab/object_hierarchy.rb @@ -17586,6 +17588,7 @@ %%WWWDIR%%/spec/lib/gitlab/anonymous_session_spec.rb %%WWWDIR%%/spec/lib/gitlab/app_logger_spec.rb %%WWWDIR%%/spec/lib/gitlab/application_rate_limiter_spec.rb +%%WWWDIR%%/spec/lib/gitlab/asciidoc/include_processor_spec.rb %%WWWDIR%%/spec/lib/gitlab/asciidoc_spec.rb %%WWWDIR%%/spec/lib/gitlab/auth/activity_spec.rb %%WWWDIR%%/spec/lib/gitlab/auth/auth_finders_spec.rb @@ -18036,6 +18039,7 @@ %%WWWDIR%%/spec/lib/gitlab/git/compare_spec.rb %%WWWDIR%%/spec/lib/gitlab/git/conflict/file_spec.rb %%WWWDIR%%/spec/lib/gitlab/git/conflict/parser_spec.rb +%%WWWDIR%%/spec/lib/gitlab/git/cross_repo_comparer_spec.rb %%WWWDIR%%/spec/lib/gitlab/git/diff_collection_spec.rb %%WWWDIR%%/spec/lib/gitlab/git/diff_spec.rb %%WWWDIR%%/spec/lib/gitlab/git/diff_stats_collection_spec.rb @@ -18336,6 +18340,7 @@ %%WWWDIR%%/spec/lib/gitlab/middleware/release_env_spec.rb %%WWWDIR%%/spec/lib/gitlab/multi_collection_paginator_spec.rb %%WWWDIR%%/spec/lib/gitlab/namespaced_session_store_spec.rb +%%WWWDIR%%/spec/lib/gitlab/no_cache_headers_spec.rb %%WWWDIR%%/spec/lib/gitlab/noteable_metadata_spec.rb %%WWWDIR%%/spec/lib/gitlab/null_request_store_spec.rb %%WWWDIR%%/spec/lib/gitlab/object_hierarchy_spec.rb @@ -20044,6 +20049,7 @@ %%WWWDIR%%/spec/support/shared_contexts/merge_request_create.rb %%WWWDIR%%/spec/support/shared_contexts/merge_request_edit.rb %%WWWDIR%%/spec/support/shared_contexts/merge_requests_allowing_collaboration.rb +%%WWWDIR%%/spec/support/shared_contexts/pages_zip_with_spoofed_size_shared_context.rb %%WWWDIR%%/spec/support/shared_contexts/policies/group_policy_shared_context.rb %%WWWDIR%%/spec/support/shared_contexts/policies/project_policy_shared_context.rb %%WWWDIR%%/spec/support/shared_contexts/policies/project_policy_table_shared_context.rb
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001311224.00VCOrdZ096791>