From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 14 19:25:07 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 819951F8; Tue, 14 Apr 2015 19:25:07 +0000 (UTC) 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 62E20283; Tue, 14 Apr 2015 19:25:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3EJP7sq054447; Tue, 14 Apr 2015 19:25:07 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3EJP4br054435; Tue, 14 Apr 2015 19:25:04 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201504141925.t3EJP4br054435@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Tue, 14 Apr 2015 19:25:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384022 - in branches/2015Q2/multimedia: mencoder mplayer mplayer/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: Tue, 14 Apr 2015 19:25:07 -0000 Author: riggs Date: Tue Apr 14 19:25:03 2015 New Revision: 384022 URL: https://svnweb.freebsd.org/changeset/ports/384022 Log: MFH: r383192 - Update to new upstream snapshot as of 2015-04-03 (included ffmpeg snapshot as of 2015-04-03) - Fix vulnerabilities CVE-2014-8544 and CVE-2014-9604 with bundled ffmpeg snapshot in the process Approved by: ports-secteam (delphij) Modified: branches/2015Q2/multimedia/mencoder/Makefile branches/2015Q2/multimedia/mencoder/distinfo branches/2015Q2/multimedia/mplayer/Makefile branches/2015Q2/multimedia/mplayer/Makefile.shared branches/2015Q2/multimedia/mplayer/distinfo branches/2015Q2/multimedia/mplayer/files/patch-libavcodec-Makefile branches/2015Q2/multimedia/mplayer/files/patch-libavformat-udp.c Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/multimedia/mencoder/Makefile ============================================================================== --- branches/2015Q2/multimedia/mencoder/Makefile Tue Apr 14 19:08:28 2015 (r384021) +++ branches/2015Q2/multimedia/mencoder/Makefile Tue Apr 14 19:25:03 2015 (r384022) @@ -3,7 +3,6 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 2 COMMENT= Convenient video file and movie encoder Modified: branches/2015Q2/multimedia/mencoder/distinfo ============================================================================== --- branches/2015Q2/multimedia/mencoder/distinfo Tue Apr 14 19:08:28 2015 (r384021) +++ branches/2015Q2/multimedia/mencoder/distinfo Tue Apr 14 19:25:03 2015 (r384022) @@ -1,2 +1,2 @@ -SHA256 (mplayer-1.1.20141223.tar.xz) = 8d5ae2b77cdb6b86670a3741ea024b0ba8f7e4515221b224a10b690ee841d909 -SIZE (mplayer-1.1.20141223.tar.xz) = 11408272 +SHA256 (mplayer-1.1.20150403.tar.xz) = 910c2c6fda92f5883e09f34c39ca314aa5a815fa1c224e5c072bde82339f6db3 +SIZE (mplayer-1.1.20150403.tar.xz) = 11552096 Modified: branches/2015Q2/multimedia/mplayer/Makefile ============================================================================== --- branches/2015Q2/multimedia/mplayer/Makefile Tue Apr 14 19:08:28 2015 (r384021) +++ branches/2015Q2/multimedia/mplayer/Makefile Tue Apr 14 19:25:03 2015 (r384022) @@ -3,7 +3,6 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 2 COMMENT= High performance media player supporting many formats Modified: branches/2015Q2/multimedia/mplayer/Makefile.shared ============================================================================== --- branches/2015Q2/multimedia/mplayer/Makefile.shared Tue Apr 14 19:08:28 2015 (r384021) +++ branches/2015Q2/multimedia/mplayer/Makefile.shared Tue Apr 14 19:25:03 2015 (r384022) @@ -4,7 +4,7 @@ # # $FreeBSD$ -MPLAYER_SNAPSHOT_DATE= 2014-12-23 +MPLAYER_SNAPSHOT_DATE= 2015-04-03 MPLAYER_PORT_VERSION= 1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g} CATEGORIES?= multimedia audio MASTER_SITES= ${MASTER_SITE_LOCAL} Modified: branches/2015Q2/multimedia/mplayer/distinfo ============================================================================== --- branches/2015Q2/multimedia/mplayer/distinfo Tue Apr 14 19:08:28 2015 (r384021) +++ branches/2015Q2/multimedia/mplayer/distinfo Tue Apr 14 19:25:03 2015 (r384022) @@ -1,2 +1,2 @@ -SHA256 (mplayer-1.1.20141223.tar.xz) = 8d5ae2b77cdb6b86670a3741ea024b0ba8f7e4515221b224a10b690ee841d909 -SIZE (mplayer-1.1.20141223.tar.xz) = 11408272 +SHA256 (mplayer-1.1.20150403.tar.xz) = 910c2c6fda92f5883e09f34c39ca314aa5a815fa1c224e5c072bde82339f6db3 +SIZE (mplayer-1.1.20150403.tar.xz) = 11552096 Modified: branches/2015Q2/multimedia/mplayer/files/patch-libavcodec-Makefile ============================================================================== --- branches/2015Q2/multimedia/mplayer/files/patch-libavcodec-Makefile Tue Apr 14 19:08:28 2015 (r384021) +++ branches/2015Q2/multimedia/mplayer/files/patch-libavcodec-Makefile Tue Apr 14 19:25:03 2015 (r384022) @@ -1,11 +1,11 @@ ---- ffmpeg/libavcodec/Makefile.orig 2012-07-20 19:20:04.000000000 +0200 -+++ ffmpeg/libavcodec/Makefile 2012-07-21 18:25:12.582670118 +0200 -@@ -788,7 +788,7 @@ - codec_names.h \ - fft-internal.h \ +--- ffmpeg/libavcodec/Makefile.orig 2015-04-02 19:20:07.000000000 +0200 ++++ ffmpeg/libavcodec/Makefile 2015-04-03 13:25:18.741269686 +0200 +@@ -865,7 +865,7 @@ + old_codec_ids.h \ tableprint.h \ + tableprint_vlc.h \ - $(ARCH)/vp56_arith.h \ -+ $(MPLAYER_ARCH)/vp56_arith.h \ ++ $(MPLAYER_ARCH)/vp56_arith.h \ SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h Modified: branches/2015Q2/multimedia/mplayer/files/patch-libavformat-udp.c ============================================================================== --- branches/2015Q2/multimedia/mplayer/files/patch-libavformat-udp.c Tue Apr 14 19:08:28 2015 (r384021) +++ branches/2015Q2/multimedia/mplayer/files/patch-libavformat-udp.c Tue Apr 14 19:25:03 2015 (r384022) @@ -1,11 +1,11 @@ ---- ffmpeg/libavformat/udp.c.orig 2011-03-16 13:49:21.000000000 +0100 -+++ ffmpeg/libavformat/udp.c 2011-03-18 17:18:12.884305376 +0100 -@@ -42,6 +42,8 @@ - #define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP - #endif +--- ffmpeg/libavformat/udp.c.orig 2015-03-30 19:20:06.000000000 +0200 ++++ ffmpeg/libavformat/udp.c 2015-04-03 13:29:34.228251670 +0200 +@@ -71,6 +71,8 @@ + #define UDP_MAX_PKT_SIZE 65536 + #define UDP_HEADER_SIZE 8 +#define IPPROTO_IPV6 41 + - typedef struct { + typedef struct UDPContext { + const AVClass *class; int udp_fd; - int ttl;