pull in a patch from mplayer CVS to fix buffer overflow in DMO reader, see

http://lists.grok.org.uk/pipermail/full-disclosure/2007-March/052738.html
bump PKGREVISIONs

7 files changed, 35 insertions, 7 deletions

diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index de515d8b9ca..a61deff3a6a 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2007/02/23 19:19:39 drochner Exp $
+# $NetBSD: Makefile,v 1.33 2007/03/09 15:14:16 drochner Exp $
 
 PKGNAME=	mencoder-${MPLAYER_PKG_VERSION}
 
-PKGREVISION=	3
+PKGREVISION=	4
 
 COMMENT=	Simple movie encoder for MPlayer-playable movies
 
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index 36f655fff97..addfff71823 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2007/02/23 19:19:40 drochner Exp $
+$NetBSD: distinfo,v 1.39 2007/03/09 15:14:16 drochner Exp $
 
 SHA1 (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = a450c0b0749c343a8496ba7810363c9d46dfa73c
 RMD160 (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = 8cea02e832aec5d9e090829d61d0f131dcc177a2
@@ -10,6 +10,7 @@ SHA1 (patch-ad) = d0b72eaa5e63d2cfd7828ea1a9973f1728c607b5
 SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b
 SHA1 (patch-ai) = bcf45db81587d99fc69ae5fcf89ff4a4b8f6f53c
 SHA1 (patch-aj) = 40ba1625f85f0264628013ad0209aa095e8e5d3f
+SHA1 (patch-ak) = f095e2824fd54ec7a8ea7a8a59641743c1b65191
 SHA1 (patch-ba) = bdb20f4ead6f55c0847534b5b1f06ea865e438e6
 SHA1 (patch-bb) = 554ca2074716ada4f817f55be61e808e1dc5c93e
 SHA1 (patch-bc) = c073f6e5d2d71030346fda82ff3a1f474ad49c0f
diff --git a/multimedia/mplayer-share/patches/patch-ak b/multimedia/mplayer-share/patches/patch-ak
new file mode 100644
index 00000000000..1c4e3108eb6
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.3 2007/03/09 15:14:16 drochner Exp $
+
+--- loader/dmo/DMO_VideoDecoder.c.orig	2007-03-09 14:52:13.000000000 +0100
++++ loader/dmo/DMO_VideoDecoder.c
+@@ -121,6 +121,7 @@ DMO_VideoDecoder * DMO_VideoDecoder_Open
+      
+         this->iv.m_bh = malloc(bihs);
+         memcpy(this->iv.m_bh, format, bihs);
++	this->iv.m_bh->biSize = bihs;
+ 
+         this->iv.m_State = STOP;
+         //this->iv.m_pFrame = 0;
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 0149e72d904..1637eef62a9 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2007/02/23 19:19:40 drochner Exp $
+# $NetBSD: Makefile,v 1.41 2007/03/09 15:14:16 drochner Exp $
 
 PKGNAME=	mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=	4
+PKGREVISION=	5
 
 COMMENT=	Software-only MPEG-1/2/4 video decoder
 
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index c7b62bf8ba3..76e4b0d3b6f 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.50 2007/02/09 19:25:05 drochner Exp $
+# $NetBSD: Makefile,v 1.51 2007/03/09 15:14:16 drochner Exp $
 
 .include "Makefile.common"
 
+PKGREVISION=		1
+
 COMMENT=		Multimedia player library
 
 BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 64932f0e413..1db58424228 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.44 2007/02/07 20:04:00 drochner Exp $
+$NetBSD: distinfo,v 1.45 2007/03/09 15:14:16 drochner Exp $
 
 SHA1 (xine-lib-1.1.4.tar.gz) = d3e5b14a6cb1b9624334b215a84f3d18aa833a84
 RMD160 (xine-lib-1.1.4.tar.gz) = 81871160e302281b74b1730a8e3ef4bf76fd0721
@@ -20,6 +20,7 @@ SHA1 (patch-ap) = 151e3a8cc6503cf1dc9b78d8be6e362bbded0560
 SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
 SHA1 (patch-av) = ff076273416fa701da325aa5060503ecb16a9ed1
 SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc
+SHA1 (patch-ax) = fc450a19a3d8cb49301dc9bfd4f8d7610549482a
 SHA1 (patch-bd) = 2f0f39512d185377cca1ebaf4e891d518a1c14d0
 SHA1 (patch-be) = 04eb23f58cb96dab4b7c7120092364915ebaf330
 SHA1 (patch-bg) = 83f97ad77c8295fcaf78a7ea7fe9c4f87efd80d0
diff --git a/multimedia/xine-lib/patches/patch-ax b/multimedia/xine-lib/patches/patch-ax
new file mode 100644
index 00000000000..59be6771f88
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-ax
@@ -0,0 +1,12 @@
+$NetBSD: patch-ax,v 1.3 2007/03/09 15:14:16 drochner Exp $
+
+--- src/libw32dll/dmo/DMO_VideoDecoder.c.orig	2007-03-09 15:19:08.000000000 +0100
++++ src/libw32dll/dmo/DMO_VideoDecoder.c
+@@ -118,6 +118,7 @@ DMO_VideoDecoder * DMO_VideoDecoder_Open
+      
+         this->iv.m_bh = (BITMAPINFOHEADER*)malloc(bihs);
+         memcpy(this->iv.m_bh, format, bihs);
++	this->iv.m_bh->biSize = bihs;
+ 
+         this->iv.m_State = STOP;
+         //this->iv.m_pFrame = 0;