SECURITY update to VLC 1.1.13; fixes a buffer overflow in the TiVo demuxer.

Also install .la files for libvlc/libvlccore. From Brad (maintainer).

x11/vlc/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.138 2011/12/03 23:37:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.139 2011/12/23 15:01:59 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,7 @@ COMMENT-main=	VideoLAN client; multimedia player
 COMMENT-jack=	JACK audio output module for VLC
 COMMENT-web=	Mozilla plugin for embedded media playback
 
-V=		1.1.12
+V=		1.1.13
 DISTNAME=	vlc-${V}
 PKGNAME-main=	${DISTNAME}
 PKGNAME-jack=	vlc-jack-${V}
@@ -15,8 +15,6 @@ CATEGORIES=	x11
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${V}/
 EXTRACT_SUFX=	.tar.bz2
 
-REVISION-main=	0
-
 SHARED_LIBS=	vlc	1.0 \
 		vlccore	1.0
 
@@ -162,6 +160,10 @@ MULTI_PACKAGES+=-web
 
 .include <bsd.port.arch.mk>
 
+.if ${BUILD_PACKAGES:M-jack}
+CONFIGURE_ARGS+=--enable-jack
+.endif
+
 .if ${BUILD_PACKAGES:M-web}
 BUILD_DEPENDS+=	devel/xulrunner/1.9,-devel>=1.9
 CONFIGURE_ARGS+=--enable-mozilla \
@@ -171,10 +173,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include/nspr -I${LOCALBASE}/xulrunner1.9/include -DOPE
 PORTPATH=	${WRKDIR}/bin:/usr/bin:/bin:/usr/sbin:/sbin:${DEPBASE}/bin:${LOCALBASE}/bin:${X11BASE}/bin:${LOCALBASE}/xulrunner1.9
 .endif
 
-.if ${BUILD_PACKAGES:M-jack}
-CONFIGURE_ARGS+=--enable-jack
-.endif
-
 .if ${MACHINE_ARCH} == "amd64"
 PKG_ARGS+=-Damd64=1
 .else
@@ -187,14 +185,12 @@ PKG_ARGS+=-Di386=1
 PKG_ARGS+=-Di386=0
 .endif
 
-pre-configure:
-	@perl -pi -e 's/grep -v /grep -av /' ${WRKSRC}/src/Makefile.in
-
 post-install:
 .if ${BUILD_PACKAGES:M-web}
 	@rm ${PREFIX}/lib/mozilla/plugins/libvlcplugin.a
+	@rm ${PREFIX}/lib/mozilla/plugins/libvlcplugin.la
 .endif
 	@find ${PREFIX}/lib/vlc -name '*.a' -print | xargs rm
-	@find ${PREFIX}/lib -name '*.la' -print | xargs rm
+	@find ${PREFIX}/lib/vlc -name '*.la' -print | xargs rm
 
 .include <bsd.port.mk>

x11/vlc/distinfo

@@ -1,5 +1,5 @@
-MD5 (vlc-1.1.12.tar.bz2) = kd4a0wjJR+NTgPnXR/9XEw==
-RMD160 (vlc-1.1.12.tar.bz2) = EXUwq8i9PzjZIzt6fJGjqqF6+Hw=
-SHA1 (vlc-1.1.12.tar.bz2) = s53mZxGjN0bOEvFqUOQdPe97FFI=
-SHA256 (vlc-1.1.12.tar.bz2) = bcUNJ9JaD6tVtm+a46pAAQgtLYa5awSRqNqzVCO+Gmg=
-SIZE (vlc-1.1.12.tar.bz2) = 26220996
+MD5 (vlc-1.1.13.tar.bz2) = lnj7egSAi24N5jdG015LsQ==
+RMD160 (vlc-1.1.13.tar.bz2) = xapDipCF3b8o6EnfRCt1R1aTKQ0=
+SHA1 (vlc-1.1.13.tar.bz2) = BbvH/0J/O5GbKaRc4BTK/5upJkg=
+SHA256 (vlc-1.1.13.tar.bz2) = A+3sRNRjufXn21b9hExtSseZZmOOGsMt7c+1hHqTI8E=
+SIZE (vlc-1.1.13.tar.bz2) = 26226587

x11/vlc/patches/patch-modules_misc_inhibit_xdg_c

@@ -1,18 +1,18 @@
-$OpenBSD: patch-modules_misc_inhibit_xdg_c,v 1.1 2011/11/16 13:33:15 phessler Exp $
+$OpenBSD: patch-modules_misc_inhibit_xdg_c,v 1.2 2011/12/23 15:01:59 sthen Exp $
 
 Missing posix_spawnp and family.
 
---- modules/misc/inhibit/xdg.c.orig	Sun Nov 13 13:12:04 2011
-+++ modules/misc/inhibit/xdg.c	Sun Nov 13 13:15:22 2011
-@@ -26,7 +26,6 @@
- #include <vlc_plugin.h>
+--- modules/misc/inhibit/xdg.c.orig	Tue Nov 22 15:30:36 2011
++++ modules/misc/inhibit/xdg.c	Wed Dec 21 09:22:40 2011
+@@ -27,7 +27,6 @@
  #include <vlc_inhibit.h>
  #include <assert.h>
+ #include <signal.h>
 -#include <spawn.h>
  #include <sys/wait.h>
  
  static int Open (vlc_object_t *);
-@@ -46,7 +45,6 @@ struct vlc_inhibit_sys
+@@ -47,7 +46,6 @@ struct vlc_inhibit_sys
      vlc_thread_t thread;
      vlc_cond_t update, inactive;
      vlc_mutex_t lock;
@@ -20,7 +20,7 @@ Missing posix_spawnp and family.
      bool suspend, suspended;
  };
  
-@@ -66,18 +64,6 @@ static int Open (vlc_object_t *obj)
+@@ -67,18 +65,6 @@ static int Open (vlc_object_t *obj)
      vlc_mutex_init (&p_sys->lock);
      vlc_cond_init (&p_sys->update);
      vlc_cond_init (&p_sys->inactive);
@@ -39,7 +39,7 @@ Missing posix_spawnp and family.
      p_sys->suspend = false;
      p_sys->suspended = false;
  
-@@ -105,7 +91,6 @@ static void Close (vlc_object_t *obj)
+@@ -106,7 +92,6 @@ static void Close (vlc_object_t *obj)
  
      vlc_cancel (p_sys->thread);
      vlc_join (p_sys->thread, NULL);
@@ -47,7 +47,7 @@ Missing posix_spawnp and family.
      vlc_cond_destroy (&p_sys->inactive);
      vlc_cond_destroy (&p_sys->update);
      vlc_mutex_destroy (&p_sys->lock);
-@@ -142,26 +127,10 @@ static void *Thread (void *data)
+@@ -143,26 +128,10 @@ static void *Thread (void *data)
              vlc_cond_wait (&p_sys->update, &p_sys->lock);
  
          int canc = vlc_savecancel ();

x11/vlc/patches/patch-src_stream_output_announce_c

@@ -0,0 +1,21 @@
+$OpenBSD: patch-src_stream_output_announce_c,v 1.1 2011/12/23 15:01:59 sthen Exp $
+
+Handle SAP_Add() errors.
+
+--- src/stream_output/announce.c.orig	Thu Dec 22 05:20:46 2011
++++ src/stream_output/announce.c	Thu Dec 22 05:21:53 2011
+@@ -100,7 +100,13 @@ sout_AnnounceRegisterSDP( vlc_object_t *obj, const cha
+         goto error;
+ 
+     msg_Dbg (obj, "adding SAP session");
+-    SAP_Add (p_sap, p_session );
++    if (SAP_Add (p_sap, p_session))
++    {
++        vlc_mutex_lock (&sap_mutex);
++        vlc_object_release ((vlc_object_t *)p_sap);
++        vlc_mutex_unlock (&sap_mutex);
++        goto error;
++    }
+     return p_session;
+ 
+ error:

x11/vlc/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.18 2011/12/03 23:37:39 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.19 2011/12/23 15:01:59 sthen Exp $
 @pkgpath x11/vlc
 %%amd64%%
 %%i386%%
@@ -88,8 +88,10 @@ include/vlc/plugins/vlc_xlib.h
 include/vlc/plugins/vlc_xml.h
 include/vlc/vlc.h
 lib/libvlc.a
+lib/libvlc.la
 @lib lib/libvlc.so.${LIBvlc_VERSION}
 lib/libvlccore.a
+lib/libvlccore.la
 @lib lib/libvlccore.so.${LIBvlccore_VERSION}
 lib/pkgconfig/libvlc.pc
 lib/pkgconfig/vlc-plugin.pc
@@ -328,6 +330,7 @@ lib/vlc/plugins/video_filter/libmosaic_plugin.so
 lib/vlc/plugins/video_filter/libmotionblur_plugin.so
 lib/vlc/plugins/video_filter/libmotiondetect_plugin.so
 lib/vlc/plugins/video_filter/libnoise_plugin.so
+lib/vlc/plugins/video_filter/libosdmenu_plugin.so
 lib/vlc/plugins/video_filter/libpanoramix_plugin.so
 lib/vlc/plugins/video_filter/libpostproc_plugin.so
 lib/vlc/plugins/video_filter/libpsychedelic_plugin.so