[pkgsrc/trunk]: pkgsrc/multimedia Security fix for mplayer as given in

[dogcow <dogcow%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2712380a0940
branches:  trunk
changeset: 498611:2712380a0940
user:      dogcow <dogcow%pkgsrc.org@localhost>
date:      Sat Aug 27 06:59:52 2005 +0000

description:
Security fix for mplayer as given in
http://www.sven-tantau.de/public_files/mplayer/mplayer_20050824.txt .
bump PKGREVISION of affected pkgs.

diffstat:

 multimedia/gmplayer/Makefile              |   3 ++-
 multimedia/mencoder/Makefile              |   3 ++-
 multimedia/mplayer-share/distinfo         |   3 ++-
 multimedia/mplayer-share/patches/patch-ag |  16 ++++++++++++++++
 multimedia/mplayer/Makefile               |   4 ++--
 5 files changed, 24 insertions(+), 5 deletions(-)

diffs (79 lines):

diff -r 941ff390e86d -r 2712380a0940 multimedia/gmplayer/Makefile
--- a/multimedia/gmplayer/Makefile      Sat Aug 27 00:40:25 2005 +0000
+++ b/multimedia/gmplayer/Makefile      Sat Aug 27 06:59:52 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/07/15 18:27:52 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2005/08/27 06:59:52 dogcow 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 -r 941ff390e86d -r 2712380a0940 multimedia/mencoder/Makefile
--- a/multimedia/mencoder/Makefile      Sat Aug 27 00:40:25 2005 +0000
+++ b/multimedia/mencoder/Makefile      Sat Aug 27 06:59:52 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2005/06/17 03:50:23 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/08/27 06:59:52 dogcow Exp $
 
 PKGNAME=       mencoder-${MPLAYER_PKG_VERSION}
+PKGREVISION=   1
 
 COMMENT=       Simple movie encoder for MPlayer-playable movies
 
diff -r 941ff390e86d -r 2712380a0940 multimedia/mplayer-share/distinfo
--- a/multimedia/mplayer-share/distinfo Sat Aug 27 00:40:25 2005 +0000
+++ b/multimedia/mplayer-share/distinfo Sat Aug 27 06:59:52 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2005/07/21 14:24:48 wiz Exp $
+$NetBSD: distinfo,v 1.23 2005/08/27 06:59:52 dogcow 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-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 -r 941ff390e86d -r 2712380a0940 multimedia/mplayer-share/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-ag Sat Aug 27 06:59:52 2005 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1 2005/08/27 06:59:52 dogcow Exp $
+
+--- libmpcodecs/ad_pcm.c       2005/07/28 13:43:24     1.18
++++ libmpcodecs/ad_pcm.c       2005/08/25 19:46:20     1.19
+@@ -98,8 +98,8 @@
+ 
+ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen)
+ {
+-  int len=sh_audio->channels*sh_audio->samplesize-1;
+-  len=(minlen+len)&(~len); // sample align
++  unsigned len = sh_audio->channels*sh_audio->samplesize;
++  len = maxlen - maxlen % len; // sample align
+   len=demux_read_data(sh_audio->ds,buf,len);
+   return len;
+ }
+
diff -r 941ff390e86d -r 2712380a0940 multimedia/mplayer/Makefile
--- a/multimedia/mplayer/Makefile       Sat Aug 27 00:40:25 2005 +0000
+++ b/multimedia/mplayer/Makefile       Sat Aug 27 06:59:52 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/17 03:50:23 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/27 06:59:52 dogcow Exp $
 
 PKGNAME=       mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 
 COMMENT=       Software-only MPEG-1/2/4 video decoder