Fri Aug 14 15:24:05 2009 UTC ()
Pullup ticket #2861 - requested by kefren
vlc08: security patch

Revisions pulled up:
- multimedia/vlc08/Makefile			1.22
- multimedia/vlc08/distinfo			1.9
- multimedia/vlc08/patches/patch-ab		1.7
---
Module Name:	pkgsrc
Committed By:	kefren
Date:		Sun Aug  9 12:33:14 UTC 2009

Modified Files:
	pkgsrc/multimedia/vlc08: Makefile distinfo
Added Files:
	pkgsrc/multimedia/vlc08/patches: patch-ab

Log Message:
add fix for SA36037, bump PKGREVISION. XXX: not tested


(tron)
diff -r1.20 -r1.20.2.1 pkgsrc/multimedia/vlc08/Makefile
diff -r1.8 -r1.8.2.1 pkgsrc/multimedia/vlc08/distinfo
diff -r0 -r1.7.2.2 pkgsrc/multimedia/vlc08/patches/patch-ab
cvs diff -r1.20 -r1.20.2.1 pkgsrc/multimedia/vlc08/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc08/Attic/Makefile 2009/06/12 17:24:54 1.20
+++ pkgsrc/multimedia/vlc08/Attic/Makefile 2009/08/14 15:24:05 1.20.2.1
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.20 2009/06/12 17:24:54 ahoka Exp $ 1# $NetBSD: Makefile,v 1.20.2.1 2009/08/14 15:24:05 tron Exp $
2# 2#
3 3
4DISTNAME= vlc-${VLC_VER} 4DISTNAME= vlc-${VLC_VER}
5PKGNAME= vlc08-${VLC_VER} 5PKGNAME= vlc08-${VLC_VER}
6VLC_VER= 0.8.6i 6VLC_VER= 0.8.6i
7PKGREVISION= 4 7PKGREVISION= 5
8CATEGORIES= multimedia 8CATEGORIES= multimedia
9MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/ 9MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://www.videolan.org/ 13HOMEPAGE= http://www.videolan.org/
14COMMENT= VideoLAN Client 14COMMENT= VideoLAN Client
15 15
16# Purposely not setting PREV_PKGPATH 16# Purposely not setting PREV_PKGPATH
17SUPERSEDES= vlc-0.8.* 17SUPERSEDES= vlc-0.8.*
18 18
19PKG_DESTDIR_SUPPORT= user-destdir 19PKG_DESTDIR_SUPPORT= user-destdir
20CONFLICTS= vlc-[0-9]* vlc07-[0-9]* 20CONFLICTS= vlc-[0-9]* vlc07-[0-9]*
cvs diff -r1.8 -r1.8.2.1 pkgsrc/multimedia/vlc08/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc08/Attic/distinfo 2009/07/02 10:15:47 1.8
+++ pkgsrc/multimedia/vlc08/Attic/distinfo 2009/08/14 15:24:05 1.8.2.1
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.8 2009/07/02 10:15:47 sborrill Exp $ 1$NetBSD: distinfo,v 1.8.2.1 2009/08/14 15:24:05 tron Exp $
2 2
3SHA1 (vlc-0.8.6i.tar.bz2) = 4c6f45dffe3a8309ce201897040dc1f82b9cde99 3SHA1 (vlc-0.8.6i.tar.bz2) = 4c6f45dffe3a8309ce201897040dc1f82b9cde99
4RMD160 (vlc-0.8.6i.tar.bz2) = a5da4e1e0980594c678c04016491c8a373df4017 4RMD160 (vlc-0.8.6i.tar.bz2) = a5da4e1e0980594c678c04016491c8a373df4017
5Size (vlc-0.8.6i.tar.bz2) = 11786172 bytes 5Size (vlc-0.8.6i.tar.bz2) = 11786172 bytes
6SHA1 (patch-aa) = 497a83bb0f1e2c095a81aa84115e66b56dd47e2c 6SHA1 (patch-aa) = 497a83bb0f1e2c095a81aa84115e66b56dd47e2c
 7SHA1 (patch-ab) = df3a58d361ad0767dab78f7fae7891aee6143c6c
7SHA1 (patch-mmstu.c) = ef4bed6fb5871790bb9198dad4961384f3e38d16 8SHA1 (patch-mmstu.c) = ef4bed6fb5871790bb9198dad4961384f3e38d16
8SHA1 (patch-mmstu.h) = a11be24360948bcd8ca32bd7d01020e34c0801ad 9SHA1 (patch-mmstu.h) = a11be24360948bcd8ca32bd7d01020e34c0801ad
9SHA1 (patch-tta.c) = 923852b9aedeb75eed052e532ce5ddf50ab19951 10SHA1 (patch-tta.c) = 923852b9aedeb75eed052e532ce5ddf50ab19951
10SHA1 (patch-x264.c) = 083ab4eeb48e01216cc0c4d62006a50bcd3ae421 11SHA1 (patch-x264.c) = 083ab4eeb48e01216cc0c4d62006a50bcd3ae421
File Added: pkgsrc/multimedia/vlc08/patches/Attic/patch-ab
--- modules/access/rtsp/real.c.orig	2009-08-09 15:28:43.000000000 +0300
+++ modules/access/rtsp/real.c	2009-08-09 15:29:26.000000000 +0300
@@ -598,6 +598,8 @@ int real_get_rdt_chunk(rtsp_client_t *rt
 
   int n;
   rmff_dump_pheader(ph, *buffer);
+  if (ph->length < 12)
+	return 0;
   n=rtsp_read_data(rtsp_session, *buffer + 12, ph->length - 12);
   return (n <= 0) ? 0 : n+12;
 }