From 229196596e69becae638362c0a3ef594da254839 Mon Sep 17 00:00:00 2001 From: drochner Date: Thu, 13 Apr 2006 14:05:34 +0000 Subject: -use the "try2" distfile, it already contains the fix for the PCM decoder which we had a patch for -add another patch from the Mplayer site which fixes CVE-2006-0579 (ASF demuxer overflows) bump PKGREVISIONS of mplayer, mencoder and gmplayer --- multimedia/gmplayer/Makefile | 4 ++-- multimedia/gmplayer/distinfo | 10 ++++---- multimedia/mencoder/Makefile | 4 ++-- multimedia/mplayer-share/Makefile.common | 4 ++-- multimedia/mplayer-share/distinfo | 19 ++++----------- multimedia/mplayer-share/patches/patch-ag | 16 ------------- multimedia/mplayer-share/patches/patch-aj | 39 +++++++++++++++++++++++++++++++ multimedia/mplayer/Makefile | 4 ++-- 8 files changed, 57 insertions(+), 43 deletions(-) delete mode 100644 multimedia/mplayer-share/patches/patch-ag create mode 100644 multimedia/mplayer-share/patches/patch-aj diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile index 8db85249954..4f52e2123d6 100644 --- a/multimedia/gmplayer/Makefile +++ b/multimedia/gmplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2006/02/05 23:10:15 joerg Exp $ +# $NetBSD: Makefile,v 1.44 2006/04/13 14:05:34 drochner Exp $ # # NOTE: if you are updating both mplayer and gmplayer, you must ensure @@ -9,7 +9,7 @@ # PKGNAME= gmplayer-${MPLAYER_PKG_VERSION} -PKGREVISION= 5 +PKGREVISION= 6 SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/Skin/ \ ftp://ftp1.mplayerhq.hu/MPlayer/Skin/ \ diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo index 3f9d66ef673..6770b8b606d 100644 --- a/multimedia/gmplayer/distinfo +++ b/multimedia/gmplayer/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.33 2006/01/23 07:25:16 recht Exp $ +$NetBSD: distinfo,v 1.34 2006/04/13 14:05:34 drochner Exp $ -SHA1 (gmplayer-1.0rc7-20060123/MPlayer-1.0pre7.tar.bz2) = df1e8d4f2f44d72c6f7989932f3b272e815ecb80 -RMD160 (gmplayer-1.0rc7-20060123/MPlayer-1.0pre7.tar.bz2) = a4bac10df287c4b134ea49b3bc9bf7fb0126cae6 -Size (gmplayer-1.0rc7-20060123/MPlayer-1.0pre7.tar.bz2) = 6868877 bytes +SHA1 (gmplayer-1.0rc7-20060123/MPlayer-1.0pre7try2.tar.bz2) = dcaced128167f15d094c9b63ca8b3dfd8f583e32 +RMD160 (gmplayer-1.0rc7-20060123/MPlayer-1.0pre7try2.tar.bz2) = d1da9b34f4c3de67a3a41f9117f32d2ee88c6e54 +Size (gmplayer-1.0rc7-20060123/MPlayer-1.0pre7try2.tar.bz2) = 6868786 bytes SHA1 (gmplayer-1.0rc7-20060123/AlienMind-1.2.tar.bz2) = 0d612f7fc92332783e3a8fd42b9f957a1c6ecaee RMD160 (gmplayer-1.0rc7-20060123/AlienMind-1.2.tar.bz2) = 5e7f5fcade401af16c1614dcfc5c6f673fe4cd49 Size (gmplayer-1.0rc7-20060123/AlienMind-1.2.tar.bz2) = 131295 bytes @@ -69,9 +69,9 @@ SHA1 (patch-ac) = 3b9ae32e6e656ec4b58b7e51a1c2eaa280384f3e SHA1 (patch-ad) = d705dd315e913593223b83e533c60a9620d34cc8 SHA1 (patch-ae) = 601808d8c89cba68156fb3c95fe9fcfb8da4fca0 SHA1 (patch-af) = 6eab8572b239f6ac7afc03ad6254a7c97f90663e -SHA1 (patch-ag) = 9bc3466ef24970e3f26fc64601d9f2c27fa394d2 SHA1 (patch-ah) = 744f073e791257768e5ec7da8e321d2f25d1fb2c SHA1 (patch-ai) = a884b7a23ff8b2c31e6190d2ba9989a8f0057a0c +SHA1 (patch-aj) = cb1f5451f9614cc39255fc5ce2afef7d68c31298 SHA1 (patch-da) = be092da4f854708c1ef47f10c26e361c095a6799 SHA1 (patch-dc) = b11ef06a89f13e2ae5e013d569aa5acc99c770aa SHA1 (patch-dd) = e5b23b73a1e53e3185ecbac26042432395cd5e63 diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index aae2058351f..1e392e3cba1 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2006/02/05 23:10:17 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2006/04/13 14:05:34 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/Makefile.common b/multimedia/mplayer-share/Makefile.common index 7d3ddd6f2c9..2657f5a3057 100644 --- a/multimedia/mplayer-share/Makefile.common +++ b/multimedia/mplayer-share/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.28 2006/03/04 21:30:15 jlam Exp $ +# $NetBSD: Makefile.common,v 1.29 2006/04/13 14:05:34 drochner Exp $ -MPLAYER_DIST_VERSION= 1.0pre7 +MPLAYER_DIST_VERSION= 1.0pre7try2 # This variable is used in all packages which depend on this package MPLAYER_PKG_VERSION= 1.0rc7 diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index b51aaa9a2d5..ef7d4c076e8 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -1,26 +1,17 @@ -$NetBSD: distinfo,v 1.26 2005/12/31 01:09:56 kristerw Exp $ +$NetBSD: distinfo,v 1.27 2006/04/13 14:05:34 drochner Exp $ -SHA1 (mplayer-1.0rc7/MPlayer-1.0pre7.tar.bz2) = df1e8d4f2f44d72c6f7989932f3b272e815ecb80 -RMD160 (mplayer-1.0rc7/MPlayer-1.0pre7.tar.bz2) = a4bac10df287c4b134ea49b3bc9bf7fb0126cae6 -Size (mplayer-1.0rc7/MPlayer-1.0pre7.tar.bz2) = 6868877 bytes -SHA1 (mplayer-1.0rc7/font-arial-iso-8859-1.tar.bz2) = 152c40bf20de34aa8802d7f80d34d673b0b67212 -RMD160 (mplayer-1.0rc7/font-arial-iso-8859-1.tar.bz2) = 666697cd5efd9387057a898c714175e7c2aacbcd -Size (mplayer-1.0rc7/font-arial-iso-8859-1.tar.bz2) = 234242 bytes -SHA1 (mplayer-1.0rc7/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 -RMD160 (mplayer-1.0rc7/font-arial-iso-8859-2.tar.bz2) = 562d4d92c4f5f3d537340fde3ad8d1495ac41acb -Size (mplayer-1.0rc7/font-arial-iso-8859-2.tar.bz2) = 222208 bytes -SHA1 (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 -RMD160 (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = a2fc7ae07b0d80936ea58e168e1047efccb9eb91 -Size (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = 249705 bytes +SHA1 (mplayer-1.0rc7/MPlayer-1.0pre7try2.tar.bz2) = dcaced128167f15d094c9b63ca8b3dfd8f583e32 +RMD160 (mplayer-1.0rc7/MPlayer-1.0pre7try2.tar.bz2) = d1da9b34f4c3de67a3a41f9117f32d2ee88c6e54 +Size (mplayer-1.0rc7/MPlayer-1.0pre7try2.tar.bz2) = 6868786 bytes SHA1 (patch-aa) = 708128dde21b8de799aa26d75335da76543e2373 SHA1 (patch-ab) = 1a08f717e326d83b355eee26e1be9c0636b735c5 SHA1 (patch-ac) = 3b9ae32e6e656ec4b58b7e51a1c2eaa280384f3e SHA1 (patch-ad) = d705dd315e913593223b83e533c60a9620d34cc8 SHA1 (patch-ae) = 601808d8c89cba68156fb3c95fe9fcfb8da4fca0 SHA1 (patch-af) = 6eab8572b239f6ac7afc03ad6254a7c97f90663e -SHA1 (patch-ag) = 9bc3466ef24970e3f26fc64601d9f2c27fa394d2 SHA1 (patch-ah) = 744f073e791257768e5ec7da8e321d2f25d1fb2c SHA1 (patch-ai) = a884b7a23ff8b2c31e6190d2ba9989a8f0057a0c +SHA1 (patch-aj) = cb1f5451f9614cc39255fc5ce2afef7d68c31298 SHA1 (patch-da) = be092da4f854708c1ef47f10c26e361c095a6799 SHA1 (patch-dc) = b11ef06a89f13e2ae5e013d569aa5acc99c770aa SHA1 (patch-dd) = e5b23b73a1e53e3185ecbac26042432395cd5e63 diff --git a/multimedia/mplayer-share/patches/patch-ag b/multimedia/mplayer-share/patches/patch-ag deleted file mode 100644 index a5c11769c9c..00000000000 --- a/multimedia/mplayer-share/patches/patch-ag +++ /dev/null @@ -1,16 +0,0 @@ -$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 --git a/multimedia/mplayer-share/patches/patch-aj b/multimedia/mplayer-share/patches/patch-aj new file mode 100644 index 00000000000..1f27d4ed9be --- /dev/null +++ b/multimedia/mplayer-share/patches/patch-aj @@ -0,0 +1,39 @@ +$NetBSD: patch-aj,v 1.1 2006/04/13 14:05:34 drochner Exp $ + +--- libmpdemux/demuxer.h.orig 2005-04-03 16:08:26.000000000 +0200 ++++ libmpdemux/demuxer.h +@@ -155,17 +155,19 @@ inline static demux_packet_t* new_demux_ + dp->flags=0; + dp->refcount=1; + dp->master=NULL; +- dp->buffer=len?(unsigned char*)malloc(len+8):NULL; +- if(len) memset(dp->buffer+len,0,8); ++ dp->buffer=NULL; ++ if (len > 0 && (dp->buffer = (unsigned char *)malloc(len + 8))) ++ memset(dp->buffer + len, 0, 8); ++ else ++ dp->len = 0; + return dp; + } + + inline static void resize_demux_packet(demux_packet_t* dp, int len) + { +- if(len) ++ if(len > 0) + { + dp->buffer=(unsigned char *)realloc(dp->buffer,len+8); +- memset(dp->buffer+len,0,8); + } + else + { +@@ -173,6 +175,10 @@ inline static void resize_demux_packet(d + dp->buffer=NULL; + } + dp->len=len; ++ if (dp->buffer) ++ memset(dp->buffer + len, 0, 8); ++ else ++ dp->len = 0; + } + + inline static demux_packet_t* clone_demux_packet(demux_packet_t* pack){ diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 9e0fc1c52a6..6a220584e58 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2006/02/05 23:10:17 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2006/04/13 14:05:34 drochner Exp $ PKGNAME= mplayer-${MPLAYER_PKG_VERSION} -PKGREVISION= 9 +PKGREVISION= 10 COMMENT= Software-only MPEG-1/2/4 video decoder -- cgit v1.2.3