Sun Aug 9 12:18:17 2009 UTC ()
add fix for SA26156
Bump PKGREVISION


(kefren)
diff -r1.79 -r1.80 pkgsrc/multimedia/vlc/Makefile
diff -r1.28 -r1.29 pkgsrc/multimedia/vlc/distinfo
diff -r0 -r1.7 pkgsrc/multimedia/vlc/patches/patch-aa
cvs diff -r1.79 -r1.80 pkgsrc/multimedia/vlc/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc/Makefile 2009/07/22 09:01:39 1.79
+++ pkgsrc/multimedia/vlc/Makefile 2009/08/09 12:18:17 1.80
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.79 2009/07/22 09:01:39 wiz Exp $ 1# $NetBSD: Makefile,v 1.80 2009/08/09 12:18:17 kefren Exp $
2# 2#
3 3
4DISTNAME= vlc-${VLC_VERSION} 4DISTNAME= vlc-${VLC_VERSION}
5CATEGORIES= multimedia 5CATEGORIES= multimedia
 6PKGREVISION= 1
6MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/ 7MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9VLC_VERSION= 1.0.0 10VLC_VERSION= 1.0.0
10 11
11MAINTAINER= ahoka@NetBSD.org 12MAINTAINER= ahoka@NetBSD.org
12HOMEPAGE= http://videolan.org/ 13HOMEPAGE= http://videolan.org/
13COMMENT= VLC media player and streaming server 14COMMENT= VLC media player and streaming server
14 15
15CONFLICTS= vlc07-[0-9]* vlc08-[0-9]* 16CONFLICTS= vlc07-[0-9]* vlc08-[0-9]*
16 17
17PKG_DESTDIR_SUPPORT= user-destdir 18PKG_DESTDIR_SUPPORT= user-destdir
18USE_LIBTOOL= yes 19USE_LIBTOOL= yes
cvs diff -r1.28 -r1.29 pkgsrc/multimedia/vlc/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc/distinfo 2009/07/07 16:17:47 1.28
+++ pkgsrc/multimedia/vlc/distinfo 2009/08/09 12:18:17 1.29
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.28 2009/07/07 16:17:47 tnn Exp $ 1$NetBSD: distinfo,v 1.29 2009/08/09 12:18:17 kefren Exp $
2 2
3SHA1 (vlc-1.0.0.tar.bz2) = fff08528d97d26f6f7faeafba94b445e0e3562e8 3SHA1 (vlc-1.0.0.tar.bz2) = fff08528d97d26f6f7faeafba94b445e0e3562e8
4RMD160 (vlc-1.0.0.tar.bz2) = 7d0ed52c580c75d09003788f5a2d27b7de18b410 4RMD160 (vlc-1.0.0.tar.bz2) = 7d0ed52c580c75d09003788f5a2d27b7de18b410
5Size (vlc-1.0.0.tar.bz2) = 19973964 bytes 5Size (vlc-1.0.0.tar.bz2) = 19973964 bytes
 6SHA1 (patch-aa) = 49157d57e4e7755be87b22234d6c04ef997f91b6
6SHA1 (patch-configure) = 88a32710eea4987975839bf982d7a6958b977a5c 7SHA1 (patch-configure) = 88a32710eea4987975839bf982d7a6958b977a5c
7SHA1 (patch-v4l2) = 1f91206f8e2f78514056386977a6c2230a710211 8SHA1 (patch-v4l2) = 1f91206f8e2f78514056386977a6c2230a710211
File Added: pkgsrc/multimedia/vlc/patches/Attic/patch-aa
--- modules/access/rtsp/real.c.orig	2009-08-09 13:00:43.000000000 +0300
+++ modules/access/rtsp/real.c	2009-08-09 13:01:54.000000000 +0300
@@ -592,6 +592,8 @@ int real_get_rdt_chunk(rtsp_client_t *rt
 
   int n;
   rmff_dump_pheader(ph, (char*)*buffer);
+  if (ph->length < 12)
+	return 0;
   n=rtsp_read_data(rtsp_session, (uint8_t*)(*buffer + 12), ph->length - 12);
   return (n <= 0) ? 0 : n+12;
 }