summaryrefslogtreecommitdiff
path: root/multimedia/vlc
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2011-04-11 15:51:18 +0000
committerdrochner <drochner@pkgsrc.org>2011-04-11 15:51:18 +0000
commit3e1578096155dd2640080546aa9ce88eac5dfc2b (patch)
treed154133e7d6f9f19a6b0b47c787bc8d02aca5929 /multimedia/vlc
parent94326f942b014b070482e02711ead36c8edbb5cd (diff)
downloadpkgsrc-3e1578096155dd2640080546aa9ce88eac5dfc2b.tar.gz
add patch from upstream to fix unsufficient memory allocation in the mp4
demuxer which can lead to stack overflow bump PKGREV
Diffstat (limited to 'multimedia/vlc')
-rw-r--r--multimedia/vlc/Makefile3
-rw-r--r--multimedia/vlc/distinfo3
-rw-r--r--multimedia/vlc/patches/patch-au15
3 files changed, 19 insertions, 2 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 2157515f010..b8f29512799 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.109 2011/04/02 16:20:37 taca Exp $
+# $NetBSD: Makefile,v 1.110 2011/04/11 15:51:18 drochner Exp $
#
DISTNAME= vlc-${VLC_VERSION}
+PKGREVISION= 1
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 7bba3940579..216c135280a 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2011/04/02 16:20:38 taca Exp $
+$NetBSD: distinfo,v 1.44 2011/04/11 15:51:18 drochner Exp $
SHA1 (vlc-1.1.8.tar.bz2) = c4ac61e31fa287a0cb7744534a1abf49cf033776
RMD160 (vlc-1.1.8.tar.bz2) = 728085c222f0a3c831d28f149898cc77f6cbe3a2
@@ -9,4 +9,5 @@ SHA1 (patch-ap) = 423b571ca8a1b740812aea021e331912ba34c868
SHA1 (patch-ar) = 25d22167cef8b8fa2a07ef633de196726eb354d2
SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086
SHA1 (patch-at) = 5761ec0809d2b03511666ae81f7b4ae01b6f5930
+SHA1 (patch-au) = c13384ec7bf17de5b111a613701a0ae415a83383
SHA1 (patch-configure) = 83f476cc71d795a69f787713a04471e078c0ec52
diff --git a/multimedia/vlc/patches/patch-au b/multimedia/vlc/patches/patch-au
new file mode 100644
index 00000000000..1e3910f033e
--- /dev/null
+++ b/multimedia/vlc/patches/patch-au
@@ -0,0 +1,15 @@
+$NetBSD: patch-au,v 1.5 2011/04/11 15:51:18 drochner Exp $
+
+VideoLAN-SA-1103
+
+--- modules/demux/mp4/libmp4.c.orig 2010-06-07 22:57:45.000000000 +0000
++++ modules/demux/mp4/libmp4.c
+@@ -2247,7 +2247,7 @@ static int MP4_ReadBox_frma( stream_t *p
+
+ static int MP4_ReadBox_skcr( stream_t *p_stream, MP4_Box_t *p_box )
+ {
+- MP4_READBOX_ENTER( MP4_Box_data_frma_t );
++ MP4_READBOX_ENTER( MP4_Box_data_skcr_t );
+
+ MP4_GET4BYTES( p_box->data.p_skcr->i_init );
+ MP4_GET4BYTES( p_box->data.p_skcr->i_encr );