summaryrefslogtreecommitdiff
path: root/multimedia/vlc
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2011-12-22 13:31:48 +0000
committerdrochner <drochner@pkgsrc.org>2011-12-22 13:31:48 +0000
commit45196e5c366afed02a0e22c73f88144e3d064007 (patch)
tree25a48c01ae0a3d61e3598634cdab08bd0f1e979c /multimedia/vlc
parentc56088f8b1ba89a172b8d210f256d8ec8c31e1cb (diff)
downloadpkgsrc-45196e5c366afed02a0e22c73f88144e3d064007.tar.gz
add patch from upstream to fix possible double free() in the TiVo
demuxer (with possible security implications) bump PKGREV
Diffstat (limited to 'multimedia/vlc')
-rw-r--r--multimedia/vlc/Makefile4
-rw-r--r--multimedia/vlc/distinfo3
-rw-r--r--multimedia/vlc/patches/patch-au14
3 files changed, 18 insertions, 3 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index cb26c4aee04..e43650bc55a 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.122 2011/11/16 01:33:16 sbd Exp $
+# $NetBSD: Makefile,v 1.123 2011/12/22 13:31:48 drochner Exp $
#
DISTNAME= vlc-${VLC_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} \
http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 2a9f588cee8..7829dcd4d7c 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.51 2011/10/07 19:13:19 drochner Exp $
+$NetBSD: distinfo,v 1.52 2011/12/22 13:31:48 drochner Exp $
SHA1 (vlc-1.1.12.tar.bz2) = b39de66711a33746ce12f16a50e41d3def7b1452
RMD160 (vlc-1.1.12.tar.bz2) = 117530abc8bd3f38d9233b7a7c91a3aaa17af87c
@@ -8,4 +8,5 @@ SHA1 (patch-ap) = 423b571ca8a1b740812aea021e331912ba34c868
SHA1 (patch-ar) = f2a8b586c4672bbb0f7ccd163531c3f27eadc949
SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086
SHA1 (patch-at) = 5761ec0809d2b03511666ae81f7b4ae01b6f5930
+SHA1 (patch-au) = f40733e9d48cd4db1eaec2367ccd86efc66d287e
SHA1 (patch-modules_audio__output_pulse.c) = 994389b214f3e2b7b8b7ccaf3bb535a94523f81b
diff --git a/multimedia/vlc/patches/patch-au b/multimedia/vlc/patches/patch-au
new file mode 100644
index 00000000000..55da9f1f81c
--- /dev/null
+++ b/multimedia/vlc/patches/patch-au
@@ -0,0 +1,14 @@
+$NetBSD: patch-au,v 1.11 2011/12/22 13:31:48 drochner Exp $
+
+VideoLAN-SA-1108
+
+--- modules/demux/ty.c.orig 2011-07-12 18:11:24.000000000 +0000
++++ modules/demux/ty.c
+@@ -1894,6 +1894,7 @@ static int get_chunk_header(demux_t *p_d
+ /*msg_Dbg( p_demux, "chunk has %d records", i_num_recs );*/
+
+ free(p_sys->rec_hdrs);
++ p_sys->rec_hdrs = NULL;
+
+ /* skip past the 4 bytes we "peeked" earlier */
+ stream_Read( p_demux->s, NULL, 4 );