From owner-svn-ports-all@FreeBSD.ORG  Mon Jun  1 07:29:03 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 DFA516E6;
 Mon,  1 Jun 2015 07:29:03 +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 CD4521AD8;
 Mon,  1 Jun 2015 07:29:03 +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 t517T3ec097897;
 Mon, 1 Jun 2015 07:29:03 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t517T3IH097895;
 Mon, 1 Jun 2015 07:29:03 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201506010729.t517T3IH097895@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 1 Jun 2015 07:29:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r388205 - in head/multimedia/kodi: . 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.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Jun 2015 07:29:04 -0000

Author: delphij
Date: Mon Jun  1 07:29:02 2015
New Revision: 388205
URL: https://svnweb.freebsd.org/changeset/ports/388205

Log:
  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
  MFH:		2015Q2

Added:
  head/multimedia/kodi/files/patch-lib_cximage-6.0_raw_dcraw.c   (contents, props changed)
Modified:
  head/multimedia/kodi/Makefile

Modified: head/multimedia/kodi/Makefile
==============================================================================
--- head/multimedia/kodi/Makefile	Mon Jun  1 07:25:54 2015	(r388204)
+++ head/multimedia/kodi/Makefile	Mon Jun  1 07:29:02 2015	(r388205)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kodi
 DISTVERSION=	14.2
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	https://codeload.github.com/xbmc/xbmc/tar.gz/${DISTVERSION}-Helix?dummy=/ \
 		GH:ffmpeg

Added: head/multimedia/kodi/files/patch-lib_cximage-6.0_raw_dcraw.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/kodi/files/patch-lib_cximage-6.0_raw_dcraw.c	Mon Jun  1 07:29:02 2015	(r388205)
@@ -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();