From febe9b1d9e8bf5e3e4cd4e98cb577e2fc23f84d8 Mon Sep 17 00:00:00 2001
From: salo <salo>
Date: Sun, 28 Aug 2005 01:16:45 +0000
Subject: Pullup ticket 718 - requested by Tom Spindler security fix for
 mplayer

Revisions pulled up:
- pkgsrc/multimedia/gmplayer/Makefile			1.37
- pkgsrc/multimedia/mencoder/Makefile			1.22
- pkgsrc/multimedia/mplayer/Makefile			1.20
- pkgsrc/multimedia/mplayer-share/distinfo		1.23
- pkgsrc/multimedia/mplayer-share/patches/patch-ag	1.1

   Module Name:		pkgsrc
   Committed By:	dogcow
   Date:		Sat Aug 27 06:59:52 UTC 2005

   Modified Files:
   	pkgsrc/multimedia/gmplayer: Makefile
   	pkgsrc/multimedia/mencoder: Makefile
   	pkgsrc/multimedia/mplayer: Makefile
   	pkgsrc/multimedia/mplayer-share: distinfo
   Added Files:
   	pkgsrc/multimedia/mplayer-share/patches: patch-ag

   Log Message:
   Security fix for mplayer as given in
   http://www.sven-tantau.de/public_files/mplayer/mplayer_20050824.txt .
   bump PKGREVISION of affected pkgs.
---
 multimedia/gmplayer/Makefile      | 3 ++-
 multimedia/mencoder/Makefile      | 3 ++-
 multimedia/mplayer-share/distinfo | 3 ++-
 multimedia/mplayer/Makefile       | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index 6f178796a53..23a164df166 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/06/17 03:50:23 jlam Exp $
+# $NetBSD: Makefile,v 1.35.2.1 2005/08/28 01:16:45 salo Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -9,6 +9,7 @@
 #
 
 PKGNAME=	gmplayer-${MPLAYER_PKG_VERSION}
+PKGREVISION=	1
 
 SKIN_SITES=	http://www.mplayerhq.hu/MPlayer/Skin/		\
 		ftp://ftp.mplayerhq.hu/MPlayer/Skin/		\
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 85aec7d054d..ab4a37a886b 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2005/06/17 03:50:23 jlam Exp $
+# $NetBSD: Makefile,v 1.21.2.1 2005/08/28 01:16:45 salo Exp $
 
 PKGNAME=	mencoder-${MPLAYER_PKG_VERSION}
+PKGREVISION=	1
 
 COMMENT=	Simple movie encoder for MPlayer-playable movies
 
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index 6dc6c07d2d3..385d40272f7 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2005/05/31 19:15:11 jmmv Exp $
+$NetBSD: distinfo,v 1.21.2.1 2005/08/28 01:16:45 salo Exp $
 
 SHA1 (mplayer-1.0rc7/MPlayer-1.0pre7.tar.bz2) = df1e8d4f2f44d72c6f7989932f3b272e815ecb80
 RMD160 (mplayer-1.0rc7/MPlayer-1.0pre7.tar.bz2) = a4bac10df287c4b134ea49b3bc9bf7fb0126cae6
@@ -18,6 +18,7 @@ SHA1 (patch-ac) = 3b9ae32e6e656ec4b58b7e51a1c2eaa280384f3e
 SHA1 (patch-ad) = d705dd315e913593223b83e533c60a9620d34cc8
 SHA1 (patch-ae) = 601808d8c89cba68156fb3c95fe9fcfb8da4fca0
 SHA1 (patch-af) = 6eab8572b239f6ac7afc03ad6254a7c97f90663e
+SHA1 (patch-ag) = 9bc3466ef24970e3f26fc64601d9f2c27fa394d2
 SHA1 (patch-da) = be092da4f854708c1ef47f10c26e361c095a6799
 SHA1 (patch-dc) = b11ef06a89f13e2ae5e013d569aa5acc99c770aa
 SHA1 (patch-dd) = e5b23b73a1e53e3185ecbac26042432395cd5e63
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index f4e46c5d8f1..8e84829fefc 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/17 03:50:23 jlam Exp $
+# $NetBSD: Makefile,v 1.19.2.1 2005/08/28 01:16:45 salo Exp $
 
 PKGNAME=	mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 
 COMMENT=	Software-only MPEG-1/2/4 video decoder
 
-- 
cgit v1.2.3