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 (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,128 +1,128 @@ @@ -1,128 +1,128 @@
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]*
21 21
22USE_LIBTOOL= yes 22USE_LIBTOOL= yes
23USE_TOOLS+= gmake perl pkg-config 23USE_TOOLS+= gmake perl pkg-config
24USE_PKGLOCALEDIR= yes 24USE_PKGLOCALEDIR= yes
25GNU_CONFIGURE= yes 25GNU_CONFIGURE= yes
26PTHREAD_OPTS+= require 26PTHREAD_OPTS+= require
27USE_LANGUAGES= c c++ 27USE_LANGUAGES= c c++
28USE_DIRS+= xdg-1.4 28USE_DIRS+= xdg-1.4
29 29
30.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
31.include "options.mk" 31.include "options.mk"
32 32
33.if ${OPSYS} == "NetBSD" 33.if ${OPSYS} == "NetBSD"
34CONFIGURE_ARGS+= --disable-vcd 34CONFIGURE_ARGS+= --disable-vcd
35.endif 35.endif
36 36
37BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0 37BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0
38BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 38BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
39BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.81 39BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.81
40 40
41CONFIGURE_ARGS+= --disable-speex # needs unstable 1.1.x branch 41CONFIGURE_ARGS+= --disable-speex # needs unstable 1.1.x branch
42CONFIGURE_ARGS+= --disable-gtk 42CONFIGURE_ARGS+= --disable-gtk
43CONFIGURE_ARGS+= --enable-release 43CONFIGURE_ARGS+= --enable-release
44CONFIGURE_ARGS+= --disable-gnomevfs 44CONFIGURE_ARGS+= --disable-gnomevfs
45CONFIGURE_ARGS+= --disable-gnutls 45CONFIGURE_ARGS+= --disable-gnutls
46CONFIGURE_ARGS+= --with-ffmpeg-zlib 46CONFIGURE_ARGS+= --with-ffmpeg-zlib
47CONFIGURE_ARGS+= --disable-smb 47CONFIGURE_ARGS+= --disable-smb
48CONFIGURE_ARGS+= --disable-mpc 48CONFIGURE_ARGS+= --disable-mpc
49CONFIGURE_ARGS+= --disable-dts 49CONFIGURE_ARGS+= --disable-dts
50CONFIGURE_ARGS+= --enable-cddax 50CONFIGURE_ARGS+= --enable-cddax
51CONFIGURE_ARGS+= --enable-dvdread 51CONFIGURE_ARGS+= --enable-dvdread
52CONFIGURE_ARGS+= --enable-flac 52CONFIGURE_ARGS+= --enable-flac
53 53
54INSTALLATION_DIRS+= ${PKGMANDIR}/man1 share/vlc/http/dialogs \ 54INSTALLATION_DIRS+= ${PKGMANDIR}/man1 share/vlc/http/dialogs \
55 share/vlc/http/images share/vlc/http/js \ 55 share/vlc/http/images share/vlc/http/js \
56 share/vlc/http/old share/vlc/http/old/admin \ 56 share/vlc/http/old share/vlc/http/old/admin \
57 share/vlc/http/old/vlm share/vlc/http/requests \ 57 share/vlc/http/old/vlm share/vlc/http/requests \
58 share/vlc/osdmenu/default share/vlc/osdmenu/default/selected \ 58 share/vlc/osdmenu/default share/vlc/osdmenu/default/selected \
59 share/vlc/osdmenu/default/selection share/vlc/osdmenu/default/volume \ 59 share/vlc/osdmenu/default/selection share/vlc/osdmenu/default/volume \
60 share/vlc/osdmenu/dvd/selected share/vlc/osdmenu/dvd/volume \ 60 share/vlc/osdmenu/dvd/selected share/vlc/osdmenu/dvd/volume \
61 share/vlc/osdmenu/dvd/unselect share/vlc/osdmenu/dvd/selection \ 61 share/vlc/osdmenu/dvd/unselect share/vlc/osdmenu/dvd/selection \
62 share/vlc/skins2 share/vlc/skins2/fonts 62 share/vlc/skins2 share/vlc/skins2/fonts
63 63
64pre-install: 64pre-install:
65 ${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 65 ${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
66 ${INSTALL_DATA} ${WRKSRC}/doc/vlc-config.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 66 ${INSTALL_DATA} ${WRKSRC}/doc/vlc-config.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
67 67
68ORIGFNT= /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf 68ORIGFNT= /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf
69DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf 69DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
70 70
71SUBST_CLASSES+= oss 71SUBST_CLASSES+= oss
72SUBST_STAGE.oss= post-patch 72SUBST_STAGE.oss= post-patch
73SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g" 73SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
74SUBST_FILES.oss+= modules/access/v4l/v4l.c 74SUBST_FILES.oss+= modules/access/v4l/v4l.c
75SUBST_FILES.oss+= modules/audio_output/oss.c 75SUBST_FILES.oss+= modules/audio_output/oss.c
76SUBST_FILES.oss+= modules/gui/pda/pda_interface.c 76SUBST_FILES.oss+= modules/gui/pda/pda_interface.c
77SUBST_FILES.oss+= modules/gui/pda/pda.glade 77SUBST_FILES.oss+= modules/gui/pda/pda.glade
78SUBST_MESSAGE.oss= Fixing hardcoded audio device. 78SUBST_MESSAGE.oss= Fixing hardcoded audio device.
79 79
80SUBST_CLASSES+= fnt 80SUBST_CLASSES+= fnt
81SUBST_STAGE.fnt= post-patch 81SUBST_STAGE.fnt= post-patch
82SUBST_SED.fnt= -e "s,${ORIGFNT},${DEFAULT_FONT}," 82SUBST_SED.fnt= -e "s,${ORIGFNT},${DEFAULT_FONT},"
83SUBST_FILES.fnt= modules/misc/freetype.c 83SUBST_FILES.fnt= modules/misc/freetype.c
84SUBST_MESSAGE.fnt= Fixing hardcoded paths. 84SUBST_MESSAGE.fnt= Fixing hardcoded paths.
85 85
86PLIST_VARS+= cdda vcd fb 86PLIST_VARS+= cdda vcd fb
87.if ${OPSYS} != "NetBSD" 87.if ${OPSYS} != "NetBSD"
88PLIST.cdda= yes 88PLIST.cdda= yes
89PLIST.vcd= yes 89PLIST.vcd= yes
90.endif 90.endif
91.if ${OPSYS} == "Linux" && exists(/usr/include/linux/fb.h) 91.if ${OPSYS} == "Linux" && exists(/usr/include/linux/fb.h)
92CONFIGURE_ARGS+= --enable-fb 92CONFIGURE_ARGS+= --enable-fb
93PLIST.fb= yes 93PLIST.fb= yes
94.else 94.else
95CONFIGURE_ARGS+= --disable-fb 95CONFIGURE_ARGS+= --disable-fb
96.endif 96.endif
97 97
98.if ${X11_TYPE} == "modular" 98.if ${X11_TYPE} == "modular"
99CONFIGURE_ARGS+= x_libraries=${PREFIX}/lib 99CONFIGURE_ARGS+= x_libraries=${PREFIX}/lib
100.endif 100.endif
101 101
102.include "../../audio/flac/buildlink3.mk" 102.include "../../audio/flac/buildlink3.mk"
103.include "../../audio/lame/buildlink3.mk" 103.include "../../audio/lame/buildlink3.mk"
104.include "../../audio/liba52/buildlink3.mk" 104.include "../../audio/liba52/buildlink3.mk"
105.include "../../audio/libcddb/buildlink3.mk" 105.include "../../audio/libcddb/buildlink3.mk"
106.include "../../audio/libid3tag/buildlink3.mk" 106.include "../../audio/libid3tag/buildlink3.mk"
107.include "../../audio/libmad/buildlink3.mk" 107.include "../../audio/libmad/buildlink3.mk"
108.include "../../audio/libvorbis/buildlink3.mk" 108.include "../../audio/libvorbis/buildlink3.mk"
109.include "../../converters/fribidi/buildlink3.mk" 109.include "../../converters/fribidi/buildlink3.mk"
110.include "../../devel/gettext-lib/buildlink3.mk" 110.include "../../devel/gettext-lib/buildlink3.mk"
111.include "../../devel/pcre/buildlink3.mk" 111.include "../../devel/pcre/buildlink3.mk"
112.include "../../devel/zlib/buildlink3.mk" 112.include "../../devel/zlib/buildlink3.mk"
113.include "../../graphics/png/buildlink3.mk" 113.include "../../graphics/png/buildlink3.mk"
114.include "../../misc/libcdio/buildlink3.mk" 114.include "../../misc/libcdio/buildlink3.mk"
115.include "../../multimedia/ffmpeg/buildlink3.mk" 115.include "../../multimedia/ffmpeg/buildlink3.mk"
116.include "../../multimedia/libdvdplay/buildlink3.mk" 116.include "../../multimedia/libdvdplay/buildlink3.mk"
117.include "../../multimedia/libdvbpsi/buildlink3.mk" 117.include "../../multimedia/libdvbpsi/buildlink3.mk"
118.include "../../multimedia/libdvdnav/buildlink3.mk" 118.include "../../multimedia/libdvdnav/buildlink3.mk"
119.include "../../multimedia/libdvdread/buildlink3.mk" 119.include "../../multimedia/libdvdread/buildlink3.mk"
120.include "../../multimedia/libmatroska/buildlink3.mk" 120.include "../../multimedia/libmatroska/buildlink3.mk"
121.include "../../multimedia/libmpeg2/buildlink3.mk" 121.include "../../multimedia/libmpeg2/buildlink3.mk"
122.include "../../multimedia/libogg/buildlink3.mk" 122.include "../../multimedia/libogg/buildlink3.mk"
123.include "../../multimedia/x264-devel/buildlink3.mk" 123.include "../../multimedia/x264-devel/buildlink3.mk"
124.include "../../textproc/libxml2/buildlink3.mk" 124.include "../../textproc/libxml2/buildlink3.mk"
125 125
126.include "../../mk/oss.buildlink3.mk" 126.include "../../mk/oss.buildlink3.mk"
127.include "../../mk/pthread.buildlink3.mk" 127.include "../../mk/pthread.buildlink3.mk"
128.include "../../mk/bsd.pkg.mk" 128.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.8.2.1 pkgsrc/multimedia/vlc08/Attic/distinfo (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;
 }