[pkgsrc/trunk]: pkgsrc/multimedia Upgrade mplayer, gmplayer, and mencoder to ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/880b97aa1332
branches:  trunk
changeset: 471833:880b97aa1332
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Mar 31 13:23:27 2004 +0000

description:
Upgrade mplayer, gmplayer, and mencoder to PKGREVISION 2:
Fix remotely exploitable buffer overflow.

diffstat:

 multimedia/gmplayer/Makefile              |   4 ++--
 multimedia/gmplayer/distinfo              |   3 ++-
 multimedia/mencoder/Makefile              |   4 ++--
 multimedia/mencoder/distinfo              |   3 ++-
 multimedia/mplayer-share/patches/patch-ac |  13 +++++++++++++
 multimedia/mplayer/Makefile               |   4 ++--
 multimedia/mplayer/distinfo               |   3 ++-
 7 files changed, 25 insertions(+), 9 deletions(-)

diffs (101 lines):

diff -r 63c4c5db55ed -r 880b97aa1332 multimedia/gmplayer/Makefile
--- a/multimedia/gmplayer/Makefile      Wed Mar 31 12:40:02 2004 +0000
+++ b/multimedia/gmplayer/Makefile      Wed Mar 31 13:23:27 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2004/03/29 17:43:43 tron Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/31 13:23:27 wiz Exp $
 
 PKGNAME=       gmplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 
 SKIN_SITES=    http://www.mplayerhq.hu/MPlayer/Skin/           \
                ftp://ftp.mplayerhq.hu/MPlayer/Skin/            \
diff -r 63c4c5db55ed -r 880b97aa1332 multimedia/gmplayer/distinfo
--- a/multimedia/gmplayer/distinfo      Wed Mar 31 12:40:02 2004 +0000
+++ b/multimedia/gmplayer/distinfo      Wed Mar 31 13:23:27 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2004/01/26 12:19:31 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2004/03/31 13:23:27 wiz Exp $
 
 SHA1 (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = d3341f05518f6b331396c431f81b736b89402432
 Size (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = 4714725 bytes
@@ -44,5 +44,6 @@
 Size (mplayer-1.0rc3/xine-lcd-1.0.tar.bz2) = 168441 bytes
 SHA1 (patch-aa) = 51722c503120b0771102a0ca48c9817271666b81
 SHA1 (patch-ab) = a0f80f7d44b41509d215bb9cf6c1266c836efd1b
+SHA1 (patch-ac) = 8d28e03ef054dfe8e7f62d31631727616a87d4ed
 SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b
 SHA1 (patch-ae) = 61fec8b2ace8bd507df57102ff72c98cd6b194d7
diff -r 63c4c5db55ed -r 880b97aa1332 multimedia/mencoder/Makefile
--- a/multimedia/mencoder/Makefile      Wed Mar 31 12:40:02 2004 +0000
+++ b/multimedia/mencoder/Makefile      Wed Mar 31 13:23:27 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/02/20 17:32:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/03/31 13:23:27 wiz Exp $
 #
 
 PKGNAME=       mencoder-${MPLAYER_PKG_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       Simple movie encoder for MPlayer-playable movies
 
 .include "../../multimedia/mplayer-share/Makefile.common"
diff -r 63c4c5db55ed -r 880b97aa1332 multimedia/mencoder/distinfo
--- a/multimedia/mencoder/distinfo      Wed Mar 31 12:40:02 2004 +0000
+++ b/multimedia/mencoder/distinfo      Wed Mar 31 13:23:27 2004 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.2 2004/01/26 12:25:14 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2004/03/31 13:23:27 wiz Exp $
 
 SHA1 (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = d3341f05518f6b331396c431f81b736b89402432
 Size (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = 4714725 bytes
 SHA1 (patch-aa) = 51722c503120b0771102a0ca48c9817271666b81
 SHA1 (patch-ab) = a0f80f7d44b41509d215bb9cf6c1266c836efd1b
+SHA1 (patch-ac) = 8d28e03ef054dfe8e7f62d31631727616a87d4ed
 SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b
 SHA1 (patch-ae) = 61fec8b2ace8bd507df57102ff72c98cd6b194d7
diff -r 63c4c5db55ed -r 880b97aa1332 multimedia/mplayer-share/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-ac Wed Mar 31 13:23:27 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2004/03/31 13:23:27 wiz Exp $
+
+--- libmpdemux/http.c.orig     Wed Nov 13 10:02:55 2002
++++ libmpdemux/http.c
+@@ -175,7 +175,7 @@ http_build_request( HTTP_header_t *http_
+       if( http_hdr->method==NULL ) http_set_method( http_hdr, "GET");
+       if( http_hdr->uri==NULL ) http_set_uri( http_hdr, "/");
+       else {
+-              uri = (char*)malloc(strlen(http_hdr->uri)*2);
++              uri = (char*)malloc((strlen(http_hdr->uri)*3) + 1);
+               if( uri==NULL ) {
+                       mp_msg(MSGT_NETWORK,MSGL_ERR,"Memory allocation failed\n");
+                       return NULL;
diff -r 63c4c5db55ed -r 880b97aa1332 multimedia/mplayer/Makefile
--- a/multimedia/mplayer/Makefile       Wed Mar 31 12:40:02 2004 +0000
+++ b/multimedia/mplayer/Makefile       Wed Mar 31 13:23:27 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2004/02/20 17:32:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/03/31 13:23:27 wiz Exp $
 
 PKGNAME=       mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       Software-only MPEG-1/2/4 video decoder
 
 .include "../../multimedia/mplayer-share/Makefile.common"
diff -r 63c4c5db55ed -r 880b97aa1332 multimedia/mplayer/distinfo
--- a/multimedia/mplayer/distinfo       Wed Mar 31 12:40:02 2004 +0000
+++ b/multimedia/mplayer/distinfo       Wed Mar 31 13:23:27 2004 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/01/26 12:08:12 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2004/03/31 13:23:27 wiz Exp $
 
 SHA1 (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = d3341f05518f6b331396c431f81b736b89402432
 Size (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = 4714725 bytes
 SHA1 (patch-aa) = 51722c503120b0771102a0ca48c9817271666b81
 SHA1 (patch-ab) = a0f80f7d44b41509d215bb9cf6c1266c836efd1b
+SHA1 (patch-ac) = 8d28e03ef054dfe8e7f62d31631727616a87d4ed
 SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b
 SHA1 (patch-ae) = 61fec8b2ace8bd507df57102ff72c98cd6b194d7