From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AB21313888F for ; Wed, 28 Oct 2015 01:43:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F00BEE07D5; Wed, 28 Oct 2015 01:43:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 70916E07D5 for ; Wed, 28 Oct 2015 01:43:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EEB86340931 for ; Wed, 28 Oct 2015 01:43:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E07D1C22 for ; Wed, 28 Oct 2015 01:43:10 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1445996581.512cacd39f22b2bfde6725f09d0f08ff37e8bbd6.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch media-video/vlc/vlc-2.2.1-r1.ebuild media-video/vlc/vlc-2.2.1.ebuild X-VCS-Directories: media-video/vlc/ media-video/vlc/files/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: 512cacd39f22b2bfde6725f09d0f08ff37e8bbd6 X-VCS-Branch: master Date: Wed, 28 Oct 2015 01:43:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6a4c1e0c-89df-44f0-8f9d-51fcf6030e0f X-Archives-Hash: e00b4197c6c5b13dff1e616bd36b9044 commit: 512cacd39f22b2bfde6725f09d0f08ff37e8bbd6 Author: Ian Delaney gentoo org> AuthorDate: Wed Oct 28 01:40:00 2015 +0000 Commit: Ian Delaney gentoo org> CommitDate: Wed Oct 28 01:43:01 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=512cacd3 media-video/vlc: revbump -> -2.2.1-r1, sec patch CVE-2015-5949 patch submitted by proxy maintainer via the gentoo bug, also runtested by Amynka, removed initial vlc-2.2.1.ebuild Gentoo bug: #558418 Package-Manager: portage-2.2.23 media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch | 15 +++++++++++++++ media-video/vlc/{vlc-2.2.1.ebuild => vlc-2.2.1-r1.ebuild} | 3 +++ 2 files changed, 18 insertions(+) diff --git a/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch b/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch new file mode 100644 index 0000000..83a5258 --- /dev/null +++ b/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch @@ -0,0 +1,15 @@ +https://git.videolan.org/?p=vlc/vlc-2.2.git;a=commitdiff;h=ce91452460a75d7424b165c4dc8db98114c3cbd9;hp=9e12195d3e4316278af1fa4bcb6a705ff27456fd +--- a/modules/demux/mp4/libmp4.c ++++ b/modules/demux/mp4/libmp4.c +@@ -3643,6 +3643,11 @@ void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box ) + { + for( i_index = 0; ; i_index++ ) + { ++ if ( MP4_Box_Function[i_index].i_parent && ++ p_box->p_father && ++ p_box->p_father->i_type != MP4_Box_Function[i_index].i_parent ) ++ continue; ++ + if( ( MP4_Box_Function[i_index].i_type == p_box->i_type )|| + ( MP4_Box_Function[i_index].i_type == 0 ) ) + { diff --git a/media-video/vlc/vlc-2.2.1.ebuild b/media-video/vlc/vlc-2.2.1-r1.ebuild similarity index 99% rename from media-video/vlc/vlc-2.2.1.ebuild rename to media-video/vlc/vlc-2.2.1-r1.ebuild index 73ab21a..be3ece4 100644 --- a/media-video/vlc/vlc-2.2.1.ebuild +++ b/media-video/vlc/vlc-2.2.1-r1.ebuild @@ -250,6 +250,7 @@ src_prepare() { # We are not in a real git checkout due to the absence of a .git directory. touch src/revision.txt || die + # PATCHES # Fix build system mistake. epatch "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch @@ -271,6 +272,8 @@ src_prepare() { # Add missed header imgproc_c.h, imgproc.hpp, bug #554562 epatch "${FILESDIR}"/opencv-3.0.0.patch + epatch "${FILESDIR}"//${P}-CVE-2015-5949.patch + # Don't use --started-from-file when not using dbus. if ! use dbus ; then sed -i 's/ --started-from-file//' share/vlc.desktop.in || die