From owner-svn-ports-all@freebsd.org Thu Jan 17 12:18:31 2019 Return-Path: Delivered-To: svn-ports-all@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 3CF27149214D; Thu, 17 Jan 2019 12:18:31 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D79328AA78; Thu, 17 Jan 2019 12:18:30 +0000 (UTC) (envelope-from mfechner@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 C7BDE19FD1; Thu, 17 Jan 2019 12:18:30 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0HCIUNC082051; Thu, 17 Jan 2019 12:18:30 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0HCIUwB082047; Thu, 17 Jan 2019 12:18:30 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201901171218.x0HCIUwB082047@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Thu, 17 Jan 2019 12:18:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r490551 - in branches/2019Q1/www/gitlab-ce: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in branches/2019Q1/www/gitlab-ce: . files X-SVN-Commit-Revision: 490551 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D79328AA78 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.966,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2019 12:18:31 -0000 Author: mfechner Date: Thu Jan 17 12:18:29 2019 New Revision: 490551 URL: https://svnweb.freebsd.org/changeset/ports/490551 Log: MFH: r489831 r490523 Upgrade to version 11.6.3. For more details see here: https://about.gitlab.com/2019/01/03/gitlab-11-6-2-released/ https://about.gitlab.com/2019/01/05/gitlab-11-6-3-released/ Approved by: mentors (implicit) Security update to 11.6.4. Approved by: mentors (implicit) Security: ff50192c-19eb-11e9-8573-001b217b3468 Approved by: ports-secteam (delphij) Modified: branches/2019Q1/www/gitlab-ce/Makefile branches/2019Q1/www/gitlab-ce/distinfo branches/2019Q1/www/gitlab-ce/files/patch-Gemfile branches/2019Q1/www/gitlab-ce/pkg-plist Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/www/gitlab-ce/Makefile ============================================================================== --- branches/2019Q1/www/gitlab-ce/Makefile Thu Jan 17 12:17:26 2019 (r490550) +++ branches/2019Q1/www/gitlab-ce/Makefile Thu Jan 17 12:18:29 2019 (r490551) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-ce -PORTVERSION= 11.6.1 +PORTVERSION= 11.6.4 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -113,7 +113,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-sidekiq>=5.2.1:devel/rubygem-sidekiq \ rubygem-sidekiq-cron0>=0.6.0:devel/rubygem-sidekiq-cron0 \ rubygem-redis-namespace>=1.6.0:databases/rubygem-redis-namespace \ - rubygem-gitlab-sidekiq-fetcher>0.1.0:devel/rubygem-gitlab-sidekiq-fetcher \ + rubygem-gitlab-sidekiq-fetcher>=0.4.0:devel/rubygem-gitlab-sidekiq-fetcher \ rubygem-rufus-scheduler342>=3.4.0:devel/rubygem-rufus-scheduler342 \ rubygem-httparty>=0.13.3:www/rubygem-httparty \ rubygem-rainbow>=3.0:devel/rubygem-rainbow \ @@ -219,7 +219,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= 598c5a7b9ddc0afbd0890d79c82088b80d706483 +GL_COMMIT= 300fef12295e24e33b7d180679d0f7c4333d91b7 USERS= git GROUPS= git Modified: branches/2019Q1/www/gitlab-ce/distinfo ============================================================================== --- branches/2019Q1/www/gitlab-ce/distinfo Thu Jan 17 12:17:26 2019 (r490550) +++ branches/2019Q1/www/gitlab-ce/distinfo Thu Jan 17 12:18:29 2019 (r490551) @@ -1,3 +1,3 @@ -TIMESTAMP = 1546421131 -SHA256 (gitlab-org-gitlab-ce-598c5a7b9ddc0afbd0890d79c82088b80d706483_GL0.tar.gz) = a393c1e44d1bcbafad147180c1183a42178ebba8095747b6ceb7e14ecf884d51 -SIZE (gitlab-org-gitlab-ce-598c5a7b9ddc0afbd0890d79c82088b80d706483_GL0.tar.gz) = 49847798 +TIMESTAMP = 1547682529 +SHA256 (gitlab-org-gitlab-ce-300fef12295e24e33b7d180679d0f7c4333d91b7_GL0.tar.gz) = 4ed006ae14dd76d033ff90a95b623cce3c7388c7b043505d25acff4098cc654a +SIZE (gitlab-org-gitlab-ce-300fef12295e24e33b7d180679d0f7c4333d91b7_GL0.tar.gz) = 49852433 Modified: branches/2019Q1/www/gitlab-ce/files/patch-Gemfile ============================================================================== --- branches/2019Q1/www/gitlab-ce/files/patch-Gemfile Thu Jan 17 12:17:26 2019 (r490550) +++ branches/2019Q1/www/gitlab-ce/files/patch-Gemfile Thu Jan 17 12:18:29 2019 (r490551) @@ -1,4 +1,4 @@ ---- Gemfile.orig 2018-12-21 14:23:37 UTC +--- Gemfile.orig 2019-01-04 23:19:12 UTC +++ Gemfile @@ -5,7 +5,7 @@ end @@ -18,14 +18,7 @@ gem 'pg', '~> 0.18.2', group: :postgres gem 'rugged', '~> 0.27' -@@ -181,13 +181,13 @@ gem 'acts-as-taggable-on', '~> 5.0' - gem 'sidekiq', '~> 5.2.1' - gem 'sidekiq-cron', '~> 0.6.0' - gem 'redis-namespace', '~> 1.6.0' --gem 'gitlab-sidekiq-fetcher', '~> 0.1.0', require: 'sidekiq-reliable-fetch' -+gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch' - - # Cron Parser +@@ -187,7 +187,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'si gem 'rufus-scheduler', '~> 3.4' # HTTP requests Modified: branches/2019Q1/www/gitlab-ce/pkg-plist ============================================================================== --- branches/2019Q1/www/gitlab-ce/pkg-plist Thu Jan 17 12:17:26 2019 (r490550) +++ branches/2019Q1/www/gitlab-ce/pkg-plist Thu Jan 17 12:18:29 2019 (r490551) @@ -9958,6 +9958,7 @@ %%WWWDIR%%/lib/gitlab/git/blame.rb %%WWWDIR%%/lib/gitlab/git/blob.rb %%WWWDIR%%/lib/gitlab/git/branch.rb +%%WWWDIR%%/lib/gitlab/git/bundle_file.rb %%WWWDIR%%/lib/gitlab/git/commit.rb %%WWWDIR%%/lib/gitlab/git/commit_stats.rb %%WWWDIR%%/lib/gitlab/git/compare.rb @@ -12072,6 +12073,7 @@ %%WWWDIR%%/spec/fixtures/junit/junit_with_three_testsuites_2.xml %%WWWDIR%%/spec/fixtures/junit/junit_with_three_testsuites_3.xml %%WWWDIR%%/spec/fixtures/logo_sample.svg +%%WWWDIR%%/spec/fixtures/malicious.bundle %%WWWDIR%%/spec/fixtures/markdown.md.erb %%WWWDIR%%/spec/fixtures/metrics.json %%WWWDIR%%/spec/fixtures/missing_metadata.po @@ -12136,6 +12138,7 @@ %%WWWDIR%%/spec/graphql/types/query_type_spec.rb %%WWWDIR%%/spec/graphql/types/time_type_spec.rb %%WWWDIR%%/spec/helpers/application_helper_spec.rb +%%WWWDIR%%/spec/helpers/application_settings_helper_spec.rb %%WWWDIR%%/spec/helpers/auth_helper_spec.rb %%WWWDIR%%/spec/helpers/auto_devops_helper_spec.rb %%WWWDIR%%/spec/helpers/avatars_helper_spec.rb @@ -13378,6 +13381,7 @@ %%WWWDIR%%/spec/lib/gitlab/git/blame_spec.rb %%WWWDIR%%/spec/lib/gitlab/git/blob_spec.rb %%WWWDIR%%/spec/lib/gitlab/git/branch_spec.rb +%%WWWDIR%%/spec/lib/gitlab/git/bundle_file_spec.rb %%WWWDIR%%/spec/lib/gitlab/git/commit_spec.rb %%WWWDIR%%/spec/lib/gitlab/git/compare_spec.rb %%WWWDIR%%/spec/lib/gitlab/git/conflict/file_spec.rb