From owner-svn-ports-all@freebsd.org Tue Mar 21 02:01:37 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1FBD3D15FD8; Tue, 21 Mar 2017 02:01:37 +0000 (UTC) (envelope-from junovitch@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 mx1.freebsd.org (Postfix) with ESMTPS id C6ACC1C3E; Tue, 21 Mar 2017 02:01:36 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2L21ZxL041623; Tue, 21 Mar 2017 02:01:35 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2L21ZWG041621; Tue, 21 Mar 2017 02:01:35 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201703210201.v2L21ZWG041621@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Tue, 21 Mar 2017 02:01:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436562 - in head/www/gitlab: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 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: Tue, 21 Mar 2017 02:01:37 -0000 Author: junovitch Date: Tue Mar 21 02:01:35 2017 New Revision: 436562 URL: https://svnweb.freebsd.org/changeset/ports/436562 Log: www/gitlab: apply upstream CVE-2017-0882 patch to 8.14.x Reported by: Brian Neel Approved by: ports-secteam (with hat) Security: CVE-2017-0882 Added: head/www/gitlab/files/patch-cve-2017-0882 (contents, props changed) Modified: head/www/gitlab/Makefile Modified: head/www/gitlab/Makefile ============================================================================== --- head/www/gitlab/Makefile Mon Mar 20 22:36:03 2017 (r436561) +++ head/www/gitlab/Makefile Tue Mar 21 02:01:35 2017 (r436562) @@ -4,7 +4,7 @@ PORTNAME= gitlab PORTVERSION= 8.14.9 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www devel MAINTAINER= tz@FreeBSD.org Added: head/www/gitlab/files/patch-cve-2017-0882 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/gitlab/files/patch-cve-2017-0882 Tue Mar 21 02:01:35 2017 (r436562) @@ -0,0 +1,22 @@ +--- app/controllers/projects/issues_controller.rb.orig 2017-02-14 21:48:43 UTC ++++ app/controllers/projects/issues_controller.rb +@@ -112,7 +112,7 @@ class Projects::IssuesController < Proje + end + + format.json do +- render json: @issue.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short]) ++ render json: @issue.to_json(include: { milestone: {}, assignee: { only: [:name, :username], methods: [:avatar_url] }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short]) + end + end + +--- app/controllers/projects/merge_requests_controller.rb.orig 2017-03-21 01:49:52 UTC ++++ app/controllers/projects/merge_requests_controller.rb +@@ -277,7 +277,7 @@ class Projects::MergeRequestsController + @merge_request.target_project, @merge_request]) + end + format.json do +- render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short]) ++ render json: @merge_request.to_json(include: { milestone: {}, assignee: { only: [:name, :username], methods: [:avatar_url] }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short]) + end + end + else