summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2004-03-31 13:23:27 +0000
committerwiz <wiz@pkgsrc.org>2004-03-31 13:23:27 +0000
commitbf0c4649edb02cbdd949cb84f72c12df718cbd0f (patch)
treebc29c5c18e0183a2018b2629fa3bf5eceac1087f /multimedia
parent75c399a89ef6febf711e1cd827d2ac17e4f954d5 (diff)
downloadpkgsrc-bf0c4649edb02cbdd949cb84f72c12df718cbd0f.tar.gz
Upgrade mplayer, gmplayer, and mencoder to PKGREVISION 2:
Fix remotely exploitable buffer overflow.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/gmplayer/Makefile4
-rw-r--r--multimedia/gmplayer/distinfo3
-rw-r--r--multimedia/mencoder/Makefile4
-rw-r--r--multimedia/mencoder/distinfo3
-rw-r--r--multimedia/mplayer-share/patches/patch-ac13
-rw-r--r--multimedia/mplayer/Makefile4
-rw-r--r--multimedia/mplayer/distinfo3
7 files changed, 25 insertions, 9 deletions
diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index 098c597c4e5..73a0a8cda4d 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -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 --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo
index 42c65edfae4..90f500ae3fc 100644
--- a/multimedia/gmplayer/distinfo
+++ b/multimedia/gmplayer/distinfo
@@ -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 @@ SHA1 (mplayer-1.0rc3/xine-lcd-1.0.tar.bz2) = 1edbf1703e64f7a7c2aa3837d3383ba60a6
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 --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 0bac9464353..c0a681782d1 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -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 --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo
index 0e64de634b4..dbc8765b06a 100644
--- a/multimedia/mencoder/distinfo
+++ b/multimedia/mencoder/distinfo
@@ -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 --git a/multimedia/mplayer-share/patches/patch-ac b/multimedia/mplayer-share/patches/patch-ac
new file mode 100644
index 00000000000..89e72d36712
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-ac
@@ -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 --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index bfe3ffae165..d9c09f1f1a2 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -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 --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index 30d5098dc30..7d0b983bb96 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -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