update to 1.1.11

changes:
-security fixes in real and avi demuxers (were patched in pkgsrc)
-minor bugfixes

5 files changed, 10 insertions, 62 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 138cb23e9e0..a8ffa0ba2bc 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.115 2011/08/23 13:06:51 obache Exp $
+# $NetBSD: Makefile,v 1.116 2011/09/12 17:25:28 drochner Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
-PKGREVISION=		3
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vlc/} \
 			http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
 EXTRACT_SUFX=		.tar.bz2
 
-VLC_VERSION=		1.1.10
+VLC_VERSION=		1.1.11
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.videolan.org/
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 232368f684a..fcdd77b9899 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.48 2011/07/23 19:49:27 abs Exp $
+$NetBSD: distinfo,v 1.49 2011/09/12 17:25:28 drochner Exp $
 
-SHA1 (vlc-1.1.10.tar.bz2) = 6c7b3fefb2ad1e2ab53d17eabf509a318b76ef03
-RMD160 (vlc-1.1.10.tar.bz2) = 8a4b32bceb2eb3d9a3a062477f772a53098cad0b
-Size (vlc-1.1.10.tar.bz2) = 25877617 bytes
+SHA1 (vlc-1.1.11.tar.bz2) = 068e75bdbfe6e595a4db14ad49e05688c8b1d5ad
+RMD160 (vlc-1.1.11.tar.bz2) = fa8a32a8e81a5f707b3cace6fa9808d5d7cb9fe6
+Size (vlc-1.1.11.tar.bz2) = 26319862 bytes
 SHA1 (patch-aa) = 684f7ad6a20ed6b9b8a8be2fc61836e6b471b686
 SHA1 (patch-ab) = 7ed32dc2a2c092083dad3c902848ba44369eac38
 SHA1 (patch-ap) = 423b571ca8a1b740812aea021e331912ba34c868
 SHA1 (patch-ar) = 25d22167cef8b8fa2a07ef633de196726eb354d2
 SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086
 SHA1 (patch-at) = 5761ec0809d2b03511666ae81f7b4ae01b6f5930
-SHA1 (patch-au) = 551dd7d84e3e74a95891a708330af8a9e315c4d8
-SHA1 (patch-av) = 892a0e260e594d0ec736f79b1e0e037d6c1a9685
 SHA1 (patch-configure) = 83f476cc71d795a69f787713a04471e078c0ec52
-SHA1 (patch-modules_audio__output_pulse.c) = ff5b4e611c5ae72b484efba301ef952db062ba7b
+SHA1 (patch-modules_audio__output_pulse.c) = 994389b214f3e2b7b8b7ccaf3bb535a94523f81b
diff --git a/multimedia/vlc/patches/patch-au b/multimedia/vlc/patches/patch-au
deleted file mode 100644
index b853199fac2..00000000000
--- a/multimedia/vlc/patches/patch-au
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-au,v 1.7 2011/07/18 17:06:43 drochner Exp $
-
-CVE-2011-2588
-
---- modules/demux/avi/libavi.c.orig	2011-05-06 15:41:42.000000000 +0000
-+++ modules/demux/avi/libavi.c
-@@ -386,7 +386,8 @@ static int AVI_ChunkRead_strf( stream_t 
-         case( AVIFOURCC_vids ):
-             p_strh->strh.i_samplesize = 0; /* XXX for ffmpeg avi file */
-             p_chk->strf.vids.i_cat = VIDEO_ES;
--            p_chk->strf.vids.p_bih = malloc( p_chk->common.i_chunk_size );
-+            p_chk->strf.vids.p_bih = malloc( __MAX( p_chk->common.i_chunk_size,
-+                                         sizeof( *p_chk->strf.vids.p_bih ) ) );
-             AVI_READ4BYTES( p_chk->strf.vids.p_bih->biSize );
-             AVI_READ4BYTES( p_chk->strf.vids.p_bih->biWidth );
-             AVI_READ4BYTES( p_chk->strf.vids.p_bih->biHeight );
-@@ -402,7 +403,7 @@ static int AVI_ChunkRead_strf( stream_t 
-             {
-                 p_chk->strf.vids.p_bih->biSize = p_chk->common.i_chunk_size;
-             }
--            if( p_chk->common.i_chunk_size - sizeof(BITMAPINFOHEADER) > 0 )
-+            if( p_chk->common.i_chunk_size > sizeof(BITMAPINFOHEADER) )
-             {
-                 memcpy( &p_chk->strf.vids.p_bih[1],
-                         p_buff + 8 + sizeof(BITMAPINFOHEADER), /* 8=fourrc+size */
diff --git a/multimedia/vlc/patches/patch-av b/multimedia/vlc/patches/patch-av
deleted file mode 100644
index 42f62bf48d0..00000000000
--- a/multimedia/vlc/patches/patch-av
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-av,v 1.3 2011/07/18 17:06:43 drochner Exp $
-
-CVE-2011-2587
-
---- modules/demux/real.c.orig	2010-12-29 21:38:25.000000000 +0000
-+++ modules/demux/real.c
-@@ -841,7 +841,8 @@ static void DemuxAudioSipr( demux_t *p_d
-     demux_sys_t *p_sys = p_demux->p_sys;
-     block_t *p_block = tk->p_sipr_packet;
- 
--    if( p_sys->i_buffer < tk->i_frame_size )
-+    if( p_sys->i_buffer < tk->i_frame_size
-+     || tk->i_sipr_subpacket_count >= tk->i_subpacket_h )
-         return;
- 
-     if( !p_block )
-@@ -851,7 +852,6 @@ static void DemuxAudioSipr( demux_t *p_d
-             return;
-         tk->p_sipr_packet = p_block;
-     }
--
-     memcpy( p_block->p_buffer + tk->i_sipr_subpacket_count * tk->i_frame_size,
-             p_sys->buffer, tk->i_frame_size );
-     if (!tk->i_sipr_subpacket_count)
diff --git a/multimedia/vlc/patches/patch-modules_audio__output_pulse.c b/multimedia/vlc/patches/patch-modules_audio__output_pulse.c
index b38c816f40c..43cf151a848 100644
--- a/multimedia/vlc/patches/patch-modules_audio__output_pulse.c
+++ b/multimedia/vlc/patches/patch-modules_audio__output_pulse.c
@@ -1,7 +1,7 @@
-$NetBSD: patch-modules_audio__output_pulse.c,v 1.1 2011/07/23 19:48:39 abs Exp $
+$NetBSD: patch-modules_audio__output_pulse.c,v 1.2 2011/09/12 17:25:28 drochner Exp $
 To enable build against pulse-audio 0.9.21 - seems to work
 
---- modules/audio_output/pulse.c.orig	2011-05-30 15:03:50.000000000 +0000
+--- modules/audio_output/pulse.c.orig	2011-06-06 22:53:14.000000000 +0000
 +++ modules/audio_output/pulse.c
 @@ -272,7 +272,7 @@ static int Open(vlc_object_t *obj)
  {
@@ -9,6 +9,6 @@ To enable build against pulse-audio 0.9.21 - seems to work
  
 -#if !defined(PA_CHECK_VERSION) || !PA_CHECK_VERSION(0,9,22)
 +#if !defined(PA_CHECK_VERSION) || !PA_CHECK_VERSION(0,9,20)
-     if( !vlc_xlib_init( p_this ) )
+     if( !vlc_xlib_init( obj ) )
          return VLC_EGENERIC;
  #endif