From owner-svn-ports-head@freebsd.org Fri Jun 29 15:01:32 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 4B70DEFA20C; Fri, 29 Jun 2018 15:01:32 +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.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 007A18E590; Fri, 29 Jun 2018 15:01:32 +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 D5F7B226C4; Fri, 29 Jun 2018 15:01:31 +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 w5TF1VSZ029813; Fri, 29 Jun 2018 15:01:31 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5TF1VPk029810; Fri, 29 Jun 2018 15:01:31 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201806291501.w5TF1VPk029810@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Fri, 29 Jun 2018 15:01:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473553 - in head/www/gitlab: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in head/www/gitlab: . files X-SVN-Commit-Revision: 473553 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.26 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: Fri, 29 Jun 2018 15:01:32 -0000 Author: mfechner Date: Fri Jun 29 15:01:30 2018 New Revision: 473553 URL: https://svnweb.freebsd.org/changeset/ports/473553 Log: Security update to 10.8.5. This update was blocked as it requires version 2.7.1, 2.7.2 fails which is a gitlab core bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/48415 Reviewed by: tz (mentor) Approved by: tz (mentor) Security: b950a83b-789e-11e8-8545-d8cb8abf62dd Differential Revision: https://reviews.freebsd.org/D16009 Modified: head/www/gitlab/Makefile head/www/gitlab/distinfo head/www/gitlab/files/patch-Gemfile Modified: head/www/gitlab/Makefile ============================================================================== --- head/www/gitlab/Makefile Fri Jun 29 14:56:15 2018 (r473552) +++ head/www/gitlab/Makefile Fri Jun 29 15:01:30 2018 (r473553) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab -PORTVERSION= 10.8.4 +PORTVERSION= 10.8.5 DISTVERSIONPREFIX= v CATEGORIES= www devel @@ -92,7 +92,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-google-api-client>=0.19.8:devel/rubygem-google-api-client \ rubygem-unf>=0.1.4:textproc/rubygem-unf \ rubygem-seed-fu>=2.3.7:databases/rubygem-seed-fu \ - rubygem-html-pipeline27>=2.7.1:textproc/rubygem-html-pipeline27 \ + rubygem-html-pipeline-gitlab>=2.7.1:textproc/rubygem-html-pipeline-gitlab \ rubygem-deckar01-task_list>=2.0.0:www/rubygem-deckar01-task_list \ rubygem-gitlab-markup>=1.6.2:textproc/rubygem-gitlab-markup \ rubygem-redcarpet>=3.4:textproc/rubygem-redcarpet \ @@ -136,7 +136,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-ruby-fogbugz>=0.2.1:devel/rubygem-ruby-fogbugz \ rubygem-kubeclient>=3.0.0:www/rubygem-kubeclient \ rubygem-d3_rails-rails4>=3.5.0:www/rubygem-d3_rails-rails4 \ - rubygem-sanitize>=2.0:textproc/rubygem-sanitize \ + rubygem-sanitize>=4.6.5:textproc/rubygem-sanitize \ rubygem-babosa>=1.0.2:textproc/rubygem-babosa \ rubygem-loofah>=2.2:textproc/rubygem-loofah \ rubygem-licensee8>=8.9:devel/rubygem-licensee8 \ Modified: head/www/gitlab/distinfo ============================================================================== --- head/www/gitlab/distinfo Fri Jun 29 14:56:15 2018 (r473552) +++ head/www/gitlab/distinfo Fri Jun 29 15:01:30 2018 (r473553) @@ -1,3 +1,3 @@ -TIMESTAMP = 1529480195 -SHA256 (gitlabhq-gitlabhq-v10.8.4_GH0.tar.gz) = 36c9680e92387507a64d599cf3e464328857efa84fc971a93dca0b3c1ffd8ace -SIZE (gitlabhq-gitlabhq-v10.8.4_GH0.tar.gz) = 48448250 +TIMESTAMP = 1529946907 +SHA256 (gitlabhq-gitlabhq-v10.8.5_GH0.tar.gz) = 3ed384557531485ae79f6549c6e8738ee8b0ee859f729b617bf4a58b3cec0006 +SIZE (gitlabhq-gitlabhq-v10.8.5_GH0.tar.gz) = 48454668 Modified: head/www/gitlab/files/patch-Gemfile ============================================================================== --- head/www/gitlab/files/patch-Gemfile Fri Jun 29 14:56:15 2018 (r473552) +++ head/www/gitlab/files/patch-Gemfile Fri Jun 29 15:01:30 2018 (r473553) @@ -27,15 +27,6 @@ # Colored output to console gem 'rainbow', '~> 2.2' -@@ -222,7 +222,7 @@ gem 'kubeclient', '~> 3.0' - gem 'd3_rails', '~> 3.5.0' - - # Sanitize user input --gem 'sanitize', '~> 2.0' -+gem 'sanitize', '>= 2.0' - gem 'babosa', '~> 1.0.2' - - # Sanitizes SVG input @@ -284,7 +284,7 @@ gem 'batch-loader', '~> 1.2.1' # Perf bar gem 'peek', '~> 1.0.1'