From owner-svn-ports-all@freebsd.org Tue Oct 11 19:23:50 2016 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 EA247C0DA53; Tue, 11 Oct 2016 19:23:50 +0000 (UTC) (envelope-from riggs@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 A8B53895; Tue, 11 Oct 2016 19:23:50 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9BJNnm6082984; Tue, 11 Oct 2016 19:23:49 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9BJNnH2082982; Tue, 11 Oct 2016 19:23:49 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201610111923.u9BJNnH2082982@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Tue, 11 Oct 2016 19:23:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r423789 - in branches/2016Q4/multimedia/mkvtoolnix: . 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-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, 11 Oct 2016 19:23:51 -0000 Author: riggs Date: Tue Oct 11 19:23:49 2016 New Revision: 423789 URL: https://svnweb.freebsd.org/changeset/ports/423789 Log: MFH: r423569 r423787 Update to upstream version 9.4.2; fixes code execution vulnerability Fix build on archs where sizeof(size_t) != sizeof(uint64_t) Approved by: ports-secteam (feld), ports-secteam (build fix blanket) Added: branches/2016Q4/multimedia/mkvtoolnix/files/patch-src_input_r__qtmp4.cpp - copied unchanged from r423787, head/multimedia/mkvtoolnix/files/patch-src_input_r__qtmp4.cpp Modified: branches/2016Q4/multimedia/mkvtoolnix/Makefile branches/2016Q4/multimedia/mkvtoolnix/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/multimedia/mkvtoolnix/Makefile ============================================================================== --- branches/2016Q4/multimedia/mkvtoolnix/Makefile Tue Oct 11 19:21:47 2016 (r423788) +++ branches/2016Q4/multimedia/mkvtoolnix/Makefile Tue Oct 11 19:23:49 2016 (r423789) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mkvtoolnix -PORTVERSION= 9.4.0 +PORTVERSION= 9.4.2 CATEGORIES= multimedia audio MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ \ https://mkvtoolnix.download/sources/ Modified: branches/2016Q4/multimedia/mkvtoolnix/distinfo ============================================================================== --- branches/2016Q4/multimedia/mkvtoolnix/distinfo Tue Oct 11 19:21:47 2016 (r423788) +++ branches/2016Q4/multimedia/mkvtoolnix/distinfo Tue Oct 11 19:23:49 2016 (r423789) @@ -1,3 +1,3 @@ -TIMESTAMP = 1472139058 -SHA256 (mkvtoolnix-9.4.0.tar.xz) = af633768ac3ca193070c76c93bbf496b41e451d1652e1d3d6fd4c20361e56265 -SIZE (mkvtoolnix-9.4.0.tar.xz) = 3765696 +TIMESTAMP = 1475996823 +SHA256 (mkvtoolnix-9.4.2.tar.xz) = df2c3773c0e7a75d88e75906cc425f9ed7f07ce36a99854162e14202ccd42904 +SIZE (mkvtoolnix-9.4.2.tar.xz) = 3774320 Copied: branches/2016Q4/multimedia/mkvtoolnix/files/patch-src_input_r__qtmp4.cpp (from r423787, head/multimedia/mkvtoolnix/files/patch-src_input_r__qtmp4.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/multimedia/mkvtoolnix/files/patch-src_input_r__qtmp4.cpp Tue Oct 11 19:23:49 2016 (r423789, copy of r423787, head/multimedia/mkvtoolnix/files/patch-src_input_r__qtmp4.cpp) @@ -0,0 +1,11 @@ +--- src/input/r_qtmp4.cpp.orig 2016-09-11 12:16:51 UTC ++++ src/input/r_qtmp4.cpp +@@ -107,7 +107,7 @@ read_qtmp4_atom(mm_io_c *read_from, + if (exit_on_error) + mxerror(boost::format(Y("Quicktime/MP4 reader: Invalid chunk size %1% at %2%.\n")) % a.size % a.pos); + else +- throw mtx::atom_chunk_size_x{a.size, a.pos}; ++ throw mtx::atom_chunk_size_x{static_cast(a.size), static_cast(a.pos)}; + } + + return a;