Date: Tue, 3 May 2016 13:05:26 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414528 - in branches/2016Q2/www/gitlab: . files Message-ID: <201605031305.u43D5Qvl038688@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Tue May 3 13:05:26 2016 New Revision: 414528 URL: https://svnweb.freebsd.org/changeset/ports/414528 Log: www/gitlab: 8.5.5 -> 8.5.11 to fix CVE-2016-4340 Changes: https://about.gitlab.com/2016/05/02/cve-2016-4340-patches/ PR: 209225 Submitted by: Torsten Zuehlsdorff <ports@toco-domains.de> (maintainer) Approved by: ports-secteam (feld) Modified: branches/2016Q2/www/gitlab/Makefile branches/2016Q2/www/gitlab/distinfo branches/2016Q2/www/gitlab/files/patch-Gemfile branches/2016Q2/www/gitlab/pkg-plist Modified: branches/2016Q2/www/gitlab/Makefile ============================================================================== --- branches/2016Q2/www/gitlab/Makefile Tue May 3 12:47:31 2016 (r414527) +++ branches/2016Q2/www/gitlab/Makefile Tue May 3 13:05:26 2016 (r414528) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab -PORTVERSION= 8.5.5 +PORTVERSION= 8.5.11 DISTVERSIONPREFIX= v CATEGORIES= www devel Modified: branches/2016Q2/www/gitlab/distinfo ============================================================================== --- branches/2016Q2/www/gitlab/distinfo Tue May 3 12:47:31 2016 (r414527) +++ branches/2016Q2/www/gitlab/distinfo Tue May 3 13:05:26 2016 (r414528) @@ -1,2 +1,2 @@ -SHA256 (gitlabhq-gitlabhq-v8.5.5_GH0.tar.gz) = 859ec6142095d459b1587616df6c83063e87a8c7417ab8606100588525d03e2d -SIZE (gitlabhq-gitlabhq-v8.5.5_GH0.tar.gz) = 15179973 +SHA256 (gitlabhq-gitlabhq-v8.5.11_GH0.tar.gz) = 084853403d55e53587d2d03a30ffc03acd36561fcc3783f0d7c8e048d3303c49 +SIZE (gitlabhq-gitlabhq-v8.5.11_GH0.tar.gz) = 15181985 Modified: branches/2016Q2/www/gitlab/files/patch-Gemfile ============================================================================== --- branches/2016Q2/www/gitlab/files/patch-Gemfile Tue May 3 12:47:31 2016 (r414527) +++ branches/2016Q2/www/gitlab/files/patch-Gemfile Tue May 3 13:05:26 2016 (r414528) @@ -1,4 +1,4 @@ ---- Gemfile.orig 2016-03-10 19:32:49 UTC +--- Gemfile.orig 2016-04-20 15:59:09 UTC +++ Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" @@ -55,7 +55,8 @@ -gem 'devise-two-factor', '~> 2.0.0' +gem 'devise-two-factor', '>= 2.0.0' gem 'rqrcode-rails3', '~> 0.1.7' - gem 'attr_encrypted', '~> 1.3.4' +-gem 'attr_encrypted', '~> 1.3.4' ++gem 'attr_encrypted', '>= 1.3.4' # Browser detection -gem "browser", '~> 1.0.0' Modified: branches/2016Q2/www/gitlab/pkg-plist ============================================================================== --- branches/2016Q2/www/gitlab/pkg-plist Tue May 3 12:47:31 2016 (r414527) +++ branches/2016Q2/www/gitlab/pkg-plist Tue May 3 13:05:26 2016 (r414528) @@ -1419,6 +1419,7 @@ %%WWWDIR%%/config/initializers/public_key.rb %%WWWDIR%%/config/initializers/rack_attack_git_basic_auth.rb %%WWWDIR%%/config/initializers/rack_lineprof.rb +%%WWWDIR%%/config/initializers/redis_config.rb %%WWWDIR%%/config/initializers/relative_url.rb.sample %%WWWDIR%%/config/initializers/secret_token.rb %%WWWDIR%%/config/initializers/sentry.rb @@ -2548,6 +2549,7 @@ %%WWWDIR%%/lib/gitlab/email/message/repository_push.rb %%WWWDIR%%/lib/gitlab/email/receiver.rb %%WWWDIR%%/lib/gitlab/email/reply_parser.rb +%%WWWDIR%%/lib/gitlab/exclusive_lease.rb %%WWWDIR%%/lib/gitlab/fogbugz_import/client.rb %%WWWDIR%%/lib/gitlab/fogbugz_import/importer.rb %%WWWDIR%%/lib/gitlab/fogbugz_import/project_creator.rb @@ -2775,6 +2777,7 @@ %%WWWDIR%%/spec/controllers/projects_controller_spec.rb %%WWWDIR%%/spec/controllers/root_controller_spec.rb %%WWWDIR%%/spec/controllers/sent_notification_controller_spec.rb +%%WWWDIR%%/spec/controllers/sessions_controller_spec.rb %%WWWDIR%%/spec/controllers/snippets_controller_spec.rb %%WWWDIR%%/spec/controllers/uploads_controller_spec.rb %%WWWDIR%%/spec/controllers/users_controller_spec.rb @@ -2884,6 +2887,7 @@ %%WWWDIR%%/spec/helpers/blob_helper_spec.rb %%WWWDIR%%/spec/helpers/broadcast_messages_helper_spec.rb %%WWWDIR%%/spec/helpers/ci_status_helper_spec.rb +%%WWWDIR%%/spec/helpers/commits_helper_spec.rb %%WWWDIR%%/spec/helpers/diff_helper_spec.rb %%WWWDIR%%/spec/helpers/emails_helper_spec.rb %%WWWDIR%%/spec/helpers/events_helper_spec.rb @@ -2994,6 +2998,7 @@ %%WWWDIR%%/spec/lib/gitlab/email/message/repository_push_spec.rb %%WWWDIR%%/spec/lib/gitlab/email/receiver_spec.rb %%WWWDIR%%/spec/lib/gitlab/email/reply_parser_spec.rb +%%WWWDIR%%/spec/lib/gitlab/exclusive_lease_spec.rb %%WWWDIR%%/spec/lib/gitlab/git_access_spec.rb %%WWWDIR%%/spec/lib/gitlab/git_access_wiki_spec.rb %%WWWDIR%%/spec/lib/gitlab/github_import/client_spec.rb
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605031305.u43D5Qvl038688>