diff options
| author | dogcow <dogcow@pkgsrc.org> | 2005-08-27 06:59:52 +0000 |
|---|---|---|
| committer | dogcow <dogcow@pkgsrc.org> | 2005-08-27 06:59:52 +0000 |
| commit | cc5659358e13b3f61eeacb96f469fea181077bca (patch) | |
| tree | ece06e7f74725d540227a4214b4f81383322e021 /multimedia | |
| parent | 88c47fab7956817765c251b21101527fcd68cb86 (diff) | |
| download | pkgsrc-cc5659358e13b3f61eeacb96f469fea181077bca.tar.gz | |
Security fix for mplayer as given in
http://www.sven-tantau.de/public_files/mplayer/mplayer_20050824.txt .
bump PKGREVISION of affected pkgs.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/gmplayer/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/mencoder/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/mplayer-share/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/mplayer-share/patches/patch-ag | 16 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile | 4 |
5 files changed, 24 insertions, 5 deletions
diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile index 5fbcbe64c20..93f4211ba32 100644 --- a/multimedia/gmplayer/Makefile +++ b/multimedia/gmplayer/Makefile @@ -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 --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 85aec7d054d..3c11004cc87 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -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 --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index 771265e5fda..364ff9f0994 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -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-ac) = 3b9ae32e6e656ec4b58b7e51a1c2eaa280384f3e 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 --git a/multimedia/mplayer-share/patches/patch-ag b/multimedia/mplayer-share/patches/patch-ag new file mode 100644 index 00000000000..a5c11769c9c --- /dev/null +++ b/multimedia/mplayer-share/patches/patch-ag @@ -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 --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index f4e46c5d8f1..50741e8d89f 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -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 |