From owner-svn-ports-branches@FreeBSD.ORG Mon Jun 1 07:30:30 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F20C9892; Mon, 1 Jun 2015 07:30:29 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 C5BE91B34; Mon, 1 Jun 2015 07:30:29 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t517UTcP099482; Mon, 1 Jun 2015 07:30:29 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t517UT7N099480; Mon, 1 Jun 2015 07:30:29 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201506010730.t517UT7N099480@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Mon, 1 Jun 2015 07:30:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r388206 - in branches/2015Q2/multimedia/kodi: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2015 07:30:30 -0000 Author: delphij Date: Mon Jun 1 07:30:28 2015 New Revision: 388206 URL: https://svnweb.freebsd.org/changeset/ports/388206 Log: MFH: r388205 Fix CVE-2015-3885. PR: 200200 Submitted by: maintainer Reported by: Sevan Janiyan Tested by: Jason Unovitch Security: 57325ecf-facc-11e4-968f-b888e347c638 Security: CVE-2015-3885 Approved by: ports-secteam Added: branches/2015Q2/multimedia/kodi/files/patch-lib_cximage-6.0_raw_dcraw.c - copied unchanged from r388205, head/multimedia/kodi/files/patch-lib_cximage-6.0_raw_dcraw.c Modified: branches/2015Q2/multimedia/kodi/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/multimedia/kodi/Makefile ============================================================================== --- branches/2015Q2/multimedia/kodi/Makefile Mon Jun 1 07:29:02 2015 (r388205) +++ branches/2015Q2/multimedia/kodi/Makefile Mon Jun 1 07:30:28 2015 (r388206) @@ -3,6 +3,7 @@ PORTNAME= kodi DISTVERSION= 14.0 PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://mirrors.kodi.tv/releases/source/ \ GHL:ffmpeg Copied: branches/2015Q2/multimedia/kodi/files/patch-lib_cximage-6.0_raw_dcraw.c (from r388205, head/multimedia/kodi/files/patch-lib_cximage-6.0_raw_dcraw.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/multimedia/kodi/files/patch-lib_cximage-6.0_raw_dcraw.c Mon Jun 1 07:30:28 2015 (r388206, copy of r388205, head/multimedia/kodi/files/patch-lib_cximage-6.0_raw_dcraw.c) @@ -0,0 +1,12 @@ +--- lib/cximage-6.0/raw/dcraw.c.orig 2015-03-26 18:25:20 UTC ++++ lib/cximage-6.0/raw/dcraw.c +@@ -820,7 +820,8 @@ struct jhead { + + int CLASS ljpeg_start (struct jhead *jh, int info_only) + { +- int c, tag, len; ++ int c, tag; ++ ushort len; + uchar data[0x10000], *dp; + + init_decoder();