Update "mplayer" packages to version 1.0pre5try2 (as 1.0rc5pl2).

Changes since version 1.0pre5:
- buffer overflow in mp3lib fixed
- heap overflow in Real rtsp streaming code fixed
- stack overflow in mmst streaming code fixed
- unnecessary bmp demuxer removed because of buffer overflows
- heap overflow in pnm streaming code fixed
This fixes the vulnerabilities reported by iDEFENSE recently.

6 files changed, 58 insertions, 63 deletions

diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index cc3e53e5094..ff2a8dd41ab 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/11/06 00:47:34 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2004/12/17 22:33:13 tron Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -9,7 +9,6 @@
 #
 
 PKGNAME=	gmplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=	7
 
 SKIN_SITES=	http://www.mplayerhq.hu/MPlayer/Skin/		\
 		ftp://ftp.mplayerhq.hu/MPlayer/Skin/		\
diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo
index 9573ffcc315..cf1a32fbcc3 100644
--- a/multimedia/gmplayer/distinfo
+++ b/multimedia/gmplayer/distinfo
@@ -1,47 +1,47 @@
-$NetBSD: distinfo,v 1.18 2004/11/06 15:46:40 tron Exp $
+$NetBSD: distinfo,v 1.19 2004/12/17 22:33:13 tron Exp $
 
-SHA1 (gmplayer-1.0rc5-20041104/MPlayer-1.0pre5.tar.bz2) = cf64892871b8673e452b5d390be25144d85fe307
-Size (gmplayer-1.0rc5-20041104/MPlayer-1.0pre5.tar.bz2) = 5072836 bytes
-SHA1 (gmplayer-1.0rc5-20041104/AlienMind-1.2.tar.bz2) = a29c2c7913318328cc21fefd04937045da7098cb
-Size (gmplayer-1.0rc5-20041104/AlienMind-1.2.tar.bz2) = 131323 bytes
-SHA1 (gmplayer-1.0rc5-20041104/Blue-1.4.tar.bz2) = 6c075d10ec651afa4dcf41751a524d1d79050fad
-Size (gmplayer-1.0rc5-20041104/Blue-1.4.tar.bz2) = 221736 bytes
-SHA1 (gmplayer-1.0rc5-20041104/BlueHeart-1.5.tar.bz2) = 8ca1d68de399d8e362706fbdb1b1aa7416705510
-Size (gmplayer-1.0rc5-20041104/BlueHeart-1.5.tar.bz2) = 281137 bytes
-SHA1 (gmplayer-1.0rc5-20041104/CornerMP-1.2.tar.bz2) = 7c97ef2f9a17c82fbd9f3b328c2e699741d8d12a
-Size (gmplayer-1.0rc5-20041104/CornerMP-1.2.tar.bz2) = 232684 bytes
-SHA1 (gmplayer-1.0rc5-20041104/CornerMP-aqua-1.4.tar.bz2) = 01cfd93fb0d9bd1ed026464b80828063c7e761de
-Size (gmplayer-1.0rc5-20041104/CornerMP-aqua-1.4.tar.bz2) = 243252 bytes
-SHA1 (gmplayer-1.0rc5-20041104/Cyrus-1.2.tar.bz2) = 580a3e7e5df82a95e59263d6e6fb9380030a6761
-Size (gmplayer-1.0rc5-20041104/Cyrus-1.2.tar.bz2) = 228477 bytes
-SHA1 (gmplayer-1.0rc5-20041104/MidnightLove-1.6.tar.bz2) = f63146ec9c3c384e4120047db86c47dc71696ce9
-Size (gmplayer-1.0rc5-20041104/MidnightLove-1.6.tar.bz2) = 539665 bytes
-SHA1 (gmplayer-1.0rc5-20041104/WMP6-2.2.tar.bz2) = aac926ef827ed6a16cdec99bf74fb1fd1e4adeb8
-Size (gmplayer-1.0rc5-20041104/WMP6-2.2.tar.bz2) = 39326 bytes
-SHA1 (gmplayer-1.0rc5-20041104/avifile-1.6.tar.bz2) = 2f049dd62314a2aec610d8b718bd8d083b8fa7ea
-Size (gmplayer-1.0rc5-20041104/avifile-1.6.tar.bz2) = 42442 bytes
-SHA1 (gmplayer-1.0rc5-20041104/gnome-1.1.tar.bz2) = 9c0c32d0a8eea094caee57116f5f1d2b34c58f61
-Size (gmplayer-1.0rc5-20041104/gnome-1.1.tar.bz2) = 368724 bytes
-SHA1 (gmplayer-1.0rc5-20041104/hayraphon-1.0.tar.bz2) = 3ba5f9d5d3011fdbbf81bfcc71e14982ef8da64b
-Size (gmplayer-1.0rc5-20041104/hayraphon-1.0.tar.bz2) = 77645 bytes
-SHA1 (gmplayer-1.0rc5-20041104/hwswskin-1.1.tar.bz2) = 9784e828e482a7eff61d9b69ff0104472de78e7c
-Size (gmplayer-1.0rc5-20041104/hwswskin-1.1.tar.bz2) = 20394 bytes
-SHA1 (gmplayer-1.0rc5-20041104/mentalic-1.2.tar.bz2) = a485d284f99dcb013ff341c217277f35f4b984cb
-Size (gmplayer-1.0rc5-20041104/mentalic-1.2.tar.bz2) = 166619 bytes
-SHA1 (gmplayer-1.0rc5-20041104/neutron-1.5.tar.bz2) = 825adb6d0762e6c1a1fa378e070474b56cf53e57
-Size (gmplayer-1.0rc5-20041104/neutron-1.5.tar.bz2) = 369313 bytes
-SHA1 (gmplayer-1.0rc5-20041104/phony-1.1.tar.bz2) = fcf7c43a66b51eb0dce05ce083b0e09b4ca5a909
-Size (gmplayer-1.0rc5-20041104/phony-1.1.tar.bz2) = 386397 bytes
-SHA1 (gmplayer-1.0rc5-20041104/plastic-1.2.tar.bz2) = 1d95bdc34627f0ab4d35352d8eb5f4aa93822e16
-Size (gmplayer-1.0rc5-20041104/plastic-1.2.tar.bz2) = 454111 bytes
-SHA1 (gmplayer-1.0rc5-20041104/proton-1.2.tar.bz2) = a241c00e1e165aca52ee90c1200e164d48197f43
-Size (gmplayer-1.0rc5-20041104/proton-1.2.tar.bz2) = 322675 bytes
-SHA1 (gmplayer-1.0rc5-20041104/slim-1.2.tar.bz2) = 4a36dea888788a41cb81aca40e53eecc58fa7a4c
-Size (gmplayer-1.0rc5-20041104/slim-1.2.tar.bz2) = 399007 bytes
-SHA1 (gmplayer-1.0rc5-20041104/xanim-1.6.tar.bz2) = 4be5a07a3d403a7a9b9b6cc5b08e67885b9231b8
-Size (gmplayer-1.0rc5-20041104/xanim-1.6.tar.bz2) = 94534 bytes
-SHA1 (gmplayer-1.0rc5-20041104/xine-lcd-1.2.tar.bz2) = 1ff19272764348d99846497f0997e7149e4ccb26
-Size (gmplayer-1.0rc5-20041104/xine-lcd-1.2.tar.bz2) = 172357 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/MPlayer-1.0pre5try2.tar.bz2) = 3a6143b1bfdcb73008461cd9fcdd30ab7524fc47
+Size (gmplayer-1.0rc5pl2-20041104/MPlayer-1.0pre5try2.tar.bz2) = 5073725 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/AlienMind-1.2.tar.bz2) = a29c2c7913318328cc21fefd04937045da7098cb
+Size (gmplayer-1.0rc5pl2-20041104/AlienMind-1.2.tar.bz2) = 131323 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/Blue-1.4.tar.bz2) = 6c075d10ec651afa4dcf41751a524d1d79050fad
+Size (gmplayer-1.0rc5pl2-20041104/Blue-1.4.tar.bz2) = 221736 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/BlueHeart-1.5.tar.bz2) = 8ca1d68de399d8e362706fbdb1b1aa7416705510
+Size (gmplayer-1.0rc5pl2-20041104/BlueHeart-1.5.tar.bz2) = 281137 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/CornerMP-1.2.tar.bz2) = 7c97ef2f9a17c82fbd9f3b328c2e699741d8d12a
+Size (gmplayer-1.0rc5pl2-20041104/CornerMP-1.2.tar.bz2) = 232684 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/CornerMP-aqua-1.4.tar.bz2) = 01cfd93fb0d9bd1ed026464b80828063c7e761de
+Size (gmplayer-1.0rc5pl2-20041104/CornerMP-aqua-1.4.tar.bz2) = 243252 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/Cyrus-1.2.tar.bz2) = 580a3e7e5df82a95e59263d6e6fb9380030a6761
+Size (gmplayer-1.0rc5pl2-20041104/Cyrus-1.2.tar.bz2) = 228477 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/MidnightLove-1.6.tar.bz2) = f63146ec9c3c384e4120047db86c47dc71696ce9
+Size (gmplayer-1.0rc5pl2-20041104/MidnightLove-1.6.tar.bz2) = 539665 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/WMP6-2.2.tar.bz2) = aac926ef827ed6a16cdec99bf74fb1fd1e4adeb8
+Size (gmplayer-1.0rc5pl2-20041104/WMP6-2.2.tar.bz2) = 39326 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/avifile-1.6.tar.bz2) = 2f049dd62314a2aec610d8b718bd8d083b8fa7ea
+Size (gmplayer-1.0rc5pl2-20041104/avifile-1.6.tar.bz2) = 42442 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/gnome-1.1.tar.bz2) = 9c0c32d0a8eea094caee57116f5f1d2b34c58f61
+Size (gmplayer-1.0rc5pl2-20041104/gnome-1.1.tar.bz2) = 368724 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/hayraphon-1.0.tar.bz2) = 3ba5f9d5d3011fdbbf81bfcc71e14982ef8da64b
+Size (gmplayer-1.0rc5pl2-20041104/hayraphon-1.0.tar.bz2) = 77645 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/hwswskin-1.1.tar.bz2) = 9784e828e482a7eff61d9b69ff0104472de78e7c
+Size (gmplayer-1.0rc5pl2-20041104/hwswskin-1.1.tar.bz2) = 20394 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/mentalic-1.2.tar.bz2) = a485d284f99dcb013ff341c217277f35f4b984cb
+Size (gmplayer-1.0rc5pl2-20041104/mentalic-1.2.tar.bz2) = 166619 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/neutron-1.5.tar.bz2) = 825adb6d0762e6c1a1fa378e070474b56cf53e57
+Size (gmplayer-1.0rc5pl2-20041104/neutron-1.5.tar.bz2) = 369313 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/phony-1.1.tar.bz2) = fcf7c43a66b51eb0dce05ce083b0e09b4ca5a909
+Size (gmplayer-1.0rc5pl2-20041104/phony-1.1.tar.bz2) = 386397 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/plastic-1.2.tar.bz2) = 1d95bdc34627f0ab4d35352d8eb5f4aa93822e16
+Size (gmplayer-1.0rc5pl2-20041104/plastic-1.2.tar.bz2) = 454111 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/proton-1.2.tar.bz2) = a241c00e1e165aca52ee90c1200e164d48197f43
+Size (gmplayer-1.0rc5pl2-20041104/proton-1.2.tar.bz2) = 322675 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/slim-1.2.tar.bz2) = 4a36dea888788a41cb81aca40e53eecc58fa7a4c
+Size (gmplayer-1.0rc5pl2-20041104/slim-1.2.tar.bz2) = 399007 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/xanim-1.6.tar.bz2) = 4be5a07a3d403a7a9b9b6cc5b08e67885b9231b8
+Size (gmplayer-1.0rc5pl2-20041104/xanim-1.6.tar.bz2) = 94534 bytes
+SHA1 (gmplayer-1.0rc5pl2-20041104/xine-lcd-1.2.tar.bz2) = 1ff19272764348d99846497f0997e7149e4ccb26
+Size (gmplayer-1.0rc5pl2-20041104/xine-lcd-1.2.tar.bz2) = 172357 bytes
 SHA1 (patch-aa) = 9a90cadba608c518e998024f8dbde39cbfab70da
 SHA1 (patch-ab) = 68e81c67cd3902499f912d3ca8c6d6bc208a2433
 SHA1 (patch-ac) = 696183adc3777cb4d9bc4b6d96d5cb7c88ec489d
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 58afc4ff17c..f217b8dde9e 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2004/12/03 15:15:05 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.16 2004/12/17 22:33:13 tron Exp $
 
 PKGNAME=	mencoder-${MPLAYER_PKG_VERSION}
-PKGREVISION=	3
 
 COMMENT=	Simple movie encoder for MPlayer-playable movies
 
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
index 7caa590e94c..5ff7089edfb 100644
--- a/multimedia/mplayer-share/Makefile.common
+++ b/multimedia/mplayer-share/Makefile.common
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.16 2004/07/20 22:04:44 salo Exp $
-#
+# $NetBSD: Makefile.common,v 1.17 2004/12/17 22:33:13 tron Exp $
 
-MPLAYER_DIST_VERSION=	1.0pre5
+MPLAYER_DIST_VERSION=	1.0pre5try2
 
 # This variable is used in all packages which depend on this package
-MPLAYER_PKG_VERSION=	1.0rc5
+MPLAYER_PKG_VERSION=	1.0rc5pl2
 
 DISTNAME=		MPlayer-${MPLAYER_DIST_VERSION}
 CATEGORIES?=		multimedia
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index e60f2f98eec..bff6cf5392c 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.13 2004/11/06 00:47:34 wiz Exp $
+$NetBSD: distinfo,v 1.14 2004/12/17 22:33:13 tron Exp $
 
-SHA1 (mplayer-1.0rc5/MPlayer-1.0pre5.tar.bz2) = cf64892871b8673e452b5d390be25144d85fe307
-Size (mplayer-1.0rc5/MPlayer-1.0pre5.tar.bz2) = 5072836 bytes
-SHA1 (mplayer-1.0rc5/font-arial-iso-8859-1.tar.bz2) = 152c40bf20de34aa8802d7f80d34d673b0b67212
-Size (mplayer-1.0rc5/font-arial-iso-8859-1.tar.bz2) = 234242 bytes
-SHA1 (mplayer-1.0rc5/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f93c453c4f268181
-Size (mplayer-1.0rc5/font-arial-iso-8859-2.tar.bz2) = 222208 bytes
-SHA1 (mplayer-1.0rc5/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68
-Size (mplayer-1.0rc5/font-arial-cp1250.tar.bz2) = 249705 bytes
+SHA1 (mplayer-1.0rc5pl2/MPlayer-1.0pre5try2.tar.bz2) = 3a6143b1bfdcb73008461cd9fcdd30ab7524fc47
+Size (mplayer-1.0rc5pl2/MPlayer-1.0pre5try2.tar.bz2) = 5073725 bytes
+SHA1 (mplayer-1.0rc5pl2/font-arial-iso-8859-1.tar.bz2) = 152c40bf20de34aa8802d7f80d34d673b0b67212
+Size (mplayer-1.0rc5pl2/font-arial-iso-8859-1.tar.bz2) = 234242 bytes
+SHA1 (mplayer-1.0rc5pl2/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f93c453c4f268181
+Size (mplayer-1.0rc5pl2/font-arial-iso-8859-2.tar.bz2) = 222208 bytes
+SHA1 (mplayer-1.0rc5pl2/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68
+Size (mplayer-1.0rc5pl2/font-arial-cp1250.tar.bz2) = 249705 bytes
 SHA1 (patch-aa) = 9a90cadba608c518e998024f8dbde39cbfab70da
 SHA1 (patch-ab) = 68e81c67cd3902499f912d3ca8c6d6bc208a2433
 SHA1 (patch-ac) = 696183adc3777cb4d9bc4b6d96d5cb7c88ec489d
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 68dce330c3c..65c790532b9 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2004/11/06 00:47:34 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2004/12/17 22:33:13 tron Exp $
 
 PKGNAME=	mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=	3
 
 COMMENT=	Software-only MPEG-1/2/4 video decoder