upgrade to VLC 0.8.6i; bug fixes and integrates the previous
security fix. ok jakemsr@
This commit is contained in:
brad
parent
1e0b82bf02
commit
e594d14508
@ -1,12 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.73 2008/07/09 17:28:42 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.74 2008/07/15 16:19:15 brad Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT-main= videolan client; multimedia player
|
||||
|
||||
V= 0.8.6h
|
||||
V= 0.8.6i
|
||||
DISTNAME= vlc-${V}
|
||||
PKGNAME-main= ${DISTNAME}p1
|
||||
PKGNAME-main= ${DISTNAME}
|
||||
CATEGORIES= x11
|
||||
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${V}/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (vlc-0.8.6h.tar.gz) = mz4VgCtILLEuedLrjMTqmA==
|
||||
RMD160 (vlc-0.8.6h.tar.gz) = gBNL3OR05Yy0IOzV1SSPnO7oceI=
|
||||
SHA1 (vlc-0.8.6h.tar.gz) = gpslmakYglTRwQm+N3tKnBjhRII=
|
||||
SHA256 (vlc-0.8.6h.tar.gz) = kqmY8spTt3YQxghDay6NmRRCdC8leTwTbLTuCV7sHv8=
|
||||
SIZE (vlc-0.8.6h.tar.gz) = 16977154
|
||||
MD5 (vlc-0.8.6i.tar.gz) = /YUhZtFwVXPNd2igYRftUQ==
|
||||
RMD160 (vlc-0.8.6i.tar.gz) = XS94Y19z8M61pIV7akCsl58vCLc=
|
||||
SHA1 (vlc-0.8.6i.tar.gz) = pEFeMxGLSOxsMYuw4QXbXlH7tXs=
|
||||
SHA256 (vlc-0.8.6i.tar.gz) = 6Zs7Se/YyujPIQymmlyBzurDsufSseed+EyavuSqhCY=
|
||||
SIZE (vlc-0.8.6i.tar.gz) = 16995014
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.13 2008/07/09 02:17:12 jakemsr Exp $
|
||||
--- configure.ac.orig Mon Jun 2 13:35:52 2008
|
||||
+++ configure.ac Sun Jun 22 14:11:16 2008
|
||||
$OpenBSD: patch-configure_ac,v 1.14 2008/07/15 16:19:15 brad Exp $
|
||||
--- configure.ac.orig Tue Jul 8 16:59:22 2008
|
||||
+++ configure.ac Sun Jul 13 03:40:00 2008
|
||||
@@ -199,7 +199,7 @@ case "${target_os}" in
|
||||
VLC_ADD_CFLAGS([libvlc],[-x objective-c])
|
||||
VLC_ADD_CFLAGS([vlc],[-x objective-c])
|
||||
@ -36,26 +36,26 @@ $OpenBSD: patch-configure_ac,v 1.13 2008/07/09 02:17:12 jakemsr Exp $
|
||||
- PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat],
|
||||
+ PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat, libpostproc],
|
||||
[
|
||||
VLC_SAVE_FLAGS
|
||||
CPPFLAGS="${CPPFLAGS} ${FFMPEG_CFLAGS}"
|
||||
@@ -2770,16 +2773,6 @@ dnl Trying with pkg-config
|
||||
CFLAGS="${CFLAGS} ${FFMPEG_CFLAGS}"
|
||||
@@ -2769,16 +2772,6 @@ dnl Trying with pkg-config
|
||||
fi
|
||||
fi
|
||||
|
||||
-dnl Check if we have (required) img_resample() in libavcodec
|
||||
-if test "${enable_ffmpeg}" != "no"
|
||||
-then
|
||||
- VLC_SAVE_FLAGS
|
||||
- CFLAGS="${CFLAGS} ${CFLAGS_ffmpeg}"
|
||||
- LDFLAGS="${LDFLAGS} ${LDFLAGS_ffmpeg}"
|
||||
- AC_CHECK_LIB(avcodec, img_resample, ,
|
||||
- [AC_MSG_ERROR([Your FFmpeg library doesn't have the needed img_resample() function. You should rebuild it with software scaler disabled])], -lavutil)
|
||||
- VLC_RESTORE_FLAGS
|
||||
-fi
|
||||
-
|
||||
dnl Clean out environment
|
||||
LIBS="${LIBS_save}"
|
||||
|
||||
dnl
|
||||
dnl ffmpegaltivec plugin
|
||||
@@ -3380,13 +3373,13 @@ AC_ARG_ENABLE(png,
|
||||
@@ -3381,13 +3374,13 @@ AC_ARG_ENABLE(png,
|
||||
[ --enable-png PNG support (default enabled)])
|
||||
if test "${enable_png}" != "no"; then
|
||||
AC_CHECK_HEADERS(png.h, [
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-modules_audio_output_Makefile_in,v 1.4 2008/06/09 22:55:43 sthen Exp $
|
||||
--- modules/audio_output/Makefile.in.orig Tue Jun 3 10:03:19 2008
|
||||
+++ modules/audio_output/Makefile.in Sat Jun 7 20:57:24 2008
|
||||
@@ -715,6 +715,7 @@ libarts_plugin_la_LDFLAGS = `$(VLC_CONFIG) --libs plug
|
||||
$OpenBSD: patch-modules_audio_output_Makefile_in,v 1.5 2008/07/15 16:19:15 brad Exp $
|
||||
--- modules/audio_output/Makefile.in.orig Tue Jul 8 17:35:44 2008
|
||||
+++ modules/audio_output/Makefile.in Sun Jul 13 03:38:04 2008
|
||||
@@ -717,6 +717,7 @@ libarts_plugin_la_LDFLAGS = `$(VLC_CONFIG) --libs plug
|
||||
-rpath '$(libvlcdir)' -avoid-version -module -shrext $(LIBEXT)
|
||||
|
||||
libarts_plugin_la_LIBADD = $(LTLIBVLC)
|
||||
@ -9,7 +9,7 @@ $OpenBSD: patch-modules_audio_output_Makefile_in,v 1.4 2008/06/09 22:55:43 sthen
|
||||
libarts_a_SOURCES = $(SOURCES_arts)
|
||||
libarts_builtin_la_SOURCES = $(SOURCES_arts)
|
||||
libarts_a_CFLAGS = `$(VLC_CONFIG) --cflags builtin pic arts`
|
||||
@@ -2067,7 +2068,7 @@ all-modules:
|
||||
@@ -2069,7 +2070,7 @@ all-modules:
|
||||
|
||||
# Build a plugin with the adequate linker and linker's flags
|
||||
_plugin.a_plugin$(LIBEXT):
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-modules_codec_ffmpeg_Makefile_in,v 1.1 2008/07/09 02:17:12 jakemsr Exp $
|
||||
--- modules/codec/ffmpeg/Makefile.in.orig Sun Jun 22 15:01:34 2008
|
||||
+++ modules/codec/ffmpeg/Makefile.in Sun Jun 22 15:04:50 2008
|
||||
$OpenBSD: patch-modules_codec_ffmpeg_Makefile_in,v 1.2 2008/07/15 16:19:15 brad Exp $
|
||||
--- modules/codec/ffmpeg/Makefile.in.orig Tue Jul 8 17:35:49 2008
|
||||
+++ modules/codec/ffmpeg/Makefile.in Sun Jul 13 03:38:04 2008
|
||||
@@ -70,7 +70,7 @@ am__objects_1 =
|
||||
am__objects_2 = libffmpeg_a-ffmpeg.$(OBJEXT) \
|
||||
libffmpeg_a-video.$(OBJEXT) libffmpeg_a-audio.$(OBJEXT) \
|
||||
@ -68,7 +68,7 @@ $OpenBSD: patch-modules_codec_ffmpeg_Makefile_in,v 1.1 2008/07/09 02:17:12 jakem
|
||||
libffmpegaltivec_plugin_la-encoder.lo \
|
||||
libffmpegaltivec_plugin_la-postprocess.lo \
|
||||
libffmpegaltivec_plugin_la-demux.lo \
|
||||
@@ -492,7 +487,6 @@ SOURCES_ffmpeg = \
|
||||
@@ -494,7 +489,6 @@ SOURCES_ffmpeg = \
|
||||
video.c \
|
||||
audio.c \
|
||||
video_filter.c \
|
||||
@ -76,7 +76,7 @@ $OpenBSD: patch-modules_codec_ffmpeg_Makefile_in,v 1.1 2008/07/09 02:17:12 jakem
|
||||
encoder.c \
|
||||
postprocess.c \
|
||||
demux.c \
|
||||
@@ -505,7 +499,6 @@ SOURCES_ffmpegaltivec = \
|
||||
@@ -507,7 +501,6 @@ SOURCES_ffmpegaltivec = \
|
||||
video.c \
|
||||
audio.c \
|
||||
video_filter.c \
|
||||
@ -84,7 +84,7 @@ $OpenBSD: patch-modules_codec_ffmpeg_Makefile_in,v 1.1 2008/07/09 02:17:12 jakem
|
||||
encoder.c \
|
||||
postprocess.c \
|
||||
demux.c \
|
||||
@@ -661,7 +654,6 @@ distclean-compile:
|
||||
@@ -663,7 +656,6 @@ distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_a-audio.Po@am__quote@
|
||||
@ -92,7 +92,7 @@ $OpenBSD: patch-modules_codec_ffmpeg_Makefile_in,v 1.1 2008/07/09 02:17:12 jakem
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_a-demux.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_a-encoder.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_a-ffmpeg.Po@am__quote@
|
||||
@@ -670,7 +662,6 @@ distclean-compile:
|
||||
@@ -672,7 +664,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_a-video.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_a-video_filter.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_builtin_la-audio.Plo@am__quote@
|
||||
@ -100,7 +100,7 @@ $OpenBSD: patch-modules_codec_ffmpeg_Makefile_in,v 1.1 2008/07/09 02:17:12 jakem
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_builtin_la-demux.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_builtin_la-encoder.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_builtin_la-ffmpeg.Plo@am__quote@
|
||||
@@ -679,7 +670,6 @@ distclean-compile:
|
||||
@@ -681,7 +672,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_builtin_la-video.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_builtin_la-video_filter.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_plugin_a-audio.Po@am__quote@
|
||||
@ -108,7 +108,7 @@ $OpenBSD: patch-modules_codec_ffmpeg_Makefile_in,v 1.1 2008/07/09 02:17:12 jakem
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_plugin_a-demux.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_plugin_a-encoder.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_plugin_a-ffmpeg.Po@am__quote@
|
||||
@@ -688,7 +678,6 @@ distclean-compile:
|
||||
@@ -690,7 +680,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_plugin_a-video.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_plugin_a-video_filter.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_plugin_la-audio.Plo@am__quote@
|
||||
@ -116,7 +116,7 @@ $OpenBSD: patch-modules_codec_ffmpeg_Makefile_in,v 1.1 2008/07/09 02:17:12 jakem
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_plugin_la-demux.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_plugin_la-encoder.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_plugin_la-ffmpeg.Plo@am__quote@
|
||||
@@ -697,7 +686,6 @@ distclean-compile:
|
||||
@@ -699,7 +688,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_plugin_la-video.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpeg_plugin_la-video_filter.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpegaltivec_a-audio.Po@am__quote@
|
||||
@ -124,7 +124,7 @@ $OpenBSD: patch-modules_codec_ffmpeg_Makefile_in,v 1.1 2008/07/09 02:17:12 jakem
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpegaltivec_a-demux.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpegaltivec_a-encoder.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpegaltivec_a-ffmpeg.Po@am__quote@
|
||||
@@ -706,7 +694,6 @@ distclean-compile:
|
||||
@@ -708,7 +696,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpegaltivec_a-video.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpegaltivec_a-video_filter.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpegaltivec_builtin_la-audio.Plo@am__quote@
|
||||
@ -132,7 +132,7 @@ $OpenBSD: patch-modules_codec_ffmpeg_Makefile_in,v 1.1 2008/07/09 02:17:12 jakem
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpegaltivec_builtin_la-demux.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpegaltivec_builtin_la-encoder.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpegaltivec_builtin_la-ffmpeg.Plo@am__quote@
|
||||
@@ -715,7 +702,6 @@ distclean-compile:
|
||||
@@ -717,7 +704,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpegaltivec_builtin_la-video.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpegaltivec_builtin_la-video_filter.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpegaltivec_plugin_a-audio.Po@am__quote@
|
||||
@ -140,7 +140,7 @@ $OpenBSD: patch-modules_codec_ffmpeg_Makefile_in,v 1.1 2008/07/09 02:17:12 jakem
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpegaltivec_plugin_a-demux.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpegaltivec_plugin_a-encoder.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpegaltivec_plugin_a-ffmpeg.Po@am__quote@
|
||||
@@ -724,7 +710,6 @@ distclean-compile:
|
||||
@@ -726,7 +712,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpegaltivec_plugin_a-video.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpegaltivec_plugin_a-video_filter.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libffmpegaltivec_plugin_la-audio.Plo@am__quote@
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
$OpenBSD: patch-modules_demux_wav_c,v 1.1 2008/07/09 17:28:42 sthen Exp $
|
||||
|
||||
wav: fix integer overflow (CVE-2008-2430)
|
||||
|
||||
When i_size is sufficiently large, we would overflow malloc(), and then
|
||||
overwrite the heap with stream_Read().
|
||||
|
||||
Bug reported by: Alin Rad Pop, Secunia Research.
|
||||
|
||||
--- modules/demux/wav.c.orig Sun May 25 19:28:57 2008
|
||||
+++ modules/demux/wav.c Thu Jul 3 13:16:18 2008
|
||||
@@ -103,7 +103,8 @@ static int Open( vlc_object_t * p_this )
|
||||
demux_sys_t *p_sys;
|
||||
|
||||
uint8_t *p_peek;
|
||||
- unsigned int i_size, i_extended;
|
||||
+ uint32_t i_size;
|
||||
+ unsigned int i_extended;
|
||||
char *psz_name;
|
||||
|
||||
WAVEFORMATEXTENSIBLE *p_wf_ext = NULL;
|
||||
@@ -136,7 +137,8 @@ static int Open( vlc_object_t * p_this )
|
||||
msg_Err( p_demux, "cannot find 'fmt ' chunk" );
|
||||
goto error;
|
||||
}
|
||||
- if( i_size < sizeof( WAVEFORMATEX ) - 2 ) /* XXX -2 isn't a typo */
|
||||
+ i_size += 2;
|
||||
+ if( i_size < sizeof( WAVEFORMATEX ) )
|
||||
{
|
||||
msg_Err( p_demux, "invalid 'fmt ' chunk" );
|
||||
goto error;
|
||||
@@ -144,14 +146,15 @@ static int Open( vlc_object_t * p_this )
|
||||
stream_Read( p_demux->s, NULL, 8 ); /* Cannot fail */
|
||||
|
||||
/* load waveformatex */
|
||||
- p_wf_ext = malloc( __EVEN( i_size ) + 2 );
|
||||
+ p_wf_ext = malloc( i_size );
|
||||
if( p_wf_ext == NULL )
|
||||
goto error;
|
||||
|
||||
p_wf = (WAVEFORMATEX *)p_wf_ext;
|
||||
p_wf->cbSize = 0;
|
||||
- if( stream_Read( p_demux->s,
|
||||
- p_wf, __EVEN( i_size ) ) < (int)__EVEN( i_size ) )
|
||||
+ i_size -= 2;
|
||||
+ if( stream_Read( p_demux->s, p_wf, i_size ) != (int)i_size
|
||||
+ || ( ( i_size & 1 ) && stream_Read( p_demux->s, NULL, 1 ) != 1 ) )
|
||||
{
|
||||
msg_Err( p_demux, "cannot load 'fmt ' chunk" );
|
||||
goto error;
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-share_Makefile_in,v 1.6 2008/06/09 22:55:43 sthen Exp $
|
||||
--- share/Makefile.in.orig Tue Jun 3 10:04:16 2008
|
||||
+++ share/Makefile.in Sat Jun 7 20:57:24 2008
|
||||
@@ -850,7 +850,6 @@ skins2/default.vlt: $(skins2_default_vlt_FILES)
|
||||
$OpenBSD: patch-share_Makefile_in,v 1.7 2008/07/15 16:19:15 brad Exp $
|
||||
--- share/Makefile.in.orig Tue Jul 8 17:36:29 2008
|
||||
+++ share/Makefile.in Sun Jul 13 03:38:05 2008
|
||||
@@ -852,7 +852,6 @@ skins2/default.vlt: $(skins2_default_vlt_FILES)
|
||||
|
||||
skins2/default.vlt:
|
||||
mkdir -p skins2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user