Pullup ticket 2107 - requested by tron

security fix for mplayer

- pkgsrc/multimedia/gmplayer/Makefile			1.60
- pkgsrc/multimedia/gmplayer/distinfo			1.47
- pkgsrc/multimedia/mplayer/Makefile			1.42-1.43
- pkgsrc/multimedia/mplayer-share/distinfo		1.40
- pkgsrc/multimedia/mplayer-share/patches/patch-ae	1.7

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Thu Jun  7 13:19:55 UTC 2007

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

   Log Message:
   Add patch from the MPlayer SVN repository to fix an overflow in the
   CDDB code reported in CVE-2007-2948. Bump package revision.
---
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Fri Jun  8 10:07:17 UTC 2007

   Modified Files:
	   pkgsrc/multimedia/mplayer: Makefile
	   pkgsrc/multimedia/mplayer-share: distinfo

   Log Message:
   Regenerate the "distinfo" for the "mplayer" package, too. Bump the
   package revision again because the patch didn't get applied previously.
   Problem pointed out by Geert Hendrickx.

4 files changed, 8 insertions, 6 deletions

diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index f9d881e5d72..2ec0eaafc1c 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2007/01/31 00:04:12 wiz Exp $
+# $NetBSD: Makefile,v 1.59.2.1 2007/06/08 11:50:25 ghen Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -9,7 +9,7 @@
 #
 
 PKGNAME=	gmplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 
 BROKEN_IN=		pkgsrc-2006Q4
 
diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo
index 6d43d2a524d..77af50067de 100644
--- a/multimedia/gmplayer/distinfo
+++ b/multimedia/gmplayer/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2007/03/23 07:40:12 wiz Exp $
+$NetBSD: distinfo,v 1.46.2.1 2007/06/08 11:50:26 ghen Exp $
 
 SHA1 (gmplayer-1.0rc9-20060123/AlienMind-1.2.tar.bz2) = 34370da1e003e4accceae194a63483aa6eebc4dc
 RMD160 (gmplayer-1.0rc9-20060123/AlienMind-1.2.tar.bz2) = f3fda7d44a59f98097162f76d0a0d58840974998
@@ -67,6 +67,7 @@ SHA1 (patch-aa) = ec50dd83f781fbac260ff469846c8c91b6471642
 SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9
 SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
 SHA1 (patch-ad) = d0b72eaa5e63d2cfd7828ea1a9973f1728c607b5
+SHA1 (patch-ae) = b725fce8f4dfb7b06f6de388265ce317f22824e9
 SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b
 SHA1 (patch-ai) = bcf45db81587d99fc69ae5fcf89ff4a4b8f6f53c
 SHA1 (patch-aj) = 40ba1625f85f0264628013ad0209aa095e8e5d3f
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index addfff71823..10df5889f0d 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2007/03/09 15:14:16 drochner Exp $
+$NetBSD: distinfo,v 1.39.2.1 2007/06/08 11:50:26 ghen Exp $
 
 SHA1 (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = a450c0b0749c343a8496ba7810363c9d46dfa73c
 RMD160 (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = 8cea02e832aec5d9e090829d61d0f131dcc177a2
@@ -7,6 +7,7 @@ SHA1 (patch-aa) = ec50dd83f781fbac260ff469846c8c91b6471642
 SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9
 SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
 SHA1 (patch-ad) = d0b72eaa5e63d2cfd7828ea1a9973f1728c607b5
+SHA1 (patch-ae) = b725fce8f4dfb7b06f6de388265ce317f22824e9
 SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b
 SHA1 (patch-ai) = bcf45db81587d99fc69ae5fcf89ff4a4b8f6f53c
 SHA1 (patch-aj) = 40ba1625f85f0264628013ad0209aa095e8e5d3f
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 1637eef62a9..e8dcdee2a5d 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2007/03/09 15:14:16 drochner Exp $
+# $NetBSD: Makefile,v 1.41.2.1 2007/06/08 11:50:26 ghen Exp $
 
 PKGNAME=	mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=	5
+PKGREVISION=	7
 
 COMMENT=	Software-only MPEG-1/2/4 video decoder